phpDoc fixes

functions/date.php

@@ -90,7 +90,7 @@ function getGMTSeconds($stamp, $tzc) {
     if ($neg) $iTzc = -1 * (int) $iTzc;
     /* stamp in gmt */
     $stamp -= $iTzc;
-    /** now find what the server is at **/
+    /* now find what the server is at */
     $current = date('Z', time());
     /* stamp in local timezone */
     $stamp += $current;
@@ -391,18 +391,18 @@ function getDateString( $stamp ) {
  * @return int the timestamp calculated from the header
  */
 function getTimeStamp($dateParts) {
-    /** $dateParts[0] == <day of week>   Mon, Tue, Wed
-    ** $dateParts[1] == <day of month>  23
-    ** $dateParts[2] == <month>         Jan, Feb, Mar
-    ** $dateParts[3] == <year>          1999
-    ** $dateParts[4] == <time>          18:54:23 (HH:MM:SS)
-    ** $dateParts[5] == <from GMT>      +0100
-    ** $dateParts[6] == <zone>          (EDT)
-    **
-    ** NOTE:  In RFC 822, it states that <day of week> is optional.
-    **        In that case, dateParts[0] would be the <day of month>
-    **        and everything would be bumped up one.
-    **/
+    /* $dateParts[0] == <day of week>   Mon, Tue, Wed
+     * $dateParts[1] == <day of month>  23
+     * $dateParts[2] == <month>         Jan, Feb, Mar
+     * $dateParts[3] == <year>          1999
+     * $dateParts[4] == <time>          18:54:23 (HH:MM:SS)
+     * $dateParts[5] == <from GMT>      +0100
+     * $dateParts[6] == <zone>          (EDT)
+     *
+     * NOTE:  In RFC 822, it states that <day of week> is optional.
+     *        In that case, dateParts[0] would be the <day of month>
+     *        and everything would be bumped up one.
+     */
 
     /*
      * Simply check to see if the first element in the dateParts
@@ -455,4 +455,4 @@ function getTimeStamp($dateParts) {
       return ($mtime);
    }
 */
-?>
+?>

plugins/abook_take/functions.php

@@ -8,7 +8,7 @@
  *
  * Functions for the Address Take plugin
  *
- * $Id$
+ * @version $Id$
  * @package plugins
  * @subpackage abook_take
  */

plugins/abook_take/setup.php

@@ -10,7 +10,7 @@
  * the To, Cc, From and Reply-To headers, also searches the body of the
  * message.
  *
- * $Id$
+ * @version $Id$
  * @package plugins
  * @subpackage abook_take
  */

plugins/abook_take/take.php

@@ -8,7 +8,7 @@
  * Address Take -- steals addresses from incoming email messages. Searches
  * the To, Cc, From and Reply-To headers.
  *
- * $Id$
+ * @version $Id$
  * @package plugins
  * @subpackage abook_take
  */

plugins/mail_fetch/class.POP3.php

@@ -1,25 +1,25 @@
 <?php
 
-   /**
-    * mail_fetch/setup.php
-    *
-    * Copyright (c) 1999-2005 The SquirrelMail Project Team
-    *
-    * Copyright (c) 1999 CDI (cdi@thewebmasters.net) All Rights Reserved
-    * Modified by Philippe Mingo 2001 mingo@rotedic.com
-    * An RFC 1939 compliant wrapper class for the POP3 protocol.
-    *
-    * Licensed under the GNU GPL. For full terms see the file COPYING.
-    *
-    * pop3 class
-    *
-    * $Id$
-    * @package plugins
-    * @subpackage mail_fetch
-    */
+/**
+ * mail_fetch/class.POP3.php
+ *
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
+ *
+ * Copyright (c) 1999 CDI (cdi@thewebmasters.net) All Rights Reserved
+ * Modified by Philippe Mingo 2001 mingo@rotedic.com
+ * An RFC 1939 compliant wrapper class for the POP3 protocol.
+ *
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * POP3 class
+ *
+ * @version $Id$
+ * @package plugins
+ * @subpackage mail_fetch
+ */
 
 /**
- * This is the pop3 class - DOCUMENT ME
+ * This is the POP3 class - DOCUMENT ME
  * @package squirrelmail
  */
 class POP3 {

plugins/mail_fetch/fetch.php

@@ -8,7 +8,7 @@
  *
  * Fetch code.
  *
- * $Id$
+ * @version $Id$
  * @package plugins
  * @subpackage mail_fetch
  */
@@ -325,4 +325,4 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
 ?>
 </center>
 </body>
-</html>
+</html>

plugins/mail_fetch/functions.php

@@ -1,82 +1,82 @@
 <?php
 
-   /**
-    **  mail_fetch/functions.php
-    **
-    **  Copyright (c) 1999-2005 The SquirrelMail Project Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Functions for the mailfetch plugin.
-    **
-    **  Original code from LexZEUS <lexzeus@mifinca.com>
-    **  and josh@superfork.com (extracted from php manual)
-    **  Adapted for MailFetch by Philippe Mingo <mingo@rotedic.com>
-    **
-    **  $Id$
-    * @package plugins
-    * @subpackage mail_fetch
-    **/
+/**
+ * mail_fetch/functions.php
+ *
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Functions for the mailfetch plugin.
+ *
+ * Original code from LexZEUS <lexzeus@mifinca.com>
+ * and josh@superfork.com (extracted from php manual)
+ * Adapted for MailFetch by Philippe Mingo <mingo@rotedic.com>
+ *
+ * @version $Id$
+ * @package plugins
+ * @subpackage mail_fetch
+ */
 
-    /**
-     * hex2bin - document me
-     */
-    function hex2bin( $data ) {
+/**
+ * hex2bin - document me
+ */
+function hex2bin( $data ) {
 
-        /* Original code by josh@superfork.com */
+    /* Original code by josh@superfork.com */
 
-        $len = strlen($data);
-        $newdata = '';
-        for( $i=0; $i < $len; $i += 2 ) {
-            $newdata .= pack( "C", hexdec( substr( $data, $i, 2) ) );
-        }
-        return $newdata;
+    $len = strlen($data);
+    $newdata = '';
+    for( $i=0; $i < $len; $i += 2 ) {
+        $newdata .= pack( "C", hexdec( substr( $data, $i, 2) ) );
     }
+    return $newdata;
+}
 
-    function mf_keyED( $txt ) {
+function mf_keyED( $txt ) {
 
-        global $MF_TIT;
+    global $MF_TIT;
 
-        if( !isset( $MF_TIT ) ) {
-            $MF_TIT = "MailFetch Secure for SquirrelMail 1.x";
-        }
+    if( !isset( $MF_TIT ) ) {
+        $MF_TIT = "MailFetch Secure for SquirrelMail 1.x";
+    }
 
-        $encrypt_key = md5( $MF_TIT );
-        $ctr = 0;
-        $tmp = "";
-        for( $i = 0; $i < strlen( $txt ); $i++ ) {
-            if( $ctr == strlen( $encrypt_key ) ) $ctr=0;
-            $tmp.= substr( $txt, $i, 1 ) ^ substr( $encrypt_key, $ctr, 1 );
-            $ctr++;
-        }
-        return $tmp;
+    $encrypt_key = md5( $MF_TIT );
+    $ctr = 0;
+    $tmp = "";
+    for( $i = 0; $i < strlen( $txt ); $i++ ) {
+        if( $ctr == strlen( $encrypt_key ) ) $ctr=0;
+        $tmp.= substr( $txt, $i, 1 ) ^ substr( $encrypt_key, $ctr, 1 );
+        $ctr++;
     }
+    return $tmp;
+}
 
-    function encrypt( $txt ) {
+function encrypt( $txt ) {
 
-        srand( (double) microtime() * 1000000 );
-        $encrypt_key = md5( rand( 0, 32000 ) );
-        $ctr = 0;
-        $tmp = "";
-        for( $i = 0; $i < strlen( $txt ); $i++ ) {
+    srand( (double) microtime() * 1000000 );
+    $encrypt_key = md5( rand( 0, 32000 ) );
+    $ctr = 0;
+    $tmp = "";
+    for( $i = 0; $i < strlen( $txt ); $i++ ) {
         if ($ctr==strlen($encrypt_key)) $ctr=0;
-            $tmp.= substr($encrypt_key,$ctr,1) .
-                (substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1));
+        $tmp.= substr($encrypt_key,$ctr,1) .
+            (substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1));
         $ctr++;
-        }
-        return bin2hex( mf_keyED( $tmp ) );
-
     }
+    return bin2hex( mf_keyED( $tmp ) );
+
+}
 
-    function decrypt( $txt ) {
+function decrypt( $txt ) {
 
-        $txt = mf_keyED( hex2bin( $txt ) );
-        $tmp = '';
-        for ( $i=0; $i < strlen( $txt ); $i++ ) {
-            $md5 = substr( $txt, $i, 1 );
-            $i++;
-            $tmp.= ( substr( $txt, $i, 1 ) ^ $md5 );
-        }
-        return $tmp;
+    $txt = mf_keyED( hex2bin( $txt ) );
+    $tmp = '';
+    for ( $i=0; $i < strlen( $txt ); $i++ ) {
+        $md5 = substr( $txt, $i, 1 );
+        $i++;
+        $tmp.= ( substr( $txt, $i, 1 ) ^ $md5 );
     }
+    return $tmp;
+}
 
 ?>

plugins/mail_fetch/index.php

@@ -1,19 +1,19 @@
 <?php
 
-   /**
-    **  index.php -- Displays the main frameset
-    **
-    **  Copyright (c) 1999-2005 The SquirrelMail Project Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Redirects to the login page.
-    **
-    **  $Id$
-    * @package plugins
-    * @subpackage mail_fetch
-    **/
+/**
+ * index.php -- Displays the main frameset
+ *
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Redirects to the login page.
+ *
+ * @version $Id$
+ * @package plugins
+ * @subpackage mail_fetch
+ **/
 
-   header("Location:../../src/login.php\n\n");
-   exit();
+header("Location:../../src/login.php\n\n");
+exit();
 
 ?>

plugins/mail_fetch/options.php

@@ -8,7 +8,7 @@
  *
  * Setup of the mailfetch plugin.
  *
- * $Id$
+ * @version $Id$
  * @package plugins
  * @subpackage mail_fetch
  */
@@ -391,4 +391,4 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
     }
 
     ?>
-</body></html>
+</body></html>

plugins/mail_fetch/setup.php

@@ -1,238 +1,238 @@
 <?php
 
-   /**
-    **  mail_fetch/setup.php
-    **
-    **  Copyright (c) 1999-2005 The SquirrelMail Project Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Setup of the mailfetch plugin.
-    **
-    **  $Id$
-    * @package plugins
-    * @subpackage mail_fetch
-    **/
-
-    /**  */
-    require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
-
-    /**
-     * Initialize the plugin
-     */
-    function squirrelmail_plugin_init_mail_fetch() {
-        global $squirrelmail_plugin_hooks;
-
-        $squirrelmail_plugin_hooks['menuline']['mail_fetch'] = 'mail_fetch_link';
-        $squirrelmail_plugin_hooks['loading_prefs']['mail_fetch'] = 'mail_fetch_load_pref';
-        $squirrelmail_plugin_hooks['login_verified']['mail_fetch'] = 'mail_fetch_setnew';
-        $squirrelmail_plugin_hooks['left_main_before']['mail_fetch'] = 'mail_fetch_login';
-        $squirrelmail_plugin_hooks['optpage_register_block']['mail_fetch'] = 'mailfetch_optpage_register_block';
-
-    }
-
-    function mail_fetch_link() {
-
-        displayInternalLink('plugins/mail_fetch/fetch.php', _("Fetch"), '');
-        echo '&nbsp;&nbsp;';
-
-    }
-
-    function mail_fetch_load_pref() {
-
-        global $data_dir;
-        global $mailfetch_server_number;
-        global $mailfetch_cypher, $mailfetch_port_;
-        global $mailfetch_server_,$mailfetch_alias_,$mailfetch_user_,$mailfetch_pass_;
-        global $mailfetch_lmos_, $mailfetch_uidl_, $mailfetch_login_, $mailfetch_fref_;
-        global $PHP_SELF;
-
-        sqgetGlobalVar('username', $username, SQ_SESSION);
-
-        if( stristr( $PHP_SELF, 'mail_fetch' ) ) {
-            $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number', 0);
-            $mailfetch_cypher = getPref($data_dir, $username, 'mailfetch_cypher', 'on' );
-            if ($mailfetch_server_number<1) $mailfetch_server_number=0;
-            for ($i=0;$i<$mailfetch_server_number;$i++) {
-                $mailfetch_server_[$i] = getPref($data_dir, $username, "mailfetch_server_$i");
-                $mailfetch_port_[$i] = getPref($data_dir, $username, "mailfetch_port_$i");
-                $mailfetch_alias_[$i]  = getPref($data_dir, $username, "mailfetch_alias_$i");
-                $mailfetch_user_[$i]   = getPref($data_dir, $username, "mailfetch_user_$i");
-                $mailfetch_pass_[$i]   = getPref($data_dir, $username, "mailfetch_pass_$i");
-                $mailfetch_lmos_[$i]   = getPref($data_dir, $username, "mailfetch_lmos_$i");
-                $mailfetch_login_[$i]  = getPref($data_dir, $username, "mailfetch_login_$i");
-                $mailfetch_fref_[$i]   = getPref($data_dir, $username, "mailfetch_fref_$i");
-                $mailfetch_uidl_[$i]   = getPref($data_dir, $username, "mailfetch_uidl_$i");
-                if( $mailfetch_cypher   == 'on' ) $mailfetch_pass_[$i] =    decrypt( $mailfetch_pass_[$i] );
-            }
+/**
+ * mail_fetch/setup.php
+ *
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Setup of the mailfetch plugin.
+ *
+ * @version $Id$
+ * @package plugins
+ * @subpackage mail_fetch
+ */
+
+/**  */
+require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
+
+/**
+ * Initialize the plugin
+ */
+function squirrelmail_plugin_init_mail_fetch() {
+    global $squirrelmail_plugin_hooks;
+
+    $squirrelmail_plugin_hooks['menuline']['mail_fetch'] = 'mail_fetch_link';
+    $squirrelmail_plugin_hooks['loading_prefs']['mail_fetch'] = 'mail_fetch_load_pref';
+    $squirrelmail_plugin_hooks['login_verified']['mail_fetch'] = 'mail_fetch_setnew';
+    $squirrelmail_plugin_hooks['left_main_before']['mail_fetch'] = 'mail_fetch_login';
+    $squirrelmail_plugin_hooks['optpage_register_block']['mail_fetch'] = 'mailfetch_optpage_register_block';
+
+}
+
+function mail_fetch_link() {
+
+    displayInternalLink('plugins/mail_fetch/fetch.php', _("Fetch"), '');
+    echo '&nbsp;&nbsp;';
+
+}
+
+function mail_fetch_load_pref() {
+
+    global $data_dir;
+    global $mailfetch_server_number;
+    global $mailfetch_cypher, $mailfetch_port_;
+    global $mailfetch_server_,$mailfetch_alias_,$mailfetch_user_,$mailfetch_pass_;
+    global $mailfetch_lmos_, $mailfetch_uidl_, $mailfetch_login_, $mailfetch_fref_;
+    global $PHP_SELF;
+
+    sqgetGlobalVar('username', $username, SQ_SESSION);
+
+    if( stristr( $PHP_SELF, 'mail_fetch' ) ) {
+        $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number', 0);
+        $mailfetch_cypher = getPref($data_dir, $username, 'mailfetch_cypher', 'on' );
+        if ($mailfetch_server_number<1) $mailfetch_server_number=0;
+        for ($i=0;$i<$mailfetch_server_number;$i++) {
+            $mailfetch_server_[$i] = getPref($data_dir, $username, "mailfetch_server_$i");
+            $mailfetch_port_[$i] = getPref($data_dir, $username, "mailfetch_port_$i");
+            $mailfetch_alias_[$i]  = getPref($data_dir, $username, "mailfetch_alias_$i");
+            $mailfetch_user_[$i]   = getPref($data_dir, $username, "mailfetch_user_$i");
+            $mailfetch_pass_[$i]   = getPref($data_dir, $username, "mailfetch_pass_$i");
+            $mailfetch_lmos_[$i]   = getPref($data_dir, $username, "mailfetch_lmos_$i");
+            $mailfetch_login_[$i]  = getPref($data_dir, $username, "mailfetch_login_$i");
+            $mailfetch_fref_[$i]   = getPref($data_dir, $username, "mailfetch_fref_$i");
+            $mailfetch_uidl_[$i]   = getPref($data_dir, $username, "mailfetch_uidl_$i");
+            if( $mailfetch_cypher   == 'on' ) $mailfetch_pass_[$i] =    decrypt( $mailfetch_pass_[$i] );
         }
     }
+}
 
-    function mail_fetch_login() {
+function mail_fetch_login() {
 
-        require_once (SM_PATH . 'include/validate.php');
-        require_once (SM_PATH . 'functions/imap.php');
-        require_once (SM_PATH . 'plugins/mail_fetch/class.POP3.php');
-        require_once (SM_PATH . 'plugins/mail_fetch/functions.php');
+    require_once (SM_PATH . 'include/validate.php');
+    require_once (SM_PATH . 'functions/imap.php');
+    require_once (SM_PATH . 'plugins/mail_fetch/class.POP3.php');
+    require_once (SM_PATH . 'plugins/mail_fetch/functions.php');
 
-        global $data_dir, $imapServerAddress, $imapPort;
+    global $data_dir, $imapServerAddress, $imapPort;
 
-        sqgetGlobalVar('username', $username, SQ_SESSION);
-        sqgetGlobalVar('key',      $key,      SQ_COOKIE);
+    sqgetGlobalVar('username', $username, SQ_SESSION);
+    sqgetGlobalVar('key',      $key,      SQ_COOKIE);
 
-        $mailfetch_newlog = getPref($data_dir, $username, 'mailfetch_newlog');
+    $mailfetch_newlog = getPref($data_dir, $username, 'mailfetch_newlog');
 
-        $outMsg = '';
+    $outMsg = '';
 
-        $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number');
-        if (!isset($mailfetch_server_number)) $mailfetch_server_number=0;
-        $mailfetch_cypher = getPref($data_dir, $username, 'mailfetch_cypher');
-        if ($mailfetch_server_number<1) $mailfetch_server_number=0;
+    $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number');
+    if (!isset($mailfetch_server_number)) $mailfetch_server_number=0;
+    $mailfetch_cypher = getPref($data_dir, $username, 'mailfetch_cypher');
+    if ($mailfetch_server_number<1) $mailfetch_server_number=0;
 
-        for ($i_loop=0;$i_loop<$mailfetch_server_number;$i_loop++) {
+    for ($i_loop=0;$i_loop<$mailfetch_server_number;$i_loop++) {
 
-            $mailfetch_login_[$i_loop] = getPref($data_dir, $username, "mailfetch_login_$i_loop");
-            $mailfetch_fref_[$i_loop] = getPref($data_dir, $username, "mailfetch_fref_$i_loop");
-            $mailfetch_pass_[$i_loop] = getPref($data_dir, $username, "mailfetch_pass_$i_loop");
-            if( $mailfetch_cypher == 'on' )
-                $mailfetch_pass_[$i_loop] = decrypt( $mailfetch_pass_[$i_loop] );
+        $mailfetch_login_[$i_loop] = getPref($data_dir, $username, "mailfetch_login_$i_loop");
+        $mailfetch_fref_[$i_loop] = getPref($data_dir, $username, "mailfetch_fref_$i_loop");
+        $mailfetch_pass_[$i_loop] = getPref($data_dir, $username, "mailfetch_pass_$i_loop");
+        if( $mailfetch_cypher == 'on' )
+            $mailfetch_pass_[$i_loop] = decrypt( $mailfetch_pass_[$i_loop] );
 
-            if( $mailfetch_pass_[$i_loop] <> '' &&          // Empty passwords no allowed
+        if( $mailfetch_pass_[$i_loop] <> '' &&          // Empty passwords no allowed
                 ( ( $mailfetch_login_[$i_loop] == 'on' &&  $mailfetch_newlog == 'on' ) || $mailfetch_fref_[$i_loop] == 'on' ) ) {
 
-                $mailfetch_server_[$i_loop] = getPref($data_dir, $username, "mailfetch_server_$i_loop");
-                $mailfetch_port_[$i_loop] = getPref($data_dir, $username , "mailfetch_port_$i_loop");
-                $mailfetch_alias_[$i_loop] = getPref($data_dir, $username, "mailfetch_alias_$i_loop");
-                $mailfetch_user_[$i_loop] = getPref($data_dir, $username, "mailfetch_user_$i_loop");
-                $mailfetch_lmos_[$i_loop] = getPref($data_dir, $username, "mailfetch_lmos_$i_loop");
-                $mailfetch_uidl_[$i_loop] = getPref($data_dir, $username, "mailfetch_uidl_$i_loop");
-                $mailfetch_subfolder_[$i_loop] = getPref($data_dir, $username, "mailfetch_subfolder_$i_loop");
+            $mailfetch_server_[$i_loop] = getPref($data_dir, $username, "mailfetch_server_$i_loop");
+            $mailfetch_port_[$i_loop] = getPref($data_dir, $username , "mailfetch_port_$i_loop");
+            $mailfetch_alias_[$i_loop] = getPref($data_dir, $username, "mailfetch_alias_$i_loop");
+            $mailfetch_user_[$i_loop] = getPref($data_dir, $username, "mailfetch_user_$i_loop");
+            $mailfetch_lmos_[$i_loop] = getPref($data_dir, $username, "mailfetch_lmos_$i_loop");
+            $mailfetch_uidl_[$i_loop] = getPref($data_dir, $username, "mailfetch_uidl_$i_loop");
+            $mailfetch_subfolder_[$i_loop] = getPref($data_dir, $username, "mailfetch_subfolder_$i_loop");
+
+            $mailfetch_server=$mailfetch_server_[$i_loop];
+            $mailfetch_port=$mailfetch_port_[$i_loop];
+            $mailfetch_user=$mailfetch_user_[$i_loop];
+            $mailfetch_alias=$mailfetch_alias_[$i_loop];
+            $mailfetch_pass=$mailfetch_pass_[$i_loop];
+            $mailfetch_lmos=$mailfetch_lmos_[$i_loop];
+            $mailfetch_login=$mailfetch_login_[$i_loop];
+            $mailfetch_uidl=$mailfetch_uidl_[$i_loop];
+            $mailfetch_subfolder=$mailfetch_subfolder_[$i_loop];
+
+            // $outMsg .= "$mailfetch_alias checked<br />";
+
+            // $outMsg .= "$mailfetch_alias_[$i_loop]<br />";
+
+            $pop3 = new POP3($mailfetch_server, 60);
+
+            if (!$pop3->connect($mailfetch_server,$mailfetch_port)) {
+                $outMsg .= _("Warning, ") . $pop3->ERROR;
+                continue;
+            }
 
-                $mailfetch_server=$mailfetch_server_[$i_loop];
-                $mailfetch_port=$mailfetch_port_[$i_loop];
-                $mailfetch_user=$mailfetch_user_[$i_loop];
-                $mailfetch_alias=$mailfetch_alias_[$i_loop];
-                $mailfetch_pass=$mailfetch_pass_[$i_loop];
-                $mailfetch_lmos=$mailfetch_lmos_[$i_loop];
-                $mailfetch_login=$mailfetch_login_[$i_loop];
-                $mailfetch_uidl=$mailfetch_uidl_[$i_loop];
-                $mailfetch_subfolder=$mailfetch_subfolder_[$i_loop];
+            $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10);
 
-                // $outMsg .= "$mailfetch_alias checked<br />";
+            $Count = $pop3->login($mailfetch_user, $mailfetch_pass);
+            if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
+                $outMsg .= _("Login Failed:") . $pop3->ERROR;
+                continue;
+            }
 
-                // $outMsg .= "$mailfetch_alias_[$i_loop]<br />";
+            //   register_shutdown_function($pop3->quit());
 
-                $pop3 = new POP3($mailfetch_server, 60);
+            $msglist = $pop3->uidl();
 
-                if (!$pop3->connect($mailfetch_server,$mailfetch_port)) {
-                    $outMsg .= _("Warning, ") . $pop3->ERROR;
-                    continue;
+            $i = 1;
+            for ($j = 1; $j < sizeof($msglist); $j++) {
+                if ($msglist["$j"] == $mailfetch_uidl) {
+                    $i = $j+1;
+                    break;
                 }
+            }
 
-                $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10);
+            if ($Count < $i) {
+                $pop3->quit();
+                continue;
+            }
+            if ($Count == 0) {
+                $pop3->quit();
+                continue;
+            }
 
-                $Count = $pop3->login($mailfetch_user, $mailfetch_pass);
-                if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
-                    $outMsg .= _("Login Failed:") . $pop3->ERROR;
-                    continue;
-                }
+            // Faster to get them all at once
+            $mailfetch_uidl = $pop3->uidl();
 
-                //   register_shutdown_function($pop3->quit());
+            if (! is_array($mailfetch_uidl) && $mailfetch_lmos == 'on')
+                $outMsg .= _("Server does not support UIDL.");
 
-                $msglist = $pop3->uidl();
+            for (; $i <= $Count; $i++) {
+                if (!ini_get('safe_mode'))
+                    set_time_limit(20); // 20 seconds per message max
+                $Message = "";
+                $MessArray = $pop3->get($i);
 
-                $i = 1;
-                for ($j = 1; $j < sizeof($msglist); $j++) {
-                if ($msglist["$j"] == $mailfetch_uidl) {
-                        $i = $j+1;
-                        break;
-                }
+                if ( (!$MessArray) or (gettype($MessArray) != "array")) {
+                    $outMsg .= _("Warning, ") . $pop3->ERROR;
+                    continue 2;
                 }
 
-                if ($Count < $i) {
-                    $pop3->quit();
-                    continue;
-                }
-                if ($Count == 0) {
-                    $pop3->quit();
-                    continue;
+                while (list($lineNum, $line) = each ($MessArray)) {
+                    $Message .= $line;
                 }
 
-                // Faster to get them all at once
-                $mailfetch_uidl = $pop3->uidl();
-
-                if (! is_array($mailfetch_uidl) && $mailfetch_lmos == 'on')
-                    $outMsg .= _("Server does not support UIDL.");
-
-                for (; $i <= $Count; $i++) {
-                    if (!ini_get('safe_mode'))
-                        set_time_limit(20); // 20 seconds per message max
-                    $Message = "";
-                    $MessArray = $pop3->get($i);
-
-                    if ( (!$MessArray) or (gettype($MessArray) != "array")) {
-                        $outMsg .= _("Warning, ") . $pop3->ERROR;
-                        continue 2;
-                    }
-
-                    while (list($lineNum, $line) = each ($MessArray)) {
-                        $Message .= $line;
-                    }
-
-                    if ($mailfetch_subfolder=="") {
-                        fputs($imap_stream, "A3$i APPEND INBOX {" . strlen($Message) . "}\r\n");
-                    } else {
-                        fputs($imap_stream, "A3$i APPEND $mailfetch_subfolder {" . strlen($Message) . "}\r\n");
-                    }
-                    $Line = fgets($imap_stream, 1024);
-                    if (substr($Line, 0, 1) == '+') {
-                        fputs($imap_stream, $Message);
-                        fputs($imap_stream, "\r\n");
-                        sqimap_read_data($imap_stream, "A3$i", false, $response, $message);
+                if ($mailfetch_subfolder=="") {
+                    fputs($imap_stream, "A3$i APPEND INBOX {" . strlen($Message) . "}\r\n");
+                } else {
+                    fputs($imap_stream, "A3$i APPEND $mailfetch_subfolder {" . strlen($Message) . "}\r\n");
+                }
+                $Line = fgets($imap_stream, 1024);
+                if (substr($Line, 0, 1) == '+') {
+                    fputs($imap_stream, $Message);
+                    fputs($imap_stream, "\r\n");
+                    sqimap_read_data($imap_stream, "A3$i", false, $response, $message);
 
-                        if ($mailfetch_lmos != 'on') {
+                    if ($mailfetch_lmos != 'on') {
                         $pop3->delete($i);
-                        }
-                    } else {
-                        echo "$Line";
-                        $outMsg .= _("Error Appending Message!");
                     }
+                } else {
+                    echo "$Line";
+                    $outMsg .= _("Error Appending Message!");
                 }
+            }
 
-                $pop3->quit();
-                sqimap_logout($imap_stream);
-                if (is_array($mailfetch_uidl)) {
-                    setPref($data_dir,$username,"mailfetch_uidl_$i_loop", array_pop($mailfetch_uidl));
-                }
-        }
+            $pop3->quit();
+            sqimap_logout($imap_stream);
+            if (is_array($mailfetch_uidl)) {
+                setPref($data_dir,$username,"mailfetch_uidl_$i_loop", array_pop($mailfetch_uidl));
+            }
         }
+    }
 
-        if( trim( $outMsg ) <> '' ) {
-            echo '<br /><font size="1">' . _("Mail Fetch Result:") . "<br />$outMsg</font>";
-        }
-        if( $mailfetch_newlog == 'on' ) {
-            setPref($data_dir, $username, 'mailfetch_newlog', 'off');
-        }
+    if( trim( $outMsg ) <> '' ) {
+        echo '<br /><font size="1">' . _("Mail Fetch Result:") . "<br />$outMsg</font>";
     }
+    if( $mailfetch_newlog == 'on' ) {
+        setPref($data_dir, $username, 'mailfetch_newlog', 'off');
+    }
+}
 
-    function mail_fetch_setnew()    {
+function mail_fetch_setnew() {
 
-        global $data_dir;
-        require_once(SM_PATH . 'functions/prefs.php');
+    global $data_dir;
+    require_once(SM_PATH . 'functions/prefs.php');
 
-        sqgetGlobalVar('username', $username, SQ_SESSION);
+    sqgetGlobalVar('username', $username, SQ_SESSION);
 
-        setPref( $data_dir, $username, 'mailfetch_newlog', 'on' );
-    }
+    setPref( $data_dir, $username, 'mailfetch_newlog', 'on' );
+}
 
-    function mailfetch_optpage_register_block() {
-      global $optpage_blocks;
+function mailfetch_optpage_register_block() {
+    global $optpage_blocks;
 
-      $optpage_blocks[] = array(
-         'name' => _("POP3 Fetch Mail"),
-         'url'  => '../plugins/mail_fetch/options.php',
-         'desc' => _("This configures settings for downloading email from a POP3 mailbox to your account on this server."),
-         'js'   => false
-      );
-   }
+    $optpage_blocks[] = array(
+            'name' => _("POP3 Fetch Mail"),
+            'url'  => '../plugins/mail_fetch/options.php',
+            'desc' => _("This configures settings for downloading email from a POP3 mailbox to your account on this server."),
+            'js'   => false
+            );
+}
 
 ?>

plugins/newmail/testsound.php

@@ -6,7 +6,7 @@
  * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- * $Id$
+ * @version $Id$
  * @package plugins
  * @subpackage newmail
  */

plugins/sent_subfolders/index.php

@@ -1,19 +1,19 @@
 <?php
 
-   /**
-    **  index.php -- Displays the main frameset
-    **
-    **  Copyright (c) 1999-2005 The SquirrelMail Project Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Redirects to the login page.
-    **
-    **  $Id$
-    * @package plugins
-    * @subpackage sent_subfolders
-    **/
+/*
+ * index.php -- Displays the main frameset
+ *
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Redirects to the login page.
+ *
+ * @version $Id$
+ * @package plugins
+ * @subpackage sent_subfolders
+ */
 
-   header("Location:../../src/login.php\n\n");
-   exit();
+header("Location:../../src/login.php\n\n");
+exit();
 
 ?>

plugins/sent_subfolders/setup.php

@@ -8,7 +8,7 @@
  *
  * This is a standard SquirrelMail 1.2 API for plugins.
  *
- * $Id$
+ * @version $Id$
  * @package plugins
  * @subpackage sent_subfolders
  */