remove dead map.php code, rename some .inc to .inc.php files, general trailing space cleanup part 1, some reindent. No expected functionality change whatsoever ;)

git-svn-id: http://www.observium.org/svn/observer/trunk@1824 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-12 08:50:47 +00:00
parent 90e2dee34a
commit c6428480bc
32 changed files with 339 additions and 423 deletions
+6 -8
View File
@@ -5,40 +5,38 @@ include("includes/defaults.inc.php");
include("config.php");
include("includes/functions.php");
$ports = mysql_result(mysql_query("SELECT count(*) FROM ports"),0);
$ports = mysql_result(mysql_query("SELECT count(*) FROM ports"),0);
$devices = mysql_result(mysql_query("SELECT count(*) FROM devices"),0);
$dataHandle = fopen("http://www.observium.org/latest.php?i=$ports&d=$devices&v=".$config['version'], r);
if($dataHandle)
if ($dataHandle)
{
while (!feof($dataHandle))
{
$data.= fread($dataHandle, 4096);
}
if($data)
if ($data)
{
list($major, $minor, $release) = explode(".", $data);
list($cur, $tag) = explode("-", $config['version']);
list($cur_major, $cur_minor, $cur_release) = explode(".", $cur);
if($argv[1] == "--cron")
if ($argv[1] == "--cron")
{
$fd = fopen('vrrd/version.txt','w');
fputs($fd, "$major.$minor.$release");
fclose($fd);
} else {
echo("Current Version $cur_major.$cur_minor.$cur_release \n");
if($major > $cur_major) {
if ($major > $cur_major) {
echo("New major release : $major.$minor.$release");
} elseif ($major == $cur_major && $minor > $cur_minor) {
echo("New minor release : $major.$minor.$release");
} elseif ($major == $cur_major && $minor == $cur_minor && $release > $cur_release) {
echo("New trivial release : $major.$minor.$release");
} elseif($major < $cur_major || ($major == $cur_major && $minor < $cur_minor) || ($major == $cur_major && $minor == $cur_minor && $release < $cur_release)) {
} elseif ($major < $cur_major || ($major == $cur_major && $minor < $cur_minor) || ($major == $cur_major && $minor == $cur_minor && $release < $cur_release)) {
echo("Your release is newer than the official version!\n");
} else {
echo("Your release is up to date\n");