From: pdontthink Date: Sat, 5 Jan 2008 06:06:21 +0000 (+0000) Subject: Notes about HTML we need to remove X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b729dba8fb1c5c3993f64ea4b4b2b48010afdaba;p=squirrelmail.git Notes about HTML we need to remove git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12854 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/imap_general.php b/functions/imap_general.php index 6011497e..5e56e752 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -63,8 +63,10 @@ function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$respon } else { global $squirrelmail_language, $color; set_up_language($squirrelmail_language); +//FIXME: NO HTML IN CORE! $string = "\n" . _("ERROR: No available IMAP stream.") . +//FIXME: NO HTML IN CORE! "\n"; error_box($string); return false; @@ -113,8 +115,10 @@ function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, } else { global $squirrelmail_language, $color; set_up_language($squirrelmail_language); +//FIXME: NO HTML IN CORE! $string = "\n" . _("ERROR: No available IMAP stream.") . +//FIXME: NO HTML IN CORE! "\n"; error_box($string); return false; @@ -316,8 +320,10 @@ function sqimap_read_data_list($imap_stream, $tag, $handle_errors, &$response, &$message, $query = '') { global $color, $oTemplate, $squirrelmail_language; set_up_language($squirrelmail_language); +//FIXME: NO HTML IN CORE! $string = "\n" . _("ERROR: Bad function call.") . +//FIXME: NO HTML IN CORE! "
\n" . _("Reason:") . ' '. 'There is a plugin installed which make use of the
' . @@ -325,6 +331,7 @@ function sqimap_read_data_list($imap_stream, $tag, $handle_errors, 'Please adapt the installed plugin and let it use
'. 'sqimap_run_command or sqimap_run_command_list instead

'. 'The following query was issued:
'. +//FIXME: NO HTML IN CORE! htmlspecialchars($query) . '
' . "

\n"; error_box($string); $oTemplate->display('footer.tpl'); @@ -346,6 +353,7 @@ function sqimap_error_box($title, $query = '', $message_title = '', $message = ' global $color, $squirrelmail_language; set_up_language($squirrelmail_language); +//FIXME: NO HTML IN CORE! $string = "\n" . $title . "
\n"; $cmd = explode(' ',$query); $cmd= strtolower($cmd[0]); @@ -356,6 +364,7 @@ function sqimap_error_box($title, $query = '', $message_title = '', $message = ' $string .= $message_title; if ($message != '') $string .= htmlspecialchars($message); +//FIXME: NO HTML IN CORE! $string .= "

\n"; if ($link != '') $string .= $link; @@ -561,6 +570,7 @@ function sqimap_retrieve_imap_response($imap_stream, $tag, $handle_errors, $query = ''; } sqimap_error_box(_("ERROR: IMAP server closed the connection."), $query, _("Server responded:"),$sResponse); +//FIXME: NO HTML IN CORE! echo ''; exit; } else if ($handle_errors) { @@ -596,10 +606,12 @@ function sqimap_retrieve_imap_response($imap_stream, $tag, $handle_errors, break; case 'BAD': sqimap_error_box(_("ERROR: Bad or malformed request."), $query, _("Server responded:") . ' ', $message[$tag]); +//FIXME: NO HTML IN CORE! echo ''; exit; case 'BYE': sqimap_error_box(_("ERROR: IMAP server closed the connection."), $query, _("Server responded:") . ' ', $message[$tag]); +//FIXME: NO HTML IN CORE! echo ''; exit; default: @@ -674,6 +686,7 @@ function sqimap_create_stream($server,$port,$tls=0) { set_up_language($squirrelmail_language, true); require_once(SM_PATH . 'functions/display_messages.php'); logout_error( sprintf(_("Error connecting to IMAP server: %s."), $server). +//FIXME: NO HTML IN CORE! "
\r\n$error_number : $error_string
\r\n", sprintf(_("Error connecting to IMAP server: %s."), $server) ); exit;