Explorar o código

Replacing tabs with spaces, trimming white space at EOL and newline at EOF (PHP only)

Fredrik Jervfors %!s(int64=20) %!d(string=hai) anos
pai
achega
5fcc041bd2
Modificáronse 40 ficheiros con 177 adicións e 180 borrados
  1. 1 1
      class/deliver/Deliver.class.php
  2. 1 1
      class/mime/Rfc822Header.class.php
  3. 3 3
      config/conf.pl
  4. 23 23
      doc/authentication.txt
  5. 6 6
      doc/index.html
  6. 2 2
      functions/abook_database.php
  7. 1 1
      functions/decode/ns_4551_1.php
  8. 1 1
      functions/decode/us_ascii.php
  9. 5 5
      functions/decode/utf_8.php
  10. 1 1
      functions/html.php
  11. 1 1
      functions/htmlentities/iso-8859-1.php
  12. 1 1
      functions/htmlentities/readme.php
  13. 1 1
      functions/htmlentities/utf-8.php
  14. 2 2
      functions/imap_asearch.php
  15. 1 3
      functions/imap_search.php
  16. 1 1
      functions/imap_utf7_local.php
  17. 1 1
      functions/mailbox_display.php
  18. 1 1
      functions/ngettext.php
  19. 8 8
      functions/page_header.php
  20. 23 23
      help/en_US/main_folder.hlp
  21. 1 1
      plugins/bug_report/functions.php
  22. 18 19
      plugins/filters/bulkquery/bulkquery.c
  23. 1 1
      plugins/fortune/config_default.php
  24. 1 1
      plugins/listcommands/setup.php
  25. 30 30
      plugins/make_archive.pl
  26. 2 2
      plugins/squirrelspell/doc/ChangeLog
  27. 1 1
      plugins/squirrelspell/doc/index.php
  28. 23 23
      plugins/squirrelspell/js/check_me.js
  29. 1 1
      plugins/squirrelspell/js/index.php
  30. 1 1
      plugins/translate/config-sample.php
  31. 1 1
      plugins/translate/config_default.php
  32. 1 1
      plugins/translate/functions.php
  33. 5 5
      po/charsetconvert.pl
  34. 1 1
      src/configtest.php
  35. 1 1
      src/printer_friendly_bottom.php
  36. 1 1
      src/search.php
  37. 1 1
      src/signout.php
  38. 1 1
      themes/silver_steel_theme.php
  39. 1 1
      themes/simple_green_theme.php
  40. 1 1
      themes/wood_theme.php

+ 1 - 1
class/deliver/Deliver.class.php

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

+ 1 - 1
class/mime/Rfc822Header.class.php

@@ -778,4 +778,4 @@ class Rfc822Header {
     }
 }
 
-?>
+?>

+ 3 - 3
config/conf.pl

@@ -3482,10 +3482,10 @@ sub set_defaults {
             $optional_delimiter             = "detect";
             $allow_charset_search           = false;
             $disp_default_folder_prefix     = $default_folder_prefix;
-	    $delete_folder                  = false;
-	    $force_username_lowercase       = false;
+            $delete_folder                  = false;
+            $force_username_lowercase       = false;
 
-	    $continue = 1;
+            $continue = 1;
         } elsif ( $server eq "mercury32" ) {
             $imap_server_type               = "mercury32";
             $default_folder_prefix          = "";

+ 23 - 23
doc/authentication.txt

@@ -31,7 +31,7 @@ TLS
 * PHP 4.3.0 or higher (Check Release Notes for PHP 4.3.x information)
 * The "STARTTLS" command is NOT supported.  The server you wish to use TLS
   on must have a dedicated port listening for TLS connections. (ie. port
-  993 for IMAP, 465 for SMTP) 
+  993 for IMAP, 465 for SMTP)
 
 CONFIGURATION
 -------------
@@ -60,26 +60,26 @@ server, start a DIGEST-MD5 auth session, and include the challenge from the
 server in your bug report.)
 
 To get the challenge with IMAP:
-	telnet <your server> imap
-	[server says hello]
-	A01 AUTHENTICATE DIGEST-MD5
-	<copy the gobbledygook that the server sends - this is what I need>
-	*
-	[server says auth aborted]
-	A02 LOGOUT
-	[server says goodbye, closes connection]
+   telnet <your server> imap
+   [server says hello]
+   A01 AUTHENTICATE DIGEST-MD5
+   <copy the gobbledygook that the server sends - this is what I need>
+   *
+   [server says auth aborted]
+   A02 LOGOUT
+   [server says goodbye, closes connection]
 
 To get the challenge with SMTP:
