We use cookies to ensure you get the best experience on our website
首页 发现 帮助
注册 登录
0ct0pu5
/
squirrelmail
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge of template patch from Steve Brown
Adapted static dirs to configurable template dir (template set support)

stekkel 19 年之前
父节点
e53f899733
当前提交
0084fb6502
共有 2 个文件被更改，包括 60 次插入 和 87 次删除
合并视图 显示文件统计
  1. 3 2
      functions/global.php
  2. 57 85
      functions/page_header.php

+ 3 - 2
functions/global.php
查看文件 

@@ -371,7 +371,7 @@ if ((bool) @ini_get('register_globals')) {
 
     /**
 
     /**
 
      * Remove globalized $_FILES variables
 
      * Remove globalized $_FILES variables
 
      * Before 4.3.0 $_FILES are included in $_REQUEST.
 
      * Before 4.3.0 $_FILES are included in $_REQUEST.
 
-     * Unglobalize them in separate call in order to remove dependency 
+     * Unglobalize them in separate call in order to remove dependency
 
      * on PHP version.
 
      * on PHP version.
 
      */
 
      */
 
     foreach ($_FILES as $key => $value) {
 
     foreach ($_FILES as $key => $value) {
 
@@ -404,7 +404,7 @@ $PHP_SELF = php_self();
 
 
 
 sqsession_is_active();
 
 sqsession_is_active();
 
 
 
-/** 
+/**
 
  * Remove globalized session data in rg=on setups
 
  * Remove globalized session data in rg=on setups
 
  */
 
  */
 
 if ((bool) @ini_get('register_globals')) {
 
 if ((bool) @ini_get('register_globals')) {
 
@@ -412,4 +412,5 @@ if ((bool) @ini_get('register_globals')) {
 
         unset($GLOBALS[$key]);
 
         unset($GLOBALS[$key]);
 
     }
 
     }
 
 }
 
 }
 
+
 
 ?>
 
 ?>

+ 57 - 85
functions/page_header.php
查看文件 

@@ -19,6 +19,7 @@ require_once(SM_PATH . 'functions/strings.php');
 
 require_once(SM_PATH . 'functions/html.php');
 
 require_once(SM_PATH . 'functions/html.php');
 
 require_once(SM_PATH . 'functions/imap_mailbox.php');
 
 require_once(SM_PATH . 'functions/imap_mailbox.php');
 
 require_once(SM_PATH . 'functions/global.php');
 
 require_once(SM_PATH . 'functions/global.php');
 
+include_once(SM_PATH . 'class/template/template.class.php');
 
 
 
 /**
 
 /**
 
  * Output a SquirrelMail page header, from <!doctype> to </head>
 
  * Output a SquirrelMail page header, from <!doctype> to </head>
 
@@ -33,12 +34,12 @@ require_once(SM_PATH . 'functions/global.php');
 
  * @return void
 
  * @return void
 
  */
 
  */
 
 function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = true, $frames = false ) {
 
 function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = true, $frames = false ) {
 
-    global $squirrelmail_language;
 
+    global $squirrelmail_language, $sTplDir;
 
 
 
     if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
 
     if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
 
         global $base_uri;
 
         global $base_uri;
 
     }
 
     }
 
-    global $theme_css, $custom_css, $pageheader_sent, 
+    global $theme_css, $custom_css, $pageheader_sent,
 
         $chosen_fontset, $chosen_fontsize, $chosen_theme;
 
         $chosen_fontset, $chosen_fontsize, $chosen_theme;
 
 
 
     /* add no cache headers here */
 
     /* add no cache headers here */
 
@@ -53,13 +54,13 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = true
 
     echo "\n" . html_tag( 'html' ,'' , '', '', 'lang="'.$squirrelmail_language.'"' ) .
 
     echo "\n" . html_tag( 'html' ,'' , '', '', 'lang="'.$squirrelmail_language.'"' ) .
 
         "<head>\n<meta name=\"robots\" content=\"noindex,nofollow\">\n";
 
         "<head>\n<meta name=\"robots\" content=\"noindex,nofollow\">\n";
 
 
 
-    
+
 
     $used_theme = basename($chosen_theme,'.php');
 
     $used_theme = basename($chosen_theme,'.php');
 
 
 
     /*
 
     /*
 
-     * Add closing / to link and meta elements only after switching to xhtml 1.0 Transitional.
 
-     * It is not compatible with html 4.01 Transitional
 
-     */
 
