When incrementing config file version numbers, we must increment what we're testing...

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index ccbaf6d4632fb9c18e873d5ea9c641431263ddf6..0e33723ec033de420f0c4e9eeb7b0ebd4e17b780 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -12,34 +12,25 @@
  * @package squirrelmail
  */
 
+//xdebug_start_profiling("/var/spool/xdebug/right_main.txt");
+
+
 /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
  */
-define('SM_PATH','../');
+include('../include/init.php');
 
 /* SquirrelMail required files. */
-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/imap_asearch.php');
+require_once(SM_PATH . 'functions/imap_general.php');
+require_once(SM_PATH . 'functions/imap_messages.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');
 
 
-// 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'));
-
 /* lets get the global vars we may need */
-sqgetGlobalVar('key',       $key,           SQ_COOKIE);
-sqgetGlobalVar('username',  $username,      SQ_SESSION);
-sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
 sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
-sqgetGlobalVar('base_uri',  $base_uri,      SQ_SESSION);
 sqgetGlobalVar('delayed_errors',  $delayed_errors,  SQ_SESSION);
 if (is_array($delayed_errors)) {
     $oErrorHandler->AssignDelayedErrors($delayed_errors);
@@ -82,15 +73,10 @@ if ( sqgetGlobalVar('account', $account, SQ_GET) ) {
 
 /* Open an imap connection */
 
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
 
 $mailbox = (isset($mailbox) && $mailbox) ? $mailbox : 'INBOX';
 
-/* compensate for the UW vulnerability. */
-if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
-                                  substr($mailbox, 0, 1) == '/')) {
-   $mailbox = 'INBOX';
-}
 /**
  * Set the global settings for a mailbox and merge them with the usersettings
  * for the mailbox. In the future we can add more mailbox specific preferences
@@ -288,7 +274,8 @@ if (isset($mail_sent) && $mail_sent == 'yes') {
     $note = _("Your Message has been sent.");
 }
 if (isset($note)) {
-    echo html_tag( 'div', '<b>' . htmlspecialchars($note) .'</b>', 'center' ) . "<br />\n";
+    $oTemplate->assign('note', htmlspecialchars($note));
+    $oTemplate->display('note.tpl');
 }
 
 if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
@@ -296,18 +283,10 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
         $just_logged_in = false;
         sqsession_register($just_logged_in, 'just_logged_in');
 
-        if (strlen(trim($motd)) > 0) {
-            echo html_tag( 'table',
-                        html_tag( 'tr',
-                            html_tag( 'td',
-                                html_tag( 'table',
-                                    html_tag( 'tr',
-                                        html_tag( 'td', $motd, 'center' )
-                                    ) ,
-                                '', $color[4], 'width="100%" cellpadding="5" cellspacing="1" border="0"' )
-                             )
-                        ) ,
-                    'center', $color[9], 'width="70%" cellpadding="0" cellspacing="3" border="0"' );
+        $motd = trim($motd);
+        if (strlen($motd) > 0) {
+            $oTemplate->assign('motd', $motd);
+            $oTemplate->display('motd.tpl');
         }
     }
 }
@@ -331,9 +310,7 @@ if ($aMailbox['EXISTS'] > 0) {
     $oTemplate->assign('compact_paginator', $compact_paginator);
     $oTemplate->assign('javascript_on', $javascript_on);
     $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false);
-    // Aaaaaahhhhhhh FIX ME DO NOT USE the string "none" for a var when you mean the boolean false or null
-    $oTemplate->assign('icon_theme', (isset($icon_theme) && $icon_theme !== 'none') ? $icon_theme : false);
-    $oTemplate->assign('use_icons', (isset($use_icons)) ? $use_icons : false);
+    $oTemplate->assign('icon_theme_path', $icon_theme_path);
     $oTemplate->assign('aOrder', array_keys($aColumns));
     $oTemplate->assign('alt_index_colors', isset($alt_index_colors) ? $alt_index_colors: false);
     $oTemplate->assign('color', $color);
@@ -342,18 +319,7 @@ if ($aMailbox['EXISTS'] > 0) {
     $oTemplate->display('message_list.tpl');
 
 } else {
-    $string = '<b>' . _("THIS FOLDER IS EMPTY") . '</b>';
-    echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[9].'">';
-    echo '     <tr><td>';
-    echo '       <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
-    echo '        <tr><td><br />';
-    echo '            <table cellpadding="1" cellspacing="5" align="center" border="0">';
-    echo '              <tr>' . html_tag( 'td', $string."\n", 'left')
-                        . '</tr>';
-    echo '            </table>';
-    echo '        <br /></td></tr>';
-    echo '       </table></td></tr>';
-    echo '    </table>';
+    $oTemplate->display('empty_folder.tpl');
 }
 
 do_hook('right_main_bottom');
@@ -364,4 +330,3 @@ $oTemplate->display('footer.tpl');
 /* add the mailbox to the cache */
 $mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox;
 sqsession_register($mailbox_cache,'mailbox_cache');
-?>
\ No newline at end of file