do not special case a folder named 'None'. There's no reason

to not use the empty string and this prevents people who want
to have a "None" folder from using it properly.

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

diff --git a/ChangeLog b/ChangeLog
index e7ee71f25bec647fbee70a3f17398bf7f720d1e9..fb4ce220c7c318f0716cfa9fb4209c80e49823e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -186,6 +186,7 @@ Version 1.5.2 - SVN
     better-than-nothing alternative.
   - Fix Priority and Receipt compose options being reset after return from
     HTML addressbook, and allow returning from an empty address book (#1673056).
+  - Do not special case the 'None' folder.
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 5d0e5ab48de0fd5ab082520ea89be001fc614326..e7c413095890dffd4cf55278729d8ad02e12941a 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -360,8 +360,7 @@ function sqimap_mailbox_exists ($imap_stream, $mailbox, $mailboxlist=null) {
  * @since 1.0 or older
  */
 function sqimap_mailbox_select ($imap_stream, $mailbox) {
-    // FIX ME: WHAAAA DO NOT USE "None" for something that does not exist. Use false or NULL instead
-    if ($mailbox == 'None') {
+    if (empty($mailbox)) {
         return;
     }
 

diff --git a/functions/page_header.php b/functions/page_header.php
index 530774a85aeeaaa7dfdf7a51406dbd5628c35937..c181479ddd08fdcfeaf26a2b5599496bf24aa8aa 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -196,7 +196,7 @@ function displayInternalLink($path, $text, $target='') {
  * @return void
  */
 
-function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
+function displayPageHeader($color, $mailbox='', $sHeaderJs='', $sBodyTagJs = '') {
 
     global $reply_focus, $hide_sm_attributions, $frame_top,
         $provider_name, $provider_uri, $startMessage,

diff --git a/help/en_US/options.hlp b/help/en_US/options.hlp
index 9cf334685cc43f5ff8fd3289f4818b2cb9604582..31d6508ab50decd520a5555cbc6d8e7081ff6b9a 100644 (file)
--- a/help/en_US/options.hlp
+++ b/help/en_US/options.hlp
@@ -268,7 +268,7 @@
       messages, the INBOX will become bold and a number will appear to the right of it
       to say how many new messages are in it.  If you set it to All Folders, this 
       behavior will happen on all folders.  If you notice that loading the folder list
-      is really slow, you can set this to INBOX or None and that should speed it up.
+      is really slow, you can set this to INBOX and that should speed it up.
       <br /><br />
       
       <b>Unseen message notification type</b><br />

diff --git a/plugins/abook_take/take.php b/plugins/abook_take/take.php
index 1f9c8d512bb3cb325f4659f78c22742b6e1732f3..3ac2c509be20b0a91fe134f2e38869eb1b656c61 100644 (file)
--- a/plugins/abook_take/take.php
+++ b/plugins/abook_take/take.php
@@ -22,7 +22,7 @@ require('../../include/init.php');
 require(SM_PATH . 'functions/forms.php');
 require(SM_PATH . 'functions/addressbook.php');
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 /* input form data */
 sqgetGlobalVar('email', $email, SQ_POST);
@@ -45,4 +45,4 @@ $formdata=array('email'=>$addrs);
 abook_create_form(SM_PATH . 'src/addressbook.php','addaddr',_("Add to address book"),_("Add address"),$formdata);
 echo '</form>';
 ?>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index 15a1c4b2dafd346641eba6774e3e39ea7731f1ee..57e631b5f6f25b20308dc1c6df1d275a6d0e7ec1 100644 (file)
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -233,7 +233,7 @@ if ( !adm_check_user() ) {
     exit;
 }
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 $newcfg = array( );
 
@@ -646,4 +646,4 @@ if ( $fp = @fopen( $cfgfile, 'w' ) ) {
 }
 
 ?>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php
index c62498caa2ba23eda0ef70635cd05e932aa26927..2e8475846ffdec7ed28611e2b0485a7473305221 100644 (file)
--- a/plugins/bug_report/bug_report.php
+++ b/plugins/bug_report/bug_report.php
@@ -24,7 +24,7 @@ require_once(SM_PATH . 'functions/forms.php');
 /** load plugin functions */
 require_once(SM_PATH . 'plugins/bug_report/functions.php');
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 /** is bug_report plugin disabled or called by wrong user */
 if (! is_plugin_enabled('bug_report') || ! bug_report_check_user()) {
@@ -131,4 +131,4 @@ echo addSubmit(_("Start Bug Report Form"));
     </form>
     <br />
   </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index dae2a87df7b8a3ca9c60d5d01ec5166135262dce..f76e2d0f6076c6dd23d010be711eeee8bab5cd08 100644 (file)
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -169,7 +169,7 @@ if( !isset($day) || $day <= 0){
 $todayis = date( 'mdY' );
 $calself=basename($PHP_SELF);
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 calendar_header();
 readcalendardata();
 startcalendar();
@@ -177,4 +177,4 @@ drawmonthview();
 endcalendar();
 
 ?>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/plugins/calendar/day.php b/plugins/calendar/day.php
index a2a2049bf73610e2ba67e96b152fc590bf4db998..40e4a4dfcc776e366cd2082cf64fec32f6e36c4b 100644 (file)
--- a/plugins/calendar/day.php
+++ b/plugins/calendar/day.php
@@ -169,7 +169,7 @@ $calself=basename($PHP_SELF);
 
 $daily_events = array();
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 calendar_header();
 readcalendardata();
 day_header();
@@ -177,4 +177,4 @@ initialize_events();
 display_events();
 ?>
 </table></td></tr></table>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/plugins/calendar/event_create.php b/plugins/calendar/event_create.php
index 86fe2e8431b5567d2660d467a32b85814df37ac6..db2347c2ae2ebd5b53d3c203cf989d67af6c9644 100644 (file)
--- a/plugins/calendar/event_create.php
+++ b/plugins/calendar/event_create.php
@@ -122,7 +122,7 @@ if (!isset($hour) || $hour <= 0){
 $calself=basename($PHP_SELF);
 
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 //load calendar menu
 calendar_header();
 
@@ -175,4 +175,4 @@ if(!isset($event_text)){
 
 ?>
 </table></td></tr></table>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/plugins/calendar/event_delete.php b/plugins/calendar/event_delete.php
index dc90191b4b4d18f667e5684403db21cfadd439ba..79867aef00d87a6f5a00f074e839da67b66b2f00 100644 (file)
--- a/plugins/calendar/event_delete.php
+++ b/plugins/calendar/event_delete.php
@@ -119,7 +119,7 @@ if ($day <= 0){
 
 $calself=basename($PHP_SELF);
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 //load calendar menu
 calendar_header();
 
@@ -145,4 +145,4 @@ if (isset($dyear) && isset($dmonth) && isset($dday) && isset($dhour) && isset($d
 
 ?>
 </table></td></tr></table>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/plugins/calendar/event_edit.php b/plugins/calendar/event_edit.php
index 7d38c64e25a0a98b5986443b5d4c5b071338e424..5b94a1b77e384fe2c2a85106d7e8b78a769f41d9 100644 (file)
--- a/plugins/calendar/event_edit.php
+++ b/plugins/calendar/event_edit.php
@@ -255,7 +255,7 @@ if ($hour <= 0){
 
 $calself=basename($PHP_SELF);
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 //load calendar menu
 calendar_header();
 
@@ -311,4 +311,4 @@ if (!isset($updated)){
 
 ?>
 </table></td></tr></table>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/plugins/change_password/options.php b/plugins/change_password/options.php
index 15b674ea7e18cdb03f2d90a65c0c70747765d64f..9b72d6c48883e94385edf42a1558061753a111c6 100644 (file)
--- a/plugins/change_password/options.php
+++ b/plugins/change_password/options.php
@@ -62,7 +62,7 @@ if(sqgetGlobalVar('cpw_go', $cpw_go, SQ_POST)) {
     }
 }
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 do_hook('change_password_init', $null);
 ?>

diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 8056a83dc5cb2cefe04fc1a91ef8827be3ff8e34..9cc1e54e93e4858c0c5c6043db046314920dc2fd 100644 (file)
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -18,7 +18,7 @@ include_once(SM_PATH . 'functions/imap_general.php');
 include_once(SM_PATH . 'functions/forms.php');
 include_once(SM_PATH . 'plugins/filters/filters.php');
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 /* get globals */
 sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);

diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index bcef8e51addffabfce244b1c75aba5bdb9f4ef8a..16b25835a824fbf49fc3f846c4663bb6787e5bba 100644 (file)
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -25,7 +25,7 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
 sqgetGlobalVar('action', $action, SQ_GET);
 /* end globals */
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 if (sqgetGlobalVar('spam_submit',$spam_submit,SQ_POST)) {
     $spam_filters = load_spam_filters();

diff --git a/plugins/info/options.php b/plugins/info/options.php
index 79fa0d18ef8a8e9e9cdcb6112efd57407ba2943d..d09ee6cd9528df10e40e2c4236c079cbc7452822 100644 (file)
--- a/plugins/info/options.php
+++ b/plugins/info/options.php
@@ -26,7 +26,7 @@ require_once(SM_PATH . 'plugins/info/functions.php');
 
 global $username, $color, $folder_prefix, $default_charset;
 $default_charset = strtoupper($default_charset);
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 $mailbox = 'INBOX';
 
 /**

diff --git a/plugins/listcommands/options.php b/plugins/listcommands/options.php
index 26e4ec235c5e49865981b285181d0ce214a953ae..67dfc0151e0658ca94f5c91506da9b082d51607f 100644 (file)
--- a/plugins/listcommands/options.php
+++ b/plugins/listcommands/options.php
@@ -70,7 +70,7 @@ if (sqGetGlobalVar('addlist', $ignore, SQ_FORM)
 
 
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 $oTemplate->assign('lists', $lists);
 $oTemplate->display('plugins/listcommands/non_rfc_lists.tpl');

diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index 918fe2981b004c9a46a4c7e7adc84716c3c93166..17711ec507340cf5d3f3c282acd60d722c395a6d 100644 (file)
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -119,7 +119,7 @@ function Mail_Fetch_Select_Server($mailfetch) {
 }
 
 $mailfetch = Mail_Fetch_Servers();
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 echo '<br />';
 

diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 81780f19e94a4803d60c2170309f2646ed7c52d4..7931bb612634ebe8ddbe432ff5ab8f6adc8334cc 100644 (file)
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -55,7 +55,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
 
 /* end globals */
 
-displayPageHeader( $color, 'None' );
+displayPageHeader( $color );
 
 switch( $mf_action ) {
  case 'add':

diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php
index 5b194f3875e87d890f9d17a77ecb7c34b9f775af..24678eef40474f05575de083d037e6a60011f5e7 100644 (file)
--- a/plugins/newmail/newmail_opt.php
+++ b/plugins/newmail/newmail_opt.php
@@ -23,7 +23,7 @@ include_once(SM_PATH . 'plugins/newmail/functions.php');
 
 include_once(SM_PATH . 'functions/forms.php');
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 echo html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) . "\n" .
         html_tag( 'tr' ) . "\n" .

diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php
index f30987ad46b9a27141c63410a89ddeeb65a203dd..8e186181f09727711fab1fde402d1d0ac669e08d 100755 (executable)
--- a/plugins/spamcop/options.php
+++ b/plugins/spamcop/options.php
@@ -18,7 +18,7 @@ require('../../include/init.php');
 /* plugin functions */
 include_once(SM_PATH . 'plugins/spamcop/functions.php');
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 /** is spamcop plugin disabled */
 // option changes do nothing, if read_body_header_right hook is not active.
@@ -194,4 +194,4 @@ echo '<p><b>' . _("More information") . '</b><br />';
 printf(_("For more information about SpamCop, it's services, spam in general, and many related topics, try reading through SpamCop's %sHelp and Feedback%s section."), '<a href="http://spamcop.net/help.shtml">', '</a>');
 echo "</p>\n";
 ?>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php
index 4044f23aaf2f555916817e39d0a8e20835ccd36e..7f8d771d893838abaf5e9bf5936bb52984bed6f2 100644 (file)
--- a/plugins/squirrelspell/sqspell_functions.php
+++ b/plugins/squirrelspell/sqspell_functions.php
@@ -125,7 +125,7 @@ function sqspell_makePage($title, $scriptsrc, $body){
       $MOD = 'options_main';
   }
 
-  displayPageHeader($color, 'None');
+  displayPageHeader($color);
   echo "&nbsp;<br />\n";
   /**
    * Check if we need to link in a script.

diff --git a/plugins/translate/options.php b/plugins/translate/options.php
index 7974d6ff02c612bff90d4bd9c000fa274cf87782..7e18ef2532ea9abb9fa45e356b74bf88e46f6b20 100644 (file)
--- a/plugins/translate/options.php
+++ b/plugins/translate/options.php
@@ -20,7 +20,7 @@ require('../../include/init.php');
 /** Plugin functions */
 include_once(SM_PATH . 'plugins/translate/functions.php');
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 ?>
    <table width="95%" align="center" border="0" cellpadding="1" cellspacing="0"><tr><td bgcolor="<?php echo $color[0]; ?>">
@@ -78,4 +78,4 @@ if (!$disable_compose_translate) {
 </td></tr>
 </table>
 </form>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/src/about.php b/src/about.php
index 98ed98da9c342b378554b55002e93c4a12f30bf6..5a121887e3a2edbe56f957b468c7578f3a2e8a62 100644 (file)
--- a/src/about.php
+++ b/src/about.php
@@ -21,7 +21,7 @@
  */
 require('../include/init.php');
 
-displayPageHeader($color, 'None' );
+displayPageHeader($color);
 
 ?>
 <p align="center">

diff --git a/src/addressbook.php b/src/addressbook.php
index bfb0a253e8ce285beaa3dc18dc02b3f6fe65d16d..69e45f7bc794e88197338807f88d858fa1f5bfdd 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -40,7 +40,7 @@ sqgetGlobalVar('doedit',        $doedit,        SQ_POST);
 $abook_sort_order = get_abook_sort();
 
 /* Create page header before addressbook_init in order to  display error messages correctly. */
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 /* Open addressbook with error messages on.
  remote backends (LDAP) are enabled because they can be used. (list_addr function)

diff --git a/src/compose.php b/src/compose.php
index 9e72e917d588c72bb6c5e39fd3a56a62594125f3..2da86907a31a37c39825073da31a4c9af906bf4b 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -383,7 +383,7 @@ if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL)
     $composeMessage=$compose_messages[$session];
 }
 
-if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) {
+if (empty($mailbox)) {
     $mailbox = 'INBOX';
 }
 

diff --git a/src/folders.php b/src/folders.php
index 91e41d79e27887efc568ef1bdf328e68d67adca2..ae3c89676d08a95aee16c1abe6575d69b80a6dd5 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -22,7 +22,7 @@ require_once(SM_PATH . 'functions/imap_general.php');
 require_once(SM_PATH . 'functions/folder_manip.php');
 require_once(SM_PATH . 'functions/forms.php');
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 /* get globals we may need */
 sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);

diff --git a/src/help.php b/src/help.php
index fd0525e7c44f73bc8fe0a3d74077b1135e26266b..ebfa81b19aba60897ccf8799329fbb8fa40eab0d 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -16,7 +16,7 @@
  */
 require('../include/init.php');
 
-displayPageHeader($color, 'None' );
+displayPageHeader($color);
 
 $helpdir[0] = 'basic.hlp';
 $helpdir[1] = 'main_folder.hlp';

diff --git a/src/image.php b/src/image.php
index e1a2680c9e61b4e66d77a0f93f1694febef054b3..2bf417c51176f9011c7ab093227a7612299e68d6 100644 (file)
--- a/src/image.php
+++ b/src/image.php
@@ -16,7 +16,7 @@
  */
 require('../include/init.php');
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 /* globals */
 if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {

diff --git a/src/left_main.php b/src/left_main.php
index 3805ec1789681a5806519cef12533785a5d0579d..5b1cf17ec4ea54f607c7b27d67f6f122be40e220 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -69,7 +69,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 != '') {
             /**
              * If $show_only_subscribed_folders is true, don't use 
              * $mailboxes array for checking if mailbox exists.

diff --git a/src/options.php b/src/options.php
index 499a4359d2591aee3cd36c2a227f04d9c5562c3c..4350c59e8271aedda5253e26ae1a00300375e142 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -237,7 +237,7 @@ if ($optmode == SMOPT_MODE_SUBMIT) {
 /* Finally, display whatever page we are supposed to show now. */
 /***************************************************************/
 
-displayPageHeader($color, 'None', (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : ''));
+displayPageHeader($color, null, (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : ''));
 
 /*
  * The main option page has a different layout then the rest of the option

diff --git a/src/options_highlight.php b/src/options_highlight.php
index c7678ca86ce26b4abdfbc5378fd69b7a5bfa83cb..1b9768b5f85c085e25fa7930c3cf39a4e39e19f3 100644 (file)
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -104,7 +104,7 @@ if (isset($theid) && ($action == 'delete') ||
 
     setPref($data_dir, $username, 'hililist', serialize($message_highlight_list));
 }
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 /**
  * Display the current rule list

diff --git a/src/options_identities.php b/src/options_identities.php
index 748494826d6368d1afd9036d4ba701dc8f1169bf..7a49817cb54cc8aeb8425faea980e159fb7bc705 100644 (file)
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -61,7 +61,7 @@ if (!empty($return)) {
     exit;
 }
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 /* since 1.1.3 */
 do_hook('options_identities_top', $null);

diff --git a/src/options_order.php b/src/options_order.php
index b3559bd437e09c75243447f01d120f40153cf0f8..8f081acd3875dd2b164f9216b24aa8453cababcf 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -73,7 +73,7 @@ if (!sqgetGlobalVar('account', $account,  SQ_GET)) {
 /* Finally, display whatever page we are supposed to show now. */
 /***************************************************************/
 
-displayPageHeader($color, 'None', (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : ''));
+displayPageHeader($color, null, (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : ''));
 
 
 /**

diff --git a/src/search.php b/src/search.php
index c2a1054e1aed106362f41f0b42efd0da137da59f..1606105d3caeeee5185daea19c3618e392659fe5 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -1312,7 +1312,7 @@ $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort,
 $boxes = sqimap_mailbox_list($imapConnection);
 /* ensure we have a valid default mailbox name */
 $mailbox = asearch_nz($mailbox_array[0]);
-if (($mailbox == '') || ($mailbox == 'None')) //Workaround for sm quirk IMHO (what if I really have a mailbox called None?)
+if ($mailbox == '')
     $mailbox = $boxes[0]['unformatted']; //Usually INBOX ;)
 
 

diff --git a/src/vcard.php b/src/vcard.php
index 7589bfece78ed519188f6e18139bf8f78bbceda9..b9766fb940d064f4020627ad8b6e86ab977beb61 100644 (file)
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -41,7 +41,7 @@ sqgetGlobalVar('startMessage', $startMessage, SQ_GET);
 $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
 sqimap_mailbox_select($imapConnection, $mailbox);
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 $msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
     '&startMessage='.urlencode($startMessage).
@@ -185,4 +185,4 @@ $oTemplate->assign('info', $opts);
 $oTemplate->display('vcard.tpl');
 
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file
+?>

diff --git a/src/view_text.php b/src/view_text.php
index 8f4344752abcd8dae3deaa8934b187237c57cf9f..ce84feb44bc81aecd1b4016c69d18a2954bf4bc4 100644 (file)
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -75,7 +75,7 @@ if ($type1 == 'html' || (isset($override_type1) &&  $override_type1 == 'html'))
     translateText($body, $wrap_at, $charset);
 }
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 $oTemplate->assign('view_message_href', $msg_url);
 $oTemplate->assign('download_href', $dwnld_url);

diff --git a/templates/default/page_header.tpl b/templates/default/page_header.tpl
index 3860ac1669aeb09953b84a0f8bd6c9ba80dbb620..99a4de40f129357179f7c066fd5b998afaede807 100644 (file)
--- a/templates/default/page_header.tpl
+++ b/templates/default/page_header.tpl
@@ -17,7 +17,7 @@ extract($t);
 
 
 $current_folder_str = '';
-if ( $shortBoxName <> '' && strtolower( $shortBoxName ) <> 'none' ) {
+if ( $shortBoxName != '' ) {
     $current_folder_str .= _("Current Folder") . ": <em>$shortBoxName&nbsp;</em>\n";
 } else {
     $current_folder_str .= '&nbsp;';