+    * Add closing / to link and meta elements only after switching to xhtml 1.0 Transitional.
 
+    * It is not compatible with html 4.01 Transitional
 
+    */
 
     echo '<link rel="stylesheet" type="text/css" href="'. $base_uri .'src/style.php'
 
     echo '<link rel="stylesheet" type="text/css" href="'. $base_uri .'src/style.php'
 
         .'?fontset='.$chosen_fontset
 
         .'?fontset='.$chosen_fontset
 
         .'&themeid='.$used_theme
 
         .'&themeid='.$used_theme
 
@@ -72,12 +73,12 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = true
 
 
 
     if ($squirrelmail_language == 'ja_JP') {
 
     if ($squirrelmail_language == 'ja_JP') {
 
         /*
 
         /*
 
-         * force correct detection of charset, when browser does not follow
 
-         * http content-type and tries to detect charset from page content.
 
-         * Shooting of browser's creator can't be implemented in php.
 
-         * We might get rid of it, if we follow http://www.w3.org/TR/japanese-xml/
 
-         * recommendations and switch to unicode.
 
-         */
 
+        * force correct detection of charset, when browser does not follow
 
+        * http content-type and tries to detect charset from page content.
 
+        * Shooting of browser's creator can't be implemented in php.
 
+        * We might get rid of it, if we follow http://www.w3.org/TR/japanese-xml/
 
+        * recommendations and switch to unicode.
 
+        */
 
         echo "<!-- \xfd\xfe -->\n";
 
         echo "<!-- \xfd\xfe -->\n";
 
         echo '<meta http-equiv="Content-type" content="text/html; charset=euc-jp">' . "\n";
 
         echo '<meta http-equiv="Content-type" content="text/html; charset=euc-jp">' . "\n";
 
     }
 
     }
 
@@ -91,12 +92,12 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = true
 
     echo <<<ECHO
 
     echo <<<ECHO
 
 <style type="text/css">
 
 <style type="text/css">
 
 <!--
 
 <!--
 
-  /* avoid stupid IE6 bug with frames and scrollbars */
 
-  body {
 
-      voice-family: "\"}\"";
 
-      voice-family: inherit;
 
-      width: expression(document.documentElement.clientWidth - 30);
 
-  }
 
+/* avoid stupid IE6 bug with frames and scrollbars */
 
+body {
 
+    voice-family: "\"}\"";
 
+    voice-family: inherit;
 
+    width: expression(document.documentElement.clientWidth - 30);
 
+}
 
 -->
 
 -->
 
 </style>
 
 </style>
 
 
 
@@ -157,22 +158,26 @@ function displayInternalLink($path, $text, $target='') {
 
 function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
 
 function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
 
 
 
     global $reply_focus, $hide_sm_attributions, $frame_top,
 
     global $reply_focus, $hide_sm_attributions, $frame_top,
 
-           $provider_name, $provider_uri, $startMessage,
 
-           $javascript_on, $action;
 
+        $provider_name, $provider_uri, $startMessage,
 
+        $javascript_on, $action, $oTemplate;
 
 
 
     if (empty($sBodyTagJs)) {
 
     if (empty($sBodyTagJs)) {
 
         if (strpos($action, 'reply') !== FALSE && $reply_focus) {
 
         if (strpos($action, 'reply') !== FALSE && $reply_focus) {
 
-          if ($reply_focus == 'select')
 
-              $sBodyTagJs = 'onload="checkForm(\'select\');"';
 
-          else if ($reply_focus == 'focus')
 
-              $sBodyTagJs = 'onload="checkForm(\'focus\');"';
 
-          else if ($reply_focus != 'none')
 
-              $sBodyTagJs = 'onload="checkForm();"';
 
+        if ($reply_focus == 'select')
 
+            $sBodyTagJs = 'onload="checkForm(\'select\');"';
 
+        else if ($reply_focus == 'focus')
 
+            $sBodyTagJs = 'onload="checkForm(\'focus\');"';
 
+        else if ($reply_focus != 'none')
 
+            $sBodyTagJs = 'onload="checkForm();"';
 
         }
 
         }
 
         else
 
         else
 
-          $sBodyTagJs = 'onload="checkForm();"';
 
+        $sBodyTagJs = 'onload="checkForm();"';
 
     }
 
     }
 
 
 
+    $urlMailbox = urlencode($mailbox);
 
+    $startMessage = (int)$startMessage;
 
+
 
+    $sTplDir = $oTemplate->template_dir;
 
 
 
     sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION );
 
     sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION );
 
 
 
