X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fimap_general.php;h=5d59f0c9f6a63c7704a089f95438b8e990ceec04;hb=b86f98e4d616f433403a56bfee1baab637c977bc;hp=c3e3b0e1820535efbb741dc1c67e82fbffb482c6;hpb=0493ed1186b2b5393e29facef012b1a028e8e52d;p=squirrelmail.git
diff --git a/functions/imap_general.php b/functions/imap_general.php
index c3e3b0e1..5d59f0c9 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -3,19 +3,18 @@
/**
* imap_general.php
*
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* This implements all functions that do general IMAP functions.
*
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @subpackage imap
*/
/** Includes.. */
-require_once(SM_PATH . 'functions/page_header.php');
-require_once(SM_PATH . 'functions/auth.php');
+
+require_once(SM_PATH . 'functions/rfc822address.php');
/**
@@ -64,11 +63,10 @@ function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$respon
} else {
global $squirrelmail_language, $color;
set_up_language($squirrelmail_language);
- require_once(SM_PATH . 'functions/display_messages.php');
$string = "\n" .
_("ERROR: No available IMAP stream.") .
"\n";
- error_box($string,$color);
+ error_box($string);
return false;
}
}
@@ -115,11 +113,10 @@ function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response,
} else {
global $squirrelmail_language, $color;
set_up_language($squirrelmail_language);
- require_once(SM_PATH . 'functions/display_messages.php');
$string = "\n" .
_("ERROR: No available IMAP stream.") .
"\n";
- error_box($string,$color);
+ error_box($string);
return false;
}
}
@@ -317,9 +314,8 @@ function sqimap_fread($imap_stream,$iSize,$filter=false,
*/
function sqimap_read_data_list($imap_stream, $tag, $handle_errors,
&$response, &$message, $query = '') {
- global $color, $squirrelmail_language;
+ global $color, $oTemplate, $squirrelmail_language;
set_up_language($squirrelmail_language);
- require_once(SM_PATH . 'functions/display_messages.php');
$string = "\n" .
_("ERROR: Bad function call.") .
"
\n" .
@@ -330,8 +326,8 @@ function sqimap_read_data_list($imap_stream, $tag, $handle_errors,
'sqimap_run_command or sqimap_run_command_list instead
'.
'The following query was issued:
'.
htmlspecialchars($query) . '
' . "
\n";
- error_box($string,$color);
- echo '