use PAGE_NAME in themes and templates

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12535 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/templates/default_advanced/page_header.tpl b/templates/default_advanced/page_header.tpl
index 08b147cfcb2fa960fe71c4756e78dbb1a0aa3e3c..4befc0d2db65dd6f6a37962c8a01e9a9e1de8bfb 100644 (file)
--- a/templates/default_advanced/page_header.tpl
+++ b/templates/default_advanced/page_header.tpl
@@ -64,10 +64,10 @@ $help_link          = makeInternalLink ('src/help.php', $help_str);
 <?php
 
    /** if preview pane turned on, do not show menubar above message */
-   global $data_dir, $username, $PHP_SELF, $pp_skip_menubar;
+   global $data_dir, $username, $pp_skip_menubar;
    $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0);
    $show_preview_pane = checkForJavascript() && $use_previewPane;
-   $current_page_is_read_body = (strpos($PHP_SELF, '/read_body.php') !== FALSE);
+   $current_page_is_read_body = (defined('PAGE_NAME') && 'PAGE_NAME' == 'read_body');
    if (!$pp_skip_menubar && (!$current_page_is_read_body || !$show_preview_pane)) {
 // Note: If we want to hide menubar on compose screen, we could do the following, 
 // but the compose screen when in the message list frame should not have the menubar
@@ -75,7 +75,7 @@ $help_link            = makeInternalLink ('src/help.php', $help_str);
 // and then use document.write() to output the menubar if needed... and we'll
 // leave that for some other time
 //-   if (!$pp_skip_menubar && (!$current_page_is_read_body || !$show_preview_pane)) {
-//+   $current_page_is_compose = (strpos($PHP_SELF, '/compose.php') !== FALSE);
+//+   $current_page_is_compose = (defined('PAGE_NAME') && 'PAGE_NAME' == 'compose');
 //+   if (!$pp_skip_menubar 
 //+    && ((!$current_page_is_read_body && !$current_page_is_compose) 
 //+        || !$show_preview_pane)) {
@@ -144,7 +144,6 @@ $help_link          = makeInternalLink ('src/help.php', $help_str);
    if ($show_preview_pane 
     && getPref($data_dir, $username, 'previewPane_autohide', 0) == 1) 
    {
-      global $PHP_SELF;
       $previewPane_vertical_split = getPref($data_dir, $username, 'previewPane_vertical_split', 0);
       if ($previewPane_vertical_split)
          $orientation = 'cols';
@@ -152,7 +151,7 @@ $help_link          = makeInternalLink ('src/help.php', $help_str);
          $orientation = 'rows';
       
       // spit out javascript to maximize compose frame
-      if (strpos($PHP_SELF, '/compose.php') !== FALSE)
+      if (defined('PAGE_NAME') && PAGE_NAME=='compose')
       {
 ?>
    var first_frame = 0;
@@ -180,16 +179,15 @@ $help_link                = makeInternalLink ('src/help.php', $help_str);
    }
 <?php 
 
-      // not on the compose screen, either hide or restore preview pane
-      } else {
+    // not on the compose screen, either hide or restore preview pane
+    } else {
 
-         $previewPane_size = getPref($data_dir, $username, 'previewPane_size', 300);
-         if (strpos($PHP_SELF, '/right_main.php') !== FALSE
-          || strpos($PHP_SELF, '/search.php') !== FALSE)
+        $previewPane_size = getPref($data_dir, $username, 'previewPane_size', 300);
+        if (defined('PAGE_NAME') && (PAGE_NAME=='right_main'||PAGE_NAME=='search')) {
             $new_size = $previewPane_size;
-         else
+        } else {
             $new_size = 0;
-
+        }
 ?>
    if (self.name == 'right')
    {

diff --git a/themes/darkness.php b/themes/darkness.php
index ccd202b0152fbff69521b8f7f86ee423211e8653..8dac3df6ce79dc47861fa8aebbb80ff397ae0bdc 100755 (executable)
--- a/themes/darkness.php
+++ b/themes/darkness.php
@@ -42,9 +42,8 @@ function IsUnique($Distance, $r, $g, $b, $usedArray)
 // Always tremble background
 // This might make people go insane.  Yes!  *Victory dance!*
 function Darkness_HeaderPlugin() {
-   global $PHP_SELF;
 
-   if (substr($PHP_SELF, -18) == '/src/left_main.php') {
+   if (defined('PAGE_NAME') && PAGE_NAME=='left_main') {
       echo '<meta http-equiv="Page-Enter" content="' .
          'blendTrans(Duration=2.0)" />' . "\n";
    }