diff --git a/html/index.php b/html/index.php index 583ceb5732..1e3327fead 100755 --- a/html/index.php +++ b/html/index.php @@ -19,7 +19,8 @@ include("../includes/functions.php"); include("includes/functions.inc.php"); // Check for install.inc.php -if (!file_exists('../config.php') && $_SERVER['PATH_INFO'] != '/install.php') { +if (!file_exists('../config.php') && $_SERVER['PATH_INFO'] != '/install.php') +{ // no config.php does so let's redirect to the install header('Location: /install.php'); exit; @@ -93,23 +94,6 @@ include("includes/authenticate.inc.php"); if (strstr($_SERVER['REQUEST_URI'], 'widescreen=yes')) { $_SESSION['widescreen'] = 1; } if (strstr($_SERVER['REQUEST_URI'], 'widescreen=no')) { unset($_SESSION['widescreen']); } -# Load the settings for Multi-Tenancy. -if (isset($config['branding']) && is_array($config['branding'])) -{ - if ($config['branding'][$_SERVER['SERVER_NAME']]) - { - foreach ($config['branding'][$_SERVER['SERVER_NAME']] as $confitem => $confval) - { - eval("\$config['" . $confitem . "'] = \$confval;"); - } - } else { - foreach ($config['branding']['default'] as $confitem => $confval) - { - eval("\$config['" . $confitem . "'] = \$confval;"); - } - } -} - # page_title_prefix is displayed, unless page_title is set if ($config['page_title']) { $config['page_title_prefix'] = $config['page_title']; } @@ -120,8 +104,6 @@ if ($config['page_title']) { $config['page_title_prefix'] = $config['page_title' <?php echo($config['page_title_suffix']); ?> - - ' . "\n"); } @@ -134,99 +116,20 @@ if ($config['page_refresh']) { echo(' - ' . "\n"); } ?> - -'); } -?> - - - - - - - - - - - - - - - @@ -236,24 +139,24 @@ function popUp(URL) if (!$vars['bare'] == "yes") { - if ($_SESSION['authenticated']) { + if ($_SESSION['authenticated']) + { include("includes/print-menubar.php"); } else { echo('
'); } - } ?>
-
-
- 

+
+
+  

+
-
-
-
+
+
-
-
+
+
+
MySQL: Cell '.($db_stats['fetchcell']+0).'/'.round($db_stats['fetchcell_sec']+0,3).'s'. - ' Row '.($db_stats['fetchrow']+0). '/'.round($db_stats['fetchrow_sec']+0,3).'s'. - ' Rows '.($db_stats['fetchrows']+0).'/'.round($db_stats['fetchrows_sec']+0,3).'s'. - ' Column '.($db_stats['fetchcol']+0). '/'.round($db_stats['fetchcol_sec']+0,3).'s'); + echo('
MySQL: Cell '.($db_stats['fetchcell']+0).'/'.round($db_stats['fetchcell_sec']+0,3).'s'. + ' Row '.($db_stats['fetchrow']+0). '/'.round($db_stats['fetchrow_sec']+0,3).'s'. + ' Rows '.($db_stats['fetchrows']+0).'/'.round($db_stats['fetchrows_sec']+0,3).'s'. + ' Column '.($db_stats['fetchcol']+0). '/'.round($db_stats['fetchcol_sec']+0,3).'s'); - $fullsize = memory_get_usage(); - unset($cache); - $cachesize = $fullsize - memory_get_usage(); - if ($cachesize < 0) { $cachesize = 0; } // Silly PHP! + $fullsize = memory_get_usage(); + unset($cache); + $cachesize = $fullsize - memory_get_usage(); + if ($cachesize < 0) { $cachesize = 0; } // Silly PHP! - echo('
Cached data in memory is '.formatStorage($cachesize).'. Page memory usage is '.formatStorage($fullsize).', peaked at '. formatStorage(memory_get_peak_usage()) .'.'); - - echo('
Generated in ' . $gentime . ' seconds.'); + echo('
Cached data in memory is '.formatStorage($cachesize).'. Page memory usage is '.formatStorage($fullsize).', peaked at '. formatStorage(memory_get_peak_usage()) .'.'); + echo('
Generated in ' . $gentime . ' seconds.'); } ?> - + } + }); + \ndocument.title = '$title';\n"); } ?> - +