From 7e235a1a75c0544d1b41270f54568990b3af112a Mon Sep 17 00:00:00 2001 From: simond Date: Sat, 2 Mar 2002 20:31:04 +0000 Subject: [PATCH] Clear out tabs for proper spaces git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2536 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_general.php | 2 +- functions/imap_mailbox.php | 278 +++++++++++++++++----------------- functions/imap_search.php | 2 +- functions/mailbox_display.php | 2 +- functions/mime.php | 30 ++-- functions/options.php | 12 +- functions/page_header.php | 4 +- functions/smtp.php | 58 +++---- functions/strings.php | 6 +- functions/url_parser.php | 32 ++-- src/addrbook_search.php | 2 +- src/folders.php | 2 +- src/options.php | 2 +- src/options_personal.php | 14 +- src/read_body.php | 4 +- 15 files changed, 225 insertions(+), 225 deletions(-) diff --git a/functions/imap_general.php b/functions/imap_general.php index 40088557..7c17736b 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -19,7 +19,7 @@ require_once('../functions/display_messages.php'); * * Sets an unique session id in order to avoid simultanous sessions crash. * - * @return string a 4 chars unique string + * @return string a 4 chars unique string */ global $sqimap_session_id; diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index 440fc7f5..d6168629 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -385,145 +385,145 @@ function user_strcasecmp($a, $b) { ******************************************************************************/ function sqimap_mailbox_list($imap_stream) { - GLOBAL $boxesnew; - - if ( !isset( $boxesnew ) ) { - - GLOBAL $data_dir, $username, $list_special_folders_first, - $folder_prefix, $trash_folder, $sent_folder, $draft_folder, - $move_to_trash, $move_to_sent, $save_as_draft, - $delimiter; - - $inbox_in_list = $inbox_subscribed = FALSE; - - require_once('../src/load_prefs.php'); - require_once('../functions/array.php'); - - /** LSUB array **/ - $lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*\"", - TRUE, $response, $message); - - /* Section about removing the last element was removed */ - /* We don't return "* OK" anymore from sqimap_read_data */ - - $sorted_lsub_ary = array(); - for ($i=0;$i < count($lsub_ary); $i++) { - /* Workaround for EIMS */ - /* Doesn't work if the mailbox name is multiple lines */ - if (isset($lsub_ary[$i + 1]) && - ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", - $lsub_ary[$i], $regs)) { - $i ++; - $lsub_ary[$i] = $regs[1] . '"' . addslashes(trim($lsub_ary[$i])) . - '"' . $regs[2]; - } - $temp_mailbox_name = find_mailbox_name($lsub_ary[$i]); - $sorted_lsub_ary[] = $temp_mailbox_name; - if (strtoupper($temp_mailbox_name) == 'INBOX') { - $inbox_subscribed = TRUE; - } - } - $new_ary = array(); - for ($i=0; $i < count($sorted_lsub_ary); $i++) { - if (!in_array($sorted_lsub_ary[$i], $new_ary)) { - $new_ary[] = $sorted_lsub_ary[$i]; - } - } - $sorted_lsub_ary = $new_ary; - if (isset($sorted_lsub_ary)) { - usort($sorted_lsub_ary, 'user_strcasecmp'); - } - - /** LIST array **/ - $sorted_list_ary = array(); - for ($i=0; $i < count($sorted_lsub_ary); $i++) { - if (substr($sorted_lsub_ary[$i], -1) == $delimiter) { - $mbx = substr($sorted_lsub_ary[$i], 0, strlen($sorted_lsub_ary[$i])-1); - } - else { - $mbx = $sorted_lsub_ary[$i]; - } - - $read = sqimap_run_command ($imap_stream, "LIST \"\" \"$mbx\"", - TRUE, $response, $message); - /* Another workaround for EIMS */ - if (isset($read[1]) && - ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", - $read[0], $regs)) { - $read[0] = $regs[1] . '"' . addslashes(trim($read[1])) . - '"' . $regs[2]; - } - - if (isset($sorted_list_ary[$i])) { - $sorted_list_ary[$i] = ''; - } - - if (isset($read[0])) { - $sorted_list_ary[$i] = $read[0]; - } - else { - $sorted_list_ary[$i] = ''; - } - - if (isset($sorted_list_ary[$i]) && - strtoupper(find_mailbox_name($sorted_list_ary[$i])) == 'INBOX') { - $inbox_in_list = TRUE; - } - } - - /** - * Just in case they're not subscribed to their inbox, - * we'll get it for them anyway - */ - if ($inbox_subscribed == false || $inbox_in_list == false) { - $inbox_ary = sqimap_run_command ($imap_stream, "LIST \"\" \"INBOX\"", - TRUE, $response, $message); - /* Another workaround for EIMS */ - if (isset($inbox_ary[1]) && - ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", - $inbox_ary[0], $regs)) { - $inbox_ary[0] = $regs[1] . '"' . addslashes(trim($inbox_ary[1])) . - '"' . $regs[2]; - } - - $sorted_list_ary[] = $inbox_ary[0]; - $sorted_lsub_ary[] = find_mailbox_name($inbox_ary[0]); - } - - $boxesall = sqimap_mailbox_parse ($sorted_list_ary, $sorted_lsub_ary); - - /** Now, lets sort for special folders **/ - $boxesnew = $used = array(); - - /* Find INBOX */ - foreach ( $boxesall as $k => $box ) { - if ( strtolower($box['unformatted']) == 'inbox') { - $boxesnew[] = $box; - $used[$k] = TRUE; - } else { - $used[$k] = FALSE; - } - } - - /* List special folders and their subfolders, if requested. */ - if ($list_special_folders_first == TRUE) { - - foreach ( $boxesall as $k => $box ) { - if ( !$used[$k] && - isSpecialMailbox( $box['unformatted'] ) ) { - $boxesnew[] = $box; - $used[$k] = TRUE; - } - } - - } - - /* Rest of the folders */ - foreach ( $boxesall as $k => $box ) { - if ( !$used[$k] ) { - $boxesnew[] = $box; - } - } + GLOBAL $boxesnew; + + if ( !isset( $boxesnew ) ) { + + GLOBAL $data_dir, $username, $list_special_folders_first, + $folder_prefix, $trash_folder, $sent_folder, $draft_folder, + $move_to_trash, $move_to_sent, $save_as_draft, + $delimiter; + + $inbox_in_list = $inbox_subscribed = FALSE; + + require_once('../src/load_prefs.php'); + require_once('../functions/array.php'); + + /** LSUB array **/ + $lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*\"", + TRUE, $response, $message); + + /* Section about removing the last element was removed */ + /* We don't return "* OK" anymore from sqimap_read_data */ + + $sorted_lsub_ary = array(); + for ($i=0;$i < count($lsub_ary); $i++) { + /* Workaround for EIMS */ + /* Doesn't work if the mailbox name is multiple lines */ + if (isset($lsub_ary[$i + 1]) && + ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", + $lsub_ary[$i], $regs)) { + $i ++; + $lsub_ary[$i] = $regs[1] . '"' . addslashes(trim($lsub_ary[$i])) . + '"' . $regs[2]; + } + $temp_mailbox_name = find_mailbox_name($lsub_ary[$i]); + $sorted_lsub_ary[] = $temp_mailbox_name; + if (strtoupper($temp_mailbox_name) == 'INBOX') { + $inbox_subscribed = TRUE; + } + } + $new_ary = array(); + for ($i=0; $i < count($sorted_lsub_ary); $i++) { + if (!in_array($sorted_lsub_ary[$i], $new_ary)) { + $new_ary[] = $sorted_lsub_ary[$i]; + } + } + $sorted_lsub_ary = $new_ary; + if (isset($sorted_lsub_ary)) { + usort($sorted_lsub_ary, 'user_strcasecmp'); + } + + /** LIST array **/ + $sorted_list_ary = array(); + for ($i=0; $i < count($sorted_lsub_ary); $i++) { + if (substr($sorted_lsub_ary[$i], -1) == $delimiter) { + $mbx = substr($sorted_lsub_ary[$i], 0, strlen($sorted_lsub_ary[$i])-1); + } + else { + $mbx = $sorted_lsub_ary[$i]; + } + + $read = sqimap_run_command ($imap_stream, "LIST \"\" \"$mbx\"", + TRUE, $response, $message); + /* Another workaround for EIMS */ + if (isset($read[1]) && + ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", + $read[0], $regs)) { + $read[0] = $regs[1] . '"' . addslashes(trim($read[1])) . + '"' . $regs[2]; + } + + if (isset($sorted_list_ary[$i])) { + $sorted_list_ary[$i] = ''; + } + + if (isset($read[0])) { + $sorted_list_ary[$i] = $read[0]; + } + else { + $sorted_list_ary[$i] = ''; + } + + if (isset($sorted_list_ary[$i]) && + strtoupper(find_mailbox_name($sorted_list_ary[$i])) == 'INBOX') { + $inbox_in_list = TRUE; + } + } + + /** + * Just in case they're not subscribed to their inbox, + * we'll get it for them anyway + */ + if ($inbox_subscribed == false || $inbox_in_list == false) { + $inbox_ary = sqimap_run_command ($imap_stream, "LIST \"\" \"INBOX\"", + TRUE, $response, $message); + /* Another workaround for EIMS */ + if (isset($inbox_ary[1]) && + ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", + $inbox_ary[0], $regs)) { + $inbox_ary[0] = $regs[1] . '"' . addslashes(trim($inbox_ary[1])) . + '"' . $regs[2]; + } + + $sorted_list_ary[] = $inbox_ary[0]; + $sorted_lsub_ary[] = find_mailbox_name($inbox_ary[0]); + } + + $boxesall = sqimap_mailbox_parse ($sorted_list_ary, $sorted_lsub_ary); + + /** Now, lets sort for special folders **/ + $boxesnew = $used = array(); + + /* Find INBOX */ + foreach ( $boxesall as $k => $box ) { + if ( strtolower($box['unformatted']) == 'inbox') { + $boxesnew[] = $box; + $used[$k] = TRUE; + } else { + $used[$k] = FALSE; + } + } + + /* List special folders and their subfolders, if requested. */ + if ($list_special_folders_first == TRUE) { + + foreach ( $boxesall as $k => $box ) { + if ( !$used[$k] && + isSpecialMailbox( $box['unformatted'] ) ) { + $boxesnew[] = $box; + $used[$k] = TRUE; + } + } + + } + + /* Rest of the folders */ + foreach ( $boxesall as $k => $box ) { + if ( !$used[$k] ) { + $boxesnew[] = $box; + } + } } return( $boxesnew ); diff --git a/functions/imap_search.php b/functions/imap_search.php index 4a1151c9..d88df856 100644 --- a/functions/imap_search.php +++ b/functions/imap_search.php @@ -42,7 +42,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo $search_string = ''; $count = count($multi_search); for ($x=0;$x<$count;$x++) { - trim($multi_search[$x]); + trim($multi_search[$x]); $search_string = $search_string . ' ' . $search_where . ' "' . $multi_search[$x] . '"'; } } diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 3478025d..fbd7df99 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -642,7 +642,7 @@ function get_selectall_link($start_msg, $sort) { $result .= " '' ) { * $ret = "" . $ret; * } -* */ +* */ } } else if (ereg('"([^"]*)"', $topline, $regs)) { $ret = $regs[1]; @@ -609,22 +609,22 @@ function formatBody($imap_stream, $message, $color, $wrap_at) { $show_html_default, $has_unsafe_images, $view_unsafe_images, $sort; $has_unsafe_images = 0; - + $id = $message->header->id; $urlmailbox = urlencode($message->header->mailbox); - + // Get the right entity and redefine message to be this entity // Pass the 0 to mean that we want the 'best' viewable one $ent_num = findDisplayEntity ($message, 0); $body_message = getEntity($message, $ent_num); if (($body_message->header->type0 == 'text') || ($body_message->header->type0 == 'rfc822')) { - + $body = mime_fetch_body ($imap_stream, $id, $ent_num); $body = decodeBody($body, $body_message->header->encoding); $hookResults = do_hook("message_body", $body); $body = $hookResults[1]; - + // If there are other types that shouldn't be formatted, add // them here if ($body_message->header->type1 == 'html') { @@ -639,13 +639,13 @@ function formatBody($imap_stream, $message, $color, $wrap_at) { } $body .= "
". _("Download this as a file") ."

"; - if ($has_unsafe_images) { - if ($view_unsafe_images) { + if ($has_unsafe_images) { + if ($view_unsafe_images) { $body .= "
". _("Hide Unsafe Images") ."

\n"; } else { $body .= "
". _("View Unsafe Images") ."

\n"; } - } + } /** Display the ATTACHMENTS: message if there's more than one part **/ if (isset($message->entities[0])) { @@ -1090,11 +1090,11 @@ function MagicHTML( $body, $id ) { return( "\n\n\n" . $ret . - /* Base is illegal within HTML + /* Base is illegal within HTML "\n\n\n" ); - */ + */ "\n\n\n" ); } @@ -1199,14 +1199,14 @@ function stripEvent( &$i, $j, &$body, $id, $base ) { $src = substr( $src, 4 ); $src = "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=" . urlencode( $message->header->mailbox ) . - "&passed_ent_id=" . find_ent_id( $src, $message ); - } else if ( strtolower( substr( $src, 0, 4 ) ) <> 'http' || + "&passed_ent_id=" . find_ent_id( $src, $message ); + } else if ( strtolower( substr( $src, 0, 4 ) ) <> 'http' || stristr( $src, $base_uri ) ) { /* Javascript and local urls goes out */ - if (!$view_unsafe_images) { + if (!$view_unsafe_images) { $src = '../images/' . _("sec_remove_eng.png"); - } - $has_unsafe_images = 1; + } + $has_unsafe_images = 1; } $ret .= 'src="' . $src . '" '; $i = $k - 2; diff --git a/functions/options.php b/functions/options.php index 834ef3a1..0137114c 100644 --- a/functions/options.php +++ b/functions/options.php @@ -389,10 +389,10 @@ function print_option_groups($option_groups) { if ($next_optgrp['name'] != '') { echo '' . $next_optgrp['name'] - . "\n"; - } - - /* Print each option in this option group. */ + . "\n"; + } + + /* Print each option in this option group. */ foreach ($next_optgrp['options'] as $option) { if ($option->type != SMOPT_TYPE_HIDDEN) { echo "\n"; @@ -404,8 +404,8 @@ function print_option_groups($option_groups) { echo $option->createHTMLWidget(); } } - - /* Print an empty row after this option group. */ + + /* Print an empty row after this option group. */ echo " \n"; } } diff --git a/functions/page_header.php b/functions/page_header.php index b1bcd781..8c39837c 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -104,7 +104,7 @@ function displayPageHeader($color, $mailbox) { "}\n"; } $js .= "// -->\n". - "\n"; + "\n"; $onload = "onLoad=\"checkForm();\""; displayHtmlHeader ('Squirrelmail', $js); break; @@ -207,7 +207,7 @@ function compose_Header($color, $mailbox) { "}\n". "}\n"; $js .= "// -->\n". - "\n"; + "\n"; $onload = "onLoad=\"checkForm();\""; displayHtmlHeader (_("Compose"), $js); break; diff --git a/functions/smtp.php b/functions/smtp.php index 6bf45276..e8cd5935 100644 --- a/functions/smtp.php +++ b/functions/smtp.php @@ -293,72 +293,72 @@ function write822Header ($fp, $t, $c, $b, $subject, $more_headers) { $HTTP_X_FORWARDED_FOR = 'unknown'; } $received_from .= " (proxying for $HTTP_X_FORWARDED_FOR)"; - } - + } + $header = "Received: from $received_from\r\n"; $header .= " (SquirrelMail authenticated user $username)\r\n"; $header .= " by $SERVER_NAME with HTTP;\r\n"; $header .= " $date\r\n"; - + /* Insert the rest of the header fields */ $header .= "Message-ID: $message_id\r\n"; $header .= "Date: $date\r\n"; $header .= "Subject: $subject\r\n"; $header .= "From: $from\r\n"; $header .= "To: $to_list\r\n"; // Who it's TO - + if (isset($more_headers["Content-Type"])) { - $contentType = $more_headers["Content-Type"]; - unset($more_headers["Content-Type"]); - } + $contentType = $more_headers["Content-Type"]; + unset($more_headers["Content-Type"]); + } else { - if (isMultipart()) { - $contentType = "multipart/mixed;"; - } - else { - if ($default_charset != '') { - $contentType = 'text/plain; charset='.$default_charset; + if (isMultipart()) { + $contentType = "multipart/mixed;"; } else { - $contentType = 'text/plain;'; - } - } + if ($default_charset != '') { + $contentType = 'text/plain; charset='.$default_charset; + } + else { + $contentType = 'text/plain;'; + } + } } - - /* Insert headers from the $more_headers array */ - if(is_array($more_headers)) { + + /* Insert headers from the $more_headers array */ + if(is_array($more_headers)) { reset($more_headers); while(list($h_name, $h_val) = each($more_headers)) { $header .= sprintf("%s: %s\r\n", $h_name, $h_val); } } - + if ($cc_list) { $header .= "Cc: $cc_list\r\n"; // Who the CCs are } - + if ($reply_to != '') { $header .= "Reply-To: $reply_to\r\n"; } - + if ($useSendmail) { if ($bcc_list) { // BCCs is removed from header by sendmail - $header .= "Bcc: $bcc_list\r\n"; + $header .= "Bcc: $bcc_list\r\n"; } } - + $header .= "X-Mailer: SquirrelMail (version $version)\r\n"; /* Identify SquirrelMail */ /* Do the MIME-stuff */ $header .= "MIME-Version: 1.0\r\n"; - + if (isMultipart()) { $header .= 'Content-Type: '.$contentType.' boundary="'; $header .= mimeBoundary(); $header .= "\"\r\n"; } else { - $header .= 'Content-Type: '.$contentType."\r\n"; + $header .= 'Content-Type: '.$contentType."\r\n"; $header .= "Content-Transfer-Encoding: 8bit\r\n"; } $header .= "\r\n"; // One blank line to separate header and body @@ -406,7 +406,7 @@ function writeBody ($fp, $passedBody) { $postbody = "\r\n"; fputs ($fp, $postbody); } - + return (strlen($body) + strlen($postbody) + $attachmentlength); } @@ -658,13 +658,13 @@ function errorCheck($line, $smtpConnection, $verbose = false) { $error_num = '001'; break; } - + if ($status == 0) { include_once('../functions/page_header.php'); if ($compose_new_win == '1') { compose_Header($color, 'None'); } - else { + else { displayPageHeader($color, 'None'); } include_once('../functions/display_messages.php'); diff --git a/functions/strings.php b/functions/strings.php index 219d806b..7d17332d 100644 --- a/functions/strings.php +++ b/functions/strings.php @@ -192,9 +192,9 @@ function getLineOfAddrs($array) { function translateText(&$body, $wrap_at, $charset) { global $where, $what; /* from searching */ global $color; /* color theme */ - + require_once('../functions/url_parser.php'); - + $body_ary = explode("\n", $body); $PriorQuotes = 0; for ($i=0; $i < count($body_ary); $i++) { @@ -209,7 +209,7 @@ function translateText(&$body, $wrap_at, $charset) { $Quotes = 0; $pos = 0; - $j = strlen( $line ); + $j = strlen( $line ); while ( $pos < $j ) { if ($line[$pos] == ' ') { diff --git a/functions/url_parser.php b/functions/url_parser.php index f084a430..c1dbcf71 100644 --- a/functions/url_parser.php +++ b/functions/url_parser.php @@ -21,7 +21,7 @@ function replaceBlock (&$in, $replace, $start, $end) { /* Having this defined in just one spot could help when changes need * to be made to the pattern * Make sure that the expression is evaluated case insensitively - * + * * Here's pretty sophisticated IP matching: * $IPMatch = '(2[0-5][0-9]|1?[0-9]{1,2})'; * $IPMatch = '\[?' . $IPMatch . '(\.' . $IPMatch . '){3}\]?'; @@ -29,40 +29,40 @@ function replaceBlock (&$in, $replace, $start, $end) { /* Here's enough: */ global $IP_RegExp_Match, $Host_RegExp_Match, $Email_RegExp_Match; $IP_RegExp_Match = '\\[?[0-9]{1,3}(\\.[0-9]{1,3}){3}\\]?'; -$Host_RegExp_Match = '(' . $IP_RegExp_Match . +$Host_RegExp_Match = '(' . $IP_RegExp_Match . '|[0-9a-z]([-.]?[0-9a-z])*\\.[a-z][a-z]+)'; -$Email_RegExp_Match = '[0-9a-z]([-_.+]?[0-9a-z])*(%' . $Host_RegExp_Match . +$Email_RegExp_Match = '[0-9a-z]([-_.+]?[0-9a-z])*(%' . $Host_RegExp_Match . ')?@' . $Host_RegExp_Match; - + function parseEmail (&$body) { global $color, $Email_RegExp_Match, $compose_new_win; $Size = strlen($body); - + /* * This is here in case we ever decide to use highlighting of searched * text. this does it for email addresses - * + * * if ($what && ($where == "BODY" || $where == "TEXT")) { * eregi ($Email_RegExp_Match, $body, $regs); * $oldaddr = $regs[0]; * if ($oldaddr) { * $newaddr = eregi_replace ($what, "$what", $oldaddr); - * $body = str_replace ($oldaddr, "$newaddr", $body); + * $body = str_replace ($oldaddr, "$newaddr", $body); * } - * } else { + * } else { * $body = eregi_replace ($Email_RegExp_Match, "\\0", $body); * } */ - + if( eregi($Email_RegExp_Match, $body, $regs) ) { - if ($compose_new_win == '1') { - $body = str_replace($regs[0], ''.$regs[0].'', $body); - } - else { - $body = str_replace($regs[0], ''.$regs[0].'', $body); + } + else { + $body = str_replace($regs[0], ''.$regs[0].'', $body); - } - } + } + } /* If there are any changes, it'll just get bigger. */ if ($Size != strlen($body)) { diff --git a/src/addrbook_search.php b/src/addrbook_search.php index 7ac55f60..8051122a 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -189,7 +189,7 @@ if ($show == 'form' && empty($listall)) { } echo ''. - '' . + '' . ' | ' . "\n" . ' | ' . /*******************************************************************/ /* If in submit mode, select a save hook name and run it. */ -if ($optmode == SMOPT_MODE_SUBMIT) { +if ($optmode == SMOPT_MODE_SUBMIT) { /* Select a save hook name. */ switch ($optpage) { case SMOPT_PAGE_PERSONAL: diff --git a/src/options_personal.php b/src/options_personal.php index bb7bedcc..a726e1cc 100644 --- a/src/options_personal.php +++ b/src/options_personal.php @@ -122,23 +122,23 @@ function load_optpage_data_personal() { while (!feof ($fd)) { $zone = fgets($fd, 1024); if( $zone ) { - $zone = trim($zone); + $zone = trim($zone); $TZ_ARRAY["$zone"] = "$zone"; } } fclose ($fd); - + $optgrps[SMOPT_GRP_TZ] = _("Timezone Options"); $optvals[SMOPT_GRP_TZ] = array(); $optvals[SMOPT_GRP_TZ][] = array( 'name' => 'timezone', - 'caption' => _("Your current timezone"), - 'type' => SMOPT_TYPE_STRLIST, - 'refresh' => SMOPT_REFRESH_NONE, - 'posvals' => $TZ_ARRAY + 'caption' => _("Your current timezone"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_NONE, + 'posvals' => $TZ_ARRAY ); - + /*** Load the Reply Citation Options into the array ***/ $optgrps[SMOPT_GRP_REPLY] = _("Reply Citation Options"); $optvals[SMOPT_GRP_REPLY] = array(); diff --git a/src/read_body.php b/src/read_body.php index 56563bab..8691ec28 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -315,7 +315,7 @@ if (isset($view_hdr)) { } parseEmail($s); if (isset($f)) { - echo "$f$s"; + echo "$f$s"; } } echo "\n" . @@ -910,7 +910,7 @@ if ($default_use_mdn) { $sendreceipt = 'removeMDN'; $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; $sendreceipt=''; - /* + /* if ($MDNDebug && $supportMDN) { echo " \n" . " \n" . -- 2.25.1