Trimming whitespace and replacing tabs

class/deliver/Deliver.class.php

@@ -694,4 +694,4 @@ class Deliver {
         return $refer;
     }
 }
-?>
+?>

class/template/template.class.php

@@ -184,4 +184,4 @@ class Template
 
 }
 
-?>
+?>

config/config_default.php

@@ -1007,4 +1007,4 @@ $config_use_color = 2;
  * sent and regular output to begin, which will majorly screw
  * things up when we try to send more headers later.
  */
-?>
+?>

functions/abook_ldap_server.php

@@ -9,7 +9,7 @@
  *
  * LDAP filtering code by Tim Bell
  *   <bhat at users.sourceforge.net> (#539534)
- * ADS limit_scope code by Michael Brown 
+ * ADS limit_scope code by Michael Brown
  *   <mcb30 at users.sourceforge.net> (#1035454)
  *
  * @version $Id$
@@ -307,7 +307,7 @@ class abook_ldap_server extends addressbook_backend {
         $expr = $this->charset_encode($expr);
 
         /*
-         * allow use of one asterisk in search. 
+         * allow use of one asterisk in search.
          * Don't allow any ldap special chars if search is different
          */
         if($expr!='*') {

functions/addressbook.php

@@ -27,7 +27,7 @@ global $addrbook_dsn, $addrbook_global_dsn;
 
 /**
  * Create and initialize an addressbook object.
- * @param boolean $showerr display any address book init errors. html page header 
+ * @param boolean $showerr display any address book init errors. html page header
  * must be created before calling addressbook_init() with $showerr enabled.
  * @param boolean $onlylocal enable only local address book backends
  * @return object address book object.
@@ -73,7 +73,7 @@ function addressbook_init($showerr = true, $onlylocal = false) {
     }
 
     /* Global file based addressbook */
-    if (isset($abook_global_file) && 
+    if (isset($abook_global_file) &&
         isset($abook_global_file_writeable) &&
         isset($abook_global_file_listing) &&
         trim($abook_global_file)!=''){
@@ -81,7 +81,7 @@ function addressbook_init($showerr = true, $onlylocal = false) {
         // Detect place of address book
         if (! preg_match("/[\/\\\]/",$abook_global_file)) {
             /* no path chars, address book stored in data directory
-             * make sure that there is a slash between data directory 
+             * make sure that there is a slash between data directory
              * and address book file name
              */
             $abook_global_filename=$data_dir

functions/attachment_common.php

@@ -169,7 +169,7 @@ function attachment_common_link_html(&$Args) {
 }
 
 /**
- * Adds href and text keys to attachment_common array for image attachments 
+ * Adds href and text keys to attachment_common array for image attachments
  * @param array $Args attachment $type hook arguments
  * @since 1.2.0
  */
@@ -195,7 +195,7 @@ function attachment_common_link_image(&$Args) {
 }
 
 /**
- * Adds href and text keys to attachment_common array for vcard attachments 
+ * Adds href and text keys to attachment_common array for vcard attachments
  * @param array $Args attachment $type hook arguments
  * @since 1.2.0
  */
@@ -214,7 +214,7 @@ function attachment_common_link_vcard(&$Args) {
 
 /**
  * Processes octet-stream attachments.
- * Calls attachment_common-load_mime_types and attachment $type hooks. 
+ * Calls attachment_common-load_mime_types and attachment $type hooks.
  * @param array $Args attachment $type hook arguments
  * @since 1.2.0
  */

functions/auth.php

@@ -249,4 +249,4 @@ function get_smtp_user(&$user, &$pass) {
     }
 }
 
-?>
+?>

functions/display_messages.php

@@ -177,4 +177,4 @@ function error_option_save($message) {
     $optpage_save_error=array_merge($optpage_save_error,array($message));
 }
 // vim: et ts=4
-?>
+?>

functions/file_prefs.php

@@ -186,7 +186,7 @@ function checkForPrefs($data_dir, $username, $filename = '') {
     if (!@file_exists($filename) ) {
 
         /* If it does not exist, check for default_prefs */
-        
+
         /* First, check legacy locations: data dir */
         if(substr($data_dir,-1) != '/') {
             $data_dir .= '/';
@@ -203,7 +203,7 @@ function checkForPrefs($data_dir, $username, $filename = '') {
         if (!@file_exists($default_pref)) {
             $default_pref = SM_PATH . 'config/default_pref';
         }
-        
+
         /* If a default_pref file found, try to copy it, if none found,
          * try to create an empty one. If that fails, report an error.
          */
@@ -277,4 +277,4 @@ function getSig($data_dir, $username, $number) {
 }
 
 // vim: et ts=4
-?>
+?>

functions/folder_manip.php

@@ -25,14 +25,14 @@ function folders_checkname($imapConnection, $folder_name, $delimiter)
 {
     if (substr_count($folder_name, '"') || substr_count($folder_name, "\\") ||
         substr_count($folder_name, $delimiter) || ($folder_name == '')) {
-        
+
         global $color;
         error_box(_("Illegal folder name.") . "<br />\n" .
-	    sprintf(_("The name may not contain any of the following: %s"), '<tt>" \\ '.$delimiter.'</tt>')
-	    . "<br />\n" .
-	    _("Please select a different name.").
-            '<br /><a href="folders.php">'.
-	    _("Click here to go back") . '</a>.', $color);
+                sprintf(_("The name may not contain any of the following: %s"), '<tt>" \\ '.$delimiter.'</tt>')
+                . "<br />\n" .
+                _("Please select a different name.").
+                '<br /><a href="folders.php">'.
+                _("Click here to go back") . '</a>.', $color);
 
         sqimap_logout($imapConnection);
         exit;
@@ -49,7 +49,7 @@ function folders_create ($imapConnection, $delimiter, $folder_name, $subfolder,
     global $folder_prefix;
 
     $folder_name = imap_utf7_encode_local($folder_name);
-   
+
     if ( ! empty($contain_subs) ) {
         $folder_name = $folder_name . $delimiter;
     }
@@ -83,7 +83,7 @@ function folders_rename_getname ($imapConnection, $delimiter, $old) {
     if ( $old == '' ) {
         plain_error_message(_("You have not selected a folder to rename. Please do so.").
             '<br /><a href="../src/folders.php">'._("Click here to go back").'</a>.', $color);
-        sqimap_logout($imapConnection);    
+        sqimap_logout($imapConnection);
         exit;
     }
 
@@ -133,8 +133,8 @@ function folders_rename_getname ($imapConnection, $delimiter, $old) {
              '<input type="submit" name="cancelbutton" value="'._("Cancel")."\" />\n".
              '</form><br /></td></tr></table>';
     echo "\n</td></tr></table>\n</td></tr></table>\n\n</body></html>";
-    
-    sqimap_logout($imapConnection);    
+
+    sqimap_logout($imapConnection);
     exit;
 }
 
@@ -148,7 +148,7 @@ function folders_rename_do($imapConnection, $delimiter, $orig, $old_name, $new_n
     $orig = imap_utf7_encode_local($orig);
     $old_name = imap_utf7_encode_local($old_name);
     $new_name = imap_utf7_encode_local($new_name);
-    
+
     if ($old_name != $new_name) {
 
         if (strpos($orig, $delimiter)) {
@@ -214,7 +214,7 @@ function folders_delete_ask ($imapConnection, $folder_name)
 
     echo "\n</td></tr></table>\n</td></tr></table>\n\n</body></html>";
 
-    sqimap_logout($imapConnection);    
+    sqimap_logout($imapConnection);
     exit;
 }
 
@@ -224,7 +224,7 @@ function folders_delete_ask ($imapConnection, $folder_name)
 function folders_delete_do ($imapConnection, $delimiter, $folder_name)
 {
     require_once(SM_PATH . 'functions/tree.php');
-    
+
     $boxes = sqimap_mailbox_list ($imapConnection);
 
     global $delete_folder, $imap_server_type, $trash_folder, $move_to_trash;
@@ -310,7 +310,7 @@ function folders_subscribe($imapConnection, $folder_names)
                 '<br /><a href="../src/folders.php">'._("Click here to go back").'</a>.', $color);
             sqimap_logout($imapConnection);
             exit;
-            
+
         }
     }
     foreach ( $folder_names as $folder_name ) {
@@ -342,4 +342,4 @@ function folders_unsubscribe($imapConnection, $folder_names)
 }
 
 
-?>
+?>

functions/forms.php

@@ -20,7 +20,7 @@
 function addInputField($type, $name = null, $value = null, $attributes = '', $id = null) {
     return '<input type="'.$type.'"'.
         ($name  !== null ? ' name="'.htmlspecialchars($name).'"'   : '').
-        ($id  !== null ? ' id="'.htmlspecialchars($id).'"'   
+        ($id  !== null ? ' id="'.htmlspecialchars($id).'"'
             : ($name  !== null ? ' id="'.htmlspecialchars($name).'"'   : '')).
         ($value !== null ? ' value="'.htmlspecialchars($value).'"' : '').
         $attributes . " />\n";
@@ -146,4 +146,4 @@ function addForm($action, $method = 'post', $name = '', $enctype = '', $charset
         $enctype . $name . $charset . ">\n";
 }
 
-?>
+?>

functions/global.php

@@ -288,4 +288,4 @@ function sqsession_is_active() {
 }
 
 // vim: et ts=4
-?>
+?>

functions/i18n.php

@@ -104,7 +104,7 @@ function sq_setlocale($category,$locale) {
  *
  * @param string $charset
  * @param string $string Text to be decoded
- * @param boolean $force_decode converts string to html without $charset!=$default_charset check. 
+ * @param boolean $force_decode converts string to html without $charset!=$default_charset check.
  * Argument is available since 1.5.1 and 1.4.5.
  * @return string decoded string
  */
@@ -294,15 +294,15 @@ function set_up_language($sm_language, $do_search = false, $default = false) {
      * If function is asked to detect preferred language
      *  OR squirrelmail default language is set to empty string
      *    AND
-     * squirrelmail language ($sm_language) is empty string 
+     * squirrelmail language ($sm_language) is empty string
      * (not set in user's prefs and no cookie with language info)
      *    AND
      * browser provides list of preferred languages
      *  THEN
      * get preferred language from HTTP_ACCEPT_LANGUAGE header
      */
-    if (($do_search || empty($squirrelmail_default_language)) && 
-        ! $sm_language && 
+    if (($do_search || empty($squirrelmail_default_language)) &&
+        ! $sm_language &&
         isset($accept_lang)) {
         // TODO: use more than one language, if first language is not available
         // FIXME: function assumes that string contains two or more characters.
@@ -317,7 +317,7 @@ function set_up_language($sm_language, $do_search = false, $default = false) {
      *  THEN
      * use default squirrelmail language value from configuration.
      */
-    if ((!$sm_language||$default) && 
+    if ((!$sm_language||$default) &&
         ! empty($squirrelmail_default_language)) {
         $squirrelmail_language = $squirrelmail_default_language;
         $sm_language = $squirrelmail_default_language;
@@ -441,18 +441,18 @@ function set_up_language($sm_language, $do_search = false, $default = false) {
         /**
          * mbstring.func_overload fix (#929644).
          *
-         * php mbstring extension can replace standard string functions with their multibyte 
+         * php mbstring extension can replace standard string functions with their multibyte
          * equivalents. See http://www.php.net/ref.mbstring#mbstring.overload.
          *
          * Some SquirrelMail functions work with 8bit strings in bytes. If interface is forced
          * to use mbstring functions and mbstring internal encoding is set to multibyte charset,
-         * interface can't trust regular string functions. Due to mbstring overloading design 
+         * interface can't trust regular string functions. Due to mbstring overloading design
          * limits php scripts can't control this setting.
          *
          * This hack should fix some issues related to 8bit strings in passwords. Correct fix is
          * to disable mbstring overloading. Japanese translation uses different internal encoding.
          */
-        if ($squirrelmail_language != 'ja_JP' && 
+        if ($squirrelmail_language != 'ja_JP' &&
             function_exists('mb_internal_encoding') &&
             check_php_version(4,2,0) &&
             (int)ini_get('mbstring.func_overload')!=0) {

functions/imap.php

@@ -24,4 +24,4 @@ require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'functions/mailbox_display.php');
 require_once(SM_PATH . 'functions/mime.php');
 
-?>
+?>

functions/imap_asearch.php

@@ -176,7 +176,7 @@ function asearch_unhtmlentities($string) {
  * @global bool imap_asearch_debug_dump
  * @param string $var_name
  * @param string $var_var
- * @deprecated contains workarounds for 1.4.0 and older code. 
+ * @deprecated contains workarounds for 1.4.0 and older code.
  *   code without workarounds uses regular sm 1.4.2+ functions.
  *   it is not compatible with 1.4.1
  * @todo remove debugging function

functions/imap_mailbox.php

@@ -126,7 +126,7 @@ function compact_mailboxes_response($ary) {
  * (LIST|LSUB) (<Flags list>) (NIL|"<separator atom>") <mailbox name string>\r\n
  * mailbox name in quoted string MUST be unquoted and stripslashed (sm API)
  *
- * Originally stored in functions/strings.php. Since 1.2.6 stored in 
+ * Originally stored in functions/strings.php. Since 1.2.6 stored in
  * functions/imap_mailbox.php
  * @param string $line imap LIST/LSUB response line
  * @return string mailbox name
@@ -167,11 +167,11 @@ function check_is_noinferiors ($lsub_line) {
  * separator character, returns the second last part of the full
  * mailbox name (i.e. the mailbox's parent mailbox)
  *
- * Originally stored in functions/strings.php. Since 1.2.6 stored in 
+ * Originally stored in functions/strings.php. Since 1.2.6 stored in
  * functions/imap_mailbox.php
  * @param string $haystack full mailbox name
  * @param string $needle delimiter
- * @return string parent mailbox 
+ * @return string parent mailbox
  */
 function readMailboxParent($haystack, $needle) {
     if ($needle == '') {
@@ -214,7 +214,7 @@ function isBoxBelow( $subbox, $parentbox ) {
 /**
  * Defines special mailboxes: given a mailbox name, it checks if this is a
  * "special" one: INBOX, Trash, Sent or Draft.
- * 
+ *
  * Since 1.2.5 function includes special_mailbox hook.<br>
  * Since 1.4.3 hook supports more than one plugin.
  * @param string $box mailbox name
@@ -269,11 +269,11 @@ function isDraftMailbox($box) {
 
 /**
  * Expunges a mailbox
- * 
+ *
  * WARNING: Select mailbox before calling this function.
- * 
- * permanently removes all messages that have the \Deleted flag 
- * set from the selected mailbox. See EXPUNGE command chapter in 
+ *
+ * permanently removes all messages that have the \Deleted flag
+ * set from the selected mailbox. See EXPUNGE command chapter in
  * IMAP RFC.
  * @param stream $imap_stream imap connection resource
  * @param string $mailbox mailbox name (unused since 1.1.3).
@@ -327,7 +327,7 @@ function sqimap_mailbox_exists ($imap_stream, $mailbox) {
  * Before 1.3.0 used more arguments and returned data depended on those argumements.
  * @param stream $imap_stream imap connection resource
  * @param string $mailbox mailbox name
- * @return array results of select command (on success - permanentflags, flags and rights) 
+ * @return array results of select command (on success - permanentflags, flags and rights)
  * @since 1.0 or older
  */
 function sqimap_mailbox_select ($imap_stream, $mailbox) {
@@ -367,10 +367,10 @@ function sqimap_mailbox_select ($imap_stream, $mailbox) {
  * Creates a folder.
  *
  * Mailbox is automatically subscribed.
- * 
- * Set $type to string that does not match 'noselect' (case insensitive), 
- * if you don't want to prepend delimiter to mailbox name. Please note 
- * that 'noinferiors' might be used someday as keyword for folders 
+ *
+ * Set $type to string that does not match 'noselect' (case insensitive),
+ * if you don't want to prepend delimiter to mailbox name. Please note
+ * that 'noinferiors' might be used someday as keyword for folders
  * that store only messages.
  * @param stream $imap_steam imap connection resource
  * @param string $mailbox mailbox name
@@ -793,13 +793,13 @@ function sqimap_mailbox_list($imap_stream, $force=false) {
 
         /* Find INBOX's children */
         for($k = 0; $k < $cnt; ++$k) {
-            if (!$used[$k] && isBoxBelow(strtolower($boxesall[$k]['unformatted']), 'inbox') && 
+            if (!$used[$k] && isBoxBelow(strtolower($boxesall[$k]['unformatted']), 'inbox') &&
             strtolower($boxesall[$k]['unformatted']) != 'inbox') {
                 $boxesnew[] = $boxesall[$k];
                 $used[$k] = true;
-            }   
+            }
         }
-        
+
         /* Rest of the folders */
         for($k = 0; $k < $cnt; $k++) {
             if (!$used[$k]) {

functions/imap_messages.php

@@ -962,4 +962,4 @@ function sqimap_get_message($imap_stream, $id, $mailbox) {
     return $msg;
 }
 
-?>
+?>

functions/mailbox_display.php

@@ -1378,4 +1378,4 @@ function attachSelectedMessages($imapConnection,$aMsgHeaders) {
     return $composesession;
 }
 
-?>
+?>

functions/mime.php

@@ -315,7 +315,7 @@ function translateText(&$body, $wrap_at, $charset) {
  * be displayed as the actual message in the HTML. It contains
  * everything needed, including HTML Tags, Attachments at the
  * bottom, etc.
- * 
+ *
  * Since 1.2.0 function uses message_body hook.
  * Till 1.3.0 function included output of formatAttachments().
  *
@@ -387,12 +387,12 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
                 /**
                  * If we don't add html message between iframe tags,
                  * we must detect unsafe images and modify $has_unsafe_images.
-                 */                
+                 */
                 $html_body =  magicHTML($body, $id, $message, $mailbox);
 
                 // creating iframe url
                 $iframeurl=sqm_baseuri().'src/view_html.php?'
-                    . 'mailbox=' . $urlmailbox 
+                    . 'mailbox=' . $urlmailbox
                     . '&passed_id=' . $id
                     . '&ent_id=' . $ent_num
                     . '&view_unsafe_images=' . (int) $view_unsafe_images;
@@ -401,9 +401,9 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
                 $body = html_tag('div',_("Viewing HTML formatted email"),'center');
 
                 /**
-                 * height can't be set to 100%, because it does not work as expected when 
-                 * iframe is inside the table. Browsers do not create full height objects 
-                 * even when iframe is not nested. Maybe there is some way to get full size 
+                 * height can't be set to 100%, because it does not work as expected when
+                 * iframe is inside the table. Browsers do not create full height objects
+                 * even when iframe is not nested. Maybe there is some way to get full size
                  * with CSS. Tested in firefox 1.02 and opera 7.53
                  *
                  * width="100%" does not work as expected, when table width is not set (automatic)
@@ -415,9 +415,9 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
                     .' frameborder="1" marginwidth="0" marginheight="0" scrolling="auto">' . "\n";
 
                 // Message for browsers without iframe support
-                //$body.= _("Your browser does not support inline frames. 
+                //$body.= _("Your browser does not support inline frames.
                 // You can view HTML formated message by following below link.");
-                //$body.= "<br /><a href=\"$iframeurl\">"._("View HTML Message")."</a>"; 
+                //$body.= "<br /><a href=\"$iframeurl\">"._("View HTML Message")."</a>";
 
                 // if browser can't render iframe, it renders html message.
                 $body.= $html_body;
@@ -426,7 +426,7 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
                 $body.="</iframe></div>\n";
             } else {
                 // old way of html rendering
-                $body = magicHTML($body, $id, $message, $mailbox);   
+                $body = magicHTML($body, $id, $message, $mailbox);
             }
         } else {
             translateText($body, $wrap_at,
@@ -472,7 +472,7 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
  * Since 1.0.2 uses attachment $type0/$type1 hook.
  * Since 1.2.5 uses attachment $type0/* hook.
  * Since 1.5.0 uses attachments_bottom hook.
- * 
+ *
  * @param object $message SquirrelMail message object
  * @param array $exclude_id message parts that are not attachments.
  * @param string $mailbox mailbox name
@@ -568,9 +568,9 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
             } else {
                 $attachments .= '&nbsp;&nbsp;|&nbsp;&nbsp;';
             }
-            $attachments .= '<a href="' . $val['href'] . '">' 
-                . (isset($val['text']) && !empty($val['text']) ? $val['text'] : '') 
-                . (isset($val['extra']) && !empty($val['extra']) ? $val['extra'] : '') 
+            $attachments .= '<a href="' . $val['href'] . '">'
+                . (isset($val['text']) && !empty($val['text']) ? $val['text'] : '')
+                . (isset($val['extra']) && !empty($val['extra']) ? $val['extra'] : '')
                 . '</a>';
         }
         unset($links);
@@ -1654,7 +1654,7 @@ function sq_cid2http($message, $id, $cidurl, $mailbox){
             }
         }
     }
- 
+
     if (!empty($linkurl)) {
         $httpurl = $quotchar . SM_PATH . 'src/download.php?absolute_dl=true&amp;' .
                    "passed_id=$id&amp;mailbox=" . urlencode($mailbox) .
@@ -1666,7 +1666,7 @@ function sq_cid2http($message, $id, $cidurl, $mailbox){
          */
         $httpurl = $quotchar . SM_PATH . 'images/blank.png';
     }
- 
+
     return $httpurl;
 }
 
@@ -2073,14 +2073,14 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX', $take_mailto_links
         if ((preg_match_all($MailTo_PReg_Match, $trusted, $regs)) && ($regs[0][0] != '')) {
             foreach ($regs[0] as $i => $mailto_before) {
                 $mailto_params = $regs[10][$i];
-     
+
                 // get rid of any tailing quote since we have to add send_to to the end
                 //
                 if (substr($mailto_before, strlen($mailto_before) - 1) == '"')
                     $mailto_before = substr($mailto_before, 0, strlen($mailto_before) - 1);
                 if (substr($mailto_params, strlen($mailto_params) - 1) == '"')
                     $mailto_params = substr($mailto_params, 0, strlen($mailto_params) - 1);
-    
+
                 if ($regs[1][$i]) {    //if there is an email addr before '?', we need to merge it with the params
                     $to = 'to=' . $regs[1][$i];
                     if (strpos($mailto_params, 'to=') > -1)    //already a 'to='
@@ -2092,9 +2092,9 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX', $take_mailto_links
                             $mailto_params .= '?' . $to;
                     }
                 }
-    
+
                 $url_str = preg_replace(array('/to=/i', '/(?<!b)cc=/i', '/bcc=/i'), array('send_to=', 'send_to_cc=', 'send_to_bcc='), $mailto_params);
-    
+
                 // we'll already have target=_blank, no need to allow comp_in_new
                 // here (which would be a lot more work anyway)
                 //
@@ -2103,7 +2103,7 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX', $take_mailto_links
                 $compose_new_win = 0;
                 $comp_uri = makeComposeLink('src/compose.php' . $url_str, $mailto_before);
                 $compose_new_win = $temp_comp_in_new;
-    
+
                 // remove <a href=" and anything after the next quote (we only
                 // need the uri, not the link HTML) in compose uri
                 //

functions/page_header.php

@@ -257,4 +257,4 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload="
     }
     echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $sBodyTagJs>\n\n";
 }
-?>
+?>

functions/strings.php

@@ -1248,4 +1248,4 @@ function sq_strtoupper($string,$charset='auto') {
     return strtoupper($string);
 }
 $PHP_SELF = php_self();
-?>
+?>

functions/url_parser.php

@@ -223,4 +223,4 @@ function getEmail($string) {
     return (array_key_exists(0, $addresses) ? $addresses[0] : '');
 }
 
-?>
+?>

include/options/display.php

@@ -430,4 +430,4 @@ function icon_theme_save($option) {
 
 }
 
-?>
+?>

plugins/administrator/defines.php

@@ -370,4 +370,4 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
 
                );
 
-?>
+?>

plugins/administrator/options.php

@@ -462,7 +462,7 @@ foreach ( $newcfg as $k => $v ) {
             break;
         case SMOPT_TYPE_PATH:
             if (  sqgetGlobalVar($e, $new_v, SQ_POST) ) {
-                // FIXME: fix use of $data_dir in $attachment_dir 
+                // FIXME: fix use of $data_dir in $attachment_dir
                 $v = change_to_sm_path($new_v);
                 $newcfg[$k] = $v;
             }

plugins/bug_report/setup.php

@@ -87,4 +87,4 @@ function bug_report_options() {
     echo ' /> ' . _("Show button in toolbar") . "</td></tr>\n";
 }
 
-?>
+?>

plugins/bug_report/system_specs.php

@@ -60,7 +60,7 @@ function br_show_plugins() {
             }
         }
         // compatibility plugin can be used without need to enable it in sm config
-        if (file_exists(SM_PATH . 'plugins/compatibility/setup.php') 
+        if (file_exists(SM_PATH . 'plugins/compatibility/setup.php')
             && ! in_array('compatibility',$plugins)) {
             $str.= '    * compatibility';
             include_once(SM_PATH . 'plugins/compatibility/setup.php');

plugins/filters/filters.php

@@ -43,7 +43,7 @@ function filters_init_hooks () {
 function filters_optpage_register_block() {
     global $optpage_blocks, $AllowSpamFilters;
     if (!file_exists(SM_PATH . 'plugins/filters/config.php')) return;
-    
+
     $optpage_blocks[] = array(
         'name' => _("Message Filters"),
         'url'  => SM_PATH . 'plugins/filters/options.php',
@@ -164,9 +164,9 @@ function filters_bulkquery($filters, $IPs) {
 function start_filters() {
     global $imapServerAddress, $imapPort, $imap_stream, $imapConnection,
            $UseSeparateImapConnection, $AllowSpamFilters;
-           
+
     if (!file_exists(SM_PATH . 'plugins/filters/config.php')) return;
-    
+
     sqgetGlobalVar('username', $username, SQ_SESSION);
     sqgetGlobalVar('key',      $key,      SQ_COOKIE);
 
@@ -231,7 +231,7 @@ function user_filters($imap_stream) {
                   $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);
         } else if ($filters[$i]['where'] == 'Message Body') {
             $expunge = filter_search_and_delete($imap_stream, 'BODY',
-                  $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);                  
+                  $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);
         } else {
             /*
             *  If it's a normal TO, CC, SUBJECT, or FROM, then handle it
@@ -254,7 +254,7 @@ function user_filters($imap_stream) {
  * @param string $what String to search for
  * @param string $where_to Folder it will move to
  * @param string $user_scan Whether to search all or just unseen
- * @param string $should_expunge 
+ * @param string $should_expunge
  * @param boolean $where Which part of location to search
  * @access private
  */
@@ -800,7 +800,7 @@ function remove_filter ($id) {
 /**
  * Swaps two filters
  * @param int $id1 ID of first filter to swap
- * @param int $id2 ID of second filter to swap 
+ * @param int $id2 ID of second filter to swap
  * @access private
  */
 function filter_swap($id1, $id2) {
@@ -823,7 +823,7 @@ function filter_swap($id1, $id2) {
 function update_for_folder ($args) {
 
     if (!file_exists(SM_PATH . 'plugins/filters/config.php')) return;
-    
+
     $old_folder = $args[0];
     $new_folder = $args[2];
     $action = $args[1];

plugins/mail_fetch/fetch.php

@@ -178,7 +178,7 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
         $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10);
 
         // check if destination folder is not set, is not subscribed and is not \noselect folder
-        if($mailfetch_subfolder == '' || 
+        if($mailfetch_subfolder == '' ||
            ! mail_fetch_check_folder($imap_stream,$mailfetch_subfolder)) {
             $mailfetch_subfolder = 'INBOX';
         }

plugins/mail_fetch/functions.php

@@ -118,7 +118,7 @@ function mail_fetch_check_folder($imap_stream,$imap_folder) {
 
 /**
  * Checks if folder is noselect (can't store messages)
- * 
+ *
  * Function does not check if folder subscribed.
  * @param stream $imap_stream imap connection resource
  * @param string $imap_folder imap folder name

plugins/mail_fetch/setup.php

@@ -177,9 +177,9 @@ function mail_fetch_login() {
                 while (list($lineNum, $line) = each ($MessArray)) {
                     $Message .= $line;
                 }
-                
+
                 // check if mail folder is not null and subscribed (There is possible issue with /noselect mail folders)
-                if ($mailfetch_subfolder=='' || 
+                if ($mailfetch_subfolder=='' ||
                     ! mail_fetch_check_folder($imap_stream,$mailfetch_subfolder)) {
                     fputs($imap_stream, "A3$i APPEND INBOX {" . strlen($Message) . "}\r\n");
                 } else {

plugins/message_details/message_details_bottom.php

@@ -46,7 +46,7 @@ if (!empty($md_action))
 /**
  * Converts 8bit string to hex
  *
- * Replaces 8bit symbols with their hex strings, 
+ * Replaces 8bit symbols with their hex strings,
  * encloses them in curly brackets and uses different color.
  * @param string $string text
  * @return string
@@ -115,8 +115,8 @@ function returnTime($start) {
  * Returns actual message details
  * @param string $mailbox
  * @param string $passed_id
- * @param boolean $stripHTML If TRUE, only plain text is returned, 
- *                           default is FALSE, wherein output contains 
+ * @param boolean $stripHTML If TRUE, only plain text is returned,
+ *                           default is FALSE, wherein output contains
  *                           pretty-HTMLification of message body
  * @return string The formatted message details
  * @access public
@@ -402,11 +402,11 @@ if (!$stripHTML) {
 
 $returnValue .= $message_body;
 
-if (!$stripHTML) 
+if (!$stripHTML)
     $returnValue .= '</div></div></font></code></body></html>';
 
 return $returnValue;
 
 }
 
-?>
+?>

plugins/message_details/message_details_main.php

@@ -34,4 +34,4 @@ echo '<frame src="message_details_bottom.php?mailbox=' . urlencode($mailbox) .
     '&amp;get_message_details=yes&amp;passed_id=' . "$passed_id" .
     '" name="bottom_frame" frameborder="0" />';
 echo  '</frameset>'."\n"."</html>\n";
-?>
+?>

plugins/message_details/message_details_top.php

@@ -46,4 +46,4 @@ echo "<body text=\"$color[8]\" bgcolor=\"$color[3]\" link=\"$color[7]\" vlink=\"
      '</form></center>'.
      '</body>'.
      "</html>\n";
-?>
+?>

plugins/newmail/functions.php

@@ -421,7 +421,7 @@ function newmail_media_objects($object,$types,$path,$args=array(),$extra='',$add
 
     if (isset($newmail_mediacompat_mode) && $newmail_mediacompat_mode)
         $ret.= newmail_media_embed($object,$types[0],$path,$args,$addsuffix);
-    // add $extra code inside objects 
+    // add $extra code inside objects
     if ($extra!='')
         $ret.=$extra . "\n";
 
@@ -552,7 +552,7 @@ function newmail_media_object_ie($object,$type,$path,$args=array(),$addsuffix) {
 
 /**
  * Creates embed tags of multimedia object
- *        
+ *
  * docs about embed
  * Apple: http://www.apple.com/quicktime/authoring/embed.html
  *
@@ -597,7 +597,7 @@ function newmail_media_embed($object,$type,$path,$args=array(),$addsuffix=true)
     case SM_NEWMAIL_FILETYPE_MP3:
     case SM_NEWMAIL_FILETYPE_SVG:
     default:
-        $ret_embed='';    
+        $ret_embed='';
     }
     return $ret_embed;
 }
@@ -605,7 +605,7 @@ function newmail_media_embed($object,$type,$path,$args=array(),$addsuffix=true)
 /**
  * Adds closing tags for ie object
  * Warning:
- * * This is internal function, use newmail_media_objects() instead 
+ * * This is internal function, use newmail_media_objects() instead
  * @param integer $type media object type
  * @return string closing tag of media object
  */
@@ -620,7 +620,7 @@ function newmail_media_object_ie_close($type) {
     case SM_NEWMAIL_FILETYPE_OGG:
     case SM_NEWMAIL_FILETYPE_SVG:
     default:
-        $ret_end='';    
+        $ret_end='';
     }
     return $ret_end;
 }
@@ -628,7 +628,7 @@ function newmail_media_object_ie_close($type) {
 /**
  * Adds closing tags for object
  * Warning:
- * * This is internal function, use newmail_media_objects() instead 
+ * * This is internal function, use newmail_media_objects() instead
  * @param integer $type media object type
  * @return string closing tag of media object
  */
@@ -643,7 +643,7 @@ function newmail_media_object_close($type) {
         $ret_end="</object>\n";
         break;
     default:
-        $ret_end='';    
+        $ret_end='';
     }
     return $ret_end;
 }
@@ -651,7 +651,7 @@ function newmail_media_object_close($type) {
 /**
  * Adds closing tags for object
  * Warning:
- * * This is internal function, use newmail_media_objects() instead 
+ * * This is internal function, use newmail_media_objects() instead
  * @param integer $type media object type
  * @return string closing tag of media object
  */
@@ -666,7 +666,7 @@ function newmail_media_embed_close($type) {
     case SM_NEWMAIL_FILETYPE_MP3:
     case SM_NEWMAIL_FILETYPE_SVG:
     default:
-        $ret_end='';    
+        $ret_end='';
     }
     return $ret_end;
 }
@@ -675,14 +675,14 @@ function newmail_media_embed_close($type) {
  * Converts media attributes to string
  * Warning:
  * * attribute values are automatically sanitized by htmlspecialchars()
- * * This is internal function, use newmail_media_objects() instead 
+ * * This is internal function, use newmail_media_objects() instead
  * @param array $args array with object attributes
  * @return string string with object attributes
  */
 function newmail_media_prepare_args($args) {
     $ret_args='';
     foreach ($args as $arg => $value) {
-        $ret_args.= $arg . '="' . htmlspecialchars($value) . '" '; 
+        $ret_args.= $arg . '="' . htmlspecialchars($value) . '" ';
     }
     return $ret_args;
 }

plugins/newmail/loadfile.php

@@ -9,7 +9,7 @@
  */
 
 /**
- * define SM_PATH 
+ * define SM_PATH
  * @ignore
  */
 define('SM_PATH','../../');
@@ -25,7 +25,7 @@ global $data_dir;
 $media = getPref($data_dir,$username,'newmail_media', '(none)');
 // get other prefs
 $newmail_userfile_type=getPref($data_dir,$username,'newmail_userfile_type',false);
-    
+
 $newmail_userfile_location=getHashedFile($username, $data_dir, $username . '.sound');
 
 if ($newmail_userfile_type!=false && file_exists($newmail_userfile_location)) {

plugins/newmail/newmail_opt.php

@@ -105,14 +105,14 @@ echo 'name="media_popup" />&nbsp;<small>('._("requires JavaScript to work").')</
 
 echo html_tag( 'tr' )
      . html_tag('td',_("Width of popup window:"),'right','', 'style="white-space: nowrap;"')
-     . html_tag('td','<input type="text" name="popup_width" value="' 
+     . html_tag('td','<input type="text" name="popup_width" value="'
                 . (int)$newmail_popup_width . '" size="3" maxlengh="3" />'
                 . '&nbsp;<small>(' . _("If set to 0, reverts to default value") . ')</small>','left')
      . "</tr>\n";
 
 echo html_tag( 'tr' )
      . html_tag('td',_("Height of popup window:"),'right','', 'style="white-space: nowrap;"')
-     . html_tag('td','<input type="text" name="popup_height" value="' 
+     . html_tag('td','<input type="text" name="popup_height" value="'
                 . (int)$newmail_popup_height . '" size="3" maxlengh="3" />'
                 . '&nbsp;<small>(' . _("If set to 0, reverts to default value") . ')</small>','left')
      . "</tr>\n";

plugins/squirrelspell/setup.php

@@ -84,4 +84,4 @@ function squirrelspell_setup() {
              "</script>\n";
     }
 }
-?>
+?>

src/about.php

@@ -56,7 +56,7 @@ echo "<br />\n<br />\n";
 echo sprintf(_("SquirrelMail is a feature rich, standards compliant webmail application written in PHP. It was made by a group of volunteers united in the SquirrelMail Project Team and is released as open source, free software under the %sGNU General Public License%s."),'<a href="http://www.gnu.org/copyleft/gpl.html" target="_blank">','</a>');
 
 // add space between two sentences.
-// Don't want to join two sprintf strings. 
+// Don't want to join two sprintf strings.
 echo ' ';
 
 // i18n: %s tags are used in order to remove html URL attributes from translation
@@ -89,4 +89,4 @@ if ( count ($plugins) > 0 ) {
 </td></tr>
 <tr><td align="center">&copy; 1999 - 2005 The SquirrelMail Project Team</td></tr>
 </table></p>
-</body></html>
+</body></html>

src/addrbook_popup.php

@@ -42,4 +42,4 @@ require_once(SM_PATH . 'functions/addressbook.php');
                border="0"
                src="addrbook_search.php?show=blank" />
     </frameset>
-</html>
+</html>

src/addrbook_search_html.php

@@ -158,8 +158,8 @@ if ($javascript_on) {
                 html_tag( 'td',
                         '<input type="submit" name="addr_search_done" value="' .
                         _("Use Addresses") . '" /> ' .
-			'<input type="submit" name="addr_search_cancel" value="' .
-			_("Cancel") . '" />',
+                        '<input type="submit" name="addr_search_cancel" value="' .
+                        _("Cancel") . '" />',
                 'center', '', 'colspan="'. $td_colspan .'"' )
             ) .
          '</table>' .
@@ -307,4 +307,4 @@ if ($addrquery == '' || sizeof($res) == 0) {
 }
 
 ?>
-</body></html>
+</body></html>

src/addressbook.php

@@ -193,8 +193,8 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
                     }
                 } else {
                     /**
-                     * $editaddr is set, but $sel (address selection in address listing) 
-                     * and $doedit (address edit form) are not set. 
+                     * $editaddr is set, but $sel (address selection in address listing)
+                     * and $doedit (address edit form) are not set.
                      * Assume that user clicked on "Edit address" without selecting any address.
                      */
                     $formerror = _("Please select address that you want to edit");

src/configtest.php

@@ -79,7 +79,7 @@ if(!in_array('strings.php', $included)) {
 if (! $allow_remote_configtest) {
     sqGetGlobalVar('REMOTE_ADDR',$client_ip,SQ_SERVER);
     if (! isset($client_ip) || $client_ip!='127.0.0.1') {
-	do_err('Enable "Allow remote configtest" option in squirrelmail configuration in order to use this script.');
+        do_err('Enable "Allow remote configtest" option in squirrelmail configuration in order to use this script.');
     }
 }
 /* checking PHP specs */
@@ -206,12 +206,12 @@ echo $IND . "Themes OK.<br />\n";
 if ( $squirrelmail_default_language != 'en_US' ) {
     $loc_path = SM_PATH .'locale/'.$squirrelmail_default_language.'/LC_MESSAGES/squirrelmail.mo';
     if( ! file_exists( $loc_path ) ) {
-        do_err('You have set <i>' . $squirrelmail_default_language . 
+        do_err('You have set <i>' . $squirrelmail_default_language .
             '</i> as your default language, but I cannot find this translation (should be '.
             'in <tt>' . $loc_path . '</tt>). Please note that you have to download translations '.
             'separately from the main SquirrelMail package.', FALSE);
     } elseif ( ! is_readable( $loc_path ) ) {
-        do_err('You have set <i>' . $squirrelmail_default_language . 
+        do_err('You have set <i>' . $squirrelmail_default_language .
             '</i> as your default language, but I cannot read this translation (file '.
             'in <tt>' . $loc_path . '</tt> unreadable).', FALSE);
     } else {
@@ -486,7 +486,4 @@ if( empty($ldap_server) ) {
 <p><a href="login.php">Login now</a></p>
 
 </body>
-</html>
-<?php
-// vim: et ts=4
-?>
+</html>

src/empty_trash.php

@@ -76,4 +76,4 @@ session_write_close();
 $location = get_location();
 header ("Location: $location/left_main.php");
 
-?>
+?>

src/folders.php

@@ -99,7 +99,7 @@ if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) {
             folders_unsubscribe($imapConnection, $folder_names);
             $td_str =  _("Unsubscribed successfully.");
             break;
-    } 
+    }
 
     // if there are any messages, output them.
     if ( !empty($td_str) ) {
@@ -293,7 +293,7 @@ if ($show_only_subscribed_folders) {
             echo addForm('folders.php')
                . addHidden('smaction', 'unsubscribe')
                . "<tt><select name=\"folder_names[]\" multiple=\"multiple\" size=\"8\">\n";
-	    foreach ( $boxes as $box ) {
+            foreach ( $boxes as $box ) {
                 $use_folder = true;
                 if ((strtolower($box["unformatted"]) != "inbox") &&
                     ($box['unformatted'] != $trash_folder) &&
@@ -323,7 +323,7 @@ if ($show_only_subscribed_folders) {
             // here we filter out all boxes we're already subscribed to,
             // so we keep only the unsubscribed ones.
             foreach ($boxes_all as $box_a) {
-            
+
                 $use_folder = true;
                 foreach ( $boxes as $box ) {
                     if ($box_a['unformatted'] == $box['unformatted'] ||
@@ -331,14 +331,14 @@ if ($show_only_subscribed_folders) {
                         $use_folder = false;
                     }
                 }
-            
+
                 if ($use_folder == true) {
-	                $box_enc  = htmlspecialchars($box_a['unformatted-dm']);
+                    $box_enc  = htmlspecialchars($box_a['unformatted-dm']);
                     $box_disp = htmlspecialchars(imap_utf7_decode_local($box_a['unformatted-disp']));
                     $subboxes[$box_enc] = $box_disp;
                 }
             }
-            
+
             if ( count($subboxes) > 0 ) {
                 echo addForm('folders.php')
                  . addHidden('smaction', 'subscribe')
@@ -372,4 +372,4 @@ sqimap_logout($imapConnection);
     </table>
 </td></tr>
 </table>
-</body></html>
+</body></html>

src/help.php

@@ -212,4 +212,4 @@ echo html_tag( 'tr',
             html_tag( 'td', ' ', 'left', $color[0] )
         );
 ?>
-</table></body></html>
+</table></body></html>

src/left_main.php

@@ -163,7 +163,7 @@ function ListBoxes ($boxes, $j=0 ) {
         $font = "<font color=\"$color[15]\">";
         $fontend = '</font>';
     }
-        
+
     // let plugins fiddle with end of line
     $end .= concat_hook_function('left_main_after_each_folder',
         array(isset($numMessages) ? $numMessages : '',
@@ -173,7 +173,7 @@ function ListBoxes ($boxes, $j=0 ) {
 
     if (!$boxes->is_root) {
         echo "" . $pre .$font.
-            str_replace( 
+            str_replace(
                 array(' ','<','>'),
                 array('&nbsp;','&lt;','&gt;'),
                 $boxes->mailboxname_sub) .
@@ -679,7 +679,7 @@ if ($advanced_tree) {
    echo '<div id="leftframe"><br /><br />';*/
 }
 
-echo "\n\n" . 
+echo "\n\n" .
     '<center><font size="4"><b>'. _("Folders") . "</b><br /></font>\n\n";
 
 if ($date_format != 6) {
@@ -716,8 +716,8 @@ if ($date_format != 6) {
     }
     $clk = str_replace(' ','&nbsp;',$clk);
 
-    echo '<small><span style="white-space: nowrap;">' 
-       . str_replace(' ', '&nbsp;', _("Last Refresh")) 
+    echo '<small><span style="white-space: nowrap;">'
+       . str_replace(' ', '&nbsp;', _("Last Refresh"))
        . ":</span><br /><span style=\"white-space: nowrap;\">$clk</span></small><br />\n";
 }
 
@@ -774,4 +774,4 @@ do_hook('left_main_after');
 sqimap_logout($imapConnection);
 
 ?>
-</body></html>
+</body></html>

src/login.php

@@ -61,7 +61,7 @@ header('Pragma: no-cache');
  */
 if($imap_auth_mech == 'login') {
     /**
-     * detect disabled login, only when imapServerAddress contains 
+     * detect disabled login, only when imapServerAddress contains
      * server address and not mapping. See sqimap_get_user_server()
      */
     if (substr($imapServerAddress, 0, 4) != "map:") {
@@ -192,4 +192,4 @@ echo '</form>' . "\n";
 
 do_hook('login_bottom');
 ?>
-</body></html>
+</body></html>

src/options.php

@@ -367,7 +367,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
         'desc' => _("The order of the message index can be rearranged and changed to contain the headers in any order you want."),
         'js'   => false
     );
-    
+
     /* Build a section for Compose Options. */
     $optpage_blocks[] = array(
         'name' => _("Compose Preferences"),
@@ -490,4 +490,4 @@ if ($optpage == SMOPT_PAGE_MAIN) {
 </table>
 </td></tr>
 </table>
-</body></html>
+</body></html>

src/printer_friendly_bottom.php

@@ -186,4 +186,4 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
 } /* end pf_clean_string() function */
 
 /* --end pf-specific functions */
-?>
+?>

src/printer_friendly_top.php

@@ -40,4 +40,4 @@ echo '<body text="'.$color[8].'" bgcolor="'.$color[3].'" link="'.$color[7].'" vl
          '</form>',
      'right' );
 ?>
-</body></html>
+</body></html>

src/redirect.php

@@ -176,4 +176,4 @@ function attachment_common_parse($str, $debug) {
     sqsession_register($attachment_common_types, 'attachment_common_types');
 }
 
-?>
+?>

src/signout.php

@@ -97,4 +97,4 @@ html_tag( 'table',
 'center', $color[4], 'width="50%" cellpadding="2" cellspacing="0" border="0"' )
 ?>
 </body>
-</html>
+</html>

src/view_header.php

@@ -130,4 +130,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);
 
-?>
+?>

src/view_html.php

@@ -4,14 +4,14 @@
  * Displays html message parts
  *
  * File is used to display html message parts. Usually inside iframe.
- * It should be called with passed_id, ent_id and mailbox options in 
- * GET request. passed_ent_id and view_unsafe_images options are 
- * optional. User must be authenticated ($key in cookie. $username and 
+ * It should be called with passed_id, ent_id and mailbox options in
+ * GET request. passed_ent_id and view_unsafe_images options are
+ * optional. User must be authenticated ($key in cookie. $username and
  * $onetimepad in session).
- * 
+ *
  * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * This file is part of SquirrelMail webmail interface.
- * 
+ *
  * SquirrelMail is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or

src/webmail.php

@@ -82,7 +82,7 @@ $err=set_up_language(getPref($data_dir, $username, 'language'));
 
 $output = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\">\n".
           "<html><head>\n" .
-	  "<meta name=\"robots\" content=\"noindex,nofollow\">\n" .
+          "<meta name=\"robots\" content=\"noindex,nofollow\">\n" .
           "<title>$org_title</title>\n".
           "</head>";
 
@@ -182,4 +182,4 @@ if($ret != '') {
 echo $output;
 ?>
 </frameset>
-</html>
+</html>

templates/util_message_list.php

@@ -230,4 +230,4 @@ function getFlagText($aFlags) {
     if (!$sFlags) { $sFlags = ' '; }
     return $sFlags;
 }
-?>
+?>