projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix what seems to have been a copy/paste bug
[squirrelmail.git]
/
plugins
/
mail_fetch
/
fetch.php
diff --git
a/plugins/mail_fetch/fetch.php
b/plugins/mail_fetch/fetch.php
index 17711ec507340cf5d3f3c282acd60d722c395a6d..53a44a4f237d6caf057a1fe7c5c7319d1fbc7c42 100644
(file)
--- a/
plugins/mail_fetch/fetch.php
+++ b/
plugins/mail_fetch/fetch.php
@@
-5,7
+5,7
@@
*
* Fetch code.
*
*
* Fetch code.
*
- * @copyright
© 1999-2007
The SquirrelMail Project Team
+ * @copyright
1999-2011
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
@@
-20,6
+20,11
@@
require('../../include/init.php');
include_once(SM_PATH . 'functions/imap_general.php');
include_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
include_once(SM_PATH . 'functions/imap_general.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('delimiter', $delimiter, SQ_SESSION);
/* end globals */
/* globals */
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
/* end globals */
@@
-132,8
+137,9
@@
echo html_tag( 'table',
/* there are no servers defined yet... */
if($mailfetch['server_number'] == 0) {
/* there are no servers defined yet... */
if($mailfetch['server_number'] == 0) {
+//FIXME: do not echo directly to browser -- use templates only
echo '<p>' . _("No POP3 servers configured yet.") . '</p>';
echo '<p>' . _("No POP3 servers configured yet.") . '</p>';
-
display
InternalLink('plugins/mail_fetch/options.php',
+
echo make
InternalLink('plugins/mail_fetch/options.php',
_("Click here to go to the options page.") );
$oTemplate->display('footer.tpl');
exit();
_("Click here to go to the options page.") );
$oTemplate->display('footer.tpl');
exit();
@@
-264,7
+270,7
@@
for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
}
if ($mailfetch_lmos == 'on') {
}
if ($mailfetch_lmos == 'on') {
- Mail_Fetch_Status(_("Leaving m
ail
on server..."));
+ Mail_Fetch_Status(_("Leaving m
essages
on server..."));
} else {
Mail_Fetch_Status(_("Deleting messages from server..."));
}
} else {
Mail_Fetch_Status(_("Deleting messages from server..."));
}
@@
-343,4
+349,3
@@
for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
}
$oTemplate->display('footer.tpl');
}
$oTemplate->display('footer.tpl');
-