@@ -181,78 +186,45 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
 
     }
 
     }
 
 
 
     if( $javascript_on || strpos($sHeaderJs, 'new_js_autodetect_results.value') ) {
 
     if( $javascript_on || strpos($sHeaderJs, 'new_js_autodetect_results.value') ) {
 
-        $sJsBlock = '<script src="'. SM_PATH .'templates/default/js/default.js" type="text/javascript" language="JavaScript"></script>' ."\n";
 
+        $sJsBlock = '<script src="'. $sTplDir. 'js/default.js" type="text/javascript" language="JavaScript"></script>' ."\n";
 
         if ($sHeaderJs) {
 
         if ($sHeaderJs) {
 
             $sJsBlock .= "\n<script language=\"JavaScript\" type=\"text/javascript\">" .
 
             $sJsBlock .= "\n<script language=\"JavaScript\" type=\"text/javascript\">" .
 
                         "\n<!--\n" .
 
                         "\n<!--\n" .
 
                         $sHeaderJs . "\n\n// -->\n</script>\n";
 
                         $sHeaderJs . "\n\n// -->\n</script>\n";
 
         }
 
         }
 
         displayHtmlHeader ('SquirrelMail', $sJsBlock);
 
         displayHtmlHeader ('SquirrelMail', $sJsBlock);
 
-   } else {
 
+    } else {
 
         /* do not use JavaScript */
 
         /* do not use JavaScript */
 
         displayHtmlHeader ('SquirrelMail');
 
         displayHtmlHeader ('SquirrelMail');
 
         $sBodyTagJs = '';
 
         $sBodyTagJs = '';
 
     }
 
     }
 
 
 
-    echo "<body $sBodyTagJs>\n\n";
 
-
 
-    /** Here is the header and wrapping table **/
 
     $shortBoxName = htmlspecialchars(imap_utf7_decode_local(
 
     $shortBoxName = htmlspecialchars(imap_utf7_decode_local(
 
                 readShortMailboxName($mailbox, $delimiter)));
 
                 readShortMailboxName($mailbox, $delimiter)));
 
     if ( $shortBoxName == 'INBOX' ) {
 
     if ( $shortBoxName == 'INBOX' ) {
 
         $shortBoxName = _("INBOX");
 
         $shortBoxName = _("INBOX");
 
     }
 
     }
 
-    echo "<a name=\"pagetop\"></a>\n"
 
-        . html_tag( 'table', '', '', $color[4], 'border="0" width="100%" cellspacing="0" cellpadding="2"' ) ."\n"
 
-        . html_tag( 'tr', '', '', $color[9] ) ."\n"
 
-        . html_tag( 'td', '', 'left' ) ."\n";
 
-    if ( $shortBoxName <> '' && strtolower( $shortBoxName ) <> 'none' ) {
 
-        echo '         ' . _("Current Folder") . ": <b>$shortBoxName&nbsp;</b>\n";
 
-    } else {
 
-        echo '&nbsp;';
 
-    }
 
-    echo  "      </td>\n"
 
-        . html_tag( 'td', '', 'right' ) ."<b>\n";
 
-    displayInternalLink ('src/signout.php', _("Sign Out"), $frame_top);
 
-    echo "</b></td>\n"
 
-        . "   </tr>\n"
 
-        . html_tag( 'tr', '', '', $color[4] ) ."\n"
 
-        . ($hide_sm_attributions ? html_tag( 'td', '', 'left', '', 'colspan="2"' )
 
-                                 : html_tag( 'td', '', 'left' ) )
 
-        . "\n";
 
-    $urlMailbox = urlencode($mailbox);
 
-    $startMessage = (int)$startMessage;
 
 
 
-    echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox.'&amp;startMessage='.$startMessage);
 
-    echo "&nbsp;&nbsp;\n";
 
-    displayInternalLink ('src/addressbook.php', _("Addresses"));
 
-    echo "&nbsp;&nbsp;\n";
 
-    displayInternalLink ('src/folders.php', _("Folders"));
 
-    echo "&nbsp;&nbsp;\n";
 
-    displayInternalLink ('src/options.php', _("Options"));
 
-    echo "&nbsp;&nbsp;\n";
 