-	telnet <your server> smtp
-	[server sends some sort of "hello" banner]
-	EHLO myhostname
-	[server will probably list a bunch of capabilities]
-	AUTH DIGEST-MD5
-	<copy the gobbledygook that the server sends - this is what I need>
-	*
-	[server says auth aborted]
-	QUIT
-	[server says bye, closes connection]
+   telnet <your server> smtp
+   [server sends some sort of "hello" banner]
+   EHLO myhostname
+   [server will probably list a bunch of capabilities]
+   AUTH DIGEST-MD5
+   <copy the gobbledygook that the server sends - this is what I need>
+   *
+   [server says auth aborted]
+   QUIT
+   [server says bye, closes connection]
 
 
 OPTIONAL SMTP AUTH CONFIGURATION
@@ -90,13 +90,13 @@ If you need all users to send mail via an upstream SMTP provider
 there are two variables that can be added to config_local.php
 that will specify a sitewide SMTP username and password.
 
-Set up SMTP authentication to the remote server according to the 
-instructions above, then add the following to config_local.php, 
+Set up SMTP authentication to the remote server according to the
+instructions above, then add the following to config_local.php,
 replacing <smtp_user> and <smtp_pass> with the username and password
 you'd like to use for the entire site:
 
-  $smtp_sitewide_user = '<smtp_user>';
-  $smtp_sitewide_pass = '<smtp_pass>';
+   $smtp_sitewide_user = '<smtp_user>';
+   $smtp_sitewide_pass = '<smtp_pass>';
 
 These values will be used to connect to the SMTP server as long
 as the authentication mechanism is something besides 'none', i.e.

+ 6 - 6
doc/index.html

@@ -17,7 +17,7 @@ together a good documentation system.  This is just meant to get you up and runn
    <dt><a href="translating.txt">Translating</a></dt>
    <dd>
       If you would like to make a translation of SquirrelMail, here are some guidelines to help
-	  you along the way.  These were compiled, thanks to Gustav Foseid. 
+      you along the way.  These were compiled, thanks to Gustav Foseid.
    </dd>
 
   <dt><a href="translating_help.txt">Translating the Help System</a></dt>
@@ -29,7 +29,7 @@ together a good documentation system.  This is just meant to get you up and runn
   <dt><a href="tree.txt">The Mailbox Tree</a></dt>
    <dd>
       This explains the algorithms and arrays behind the mailbox tree used in deleting folders.
-	  This was compiled thanks to Nathan Ehresman.
+      This was compiled thanks to Nathan Ehresman.
    </dd>
 
   <dt><a href="addressbook.txt">The Addressbook</a></dt>
@@ -60,14 +60,14 @@ together a good documentation system.  This is just meant to get you up and runn
    <dt><a href="README.russian_apache">Russian Apache</a></dt>
    <dd>
       There are special instructions if you are running Russian Apache.  This
-      document, thanks to Konstantin Riabitsev, will help you out. 
+      document, thanks to Konstantin Riabitsev, will help you out.
    </dd>
 
    <dt><a href="authentication.txt">Authentication</a></dt>
    <dd>
      SquirrelMail allows you to log in to your IMAP and SMTP servers using
-	 plaintext, CRAM-MD5 or DIGEST-MD5, as well as use SSL for extra security.
-	 This document describes how to use this new code, and the requirements.
+     plaintext, CRAM-MD5 or DIGEST-MD5, as well as use SSL for extra security.
+     This document describes how to use this new code, and the requirements.
    </dd>
 
    <dt>Basic documentation that comes with distrbution:</dt>
@@ -82,4 +82,4 @@ together a good documentation system.  This is just meant to get you up and runn
 </dl>
 
 </body>
-</html>
+</html>

+ 2 - 2
functions/abook_database.php

