From: <pdo...@us...> - 2008-12-05 09:40:45
|
Revision: 13353 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13353&view=rev Author: pdontthink Date: 2008-12-05 09:40:43 +0000 (Fri, 05 Dec 2008) Log Message: ----------- Don't load plugin pages if plugin is not enabled. Thanks to Niels Teusink for finding this. Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php 2008-12-05 09:25:04 UTC (rev 13352) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php 2008-12-05 09:40:43 UTC (rev 13353) @@ -18,6 +18,11 @@ include_once(SM_PATH . 'plugins/mail_fetch/class.POP3.php'); include_once(SM_PATH . 'plugins/mail_fetch/functions.php' ); +// don't load this page if this plugin is not enabled +// +global $plugins; +if (!in_array('mail_fetch', $plugins)) exit; + /* globals */ sqgetGlobalVar('username', $username, SQ_SESSION); sqgetGlobalVar('key', $key, SQ_COOKIE); @@ -292,4 +297,4 @@ ?> </center> </body> -</html> \ No newline at end of file +</html> Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php 2008-12-05 09:25:04 UTC (rev 13352) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php 2008-12-05 09:40:43 UTC (rev 13353) @@ -17,6 +17,11 @@ require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'include/load_prefs.php'); +// don't load this page if this plugin is not enabled +// +global $plugins; +if (!in_array('mail_fetch', $plugins)) exit; + /* globals */ sqgetGlobalVar('username', $username, SQ_SESSION); sqgetGlobalVar('key', $key, SQ_COOKIE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jer...@us...> - 2009-04-15 18:23:09
|
Revision: 13546 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13546&view=rev Author: jervfors Date: 2009-04-15 18:22:55 +0000 (Wed, 15 Apr 2009) Log Message: ----------- Updating documentation block for phpDocumentor. Removing the PHP close tag at the last line. Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/class.POP3.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/class.POP3.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/class.POP3.php 2009-04-15 17:17:56 UTC (rev 13545) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/class.POP3.php 2009-04-15 18:22:55 UTC (rev 13546) @@ -1,20 +1,22 @@ -<?php +<?php - /** - * mail_fetch/setup.php - * - * Copyright (c) 1999-2006 The SquirrelMail Project Team - * - * Copyright (c) 1999 CDI (cd...@th...) All Rights Reserved - * Modified by Philippe Mingo 2001 mi...@ro... - * 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$ - */ +/** + * mail_fetch/setup.php + * + * Copyright (c) 1999-2009 CDI (cd...@th...) All Rights Reserved + * Modified by Philippe Mingo 2001-2009 mi...@ro... + * An RFC 1939 compliant wrapper class for the POP3 protocol. + * + * Licensed under the GNU GPL. For full terms see the file COPYING. + * + * POP3 class + * + * @copyright © 1999-2009 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package plugins + * @subpackage mail_fetch + */ class POP3 { var $ERROR = ''; // Error string. @@ -647,4 +649,3 @@ } } // End class - Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php 2009-04-15 17:17:56 UTC (rev 13545) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php 2009-04-15 18:22:55 UTC (rev 13546) @@ -3,12 +3,13 @@ /** * mail_fetch/fetch.php * - * Copyright (c) 1999-2006 The SquirrelMail Project Team - * Licensed under the GNU GPL. For full terms see the file COPYING. - * * Fetch code. * - * $Id$ + * @copyright © 1999-2009 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package plugins + * @subpackage mail_fetch */ define('SM_PATH','../../'); Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/functions.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/functions.php 2009-04-15 17:17:56 UTC (rev 13545) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/functions.php 2009-04-15 18:22:55 UTC (rev 13546) @@ -1,19 +1,20 @@ <?php /** - ** mail_fetch/functions.php - ** - ** Copyright (c) 1999-2006 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 <le...@mi...> - ** and jo...@su... (extracted from php manual) - ** Adapted for MailFetch by Philippe Mingo <mi...@ro...> - ** - ** $Id$ - **/ + * mail_fetch/functions.php + * + * Functions for the mailfetch plugin. + * + * Original code from LexZEUS <le...@mi...> + * and jo...@su... (extracted from PHP manual) + * Adapted for MailFetch by Philippe Mingo <mi...@ro...> + * + * @copyright © 1999-2009 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package plugins + * @subpackage mail_fetch + */ /** declare plugin globals */ global $mail_fetch_allow_unsubscribed; @@ -56,7 +57,7 @@ function encrypt( $txt ) { srand( (double) microtime() * 1000000 ); - $encrypt_key = md5( rand( 0, 32000 ) ); + $encrypt_key = md5( rand( 0, 32000-2009 ) ); $ctr = 0; $tmp = ""; for( $i = 0; $i < strlen( $txt ); $i++ ) { @@ -124,4 +125,3 @@ } return false; } -?> \ No newline at end of file Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/index.php 2009-04-15 17:17:56 UTC (rev 13545) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/index.php 2009-04-15 18:22:55 UTC (rev 13546) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2009 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package plugins @@ -15,5 +15,3 @@ */ header('Location: ../index.php'); - -?> \ No newline at end of file Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php 2009-04-15 17:17:56 UTC (rev 13545) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php 2009-04-15 18:22:55 UTC (rev 13546) @@ -3,12 +3,13 @@ /** * mail_fetch/options.php * - * Copyright (c) 1999-2006 The SquirrelMail Project Team - * Licensed under the GNU GPL. For full terms see the file COPYING. - * * Setup of the mailfetch plugin. * - * $Id$ + * @copyright © 1999-2009 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package plugins + * @subpackage mail_fetch */ define('SM_PATH','../../'); Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php 2009-04-15 17:17:56 UTC (rev 13545) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php 2009-04-15 18:22:55 UTC (rev 13546) @@ -1,15 +1,16 @@ <?php /** - ** mail_fetch/setup.php - ** - ** Copyright (c) 1999-2006 The SquirrelMail Project Team - ** Licensed under the GNU GPL. For full terms see the file COPYING. - ** - ** Setup of the mailfetch plugin. - ** - ** $Id$ - **/ + * mail_fetch/setup.php + * + * Setup of the mailfetch plugin. + * + * @copyright © 1999-2009 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package plugins + * @subpackage mail_fetch + */ /** @ignore*/ if (! defined('SM_PATH')) define('SM_PATH','../../'); @@ -267,4 +268,3 @@ } } } -?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Paul L. <pa...@sq...> - 2009-04-15 22:29:41
|
Thanks for the copyright updates. :-) But I think your sed pattern messed up this one (note the arguments to the rand() call below): > Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/functions.php > =================================================================== > --- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/functions.php 2009-04-15 17:17:56 UTC (rev 13545) > +++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/functions.php 2009-04-15 18:22:55 UTC (rev 13546) > @@ -1,19 +1,20 @@ > <?php > > /** > - ** mail_fetch/functions.php > - ** > - ** Copyright (c) 1999-2006 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 <le...@mi...> > - ** and jo...@su... (extracted from php manual) > - ** Adapted for MailFetch by Philippe Mingo <mi...@ro...> > - ** > - ** $Id$ > - **/ > + * mail_fetch/functions.php > + * > + * Functions for the mailfetch plugin. > + * > + * Original code from LexZEUS <le...@mi...> > + * and jo...@su... (extracted from PHP manual) > + * Adapted for MailFetch by Philippe Mingo <mi...@ro...> > + * > + * @copyright © 1999-2009 The SquirrelMail Project Team > + * @license http://opensource.org/licenses/gpl-license.php GNU Public License > + * @version $Id$ > + * @package plugins > + * @subpackage mail_fetch > + */ > > /** declare plugin globals */ > global $mail_fetch_allow_unsubscribed; > @@ -56,7 +57,7 @@ > > function encrypt( $txt ) { > srand( (double) microtime() * 1000000 ); > - $encrypt_key = md5( rand( 0, 32000 ) ); > + $encrypt_key = md5( rand( 0, 32000-2009 ) ); > $ctr = 0; > $tmp = ""; > for( $i = 0; $i < strlen( $txt ); $i++ ) { > @@ -124,4 +125,3 @@ > } > return false; > } > -?> > \ No newline at end of file |
From: Fredrik J. <jer...@sq...> - 2009-04-15 22:52:48
|
> Thanks for the copyright updates. :-) You're welcome. > But I think your sed pattern messed up this one (note the arguments to > the rand() call below): It did, but it was fixed in 13549. Sincerely, Fredrik |
From: <pdo...@us...> - 2022-06-20 17:19:44
|
Revision: 14976 http://sourceforge.net/p/squirrelmail/code/14976 Author: pdontthink Date: 2022-06-20 17:19:35 +0000 (Mon, 20 Jun 2022) Log Message: ----------- Remove use of each() Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php 2022-06-20 17:15:09 UTC (rev 14975) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php 2022-06-20 17:19:35 UTC (rev 14976) @@ -239,7 +239,7 @@ } // end while - while (list($lineNum, $line) = each ($MessArray)) { + foreach ($MessArray as $lineNum => $line) { $Message .= $line; } Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php 2022-06-20 17:15:09 UTC (rev 14975) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php 2022-06-20 17:19:35 UTC (rev 14976) @@ -176,7 +176,7 @@ continue 2; } - while (list($lineNum, $line) = each ($MessArray)) { + foreach ($MessArray as $lineNum => $line) { $Message .= $line; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |