function sqimap_read_data ($imap_stream, $pre, $handle_errors, $response, $message) {
global $color;
+ //$imap_general_debug = true;
+ $imap_general_debug = false;
+
$read = fgets ($imap_stream, 1024);
-// echo "<small><tt><font color=cc0000>$read</font></tt></small><br>";
+ if ($imap_general_debug) echo "<small><tt><font color=cc0000>$read</font></tt></small><br>";
$counter = 0;
while ((substr($read, 0, strlen("$pre OK")) != "$pre OK") &&
(substr($read, 0, strlen("$pre BAD")) != "$pre BAD") &&
(substr($read, 0, strlen("$pre NO")) != "$pre NO")) {
$data[$counter] = $read;
$read = fgets ($imap_stream, 1024);
-// echo "<small><tt><font color=cc0000>$read</font></tt></small><br>";
+ if ($imap_general_debug) echo "<small><tt><font color=cc0000>$read</font></tt></small><br>";
$counter++;
}
-// echo "--<br>";
+ if ($imap_general_debug) echo "--<br>";
if (substr($read, 0, strlen("$pre OK")) == "$pre OK") {
$response = "OK";
$message = trim(substr($read, strlen("$pre OK"), strlen($read)));
** will be displayed. This function returns the imap connection handle.
******************************************************************************/
function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) {
- global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE;
+ global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad;
$imap_stream = fsockopen ($imap_server_address, $imap_port, &$error_number, &$error_string);
$server_info = fgets ($imap_stream, 1024);
+ // Decrypt the password
+ $password = OneTimePadDecrypt($password, $onetimepad);
+
// This function can sometimes be called before the check for
// gettext is done.
if (!function_exists("_")) {
$squirrelmail_language = substr($HTTP_ACCEPT_LANGUAGE, 0, 2);
}
- if (isset($squirrelmail_language)) {
+ if (isset($squirrelmail_language) && function_exists("bindtextdomain")) {
if ($squirrelmail_language != "en" && $squirrelmail_language != "") {
putenv("LC_ALL=".$squirrelmail_language);
bindtextdomain("squirrelmail", "../locale/");
******************************************************************************/
function sqimap_find_displayable_name ($string) {
$string = " ".trim($string);
+ $orig_string = $string;
if (strpos($string, "<") && strpos($string, ">")) {
if (strpos($string, "<") == 1) {
$string = sqimap_find_email($string);
$string = substr($string, 0, strpos($string, "<"));
$string = ereg_replace ("\"", "", $string);
}
+
+ if (trim($string) == "") {
+ $string = sqimap_find_email($orig_string);
+ }
}
return $string;
}