Version number is now numeric only

Removed 'v ' prefix from version number so it can be evaluated in
conditions easier
Hardcoded 'v ' before all places where the version number is shown
No longer need to ltrim 'v ' from the version number
This commit is contained in:
Matt Pass
2012-09-08 19:34:25 +01:00
parent c159e9326e
commit 8c98e13984
3 changed files with 5 additions and 5 deletions

View File

@@ -10,7 +10,7 @@ if (!in_array($_SERVER["REMOTE_ADDR"], $_SESSION['allowedIPs']) && !in_array("*"
if ($ICEcoder["checkUpdates"]) {
$icv = json_encode(file_get_contents("http://icecoder.net/latest-version.txt"));
$icv = rtrim(ltrim($icv,'"'),'"\\n');
if (ltrim($ICEcoder["versionNo"],"v ")<$icv) {
if ($ICEcoder["versionNo"]<$icv) {
$updateMsg = ';top.ICEcoder.message(\'ICEcoder '.$icv.' now released\n\nPlease upgrade\')';
} else {
$cmv = json_encode(file_get_contents("http://codemirror.net/latest-version.txt"));
@@ -95,7 +95,7 @@ previousFiles = [<?php
<div class="plugins" id="pluginsContainer">
<?php echo $pluginsDisplay; ?>
</div>
<div class="version"><?php echo $ICEcoder["versionNo"];?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
<div class="version">v <?php echo $ICEcoder["versionNo"];?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
<img src="images/ice-coder.png" class="logo" onClick="ICEcoder.helpScreen()" onContextMenu="ICEcoder.settingsScreen()">
</div>

View File

@@ -36,7 +36,7 @@ for ($i=0;$i<count($themeArray);$i++) {
<div class="infoPane">
<img src="../images/ice-coder.png" class="logo">
<div class="version"><?php echo $ICEcoder["versionNo"];?></div>
<div class="version">v <?php echo $ICEcoder["versionNo"];?></div>
<p>
git:<br>

View File

@@ -29,7 +29,7 @@ include($settingsFile);
// Add ICEcoder settings to beginning of $ICEcoder array
$ICEcoder = array(
"versionNo" => "v 0.8.3",
"versionNo" => "0.8.3",
"codeMirrorDir" => "CodeMirror-2.33",
"cMThisVer" => 2.33
)+$ICEcoder;
@@ -227,7 +227,7 @@ if ($ICEcoder["accountPassword"] == "" && isset($_GET['settings'])) {
<div class="screenVCenter">
<div class="screenCenter">
<img src="../images/ice-coder.png">
<div class="version"><?php echo $ICEcoder["versionNo"];?></div>
<div class="version">v <?php echo $ICEcoder["versionNo"];?></div>
<form name="settingsUpdate" action="../" method="POST">
<input type="password" name="accountPassword" class="accountPassword">
<input type="submit" name="submit" value="Set Password" class="button">