-    displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"));
 
-    echo "&nbsp;&nbsp;\n";
 
-    displayInternalLink ('src/help.php', _("Help"));
 
-    echo "&nbsp;&nbsp;\n";
 
-
 
-    do_hook('menuline');
 
-
 
-    echo "      </td>\n";
 
-
 
-    if (!$hide_sm_attributions)
 
-    {
 
-        echo html_tag( 'td', '', 'right' ) ."\n";
 
+    $sm_attributes = '';
 
+    if (!$hide_sm_attributions) {
 
+        $sm_attributes .= '<td class="sqm_providerInfo">' ."\n";
 
         if (empty($provider_uri)) {
 
         if (empty($provider_uri)) {
 
-            echo '<a href="about.php">SquirrelMail</a>';
 
+            $sm_attributes .= '   <a href="about.php">SquirrelMail</a>';
 
         } else {
 
         } else {
 
             if (empty($provider_name)) $provider_name= 'SquirrelMail';
 
             if (empty($provider_name)) $provider_name= 'SquirrelMail';
 
-            echo '<a href="'.$provider_uri.'" target="_blank">'.$provider_name.'</a>';
 
+            $sm_attributes .= '   <a href="'.$provider_uri.'" target="_blank">'.$provider_name.'</a>'."\n";
 
         }
 
         }
 
-        echo "</td>\n";
 
+        $sm_attributes .= "  </td>\n";
 
     }
 
     }
 
-    echo "   </tr>\n".
 
-        "</table><br />\n\n";
 
+
 
+    $oTemplate->assign('body_tag_js', $sBodyTagJs);
 
+    $oTemplate->assign('shortBoxName', $shortBoxName);
 
+    $oTemplate->assign('sm_attribute_str', $sm_attributes);
 
+    $oTemplate->assign('frame_top', $frame_top);
 
+    $oTemplate->assign('urlMailbox', $urlMailbox);
 
+    $oTemplate->assign('startMessage', $startMessage);
 
+    $oTemplate->assign('hide_sm_attributions', $hide_sm_attributions);
 
+    $oTemplate->display('page_header.tpl');
 
 }
 
 }
 
 
 
 /**
 
 /**
 
@@ -271,15 +243,15 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
 
 
 
     if (empty($sBodyTagJs)) {
 
     if (empty($sBodyTagJs)) {
 
         if (strpos($action, 'reply') !== FALSE && $reply_focus) {
 
         if (strpos($action, 'reply') !== FALSE && $reply_focus) {
 
-          if ($reply_focus == 'select')
 
-              $sBodyTagJs = 'onload="checkForm(\'select\');"';
 
-          else if ($reply_focus == 'focus')
 
-              $sBodyTagJs = 'onload="checkForm(\'focus\');"';
 
-          else if ($reply_focus != 'none')
 
-              $sBodyTagJs = 'onload="checkForm();"';
 
+        if ($reply_focus == 'select')
 
+            $sBodyTagJs = 'onload="checkForm(\'select\');"';
 
+        else if ($reply_focus == 'focus')
 
+            $sBodyTagJs = 'onload="checkForm(\'focus\');"';
 
+        else if ($reply_focus != 'none')
 
+            $sBodyTagJs = 'onload="checkForm();"';
 
         }
 
         }
 
         else
 
         else
 
-          $sBodyTagJs = 'onload="checkForm();"';
 
+        $sBodyTagJs = 'onload="checkForm();"';
 
     }
 
     }
 
 
 
 
 
@@ -292,7 +264,7 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
 
                         "\n<!--\n" .
 
                         "\n<!--\n" .
 
                         $sHeaderJs . "\n\n// -->\n</script>\n";
 
                         $sHeaderJs . "\n\n// -->\n</script>\n";
 
         } else {
 
         } else {
 
-           $sJsBlock = '';
 
+        $sJsBlock = '';
 
         }
 
         }
 
         $sJsBlock .= "\n" . '<script src="'. SM_PATH .'templates/default/js/default.js" type="text/javascript" language="JavaScript"></script>' ."\n";
 
         $sJsBlock .= "\n" . '<script src="'. SM_PATH .'templates/default/js/default.js" type="text/javascript" language="JavaScript"></script>' ."\n";
 
         displayHtmlHeader (_("Compose"), $sJsBlock);
 
         displayHtmlHeader (_("Compose"), $sJsBlock);

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5