X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=inline;f=src%2Fleft_main.php;h=fbe5c3c13be9115d3969e0d02a3ce5b1c58b9935;hb=97eea19dd325ccf33df16522fb1a0410dbca831f;hp=667587f5b0d022e0b057d3d055e55a6fa59ce6b2;hpb=b087d1997057a97b54175670f00648a2a5dac4ca;p=squirrelmail.git
diff --git a/src/left_main.php b/src/left_main.php
index 667587f5..fbe5c3c1 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -6,12 +6,15 @@
* This is the code for the left bar. The left bar shows the folders
* available, and has cookie information.
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2012 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
+/** This is the left_main page */
+define('PAGE_NAME', 'left_main');
+
/**
* Include the SquirrelMail initialization file.
*/
@@ -20,8 +23,7 @@ require('../include/init.php');
/* SquirrelMail required files. */
require_once(SM_PATH . 'functions/imap_general.php');
require_once(SM_PATH . 'functions/date.php');
-require_once(SM_PATH . 'templates/util_global.php');
-require_once(SM_PATH . 'templates/util_left_main.php');
+require_once(SM_PATH . 'functions/template/folder_list_util.php');
/* These constants are used for folder stuff. */
define('SM_BOX_UNCOLLAPSED', 0);
@@ -43,9 +45,7 @@ $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort,
*/
if (!empty($left_refresh) &&
!stristr($left_refresh, 'none')){
- $xtra = "\n\n" .
- "\n".
- "\n";
+ $xtra = "\n\n";
} else {
$xtra = '';
}
@@ -53,7 +53,7 @@ if (!empty($left_refresh) &&
/**
* Include extra javascript files needed by template
*/
-$js_includes = $oTemplate->getJavascriptIncludes();
+$js_includes = $oTemplate->get_javascript_includes(TRUE);
foreach ($js_includes as $js_file) {
$xtra .= '' ."\n";
}
@@ -61,7 +61,7 @@ foreach ($js_includes as $js_file) {
// get mailbox list and cache it
$mailboxes=sqimap_get_mailboxes($imapConnection,false,$show_only_subscribed_folders);
-displayHtmlHeader( 'SquirrelMail', $xtra );
+displayHtmlHeader( $org_title, $xtra );
$oErrorHandler->setDelayedErrors(true);
sqgetGlobalVar('auto_create_done',$auto_create_done,SQ_SESSION);
@@ -70,7 +70,7 @@ if ($auto_create_special && !isset($auto_create_done)) {
$autocreate = array($sent_folder, $trash_folder, $draft_folder);
$folders_created = false;
foreach( $autocreate as $folder ) {
- if (($folder != '') && ($folder != 'none')) {
+ if ($folder != '' && $folder != SMPREF_NONE) {
/**
* If $show_only_subscribed_folders is true, don't use
* $mailboxes array for checking if mailbox exists.
@@ -142,6 +142,7 @@ if ($date_format != 6) {
}
$clk = str_replace(' ',' ',$clk);
+//FIXME don't build HTML here - do it in template
$clock = ''
. str_replace(' ', ' ', _("Last Refresh"))
. ":
$clk
\n";
@@ -191,9 +192,8 @@ $oTemplate->assign('mailboxes', $mailbox_structure);
* globals, which are dirty, filthy things in templates. :)
*/
$settings = array();
-$settings['imapConnection'] = $imapConnection;
-$settings['iconThemePath'] = $icon_theme_path;
-$settings['templateDirectory'] = $sTplDir;
+#$settings['imapConnection'] = $imapConnection;
+$settings['templateID'] = $sTemplateID;
$settings['unreadNotificationEnabled'] = $unseen_notify!=1;
$settings['unreadNotificationAllFolders'] = $unseen_notify == 3;
$settings['unreadNotificationDisplayTotal'] = $unseen_type == 2;
@@ -203,8 +203,13 @@ $settings['messageRecyclingEnabled'] = $move_to_trash;
$settings['collapsableFoldersEnabled'] = $collapse_folders==1;
$oTemplate->assign('settings', $settings);
+//access keys
+//
+$oTemplate->assign('accesskey_folders_refresh', $accesskey_folders_refresh);
+$oTemplate->assign('accesskey_folders_purge_trash', $accesskey_folders_purge_trash);
+$oTemplate->assign('accesskey_folders_inbox', $accesskey_folders_inbox);
+
$oTemplate->display('left_main.tpl');
sqimap_logout($imapConnection);
$oTemplate->display('footer.tpl');
-?>