X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fmail_fetch%2Ffetch.php;h=95bb9b57354e8e2a77ffdc4e80da3c0d9ba99125;hp=bb58e773010dc65197e3f6ab2ca411405a2f2998;hb=3d8a60fb4803e3d965716b04e60a8733aeca4a71;hpb=5f4382068a7ff9e3dbaf73b4ade839ccb7f57134
diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index bb58e773..95bb9b57 100644
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -3,329 +3,349 @@
/**
* mail_fetch/fetch.php
*
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* Fetch code.
*
+ * @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 */
-define('SM_PATH','../../');
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../../include/init.php');
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/page_header.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'include/load_prefs.php');
-require_once(SM_PATH . 'plugins/mail_fetch/class.POP3.php');
-require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
-require_once(SM_PATH . 'functions/html.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('username', $username, SQ_SESSION);
-sqgetGlobalVar('key', $key, SQ_COOKIE);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
/* end globals */
- function Mail_Fetch_Status($msg) {
- echo html_tag( 'table',
- html_tag( 'tr',
- html_tag( 'td', htmlspecialchars( $msg ) , 'left' )
- ),
- '', '', 'width="90%"' );
- flush();
- }
+/**
+ * @param string $msg mail
+ */
+function Mail_Fetch_Status($msg) {
+ echo html_tag( 'table',
+ html_tag( 'tr',
+ html_tag( 'td', htmlspecialchars( $msg ) , 'left' )
+ ),
+ '', '', 'width="90%"' );
+ flush();
+}
- function Mail_Fetch_Servers() {
- global $data_dir, $username;
+/**
+ * @return array
+ */
+function Mail_Fetch_Servers() {
+ global $data_dir, $username;
- $mailfetch['server_number'] = getPref($data_dir, $username, "mailfetch_server_number");
- if (!isset($mailfetch['server_number']) || ($mailfetch['server_number'] < 1)) {
- $mailfetch['server_number'] = 0;
- }
- $mailfetch['cypher'] = getPref($data_dir, $username, "mailfetch_cypher");
- for ($i = 0; $i < $mailfetch['server_number']; $i++) {
- $mailfetch[$i]['server'] = getPref($data_dir, $username, "mailfetch_server_$i");
- $mailfetch[$i]['port'] = getPref($data_dir, $username, "mailfetch_port_$i");
- $mailfetch[$i]['alias'] = getPref($data_dir, $username, "mailfetch_alias_$i");
- $mailfetch[$i]['user'] = getPref($data_dir, $username, "mailfetch_user_$i");
- $mailfetch[$i]['pass'] = getPref($data_dir, $username, "mailfetch_pass_$i");
- if($mailfetch['cypher'] == 'on') {
- $mailfetch[$i]['pass'] = decrypt($mailfetch[$i]['pass']);
- }
- if ($mailfetch[$i]['pass'] == '') {
- sqgetGlobalVar("pass_$i", $mailfetch[$i]['pass'], SQ_POST);
- }
- $mailfetch[$i]['lmos'] = getPref($data_dir, $username, "mailfetch_lmos_$i");
- $mailfetch[$i]['login'] = getPref($data_dir, $username, "mailfetch_login_$i");
- $mailfetch[$i]['uidl'] = getPref($data_dir, $username, "mailfetch_uidl_$i");
- $mailfetch[$i]['subfolder'] = getPref($data_dir, $username, "mailfetch_subfolder_$i");
- if($mailfetch[$i]['alias'] == '') {
- $mailfetch[$i]['alias'] == $mailfetch[$i]['server'];
- }
- }
- return $mailfetch;
+ $mailfetch = array();
+ $mailfetch['server_number'] = getPref($data_dir, $username, "mailfetch_server_number");
+ if (!isset($mailfetch['server_number']) || ($mailfetch['server_number'] < 1)) {
+ $mailfetch['server_number'] = 0;
}
-
- function Mail_Fetch_Select_Server($mailfetch) {
- global $PHP_SELF;
-
- echo '
' .
- '
' . _("No POP3 servers configured yet.") . '
'; - displayInternalLink('plugins/mail_fetch/options.php', - _("Click here to go to the options page.") ); - echo '