@@ -136,7 +136,7 @@ class abook_database extends addressbook_backend {
 
 
     /**
-     * Open the database. 
+     * Open the database.
      * @param bool $new new connection if it is true
      * @return bool
      */
@@ -259,7 +259,7 @@ class abook_database extends addressbook_backend {
     }
 
     /**
-     * List all addresses 
+     * List all addresses
      * @return array search results
      */
     function &list_addr() {

+ 1 - 1
functions/decode/ns_4551_1.php

@@ -33,4 +33,4 @@ function charset_decode_ns_4551_1 ($string) {
      */
     return strtr ($string, "[\\]{|}", "ÆØÅæøå");
 }
-?>
+?>

+ 1 - 1
functions/decode/us_ascii.php

@@ -35,4 +35,4 @@ function charset_decode_us_ascii ($string) {
     $string = preg_replace("/([\241-\377])/e","'?'",$string);
     return $string;
 }
-?>
+?>

+ 5 - 5
functions/decode/utf_8.php

@@ -26,15 +26,15 @@
  *  octdec(a-340)*64^2 + octdec(b-200)*64 + octdec(c-200)
  *
  * \a\b\c\d characters are decoded to html code calculated with formula:
- *  octdec(a-360)*64^3 + octdec(b-200)*64^2 + 
+ *  octdec(a-360)*64^3 + octdec(b-200)*64^2 +
  *  + octdec(c-200)*64 + octdec(d-200)
  *
  * \a\b\c\d\e characters are decoded to html code calculated with formula:
- *  octdec(a-370)*64^4 + octdec(b-200)*64^3 + 
+ *  octdec(a-370)*64^4 + octdec(b-200)*64^3 +
  *  + octdec(c-200)*64^2 + octdec(d-200)*64 + octdec(e-200)
  *
  * \a\b\c\d\e\f characters are decoded to html code calculated with formula:
- *  octdec(a-374)*64^5 + octdec(b-200)*64^4 + octdec(c-200)*64^3 + 
+ *  octdec(a-374)*64^5 + octdec(b-200)*64^4 + octdec(c-200)*64^3 +
  *  + octdec(d-200)*64^2 + octdec(e-200)*64 + octdec(f-200)
  *</pre>
  * @version $Id$
@@ -58,14 +58,14 @@ function charset_decode_utf_8 ($string) {
     if (! sq_is8bit($string,'utf-8'))
         return $string;
 
-    // decode six byte unicode characters 
+    // decode six byte unicode characters
     /* (i think currently there is no such symbol)
     $string = preg_replace("/([\374-\375])([\200-\277])([\200-\277])([\200-\277])([\200-\277])([\200-\277])/e",
     "'&#'.((ord('\\1')-252)*1073741824+(ord('\\2')-200)*16777216+(ord('\\3')-200)*262144+(ord('\\4')-128)*4096+(ord('\\5')-128)*64+(ord('\\6')-128)).';'",
     $string);
     */
 
-    // decode five byte unicode characters 
+    // decode five byte unicode characters
     /* (i think currently there is no such symbol)
     $string = preg_replace("/([\370-\373])([\200-\277])([\200-\277])([\200-\277])([\200-\277])/e",
     "'&#'.((ord('\\1')-248)*16777216+(ord('\\2')-200)*262144+(ord('\\3')-128)*4096+(ord('\\4')-128)*64+(ord('\\5')-128)).';'",

+ 1 - 1
functions/html.php

@@ -181,4 +181,4 @@ function html_tag( $tag,                // Tag to output
             echo $format_ar[$frm_last];
         }
     }
-?>
+?>

+ 1 - 1
functions/htmlentities/iso-8859-1.php

@@ -106,4 +106,4 @@ $sq_html_ent_table = array_merge($sq_html_ent_table,
               "\xFE" => '&thorn;',
               "\xFF" => '&yuml;')
                 );
-?>
+?>

+ 1 - 1
functions/htmlentities/readme.php

@@ -320,4 +320,4 @@
  * @package squirrelmail
  * @subpackage strings
  */
-?>
+?>

+ 1 - 1
functions/htmlentities/utf-8.php

@@ -272,4 +272,4 @@ $sq_html_ent_table = array_merge($sq_html_ent_table,
               "\xE2\x99\xA6" => '&diams;'
               )
        );
-?>
+?>

+ 2 - 2
functions/imap_asearch.php

@@ -406,8 +406,8 @@ function sqimap_asearch_get_sort_criteria($mailbox, $sort_by)
     $sort_opcodes = array ('DATE', 'FROM', 'SUBJECT', 'SIZE');
     if ($internal_date_sort == true)
         $sort_opcodes[0] = 'ARRIVAL';
-//	if (handleAsSent($mailbox))
-//	if (isSentFolder($mailbox))
+//        if (handleAsSent($mailbox))
+//        if (isSentFolder($mailbox))
     if ($mailbox == $sent_folder)
         $sort_opcodes[1] = 'TO';
     return (($sort_by % 2) ? '' : 'REVERSE ') . $sort_opcodes[($sort_by >> 1) & 3];

+ 1 - 3
functions/imap_search.php

@@ -120,6 +120,4 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
     return $msgs;
 }
 
-
-
-?>
+?>

+ 1 - 1
functions/imap_utf7_local.php

@@ -31,7 +31,7 @@ function sqimap_mb_convert_encoding($str, $to_encoding, $from_encoding, $default
 
 /**
  * encode folder name to utf7-imap
- * 
+ *
  * If mbstring functions do not support charset used by translation, falls back to iso-8859-1
  * @param string $s folder name
  * @return string utf7-imap encoded folder name

+ 1 - 1
functions/mailbox_display.php

@@ -2141,4 +2141,4 @@ function attachSelectedMessages($imapConnection,$aMsgHeaders) {
 }
 
 // vim: et ts=4
-?>
+?>

+ 1 - 1
functions/ngettext.php

@@ -33,4 +33,4 @@ function ngettext($single, $plural, $number) {
     if ($l10n[$gettext_domain]->error==1) return $single;
     return $l10n[$gettext_domain]->ngettext($single, $plural, $number);
 }
-?>
+?>

+ 8 - 8
functions/page_header.php

@@ -54,12 +54,12 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = true
 
     if ($squirrelmail_language == 'ja_JP') {
         /*
-         * force correct detection of charset, when browser does not follow 
+         * force correct detection of charset, when browser does not follow
          * http content-type and tries to detect charset from page content.
          * Shooting of browser's creator can't be implemented in php.
-         * We might get rid of it, if we follow http://www.w3.org/TR/japanese-xml/ 
+         * We might get rid of it, if we follow http://www.w3.org/TR/japanese-xml/
          * recommendations and switch to unicode.
-         */ 
+         */
         echo "<!-- \xfd\xfe -->\n";
         echo '<meta http-equiv="Content-type" content="text/html; charset=euc-jp" />' . "\n";
     }
@@ -104,11 +104,11 @@ function makeInternalLink($path, $text, $target='') {
         $target = " target=\"$target\"";
     }
 
-    // This is an inefficient hook and is only used by 
+    // This is an inefficient hook and is only used by
     // one plugin that still needs to patch this code,
-    // plus if we are templat-izing SM, visual hooks 
-    // are not needed.  However, I am leaving the code 
-    // here just in case we find a good (non-visual?) 
+    // plus if we are templat-izing SM, visual hooks
+    // are not needed.  However, I am leaving the code
+    // here just in case we find a good (non-visual?)
     // use for the internal_link hook.
     //
     //$hooktext = do_hook_function('internal_link',$text);
@@ -447,4 +447,4 @@ function compose_Header($color, $mailbox) {
     echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $onload>\n\n";
 }
 
-?>
+?>

+ 23 - 23
help/en_US/main_folder.hlp

@@ -3,7 +3,7 @@
       Message Index
    </title>
    <summary>
-      The name may sound complex, but this is just the list of email 
+      The name may sound complex, but this is just the list of email
       messages that are in a particular folder.
    </summary>
 </chapter>
@@ -15,42 +15,42 @@
    <description>
       <p>
       After you click on a folder, you will be taken (in the right frame) to the
-      message index.  This lists messages in the selected folder.  Below the 
-      menu choice is a line which informs you which mails you are viewing 
+      message index.  This lists messages in the selected folder.  Below the
+      menu choice is a line which informs you which mails you are viewing
       numerically and how many total you have.
       </p><p>
       For example: Viewing messages <b>20</b> to <b>30</b> (45 total).
       </p><p>
-      Notice that the total message count might be different from the unread 
+      Notice that the total message count might be different from the unread
       mail count which is to the right of the main mail folder.
       </p><p>
-      A bar containing four buttons is next.  On the left side is a drop down 
-      list box.  This box lists your currently subscribed folders.  Any selected 
+      A bar containing four buttons is next.  On the left side is a drop down
+      list box.  This box lists your currently subscribed folders.  Any selected
       message will be moved to the selected folder when the move button is pushed.
-      Multiple messages may be moved at once.  On the far right side of this bar is 
-      a button used to delete selected messages.  Just select the junk mail and 
+      Multiple messages may be moved at once.  On the far right side of this bar is
+      a button used to delete selected messages.  Just select the junk mail and
       press the button. To the left of the Delete button are two buttons which
       allow you to mark selected messages either as Read or as Unread.
       </p><p>
-	  A bar containing three fields (From, Date, and Subject) is next.  These headings
-	  separate the message table into logical parts.  From tells you who sent
-	  you the message, or at least what email address it came from.  Date
-	  shows the day which the email was sent.  Subject displays what the sender
-	  entered as the subject.  <b>Note:</b> Between the Date and Subject
-	  columns is a small column that is unlabeled.  There could be a "+", "!"
-	  or an "A" in there.  If you see the "+", that means that the message has
-	  attachments; if you see the "A", that means that you have answered the
-	  message, and if you see the "!", then the message was marked as urgent!  
+      A bar containing three fields (From, Date, and Subject) is next.  These headings
+      separate the message table into logical parts.  From tells you who sent
+      you the message, or at least what email address it came from.  Date
+      shows the day which the email was sent.  Subject displays what the sender
+      entered as the subject.  <b>Note:</b> Between the Date and Subject
+      columns is a small column that is unlabeled.  There could be a "+", "!"
+      or an "A" in there.  If you see the "+", that means that the message has
+      attachments; if you see the "A", that means that you have answered the
+      message, and if you see the "!", then the message was marked as urgent!
       </p><p>
-      What remains is the actual message table.  You will notice that unread 
+      What remains is the actual message table.  You will notice that unread
       messages are <b>bold</b> while viewed messages are in normal text.
-      Four fields form this table.  On the far left is a select box.  When 
-      selected, the message on the same line is subject to the actions previously 
+      Four fields form this table.  On the far left is a select box.  When
+      selected, the message on the same line is subject to the actions previously
       discussed (moving, marking (un)read and deletion).
       The Toggle All link at the top of the list allows you to check all
       select boxes at once.<br />
-      Under the From header is listed whom 
-      the message is from.  Surprising, we know. But hey, you don't have to read 
+      Under the From header is listed whom
+      the message is from.  Surprising, we know. But hey, you don't have to read
       this.  The date is listed next, and finally the subject.
       </p>
       <p>
@@ -61,6 +61,6 @@
       a page). If you click Show All you will disable the so-called paginating and
       all messages will be displayed on one big page.
       </p>
