vastly simplified .htaccess and cleaned up how we use variables a little

git-svn-id: http://www.observium.org/svn/observer/trunk@2446 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-09-12 04:57:56 +00:00
parent 399b00589a
commit 99c6fc3e65
14 changed files with 128 additions and 148 deletions

View File

@@ -10,27 +10,27 @@ foreach (dbFetchRows("SELECT * FROM `applications` WHERE `device_id` = ?", array
{
echo($sep);
if (!$_GET['opta']) { $_GET['opta'] = $app['app_type']; }
if (!$_GET['optc']) { $_GET['optc'] = $app['app_type']; }
if ($_GET['opta'] == $app['app_type'])
if ($_GET['optc'] == $app['app_type'])
{
echo("<span class='pagemenu-selected'>");
#echo('<img src="images/icons/'.$app['app_type'].'.png" class="optionicon" />');
} else {
#echo('<img src="images/icons/greyscale/'.$app['app_type'].'.png" class="optionicon" />');
}
echo("<a href='device/".$device['device_id']."/apps/" . $app['app_type'] . ($_GET['optb'] ? "/" . $_GET['optb'] : ''). "/'> " . $app['app_type'] ."</a>");
if ($_GET['opta'] == $app['app_type']) { echo("</span>"); }
echo("<a href='device/".$device['device_id']."/apps/" . $app['app_type'] . ($_GET['optd'] ? "/" . $_GET['optd'] : ''). "/'> " . $app['app_type'] ."</a>");
if ($_GET['optc'] == $app['app_type']) { echo("</span>"); }
$sep = " | ";
}
print_optionbar_end();
$app = dbFetchRow("SELECT * FROM `applications` WHERE `device_id` = ? AND `app_type` = ?", array($device['device_id'], $_GET['opta']));
$app = dbFetchRow("SELECT * FROM `applications` WHERE `device_id` = ? AND `app_type` = ?", array($device['device_id'], $_GET['optc']));
if (is_file("pages/device/apps/".mres($_GET['opta']).".inc.php"))
if (is_file("pages/device/apps/".mres($_GET['optc']).".inc.php"))
{
include("pages/device/apps/".mres($_GET['opta']).".inc.php");
include("pages/device/apps/".mres($_GET['optc']).".inc.php");
}
?>