* added footer template which also takes care of displaying the error messages

from the error_handler.
* moved template object creation to a higher level, validate.php
* merge patch from Steve Brown into style.php
* modifications in order to create template set selection support

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

diff --git a/src/about.php b/src/about.php
index 76f85ffae4eb4b4990eb92fcf63d77adcf93b594..90873ae00d85994e773ac3364efd68444499e983 100644 (file)
--- a/src/about.php
+++ b/src/about.php
@@ -23,7 +23,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 
 displayPageHeader($color, 'None' );
 
@@ -89,4 +89,6 @@ if ( count ($plugins) > 0 ) {
 </td></tr>
 <tr><td align="center">&copy; 1999 - 2006 The SquirrelMail Project Team</td></tr>
 </table></p>
-</body></html>
\ No newline at end of file
+<?php
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php
index e43bf2aec500c885c840cbb527756db5c8e28a63..5d6a288ad94404cbb04a1020bfb58f6fafee4b36 100644 (file)
--- a/src/addrbook_popup.php
+++ b/src/addrbook_popup.php
@@ -19,7 +19,7 @@
 define('SM_PATH','../');
 
 /** SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/addressbook.php');
 
 ?>

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index cd6366bc77d8bf5cee388edbf29022c2ee4870d6..b26dfc538c365f2aa89124363f0208688482529b 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -23,7 +23,7 @@
 define('SM_PATH','../');
 
 /** SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 include_once(SM_PATH . 'functions/strings.php');
 include_once(SM_PATH . 'functions/global.php');
 include_once(SM_PATH . 'functions/html.php');
@@ -311,6 +311,5 @@ if ($show == 'form' && ! isset($listall)) {
         echo html_tag( 'p', '<br /><b>' . _("Nothing to search") . "</b>\n",'center' );
     }
 }
-
-?>
-</body></html>
\ No newline at end of file
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 9862ced6c3e38c0ec2e83c83b7d77a96528269c1..f1931f0dabb523d87c20d4d928b8edc4f515b2ce 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -22,7 +22,7 @@ if (! defined('SM_PATH') ) {
 }
 
 /** SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 include_once(SM_PATH . 'functions/global.php');
 include_once(SM_PATH . 'functions/date.php');
 include_once(SM_PATH . 'functions/display_messages.php');
@@ -300,6 +300,6 @@ if ($addrquery == '' || sizeof($res) == 0) {
     echo '<input type="submit" value="' . _("Return") . '" name="return" />' . "\n" .
          '</form></center></nobr>';
 }
-
-?>
-</body></html>
\ No newline at end of file
+<?php
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/addressbook.php b/src/addressbook.php
index b3509bdebca18eddf99aa0af7f395397144814a0..50b16a9229865842540c6ddc9bc152add5dce65b 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -19,7 +19,7 @@
 define('SM_PATH','../');
 
 /** SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/addressbook.php');
 require_once(SM_PATH . 'functions/forms.php');
@@ -284,7 +284,7 @@ if ($showaddrlist) {
                                 html_tag( 'th', _("Info") .
                                     show_abook_sort_button($abook_sort_order, _("sort by info"), 6, 7),
                                     'left', '', 'width="1%"' ) .
-                                  ($abook->add_extra_field ? html_tag( 'th', ' ','left', '', 'width="1%"'): '') . 
+                                  ($abook->add_extra_field ? html_tag( 'th', ' ','left', '', 'width="1%"'): '') .
                                 "\n",
                                 '', $color[9] ) . "\n";
                 }
@@ -328,8 +328,8 @@ if ($showaddrlist) {
                                ' ' ,
                                'center', '', 'valign="top" width="1%"' );
             }
-            echo html_tag( 'td', 
-                           ' ' . htmlspecialchars($row['nickname']) . ' ', 
+            echo html_tag( 'td',
+                           ' ' . htmlspecialchars($row['nickname']) . ' ',
                            'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' );
 
             // different full name display formating for Japanese translation
@@ -338,7 +338,7 @@ if ($showaddrlist) {
                  * translation uses euc-jp character set internally.
                  * htmlspecialchars() should not break any characters.
                  */
-                echo html_tag( 'td', 
+                echo html_tag( 'td',
                                ' ' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . ' ',
                                'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' );
             } else {
@@ -359,7 +359,7 @@ if ($showaddrlist) {
 
             // add extra column if third party backend needs it
             if ($abook->add_extra_field) {
-                echo html_tag( 'td', 
+                echo html_tag( 'td',
                                ' ' . (isset($row['extra']) ? $row['extra'] : '') . ' ',
                                'left', '', 'valign="top" width="1%"' );
             }
@@ -394,6 +394,5 @@ echo "</form>\n";
 echo "<!-- start of addressbook_bottom hook-->\n";
 do_hook('addressbook_bottom');
 echo "\n<!-- end of addressbook_bottom hook-->\n";
-
-?>
-</body></html>
\ No newline at end of file
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/compose.php b/src/compose.php
index abcdf9d8e89254bb3f573611c2e3bd88e58d0927..4f610ca5d710f0b37eddbd09c5f2bd0dbac0be9a 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -24,7 +24,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/date.php');
@@ -467,7 +467,7 @@ if ($send) {
             exit();
         }
         unset($compose_messages[$session]);
-        
+
         /* if it is resumed draft, delete draft message */
         if ( isset($delete_draft)) {
             $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false);
@@ -1025,7 +1025,7 @@ function showInputForm ($session, $values=false) {
         $username, $data_dir, $identity, $idents, $delete_draft,
         $mailprio, $compose_new_win, $saved_draft, $mail_sent, $sig_first,
         $username, $compose_messages, $composesession, $default_charset,
-        $compose_onsubmit;
+        $compose_onsubmit, $oTemplate;
 
     if (checkForJavascript()) {
         $onfocus = ' onfocus="alreadyFocused=true;"';
@@ -1070,8 +1070,8 @@ function showInputForm ($session, $values=false) {
 
     // Plugins that use compose_form hook can add an array entry
     // to the globally scoped $compose_onsubmit; we add them up
-    // here and format the form tag's full onsubmit handler.  
-    // Each plugin should use "return false" if they need to 
+    // here and format the form tag's full onsubmit handler.
+    // Each plugin should use "return false" if they need to
     // stop form submission but otherwise should NOT use "return
     // true" to give other plugins the chance to do what they need
     // to do; SquirrelMail itself will add the final "return true".
@@ -1079,21 +1079,21 @@ function showInputForm ($session, $values=false) {
     // need to quote accordingly.
     if (checkForJavascript()) {
         $onsubmit_text = ' onsubmit="';
-        if (empty($compose_onsubmit)) 
+        if (empty($compose_onsubmit))
             $compose_onsubmit = array();
-        else if (!is_array($compose_onsubmit)) 
+        else if (!is_array($compose_onsubmit))
             $compose_onsubmit = array($compose_onsubmit);
 
         foreach ($compose_onsubmit as $text) {
             $text = trim($text);
-            if (substr($text, -1) != ';' && substr($text, -1) != '}') 
+            if (substr($text, -1) != ';' && substr($text, -1) != '}')
                 $text .= '; ';
             $onsubmit_text .= $text;
         }
 
         echo $onsubmit_text . ' return true;"';
     }
-    
+
 
     echo ">\n";
 
@@ -1340,7 +1340,7 @@ function showInputForm ($session, $values=false) {
     }
 
     do_hook('compose_bottom');
-    echo '</body></html>' . "\n";
+    $oTemplate->display('footer.tpl');
 }
 
 

diff --git a/src/delete_message.php b/src/delete_message.php
index c70877a3748be183a00168daff050e11a6469be8..56f6da3f76e1c3ae072288f6585ed7e7bf4e3f28 100644 (file)
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -18,11 +18,10 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 include_once(SM_PATH . 'functions/display_messages.php');
 
 global $color;
 error_box('delete_message.php script is obsolete since 1.5.1.',$color);
-
-?>
-</body></html>
\ No newline at end of file
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/folders.php b/src/folders.php
index cfb8bb49446d21d5636a55d30f8b88f3baa2a1e5..f5ccdbed253ebacb8e5e76a2cdf19046f68151cd 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -20,7 +20,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/folder_manip.php');
 require_once(SM_PATH . 'functions/plugin.php');
@@ -142,9 +142,9 @@ $server_type = strtolower($imap_server_type);
 if ( $server_type == 'courier' ) {
     /**
      * If we use courier, we should hide system trash folder
-     * FIXME: (tokul) Who says that courier does not allow storing folders in 
-     * INBOX.Trash or inbox.trash? Can't reproduce it 3.0.8. This entry is 
-     * useless, because in_array() check is case sensitive and INBOX is in 
+     * FIXME: (tokul) Who says that courier does not allow storing folders in
+     * INBOX.Trash or inbox.trash? Can't reproduce it 3.0.8. This entry is
+     * useless, because in_array() check is case sensitive and INBOX is in
      * upper case.
      */
     array_push($skip_folders, 'inbox.trash');
@@ -192,14 +192,14 @@ foreach ($boxes as $index => $aBoxData) {
     if (isSpecialMailbox($aBoxData['unformatted']) &&
         ! in_array($aBoxData['unformatted'],$skip_folders)) {
         $skip_folders[] = $aBoxData['unformatted'];
-    } 
+    }
 }
 
 /**
  * Retrieve list of folders when special folders are excluded. Special folders
  * should be unavailable in rename/delete/unsubscribe. Theoretically user can
- * modify form and perform these operations with special folders, but if user 
- * manages to delete/rename/unsubscribe special folder by hacking form... 
+ * modify form and perform these operations with special folders, but if user
+ * manages to delete/rename/unsubscribe special folder by hacking form...
  *
  * If script or program depends on special folder, they should not assume that
  * folder is available.
@@ -358,4 +358,6 @@ sqimap_logout($imapConnection);
     </table>
 </td></tr>
 </table>
-</body></html>
\ No newline at end of file
+<?php
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/help.php b/src/help.php
index eecd777622467fd968eed3704fdaa836c7c9e96b..42b236c48310fe702bcffafc7d1bd9836e77c142 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -18,7 +18,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 
@@ -212,4 +212,7 @@ echo html_tag( 'tr',
         );
 
 ?>
-</table></body></html>
\ No newline at end of file
+</table>
+<?php
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/image.php b/src/image.php
index 19bb1d0f4667e4e470de447f92a91b5ed4392b4d..1158ca41b839912d22d10944042428dda9c53dc8 100644 (file)
--- a/src/image.php
+++ b/src/image.php
@@ -18,7 +18,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'functions/page_header.php');
@@ -63,4 +63,6 @@ $DownloadLink = '../src/download.php?passed_id=' . $passed_id .
 <img src="<?php echo $DownloadLink; ?>" />
 
 </td></tr></table>
-</body></html>
\ No newline at end of file
+<?php
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/left_main.php b/src/left_main.php
index de427279df9bfba051c3d70450a5460196403f24..8e7e941ad34aa4a265e008fc06e127f1fa77f0f7 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -19,7 +19,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/page_header.php');
@@ -125,7 +125,7 @@ function ListBoxes ($boxes, $j=0 ) {
             $boxes->total = $result['MESSAGES'];
             $boxes->unseen = $result['UNSEEN'];
         }
-        
+
         $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
         if ($unseen > 0) {
             $pre .= '<b>';
@@ -794,4 +794,7 @@ sqimap_logout($imapConnection);
 
 ?>
 </td></tr></table>
-</div></body></html>
\ No newline at end of file
+</div>
+<?php
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/options_highlight.php b/src/options_highlight.php
index 61ac7ddf08bfad44f12bd5e3c859afdef2e2a42e..f68c1da203e52393c24fbe94367cc1c05bff6f42 100644 (file)
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -19,7 +19,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 include_once(SM_PATH . 'functions/display_messages.php');
 include_once(SM_PATH . 'functions/imap.php');
 include_once(SM_PATH . 'functions/plugin.php');
@@ -466,4 +466,7 @@ if ($action == 'edit' || $action == 'add') {
 do_hook('options_highlight_bottom');
 
 ?>
-</table></body></html>
\ No newline at end of file
+</table>
+<?php
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/options_order.php b/src/options_order.php
index e37e016a4aaa8721141ec66c20ddf1c95f74684a..5e1c36f2adbf08e86aa9270f731febbfa47308e5 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -19,7 +19,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 include_once(SM_PATH . 'functions/global.php');
 include_once(SM_PATH . 'functions/display_messages.php');
 include_once(SM_PATH . 'functions/imap.php');
@@ -234,8 +234,8 @@ function viewOrderForm($aColumns, $aOrder, $aOpts, $mailbox) {
       </table>
     </td></tr>
   </table>
-</body></html>
 
 <?php
 }
+$oTemplate->display('footer.tpl');
 ?>
\ No newline at end of file

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 51b4a129bb349fda5bc5b4a8c510d2684077de81..3e4e95fa1789c64e4a5c338782dc74df95f92909 100644 (file)
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -21,7 +21,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/imap.php');
 
 /* get some of these globals */
@@ -135,7 +135,7 @@ echo '<body text="#000000" bgcolor="#FFFFFF" link="#000000" vlink="#000000" alin
      echo html_tag( 'tr',
          html_tag( 'td', '<hr style="height: 1px;" /><br />' . "\n" . $body, 'left', '', 'colspan="2"' )
      ) . "\n" ;
-     
+
      if (! empty($attachments)) {
          // attachments title
          echo html_tag( 'tr',
@@ -151,8 +151,8 @@ echo '<body text="#000000" bgcolor="#FFFFFF" link="#000000" vlink="#000000" alin
          ) . "\n" ;
      }
 
-     echo '</table>' . "\n" .
-     '</body></html>';
+     echo '</table>' . "\n";
+$oTemplate->display('footer.tpl');
 
 /* --end browser output-- */
 
@@ -262,12 +262,12 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) {
 
         // TODO: maybe make it nicer?
         $attachments .= '<table cellpadding="1" cellspacing="0" width="100%" border="1"><tr><th colspan="2">'.decodeHeader($display_filename).'</th></tr>' .
-            '<tr>'. 
-            html_tag( 'td',_("Size:"), 'right', '', 'width="25%"') . 
+            '<tr>'.
+            html_tag( 'td',_("Size:"), 'right', '', 'width="25%"') .
             html_tag( 'td',show_readable_size($header->size), 'left', '', 'width="75%"') .
             '</tr><tr>' . "\n" .
             html_tag( 'td',_("Type:"), 'right', '', 'width="25%"') .
-            html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left', '', 'width="75%"') . 
+            html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left', '', 'width="75%"') .
             '</tr>';
         if (! empty($description)) {
             $attachments .= $description;

diff --git a/src/printer_friendly_top.php b/src/printer_friendly_top.php
index 0d21deedc09da951a785c8aec2e47932241721cd..cc7a924f8d4c9589c0146f2f1c52ada7bb18ac37 100644 (file)
--- a/src/printer_friendly_top.php
+++ b/src/printer_friendly_top.php
@@ -19,7 +19,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 
 displayHtmlHeader( _("Printer Friendly"),
              "<script language=\"javascript\" type=\"text/javascript\">\n".
@@ -40,5 +40,5 @@ echo '<body text="'.$color[8].'" bgcolor="'.$color[3].'" link="'.$color[7].'" vl
          '</form>',
      'right' );
 
-?>
-</body></html>
\ No newline at end of file
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/read_body.php b/src/read_body.php
index 09c41347ee2a2b9e322615fe859f63a7295902b3..a4706cf9a456170028459105c014fecab2a01911 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -19,14 +19,14 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
+include_once(SM_PATH . 'include/validate.php');
+//require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/mime.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'functions/url_parser.php');
 require_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'functions/global.php');
+//require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/identity.php');
 include_once(SM_PATH . 'functions/arrays.php');
 include_once(SM_PATH . 'functions/mailbox_display.php');
@@ -1029,6 +1029,5 @@ sqimap_logout($imapConnection);
  */
 $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
 sqsession_register($mailbox_cache,'mailbox_cache');
-
+$oTemplate->display('footer.tpl');
 ?>
-</body></html>

diff --git a/src/right_main.php b/src/right_main.php
index 6c85464b477053a41b23ebde796084eed0964e62..88841c6a576a2090c04f0166acc43e47ca94e888 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -19,45 +19,17 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
+include_once(SM_PATH . 'include/validate.php');
+//include_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'functions/mime.php');
 require_once(SM_PATH . 'functions/mailbox_display.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'functions/plugin.php');
-include_once(SM_PATH . 'class/error.class.php');
+//require_once(SM_PATH . 'functions/plugin.php');
 
 
-//include_once(SM_PATH . 'templates/default/message_list.tpl');
-include_once(SM_PATH . 'class/template/template.class.php');
-
-/**
- * Which templatedir are we using. TODO, add make a config var of this and make it possible to switch templates
- */
-$sTplDir = SM_PATH . 'templates/default/';
-
-/*
- * Initialize the template object
- */
-$oTemplate = new Template($sTplDir);
-
-/*
- * Initialize our custom error handler object
- */
-$oErrorHandler = new ErrorHandler($oTemplate,'error_message.tpl');
-
-/*
- * Activate custom error handling
- */
-if (version_compare(PHP_VERSION, "4.3.0", ">=")) {
-    $oldErrorHandler = set_error_handler(array($oErrorHandler, 'SquirrelMailErrorhandler'));
-} else {
-    $oldErrorHandler = set_error_handler('SquirrelMailErrorhandler');
-}
-
 // Trigger Developers to look at CSS ;)
 // trigger_error("This layout sucks. Adapt squirrelmail.css!!!",E_USER_WARNING);
 //sqm_trigger_imap_error('SQM_IMAP_NO_THREAD',"BLA1",'BAD', 'BLA2', array('test1'=>'test1'));

diff --git a/src/search.php b/src/search.php
index 4a2c836970205f2e64249ea1bde540b13203adb8..aa7ff0b367f70d0ca978f17c09f2384c9c117a6e 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -24,7 +24,7 @@ define('SM_PATH','../');
 
 /** SquirrelMail required files.
  */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 include_once(SM_PATH . 'functions/strings.php');
 include_once(SM_PATH . 'functions/imap_asearch.php');
 include_once(SM_PATH . 'functions/imap_mailbox.php');
@@ -1641,7 +1641,7 @@ if ($submit == $search_button_text) {
 
 do_hook('search_bottom');
 sqimap_logout($imapConnection);
-echo '</body></html>';
+$oTemplate->display('footer.tpl');
 sqsession_register($mailbox_cache,'mailbox_cache');
 
 ?>

diff --git a/src/signout.php b/src/signout.php
index 2c131761dd4c82e93b6c70c84abad60c9ed66a6a..82712e1bf517065f0fecfa0457cb308640898717 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -17,7 +17,7 @@
  */
 define('SM_PATH','../');
 
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/prefs.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/strings.php');
@@ -92,6 +92,5 @@ html_tag( 'table',
     '', $color[0] ) ,
 'center', $color[4], 'width="50%" cellpadding="2" cellspacing="0" border="0"' )
 
-?>
-</body>
-</html>
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/style.php b/src/style.php
index 41923c9d454c8c90fadbbad7c7773861f4a8159c..7d7976bd0b07c8d817bbd3ea3370ab5660a4a897 100644 (file)
--- a/src/style.php
+++ b/src/style.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Style sheet script
- * 
+ *
  * Script processes GET arguments and generates CSS output from stylesheet.tpl.
  * Used GET arguments:
  * <ul>
@@ -22,6 +22,7 @@ define('SM_PATH','../');
 require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'config/config.php');
+require_once(SM_PATH . 'include/load_prefs.php');
 
 /* temp setting containing list of font styles. Should go to config.php */
 $fontsets=array();
@@ -39,7 +40,7 @@ $fontsets['tahoma']['STYLE']='tahoma,sans-serif';
 /* template init */
 /** start block copy from right_main.php */
 include_once(SM_PATH . 'class/template/template.class.php');
-$sTplDir = SM_PATH . 'templates/default/';
+
 $oTemplate = new Template($sTplDir);
 /** end block copy */
 
@@ -71,12 +72,26 @@ if (sqgetGlobalVar('themeid',$themeid,SQ_GET) &&
     include_once($theme[$theme_default]['PATH']);
 }
 
+/**
+ * get alignment variable from language settings...
+ * MOVE THIS to a central init section !!!!
+ */
+if (!sqgetGlobalVar('align',$align,SQ_SESSION)) {
+    $dir = ( isset( $languages[$squirrelmail_language]['DIR']) ) ? $languages[$squirrelmail_language]['DIR'] : 'ltr';
+    if ( $dir == 'ltr' ) {
+        $align = array('left' => 'left', 'right' => 'right');
+    } else {
+        $align = array('left' => 'right', 'right' => 'left');
+    }
+    sqsession_register($align, 'align');
+}
+
 /**/
 $oTemplate->assign('color', $color);
 
 /**
  * set color constants in order to use simple names instead of color array
- * 0 - SQM_TEXT_DISABLED, SQM_TITLE_BACKGROUND, SQM_BUTTON_BACKGROUND_DISABLED, 
+ * 0 - SQM_TEXT_DISABLED, SQM_TITLE_BACKGROUND, SQM_BUTTON_BACKGROUND_DISABLED,
  *     SQM_ROW_BACKGROUND_1
  * 1 -
  * 2 - SQM_ERROR_TEXT
@@ -85,8 +100,8 @@ $oTemplate->assign('color', $color);
  * 5 - SQM_ROW_BACKGROUND_HIGHLIGHT, SQM_COLUMN_HEADER_BACKGROUND
  * 6 - SQM_TEXT_STANDARD_LEFT
  * 7 - SQM_TITLE_TEXT, SQM_BLOCK_TITLE_TEXT
- * 8 - SQM_TEXT_STANDARD, SQM_BUTTON_TEXT, SQM_BLOCK_TEXT, SQM_ROW_TEXT_1, 
- *     SQM_ROW_TEXT_2, SQM_ROW_TEXT_HIGHLIGHT, SQM_ROW_TEXT_SELECTED, 
+ * 8 - SQM_TEXT_STANDARD, SQM_BUTTON_TEXT, SQM_BLOCK_TEXT, SQM_ROW_TEXT_1,
+ *     SQM_ROW_TEXT_2, SQM_ROW_TEXT_HIGHLIGHT, SQM_ROW_TEXT_SELECTED,
  *     SQM_COLUMN_HEADER_TEXT
  * 9 - SQM_BUTTON_BACKGROUND
  * 10 - SQM_BLOCK_TITLE
@@ -139,6 +154,9 @@ define('SQM_MESSAGE_QUOTE_2',$color[14]);
 
 define('SQM_ERROR_TEXT',$color[2]);
 
+define('SQM_ALIGN_LEFT', $align['left']);
+define('SQM_ALIGN_RIGHT', $align['right']);
+
 if (sqgetGlobalVar('fontset',$fontset,SQ_GET) &&
     isset($fontsets[$fontset])) {
     $fontfamily=$fontsets[$fontset]['STYLE'];

diff --git a/src/vcard.php b/src/vcard.php
index df93af005a6ec3c07a3396add1cbb37ba70775e9..3bee7c97a7e5c69dfec2a863abde25b9cdcb76c8 100644 (file)
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -18,7 +18,7 @@
 Define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/mime.php');
 require_once(SM_PATH . 'functions/url_parser.php');
 
@@ -242,4 +242,6 @@ echo '<a href="../src/download.php?absolute_dl=true&amp;passed_id=' .
 <table border="0" cellspacing="0" cellpadding="2" align="center">
 <tr><td bgcolor="<?php echo $color[4]; ?>">
 </td></tr></table>
-</body></html>
\ No newline at end of file
+<?php
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/src/view_header.php b/src/view_header.php
index eb4718b102ae4f54af4833ded60faad4a2336b3f..d2a85ebfdbd7ae8ddf966e80731861abb6a57b14 100644 (file)
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -18,7 +18,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/html.php');
@@ -133,4 +133,4 @@ $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, t
 $header = parse_viewheader($imapConnection,$passed_id, $passed_ent_id);
 view_header($header, $mailbox, $color);
 
-?>
+?>
\ No newline at end of file

diff --git a/src/view_html.php b/src/view_html.php
index 3581d55517d512acea604d1a3d334b563cc2df08..b7ac88020ed68727861eb51ba6c70272ee084fd7 100644 (file)
--- a/src/view_html.php
+++ b/src/view_html.php
@@ -23,7 +23,7 @@
 define('SM_PATH','../');
 
 /** SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 include_once(SM_PATH . 'functions/imap.php');
 
 /** Get globals */

diff --git a/src/view_text.php b/src/view_text.php
index 8176aafed87f60f458797042e08061175bb3126f..959a4b901590837395f493845209b001576dabcd 100644 (file)
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -20,7 +20,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/mime.php');
@@ -97,4 +97,6 @@ echo '<a href="' . $dwnld_url . '">' . _("Download this as a file") . '</a>';
 <tr><td bgcolor="<?php echo $color[4]; ?>"><tt>
 <?php echo $body; ?>
 </tt></td></tr></table>
-</body></html>
\ No newline at end of file
+<?php
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file