-      
+
    </description>
 </section>

+ 1 - 1
plugins/bug_report/functions.php

@@ -125,4 +125,4 @@ function add_sf_bug_form() {
   // Return form
   return $ret;
 }
-?>
+?>

+ 18 - 19
plugins/filters/bulkquery/bulkquery.c

@@ -49,26 +49,26 @@ void do_queries () {
 //fprintf (stderr, "making query %s\n", tIP->IP); fflush(stderr);
       if (lwres_context_create(&ctx, NULL, NULL, NULL, 0) != 0) {
          fprintf (stderr, "Couldn't create context\n");
-	 return;
+         return;
       } else {
          lwres_conf_parse(ctx, lwres_resolv_conf);
          //pthread_mutex_lock(mutexoutput);
-	 n = lwres_getrdatabyname(ctx, tIP->IP, ns_c_in, ns_t_a, 0, &response);
+         n = lwres_getrdatabyname(ctx, tIP->IP, ns_c_in, ns_t_a, 0, &response);
          //pthread_mutex_unlock(mutexoutput);
-	 if (n == LWRES_R_SUCCESS) {
-            printf ("%s,%d.%d.%d.%d,%d\n", tIP->IP, 
-			    response->rdatas[0][0], response->rdatas[0][1],
-			    response->rdatas[0][2], response->rdatas[0][3],
-			    response->ttl);
-	    //fprintf (stderr, "freeing response\n"); fflush(stderr);
-	    lwres_grbnresponse_free(ctx, &response);
-	 } else {
-	    //fprintf (stderr, "Nothing found\n");
+         if (n == LWRES_R_SUCCESS) {
+            printf ("%s,%d.%d.%d.%d,%d\n", tIP->IP,
+                            response->rdatas[0][0], response->rdatas[0][1],
+                            response->rdatas[0][2], response->rdatas[0][3],
+                            response->ttl);
+            //fprintf (stderr, "freeing response\n"); fflush(stderr);
+            lwres_grbnresponse_free(ctx, &response);
+         } else {
+            //fprintf (stderr, "Nothing found\n");
             printf ("%s, %s, %d\n", tIP->IP, tIP->IP, defttl);
-	 }
-	 //fprintf (stderr, "freeing context\n"); fflush(stderr);
-	 lwres_context_destroy(&ctx);
-	 //fprintf (stderr, "done freeing\n"); fflush(stderr);
+         }
+         //fprintf (stderr, "freeing context\n"); fflush(stderr);
+         lwres_context_destroy(&ctx);
+         //fprintf (stderr, "done freeing\n"); fflush(stderr);
       }
 
       pthread_mutex_lock(mutexp);
@@ -91,7 +91,7 @@ void GetRBLs() {
       dnsrbls[numrbls] = (char *) malloc(strlen(instr)+1);
       if (dnsrbls[numrbls] == NULL) {
          fprintf (stderr, "Couldn't allocate memory for %d DNS RBLs\n", numrbls);
-	 exit (10);
+         exit (10);
       } else {
          strcpy (dnsrbls[numrbls], instr);
          numrbls++;
@@ -126,7 +126,7 @@ main () {
          tIP = (iplist)malloc(sizeof(struct ipnode));
          tIP->IP = (char *)malloc(strlen(instr)+strlen(dnsrbls[loop1])+2);
          strcpy (tIP->IP, instr);
-	 strcat (tIP->IP, dnsrbls[loop1]);
+         strcat (tIP->IP, dnsrbls[loop1]);
          tIP->next = IPs;
          IPs = tIP;
          numqueries++;
@@ -151,7 +151,7 @@ main () {
    for (loop1 = 0; ((loop1<MAXTHREADS) && (loop1<numqueries)); loop1++) {
       if (pthread_create(&threads[loop1], NULL,
                          (void *) do_queries, NULL) != 0) {
-	 fprintf (stderr, "Couldn't make more than %d threads\n", numthreads);
+         fprintf (stderr, "Couldn't make more than %d threads\n", numthreads);
          break;
       } else {
          numthreads++;
@@ -166,4 +166,3 @@ main () {
 
    exit (0);
 }
-

+ 1 - 1
plugins/fortune/config_default.php

@@ -23,4 +23,4 @@ $fortune_location = '/usr/games/fortune';
  * @since 1.5.1
  */
 $fortune_options = '-s';
-?>
+?>

+ 1 - 1
plugins/listcommands/setup.php

@@ -90,4 +90,4 @@ function plugin_listcommands_menu() {
     }
 }
 
-?>
+?>

+ 30 - 30
plugins/make_archive.pl

@@ -29,7 +29,7 @@ foreach $arg (@ARGV)
     else
     {
         print "Unrecognized argument:  $arg\n";
-	exit(0);
+        exit(0);
     }
 }
 
@@ -67,12 +67,12 @@ $QuietString = " > /dev/null 2> /dev/null" if (! $Verbose);
 
 print "\n\n" if ($Verbose);
 print "Creating $Plugin.$Version-$SMVersion.tar.gz\n";
-system("tar cvfz $Plugin.$Version-$SMVersion.tar.gz $Plugin" . 
+system("tar cvfz $Plugin.$Version-$SMVersion.tar.gz $Plugin" .
     FindTarExcludes(@Files) . $QuietString);
-    
+
 #print "\n\n" if ($Verbose);
 #print "Creating $Plugin.$Version-$SMVersion.zip\n";
-#system("zip -r $Plugin.$Version-$SMVersion.zip $Plugin/" . 
+#system("zip -r $Plugin.$Version-$SMVersion.zip $Plugin/" .
 #    FindZipExcludes(@Files) . $QuietString);
 
 
@@ -80,11 +80,11 @@ system("tar cvfz $Plugin.$Version-$SMVersion.tar.gz $Plugin" .
 sub VerifyPluginDir
 {
     local ($Plugin) = @_;
-    
+
     if (! -e $Plugin && ! -d $Plugin)
     {
         print "The $Plugin directory doesn't exist, " .
-	    "or else it is not a directory.\n";
+            "or else it is not a directory.\n";
         exit(0);
     }
 }
@@ -93,39 +93,39 @@ sub VerifyPluginDir
 sub FindTarExcludes
 {
     local (@Files) = @_;
-    
+
     $ExcludeStr = "";
-    
+
     foreach $File (@Files)
     {
         if ($File =~ /^(.*\/CVS)\/$/)
-	{
-	    $ExcludeStr .= " --exclude $1";
-	}
+        {
+            $ExcludeStr .= " --exclude $1";
+        }
     }
-    
+
     return $ExcludeStr;
 }
 
 sub FindZipExcludes
 {
     local (@Files) = @_;
-    
+
     $ExcludeStr = "";
-    
+
     foreach $File (@Files)
     {
         if ($File =~ /^(.*\/CVS)\/$/)
-	{
-	    $ExcludeStr .= " $1/ $1/*";
-	}
+        {
+            $ExcludeStr .= " $1/ $1/*";
+        }
     }
-    
+
     if ($ExcludeStr ne "")
     {
         $ExcludeStr = " -x" . $ExcludeStr;
     }
-    
+
     return $ExcludeStr;
 }
 
@@ -133,25 +133,25 @@ sub RecurseDir
 {
     local ($Dir) = @_;
     local (@Files, @Results);
-    
+
     opendir(DIR, $Dir);
     @Files = readdir(DIR);
     closedir(DIR);
-    
+
     @Results = ("$Dir/");
-    
+
     foreach $file (@Files)
     {
         next if ($file =~ /^[\.]+/);
         if (-d "$Dir/$file")
-	{
-	    push (@Results, RecurseDir("$Dir/$file"));
-	}
-	else
-	{
-	    push (@Results, "$Dir/$file");
-	}
+        {
+            push (@Results, RecurseDir("$Dir/$file"));
+        }
+        else
+        {
+            push (@Results, "$Dir/$file");
+        }
     }
-    
+
     return @Results;
 }

+ 2 - 2
plugins/squirrelspell/doc/ChangeLog

@@ -7,7 +7,7 @@ v0.3.7
 - Moving some strings from .js files into .mod or .php so they can be
   translated.
 - Miscellaneous code moves and smallish rewrites.
-	
+
 v0.3.6
 ------
 - Remote arbirtary execution as apache user vulnerability fix.
@@ -47,7 +47,7 @@ Added vlink and alink settings, plus fixed some colors.
 
 v0.3b
 ------
-- Major code re-organization. 
+- Major code re-organization.
 - Moved modules into separate directory.
 - Moved most JavaScript out of the main code into separate .js files
 - Created generic GUI-wrappers for most interface screens.

+ 1 - 1
plugins/squirrelspell/doc/index.php

@@ -16,4 +16,4 @@
    header("Location:../../../src/login.php\n\n");
    exit();
 
-?>
+?>

+ 23 - 23
plugins/squirrelspell/js/check_me.js

@@ -33,7 +33,7 @@ function populateSqspellForm(){
   } else {
     CurrentLocation++;
   }
-  
+
   tmp = CurrentLoc.split(":");
   CurrentLine=parseInt(tmp[0]);
   CurrentSymbol=parseInt(tmp[1]);
@@ -53,7 +53,7 @@ function populateSqspellForm(){
   }
   NewLineValue+=LineValue.substring(StartWith, CurrentSymbol) + "*" + Word + "*" + LineValue.substring(CurrentSymbol + Word.length, EndWith) + EndLine;
   document.forms[0].sqspell_line_area.value=NewLineValue;
-       
+
   if (suggestions[CurrentError]){
     WordSuggestions = suggestions[CurrentError].split(", ");
     for (i=0; i<WordSuggestions.length; i++){
@@ -65,7 +65,7 @@ function populateSqspellForm(){
     document.forms[0].sqspell_oruse.focus();
     document.forms[0].sqspell_oruse.select();
   }
-  
+
   document.forms[0].sqspell_suggestion.selectedIndex=0;
   if (!document.forms[0].sqspell_oruse.value)
     document.forms[0].sqspell_oruse.value=document.forms[0].sqspell_suggestion.options[document.forms[0].sqspell_suggestion.selectedIndex].value;
@@ -151,7 +151,7 @@ function sqspellChangeAll(){
      * Load it again to reflect the changes in symbol data
      */
     allLoc = locations[CurrentError].split(", ");
-  }       
+  }
   CurrentLocation=0;
   proceed();
 }
@@ -168,7 +168,7 @@ function sqspellIgnore(){
 
 /**
  * This function is called when the "Ignore All" button is pressed.
- * 
+ *
  * @return void
  */
 function sqspellIgnoreAll(){
@@ -185,7 +185,7 @@ function clearSqspellForm(){
   for (i=0; i<document.forms[0].sqspell_suggestion.length; i++){
     document.forms[0].sqspell_suggestion.options[i]=null;
   }
-       
+
   /**
    * Now, I've been instructed by the Netscape Developer docs to call
    * history.go(0) to refresh the page after I've changed the options.
@@ -211,7 +211,7 @@ function proceed(){
   } else {
     if (ChangesMade || document.forms[0].words.value){
       if (confirm(ui_completed))
-	sqspellCommitChanges();
+        sqspellCommitChanges();
       else self.close();
     } else {
       confirm (ui_nochange);
@@ -232,33 +232,33 @@ function proceed(){
  * @return            void
  */
 function updateSymbol(lLine, lSymbol, difference){
-  /** 
+  /**
    * Now, I will admit that this is not the best way to do stuff,
    * However that's the solution I've come up with.
    *
    * If you are wondering why I didn't use two-dimensional arrays instead,
    * well, sometimes there will be a long line with an error close to the
-   * end of it, so the coordinates would be something like 2,98 and 
-   * some Javascript implementations will create 98 empty members of an 
-   * array just to have a filled number 98. This is too resource-wasteful 
-   * and I have decided to go with the below solution instead. It takes 
+   * end of it, so the coordinates would be something like 2,98 and
+   * some Javascript implementations will create 98 empty members of an
+   * array just to have a filled number 98. This is too resource-wasteful
+   * and I have decided to go with the below solution instead. It takes
    * a little more processing, but it saves a lot on memory.
    *
    * It just looks heinous. In real life it's really nice and sane. ;)
    */
-       
+
   for (i=0; i<misses.length; i++){
     if(locations[i].indexOf(lLine + ":") >= 0){
       allLoc = locations[i].split(", ");
       for (j=0; j<allLoc.length; j++){
-	if (allLoc[j].indexOf(lLine+":")==0){
-	  tmp = allLoc[j].split(":");
-	  tmp[0] = parseInt(tmp[0]); tmp[1] = parseInt(tmp[1]);
-	  if (tmp[1] > lSymbol){
-	    tmp[1] = tmp[1] + difference;
-	    allLoc[j] = tmp.join(":");
-	  }
-	}
+        if (allLoc[j].indexOf(lLine+":")==0){
+          tmp = allLoc[j].split(":");
+          tmp[0] = parseInt(tmp[0]); tmp[1] = parseInt(tmp[1]);
+          if (tmp[1] > lSymbol){
+            tmp[1] = tmp[1] + difference;
+            allLoc[j] = tmp.join(":");
+          }
+        }
       }
       locations[i] = allLoc.join(", ");
     }
@@ -277,10 +277,10 @@ function sqspellCommitChanges(){
     if (i!=1) newBody+="\r\n";
     newBody += sqspell_lines[i];
   }
-  
+
   opener.document.compose.subject.value=newSubject;
   opener.document.compose.body.value=newBody;
-  
+
   /**
    * See if any words were added to the dictionary.
    */

+ 1 - 1
plugins/squirrelspell/js/index.php

@@ -16,4 +16,4 @@
    header("Location:../../../src/login.php\n\n");
    exit();
 
-?>
+?>

+ 1 - 1
plugins/translate/config-sample.php

@@ -122,4 +122,4 @@ function translate_custom_showtrad() {
 function translate_custom_showoption() {
     translate_showoption_internal('server', 'custom', 'Al Misbar');
 }
-?>
+?>

+ 1 - 1
plugins/translate/config_default.php

@@ -108,4 +108,4 @@ $disable_compose_translate=true;
  */
 global $translate_custom_enabled;
 $translate_custom_enabled=false;
-?>
+?>

+ 1 - 1
plugins/translate/functions.php

@@ -928,4 +928,4 @@ function translate_form_google($message) {
 
     translate_table_end();
 }
-?>
+?>

+ 5 - 5
po/charsetconvert.pl

@@ -14,16 +14,16 @@ while (<>) {
   unless (/^\#/) {
 
     ($orig_text, $unicode_text, $dummy, $name) = split /\t/;
-	
-    # oct does not only do what it's name suggest. If a string starts 
+
+    # oct does not only do what it's name suggest. If a string starts
     # with 0x it is interpreted as a hexadecimal value.
     $orig = oct $orig_text;
     $unicode = oct $unicode_text;
-	
+
     if ($orig >= $min) {
       print "            // $name\n";
       printf ('            $string = str_replace("\%o", "&#%d", $string);'."\n",
-	      $orig, $unicode);
+              $orig, $unicode);
     }
-  } 
+  }
 }

+ 1 - 1
src/configtest.php

@@ -419,4 +419,4 @@ if( empty($ldap_server) ) {
 </html>
 <?php
 // vim: et ts=4
-?>
+?>

+ 1 - 1
src/printer_friendly_bottom.php

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

+ 1 - 1
src/search.php

@@ -1493,4 +1493,4 @@ do_hook('search_bottom');
 sqimap_logout($imapConnection);
 echo '</body></html>';
 sqsession_register($mailbox_cache,'mailbox_cache');
-?>
+?>

+ 1 - 1
src/signout.php

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

+ 1 - 1
themes/silver_steel_theme.php

@@ -28,4 +28,4 @@ $color[13]  = '#ffffff'; //
 $color[14]  = '#ffffff'; //
 $color[15]  = '#D0D0D0'; //       Unselectable folders
 
-?>
+?>

+ 1 - 1
themes/simple_green_theme.php

@@ -28,4 +28,4 @@ $color[13] = "#800000"; // (dark red) > Quoted Message Text
 $color[14] = "#FF0000"; // (rec) >> Multi-Quoted Message Text (2 >'s or more)
 $color[15] = "#002266"; // (dark blue NOTE: not tested) L. Frame: unselectable folders
 
-?>
+?>

+ 1 - 1
themes/wood_theme.php

@@ -28,4 +28,4 @@ $color[13]  = '#ffffff'; //
 $color[14]  = '#ffffff'; //
 $color[15]  = '#D0D0D0'; //       Unselectable folders
 
-?>
+?>