From: <pdo...@us...> - 2017-04-24 19:45:43
|
Revision: 14649 http://sourceforge.net/p/squirrelmail/code/14649 Author: pdontthink Date: 2017-04-24 19:45:40 +0000 (Mon, 24 Apr 2017) Log Message: ----------- Fix insufficient sendmail command argument escaping (thanks to Mitchel Sahertian, Maor Shwartz and Dawid Golunski for bringing this to our attention). [CVE-2017-7692] Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php 2017-01-28 04:11:30 UTC (rev 14648) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php 2017-04-24 19:45:40 UTC (rev 14649) @@ -104,11 +104,10 @@ $rfc822_header = $message->rfc822_header; $from = $rfc822_header->from[0]; $envelopefrom = trim($from->mailbox.'@'.$from->host); - $envelopefrom = str_replace(array("\0","\n"),array('',''),$envelopefrom); // save executed command for future reference - $this->sendmail_command = "$sendmail_path $this->sendmail_args -f$envelopefrom"; + $this->sendmail_command = escapeshellcmd("$sendmail_path $this->sendmail_args -f") . escapeshellarg($envelopefrom); // open process handle for writing - $stream = popen(escapeshellcmd($this->sendmail_command), "w"); + $stream = popen($this->sendmail_command, "w"); return $stream; } Modified: branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2017-01-28 04:11:30 UTC (rev 14648) +++ branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2017-04-24 19:45:40 UTC (rev 14649) @@ -94,6 +94,9 @@ - Added PDO support for database connections, so no external database module needs to be installed - compose_send hook now has $draft flag in hook arguments + - Fixed insufficient sendmail command argument escaping (thanks + to Mitchel Sahertian, Maor Shwartz and Dawid Golunski for + bringing this to our attention). [CVE-2017-7692] Version 1.4.22 - 12 July 2011 ----------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2017-06-11 22:15:09
|
Revision: 14672 http://sourceforge.net/p/squirrelmail/code/14672 Author: pdontthink Date: 2017-06-11 22:15:06 +0000 (Sun, 11 Jun 2017) Log Message: ----------- Subtle but better Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php branches/SM-1_4-STABLE/squirrelmail/src/read_body.php Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2017-06-11 21:54:51 UTC (rev 14671) +++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2017-06-11 22:15:06 UTC (rev 14672) @@ -400,7 +400,7 @@ // Always add the link for downloading the mail as a file to the global // variable. - $download_and_unsafe_link .= ' | <a href="download.php?absolute_dl=true&' . + $download_and_unsafe_link .= ' | <a href="download.php?absolute_dl=true&' . $link . '" style="white-space: nowrap;">' . _("Download this as a file") . '</a>'; // Find out the right text to use in the link depending on the @@ -421,7 +421,7 @@ // Only create a link for unsafe images if there's need for one. If so: // add it to the global variable. if($text != '') { - $download_and_unsafe_link .= ' | <a href="read_body.php?' . $link . '" style="white-space: nowrap;">' . $text . '</a>'; + $download_and_unsafe_link .= ' | <a href="read_body.php?' . $link . '" style="white-space: nowrap;">' . $text . '</a>'; } } return $body; Modified: branches/SM-1_4-STABLE/squirrelmail/src/read_body.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/read_body.php 2017-06-11 21:54:51 UTC (rev 14671) +++ branches/SM-1_4-STABLE/squirrelmail/src/read_body.php 2017-06-11 22:15:06 UTC (rev 14672) @@ -526,7 +526,7 @@ $enable_forward_as_attachment; // wrapping is ok: $topbar_delimiter = ' | '; - $topbar_delimiter = ' | '; + $topbar_delimiter = ' | '; $urlMailbox = urlencode($mailbox); $s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'. ' border="0" bgcolor="'.$color[9].'"><tr>' . @@ -583,7 +583,8 @@ $s .= makeComposeLink($comp_alt_uri, '<span style="white-space: nowrap;">' . $comp_alt_string . '</span>'); } - $s .= '</small></td><td align="center" width="2%" style="white-space: nowrap"><small>' . $topbar_delimiter; + $s .= '</small></td><td align="center" width="2%" style="white-space: nowrap"><small>' + . (strpos($topbar_delimiter, ' ') === 0 ? substr($topbar_delimiter, 6) : ltrim($topbar_delimiter)); if (!(isset($where) && isset($what)) && !$passed_ent_id) { $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id); @@ -647,7 +648,8 @@ $s .= $topbar_delimiter . $next_link; } - $s .= $topbar_delimiter . '</small></td>' . "\n" . + $s .= (strrpos($topbar_delimiter, ' ') === strlen($topbar_delimiter) - 6 ? substr($topbar_delimiter, 0, -6) : rtrim($topbar_delimiter)) + . '</small></td>' . "\n" . html_tag( 'td', '', 'right', '', 'width="49%" ' ) . '<small>'; $comp_action_uri = $comp_uri . '&smaction=forward'; $s .= makeComposeLink($comp_action_uri, _("Forward")); @@ -699,7 +701,7 @@ '<a href="'.$url.'" style="white-space: nowrap;">'._("View Full Header").'</a>'; /* Output the printer friendly link if we are in subtle mode. */ - $s .= ' | ' . + $s .= ' | ' . printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color); echo $s; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2017-07-06 02:46:16
|
Revision: 14700 http://sourceforge.net/p/squirrelmail/code/14700 Author: pdontthink Date: 2017-07-06 02:46:14 +0000 (Thu, 06 Jul 2017) Log Message: ----------- Add newline after <textarea> because it is always removed by the browser per spec: https://www.w3.org/TR/html401/appendix/notes.html#notes-line-breaks Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/forms.php branches/SM-1_4-STABLE/squirrelmail/functions/options.php branches/SM-1_4-STABLE/squirrelmail/src/options_identities.php Modified: branches/SM-1_4-STABLE/squirrelmail/functions/forms.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/forms.php 2017-07-06 02:36:51 UTC (rev 14699) +++ branches/SM-1_4-STABLE/squirrelmail/functions/forms.php 2017-07-06 02:46:14 UTC (rev 14700) @@ -129,7 +129,7 @@ return '<textarea name="'.sm_encode_html_special_chars($name).'" '. ($name !== null && strpos($attr, 'id="') === FALSE ? 'id="'.sm_encode_html_special_chars(strtr($name, '[]', '__')).'" ' : ' '). 'rows="'.(int)$rows .'" cols="'.(int)$cols.'" '. - $attr . '>'.sm_encode_html_special_chars($text) ."</textarea>\n"; + $attr . '>'. "\n" . sm_encode_html_special_chars($text) ."</textarea>\n"; } /** Modified: branches/SM-1_4-STABLE/squirrelmail/functions/options.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/options.php 2017-07-06 02:36:51 UTC (rev 14699) +++ branches/SM-1_4-STABLE/squirrelmail/functions/options.php 2017-07-06 02:46:14 UTC (rev 14700) @@ -604,7 +604,7 @@ default: $rows = 5; $cols = 50; } $result = "<textarea name=\"new_$this->name\" rows=\"$rows\" " - . "cols=\"$cols\" $this->script>" + . "cols=\"$cols\" $this->script>\n" . sm_encode_html_special_chars($this->value) . "</textarea>\n"; return ($result); } Modified: branches/SM-1_4-STABLE/squirrelmail/src/options_identities.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/options_identities.php 2017-07-06 02:36:51 UTC (rev 14699) +++ branches/SM-1_4-STABLE/squirrelmail/src/options_identities.php 2017-07-06 02:46:14 UTC (rev 14700) @@ -185,7 +185,7 @@ $str = ''; $str .= '<tr' . $bgcolor . ">\n"; $str .= ' <td style="white-space: nowrap;text-align:right;">' . $title . ' </td>' . "\n"; - $str .= ' <td> <textarea name="' . $name . '" cols="50" rows="5">'. sm_encode_html_special_chars($data) . '</textarea> </td>' . "\n"; + $str .= ' <td> <textarea name="' . $name . '" cols="50" rows="5">'. "\n" . sm_encode_html_special_chars($data) . '</textarea> </td>' . "\n"; $str .= '</tr>'; return $str; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2017-11-18 21:58:37
|
Revision: 14730 http://sourceforge.net/p/squirrelmail/code/14730 Author: pdontthink Date: 2017-11-18 21:58:34 +0000 (Sat, 18 Nov 2017) Log Message: ----------- Add ability for saved drafts to indicate if they are a reply and if so, to which message, and mark that message as replied when the draft is finally sent Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php branches/SM-1_4-STABLE/squirrelmail/src/compose.php Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php 2017-11-18 21:52:35 UTC (rev 14729) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php 2017-11-18 21:58:34 UTC (rev 14730) @@ -322,6 +322,9 @@ case 'x-spam-status': $this->x_spam_status = $this->parseSpamStatus($value); break; + case 'x-sm-flag-reply': + $this->x_sm_flag_reply = $value; + break; default: break; } Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/compose.php 2017-11-18 21:52:35 UTC (rev 14729) +++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php 2017-11-18 21:58:34 UTC (rev 14730) @@ -854,6 +854,8 @@ } sqUnWordWrap($body); $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); + if (!empty($orig_header->x_sm_flag_reply)) + $composeMessage->rfc822_header->more_headers['X-SM-Flag-Reply'] = $orig_header->x_sm_flag_reply; //TODO: completely unclear if should be using $compose_session instead of $session below $compose_messages[$session] = $composeMessage; sqsession_register($compose_messages,'compose_messages'); @@ -1748,6 +1750,18 @@ $draft = $hookReturn[2]; } + // remove special header if present and prepare to mark + // a message that a draft was composed in reply to + if (!empty($composeMessage->rfc822_header->x_sm_flag_reply) && !$draft) { + global $passed_id, $mailbox, $action; + list($passed_id, $mailbox) = explode('::', $rfc822_header->x_sm_flag_reply, 2); + unset($composeMessage->rfc822_header->x_sm_flag_reply); + unset($composeMessage->rfc822_header->more_headers['X-SM-Flag-Reply']); + + // tricks the code below that marks the reply + $action = 'reply'; + } + if (!$useSendmail && !$draft) { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); $deliver = new Deliver_SMTP(); @@ -1783,6 +1797,13 @@ $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, $imap_stream_options); if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) { +//TODO: this can leak private information about folders and message IDs if messages are accessed/sent from another client --- should this feature be optional? + // make note of the message to mark as having been replied to + global $passed_id, $mailbox, $action; + if ($action == 'reply' || $action == 'reply_all') { + $composeMessage->rfc822_header->more_headers['X-SM-Flag-Reply'] = $passed_id . '::' . $mailbox; + } + require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); $imap_deliver = new Deliver_IMAP(); $succes = $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $imap_stream, $draft_folder); @@ -1819,8 +1840,12 @@ // mark original message as having been replied to if applicable global $passed_id, $mailbox, $action; if ($action == 'reply' || $action == 'reply_all') { - sqimap_mailbox_select ($imap_stream, $mailbox); - sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', false); + // select errors here could be due to a draft reply being sent + // after the original message's mailbox is moved or deleted + $result = sqimap_mailbox_select ($imap_stream, $mailbox, false); + // a non-empty return from above means we can proceed + if (!empty($result)) + sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', false); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2017-11-22 04:38:01
|
Revision: 14739 http://sourceforge.net/p/squirrelmail/code/14739 Author: pdontthink Date: 2017-11-22 04:38:00 +0000 (Wed, 22 Nov 2017) Log Message: ----------- Add option to allow returning to the message one had been replying to after sending Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/include/options/display.php branches/SM-1_4-STABLE/squirrelmail/src/compose.php Modified: branches/SM-1_4-STABLE/squirrelmail/include/options/display.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/include/options/display.php 2017-11-19 01:38:00 UTC (rev 14738) +++ branches/SM-1_4-STABLE/squirrelmail/include/options/display.php 2017-11-22 04:38:00 UTC (rev 14739) @@ -279,6 +279,13 @@ ); $optvals[SMOPT_GRP_MESSAGE][] = array( + 'name' => 'return_to_message_after_reply', + 'caption' => _("Return to Original Message After Replying"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[SMOPT_GRP_MESSAGE][] = array( 'name' => 'show_xmailer_default', 'caption' => _("Enable Mailer Display"), 'type' => SMOPT_TYPE_BOOLEAN, Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/compose.php 2017-11-19 01:38:00 UTC (rev 14738) +++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php 2017-11-22 04:38:00 UTC (rev 14739) @@ -506,8 +506,13 @@ Header("Location: $location/compose.php?mail_sent=yes"); } else { - Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort". - "&startMessage=$startMessage"); + $return_to_message_after_reply = getPref($data_dir, $username, 'return_to_message_after_reply', 0); + if (($action === 'reply' || $action === 'reply_all') && $return_to_message_after_reply) + Header("Location: $location/read_body.php?passed_id=$passed_id&mailbox=$urlMailbox&sort=$sort". + "&startMessage=$startMessage"); + else + Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort". + "&startMessage=$startMessage"); } } else { if ($compose_new_win == '1') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2017-11-22 06:40:43
|
Revision: 14743 http://sourceforge.net/p/squirrelmail/code/14743 Author: pdontthink Date: 2017-11-22 06:40:40 +0000 (Wed, 22 Nov 2017) Log Message: ----------- Allow plugins to more easily control the setting during reply if needed Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php branches/SM-1_4-STABLE/squirrelmail/src/compose.php Modified: branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php 2017-11-22 06:15:41 UTC (rev 14742) +++ branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php 2017-11-22 06:40:40 UTC (rev 14743) @@ -243,6 +243,9 @@ $include_self_reply_all = getPref($data_dir, $username, 'include_self_reply_all', SMPREF_ON); +$return_to_message_after_reply = + getPref($data_dir, $username, 'return_to_message_after_reply', SMPREF_OFF); + /* Page selector options */ $page_selector = getPref($data_dir, $username, 'page_selector', SMPREF_ON); $page_selector_max = getPref($data_dir, $username, 'page_selector_max', 10); Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/compose.php 2017-11-22 06:15:41 UTC (rev 14742) +++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php 2017-11-22 06:40:40 UTC (rev 14743) @@ -506,7 +506,7 @@ Header("Location: $location/compose.php?mail_sent=yes"); } else { - $return_to_message_after_reply = getPref($data_dir, $username, 'return_to_message_after_reply', 0); + global $return_to_message_after_reply; if (($action === 'reply' || $action === 'reply_all') && $return_to_message_after_reply) Header("Location: $location/read_body.php?passed_id=$passed_id&mailbox=$urlMailbox&sort=$sort". "&startMessage=$startMessage"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2018-01-16 23:36:14
|
Revision: 14749 http://sourceforge.net/p/squirrelmail/code/14749 Author: pdontthink Date: 2018-01-16 23:36:07 +0000 (Tue, 16 Jan 2018) Log Message: ----------- Happy New Year Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php branches/SM-1_4-STABLE/squirrelmail/class/html.class.php branches/SM-1_4-STABLE/squirrelmail/class/index.php branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php branches/SM-1_4-STABLE/squirrelmail/config/conf.pl branches/SM-1_4-STABLE/squirrelmail/config/config_default.php branches/SM-1_4-STABLE/squirrelmail/config/config_local.php branches/SM-1_4-STABLE/squirrelmail/config/index.php branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php branches/SM-1_4-STABLE/squirrelmail/data/index.php branches/SM-1_4-STABLE/squirrelmail/doc/index.php branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php branches/SM-1_4-STABLE/squirrelmail/functions/auth.php branches/SM-1_4-STABLE/squirrelmail/functions/constants.php branches/SM-1_4-STABLE/squirrelmail/functions/date.php branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_4.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_5.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_6.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_7.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_8.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_9.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_ir_111.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_r.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_u.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/ns_4551_1.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/tis_620.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/us_ascii.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/utf_8.php branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1251.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1255.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1256.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/index.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_1.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_15.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_2.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_7.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_9.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_r.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_u.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/tis_620.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/us_ascii.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/utf_8.php branches/SM-1_4-STABLE/squirrelmail/functions/file_prefs.php branches/SM-1_4-STABLE/squirrelmail/functions/forms.php branches/SM-1_4-STABLE/squirrelmail/functions/gettext.php branches/SM-1_4-STABLE/squirrelmail/functions/global.php branches/SM-1_4-STABLE/squirrelmail/functions/html.php branches/SM-1_4-STABLE/squirrelmail/functions/i18n.php branches/SM-1_4-STABLE/squirrelmail/functions/identity.php branches/SM-1_4-STABLE/squirrelmail/functions/imap.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_mailbox.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_search.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_utf7_local.php branches/SM-1_4-STABLE/squirrelmail/functions/index.php branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php branches/SM-1_4-STABLE/squirrelmail/functions/mime.php branches/SM-1_4-STABLE/squirrelmail/functions/options.php branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php branches/SM-1_4-STABLE/squirrelmail/functions/plugin.php branches/SM-1_4-STABLE/squirrelmail/functions/prefs.php branches/SM-1_4-STABLE/squirrelmail/functions/strings.php branches/SM-1_4-STABLE/squirrelmail/functions/tree.php branches/SM-1_4-STABLE/squirrelmail/functions/url_parser.php branches/SM-1_4-STABLE/squirrelmail/help/index.php branches/SM-1_4-STABLE/squirrelmail/images/index.php branches/SM-1_4-STABLE/squirrelmail/include/index.php branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php branches/SM-1_4-STABLE/squirrelmail/include/options/display.php branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php branches/SM-1_4-STABLE/squirrelmail/include/options/index.php branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php branches/SM-1_4-STABLE/squirrelmail/include/validate.php branches/SM-1_4-STABLE/squirrelmail/index.php branches/SM-1_4-STABLE/squirrelmail/locale/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/auth.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/defines.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/bug_report.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/calendar.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/calendar_data.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/day.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/event_create.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/event_delete.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/event_edit.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/delete_move_next/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/delete_move_next/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/README branches/SM-1_4-STABLE/squirrelmail/plugins/demo/demo.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/bulkquery/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/filters.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/spamoptions.php branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/fortune_functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/listcommands/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/listcommands/mailout.php branches/SM-1_4-STABLE/squirrelmail/plugins/listcommands/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/class.POP3.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/config_example.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_bottom.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_main.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_top.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/newmail.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/newmail_opt.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/sounds/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/testsound.php branches/SM-1_4-STABLE/squirrelmail/plugins/sent_subfolders/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/sent_subfolders/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/spamcop.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/INSTALL branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/doc/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/js/check_me.js branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/js/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/js/init.js branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/change_main_options.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/check_me.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/crypto.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/edit_dic.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/enc_setup.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/forget_me.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/init.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/lang_change.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/options_main.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_config.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_interface.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_options.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/README branches/SM-1_4-STABLE/squirrelmail/plugins/test/decodeheader.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/ngettext.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/test.php branches/SM-1_4-STABLE/squirrelmail/plugins/translate/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/translate/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/translate/setup.php branches/SM-1_4-STABLE/squirrelmail/po/independent_strings.txt branches/SM-1_4-STABLE/squirrelmail/po/index.php branches/SM-1_4-STABLE/squirrelmail/po/squirrelmail.pot branches/SM-1_4-STABLE/squirrelmail/scripts/common.js branches/SM-1_4-STABLE/squirrelmail/scripts/index.php branches/SM-1_4-STABLE/squirrelmail/scripts/reload_page.js branches/SM-1_4-STABLE/squirrelmail/scripts/remote_request.js branches/SM-1_4-STABLE/squirrelmail/src/addrbook_popup.php branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search.php branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search_html.php branches/SM-1_4-STABLE/squirrelmail/src/addressbook.php branches/SM-1_4-STABLE/squirrelmail/src/compose.php branches/SM-1_4-STABLE/squirrelmail/src/configtest.php branches/SM-1_4-STABLE/squirrelmail/src/delete_message.php branches/SM-1_4-STABLE/squirrelmail/src/download.php branches/SM-1_4-STABLE/squirrelmail/src/empty_trash.php branches/SM-1_4-STABLE/squirrelmail/src/folders.php branches/SM-1_4-STABLE/squirrelmail/src/folders_create.php branches/SM-1_4-STABLE/squirrelmail/src/folders_delete.php branches/SM-1_4-STABLE/squirrelmail/src/folders_rename_do.php branches/SM-1_4-STABLE/squirrelmail/src/folders_rename_getname.php branches/SM-1_4-STABLE/squirrelmail/src/folders_subscribe.php branches/SM-1_4-STABLE/squirrelmail/src/help.php branches/SM-1_4-STABLE/squirrelmail/src/image.php branches/SM-1_4-STABLE/squirrelmail/src/index.php branches/SM-1_4-STABLE/squirrelmail/src/left_main.php branches/SM-1_4-STABLE/squirrelmail/src/login.php branches/SM-1_4-STABLE/squirrelmail/src/mailto.php branches/SM-1_4-STABLE/squirrelmail/src/move_messages.php branches/SM-1_4-STABLE/squirrelmail/src/options.php branches/SM-1_4-STABLE/squirrelmail/src/options_highlight.php branches/SM-1_4-STABLE/squirrelmail/src/options_identities.php branches/SM-1_4-STABLE/squirrelmail/src/options_order.php branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_main.php branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_top.php branches/SM-1_4-STABLE/squirrelmail/src/read_body.php branches/SM-1_4-STABLE/squirrelmail/src/redirect.php branches/SM-1_4-STABLE/squirrelmail/src/right_main.php branches/SM-1_4-STABLE/squirrelmail/src/search.php branches/SM-1_4-STABLE/squirrelmail/src/signout.php branches/SM-1_4-STABLE/squirrelmail/src/vcard.php branches/SM-1_4-STABLE/squirrelmail/src/view_header.php branches/SM-1_4-STABLE/squirrelmail/src/view_text.php branches/SM-1_4-STABLE/squirrelmail/src/webmail.php branches/SM-1_4-STABLE/squirrelmail/themes/alien_glow.php branches/SM-1_4-STABLE/squirrelmail/themes/autumn.php branches/SM-1_4-STABLE/squirrelmail/themes/autumn2.php branches/SM-1_4-STABLE/squirrelmail/themes/black_bean_burrito_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/blue_grey_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/blue_on_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/bluesnews_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/bluesome.php branches/SM-1_4-STABLE/squirrelmail/themes/bluesteel_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/christmas.php branches/SM-1_4-STABLE/squirrelmail/themes/classic_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/classic_blue2.php branches/SM-1_4-STABLE/squirrelmail/themes/css/index.php branches/SM-1_4-STABLE/squirrelmail/themes/dark_green.php branches/SM-1_4-STABLE/squirrelmail/themes/dark_grey_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/darkness.php branches/SM-1_4-STABLE/squirrelmail/themes/deepocean2_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/deepocean_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/default_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/dompie_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/forest_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/greenhouse_effect.php branches/SM-1_4-STABLE/squirrelmail/themes/high_contrast_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/ice_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/in_the_pink.php branches/SM-1_4-STABLE/squirrelmail/themes/index.php branches/SM-1_4-STABLE/squirrelmail/themes/kind_of_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/maize_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/methodical_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/midnight.php branches/SM-1_4-STABLE/squirrelmail/themes/minimal_bw.php branches/SM-1_4-STABLE/squirrelmail/themes/monostochastic.php branches/SM-1_4-STABLE/squirrelmail/themes/netstyle_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/penguin.php branches/SM-1_4-STABLE/squirrelmail/themes/plain_blue_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/powder_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/purple_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/random.php branches/SM-1_4-STABLE/squirrelmail/themes/redmond.php branches/SM-1_4-STABLE/squirrelmail/themes/sandstorm_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/seaspray_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/servery_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/shades_of_grey.php branches/SM-1_4-STABLE/squirrelmail/themes/silver_steel_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/simple_green2.php branches/SM-1_4-STABLE/squirrelmail/themes/simple_green_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/simple_purple.php branches/SM-1_4-STABLE/squirrelmail/themes/slashdot_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/spice_of_life.php branches/SM-1_4-STABLE/squirrelmail/themes/spice_of_life_dark.php branches/SM-1_4-STABLE/squirrelmail/themes/spice_of_life_lite.php branches/SM-1_4-STABLE/squirrelmail/themes/techno_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/turquoise.php branches/SM-1_4-STABLE/squirrelmail/themes/wood_theme.php Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -7,7 +7,7 @@ * a delivery backend. * * @author Marc Groot Koerkamp - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * Delivery backend for the Deliver class. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * SMTP delivery backend for the Deliver class. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -6,7 +6,7 @@ * Delivery backend for the Deliver class. * * @author Marc Groot Koerkamp - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -7,7 +7,7 @@ * * http://www.imc.org/pdi/vcard-21.txt * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/html.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/html.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/html.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * This contains functions needed to generate html output. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/index.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/index.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -6,7 +6,7 @@ * This file contains functions needed to extract email address headers from * mime messages. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content type headers * (rfc2045) in mime messages. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content disposition headers * in mime messages. See RFC 2183. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -6,7 +6,7 @@ * This file should contain class needed to handle Language properties in * mime messages. I suspect that it is RFC2231 * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle mime messages. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -6,7 +6,7 @@ * This file contains class needed to handle SMIME mime messages. * * @link http://www.ietf.org/html.charters/smime-charter.html - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * This file loads classes needed to handle mime messages. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/config/conf.pl =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/conf.pl 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/config/conf.pl 2018-01-16 23:36:07 UTC (rev 14749) @@ -1,7 +1,7 @@ #!/usr/bin/env perl # conf.pl # -# Copyright (c) 1999-2017 The SquirrelMail Project Team +# Copyright (c) 1999-2018 The SquirrelMail Project Team # Licensed under the GNU GPL. For full terms see COPYING. # # A simple configure script to configure SquirrelMail Modified: branches/SM-1_4-STABLE/squirrelmail/config/config_default.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/config_default.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/config/config_default.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -15,7 +15,7 @@ * passwords being leaked to e.g. other system users. Take extra care when * the webserver is shared with untrusted users. * - * @copyright 2000-2017 The SquirrelMail Project Team + * @copyright 2000-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/config/config_local.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/config_local.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/config/config_local.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -7,7 +7,7 @@ * Don't do it unless you know what you're doing. * Use standard PHP syntax, see config.php for examples. * - * @copyright 2002-2017 The SquirrelMail Project Team + * @copyright 2002-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/config/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/index.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/config/index.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 2018-01-16 23:36:07 UTC (rev 14749) @@ -30,7 +30,7 @@ .SH "AUTHOR" Tomas Kuliavas <to...@us...> .SH "COPYRIGHT" -Copyright (c) 2006-2017 The SquirrelMail Project Team +Copyright (c) 2006-2018 The SquirrelMail Project Team .SH "LICENSE" This manual is licensed under GNU General Public License. See COPYING file included in the SquirrelMail package or Modified: branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -3,7 +3,7 @@ /** * Script provides form to decode encrypted header information. * - * @copyright 2005-2017 The SquirrelMail Project Team + * @copyright 2005-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/data/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/data/index.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/data/index.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/doc/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/doc/index.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/doc/index.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * Redirects to the index.html file. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -3,7 +3,7 @@ /** * abook_database.php * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * Address book backend for LDAP server * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -3,7 +3,7 @@ /** * abook_local_file.php * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * Functions require SM_PATH and support of forms.php functions * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * This file provides the handling of often-used attachment types. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/auth.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/auth.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/auth.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -5,7 +5,7 @@ * * Contains functions used to do authentication. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/constants.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/constants.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/constants.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -7,7 +7,7 @@ * This file is include by src/login.php, src/redirect.php and * src/load_prefs.php. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/date.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/date.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/date.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -8,7 +8,7 @@ * <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT) * (as specified in RFC 822) -- 'Tue' is optional * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -47,7 +47,7 @@ * NOT to quote identifiers by setting * this to "none" * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -16,7 +16,7 @@ * Date: 1/7/2000 * Contact: cp...@mi... * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -16,7 +16,7 @@ * Date: 01/5/99 * Contact: cp...@mi... * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -16,7 +16,7 @@ * Authors: Lori Brownell <lo...@mi...> * K.D. Chang <a-k...@mi...> * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -18,7 +18,7 @@ K.D. Chang <a-k...@mi...> The entries are in cp866_DOSCyrillicRussian order * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2017 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -6,7 +6,7 @@ * This file contains iso-8859-1 decoding function that is needed to read * iso-8859-1 encoded mails in non-iso-8859-1 locale. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -34,7 +34,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -34,7 +34,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php 2017-12-29 20:03:40 UTC (rev 14748) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php 2018-01-16 23:36:07 UTC (rev 14749) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2017 The SquirrelMail Project Team + * @copyright 2003-2018 The SquirrelMail Project... [truncated message content] |
From: <pdo...@us...> - 2018-04-19 04:14:33
|
Revision: 14757 http://sourceforge.net/p/squirrelmail/code/14757 Author: pdontthink Date: 2018-04-19 04:14:31 +0000 (Thu, 19 Apr 2018) Log Message: ----------- Allow users who cannot edit their email address but who have multiple identities to edit all their identities Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog branches/SM-1_4-STABLE/squirrelmail/functions/identity.php branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php branches/SM-1_4-STABLE/squirrelmail/src/options_identities.php Modified: branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2018-04-06 17:31:06 UTC (rev 14756) +++ branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2018-04-19 04:14:31 UTC (rev 14757) @@ -119,6 +119,8 @@ replying to after sending - Sanitize user-supplied attachment filenames (thanks to Florian Grunow for reporting this issue) [CVE-2018-8741] + - Allow users who cannot edit their email address but who have + multiple identities to edit all their identities Version 1.4.22 - 12 July 2011 ----------------------------- Modified: branches/SM-1_4-STABLE/squirrelmail/functions/identity.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/identity.php 2018-04-06 17:31:06 UTC (rev 14756) +++ branches/SM-1_4-STABLE/squirrelmail/functions/identity.php 2018-04-19 04:14:31 UTC (rev 14757) @@ -66,7 +66,7 @@ */ function save_identities($identities) { - global $username, $data_dir, $domain; + global $username, $data_dir, $domain, $edit_identity, $edit_name, $edit_reply_to; if (empty($identities) || !is_array($identities)) { return; @@ -89,8 +89,16 @@ $key = ($id?$id:''); + if (!$edit_identity && !$edit_name) + $ident['full_name'] = getPref($data_dir, $username, 'full_name' . $key); setPref($data_dir, $username, 'full_name' . $key, $ident['full_name']); + + if (!$edit_identity) + $ident['email_address'] = getPref($data_dir, $username, 'email_address' . $key); setPref($data_dir, $username, 'email_address' . $key, $ident['email_address']); + + if (!$edit_identity && !$edit_reply_to) + $ident['reply_to'] = getPref($data_dir, $username, 'reply_to' . $key); setPref($data_dir, $username, 'reply_to' . $key, $ident['reply_to']); if ($id === 0) { @@ -115,6 +123,8 @@ */ function sqfixidentities( $identities, $id, $action ) { + global $edit_identity; + $num_cur = getPref($data_dir, $username, 'identities'); $fixed = array(); $tmp_hold = array(); $i = 0; @@ -125,14 +135,19 @@ foreach( $identities as $key=>$ident ) { - if (empty_identity($ident)) { - continue; - } + // we already have a delete action; legit empty array + // can happen if email address is not ediable + // if (empty_identity($ident)) { + // continue; + // } switch($action) { case 'makedefault': + // can only get here if someone is trying to be sneaky + if ($num_cur < 2) exit; + if ($key == $id) { $fixed[0] = $ident; @@ -147,6 +162,9 @@ case 'move': + // can only get here if someone is trying to be sneaky + if ($num_cur < 2) exit; + if ($key == ($id - 1)) { $tmp_hold = $ident; @@ -166,6 +184,9 @@ case 'delete': + // can only get here if someone is trying to be sneaky + if (!$edit_identity) exit; + if ($key == $id) { // inform plugins about deleted id do_hook('options_identities_process', $action, $id); @@ -178,6 +199,10 @@ // Process actions from plugins and save/update action // default: + // make sure no one is being sneaky trying to add identities when they shouldn't + if (!$edit_identity && $num_cur !== count($identities)) { + exit; + } /** * send action and id information. number of hook arguments * differs from 1.4.4 or older and 1.5.0. count($args) can Modified: branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php 2018-04-06 17:31:06 UTC (rev 14756) +++ branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php 2018-04-19 04:14:31 UTC (rev 14757) @@ -13,6 +13,7 @@ /** SquirrelMail required files. */ require_once(SM_PATH . 'functions/imap.php'); +include_once(SM_PATH . 'functions/identity.php'); /* Define the group constants for the personal options page. */ define('SMOPT_GRP_CONTACT', 0); @@ -129,7 +130,9 @@ 'save' => 'save_option_signature' ); - if ($edit_identity) { +//TODO: use getPref(...'identities'...)? + $identities_count = count(get_identities()); + if ($identities_count > 1 || $edit_identity) { $identities_link_value = '<a href="options_identities.php">' . _("Edit Advanced Identities") . '</a> ' Modified: branches/SM-1_4-STABLE/squirrelmail/src/options_identities.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/options_identities.php 2018-04-06 17:31:06 UTC (rev 14756) +++ branches/SM-1_4-STABLE/squirrelmail/src/options_identities.php 2018-04-19 04:14:31 UTC (rev 14757) @@ -30,15 +30,17 @@ include_once(SM_PATH . 'functions/forms.php'); include_once(SM_PATH . 'functions/identity.php'); +if (!sqgetGlobalVar('identities', $identities, SQ_SESSION)) { + $identities = get_identities(); +} + /* make sure that page is not available when $edit_identity is false */ -if (!$edit_identity) { +$cnt = count($identities); +if ($cnt < 2 && !$edit_identity) { error_box(_("Editing identities is disabled."),$color); die('</body></html>'); } -if (!sqgetGlobalVar('identities', $identities, SQ_SESSION)) { - $identities = get_identities(); -} sqgetGlobalVar('newidentities', $newidentities, SQ_POST); sqgetGlobalVar('smaction', $smaction, SQ_POST); sqgetGlobalVar('return', $return, SQ_POST); @@ -69,6 +71,8 @@ $identities = sqfixidentities( $newidentities , $identid , $action ); save_identities($identities); + // save_identities() can also alter the identities, so: + $identities = get_identities(); } if (!empty($return)) { @@ -82,8 +86,8 @@ $td_str = '<form name="f" action="options_identities.php" method="post"><br />' . "\n" . addHidden('smtoken', sm_generate_security_token()) . "\n" - . '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . "\n"; -$cnt = count($identities); + . '<table border="0" cellspacing="0" cellpadding="2" width="100%">' . "\n"; +$cnt = count($identities); // $identities may have changed, so we need to count again foreach( $identities as $iKey=>$ident ) { if ($iKey == 0) { @@ -96,7 +100,8 @@ } -$td_str .= ShowIdentityInfo( _("Add a New Identity"), array('full_name'=>'','email_address'=>'','reply_to'=>'','signature'=>''), $cnt); +if ($edit_identity) + $td_str .= ShowIdentityInfo( _("Add a New Identity"), array('full_name'=>'','email_address'=>'','reply_to'=>'','signature'=>''), $cnt); $td_str .= '</table>' . "\n"; $td_str .= '</form>'; @@ -121,7 +126,7 @@ function ShowIdentityInfo($title, $identity, $id ) { - global $color; + global $color, $edit_identity, $edit_name, $edit_reply_to, $cnt; if (empty($identity['full_name']) && empty($identity['email_address']) && empty($identity['reply_to']) && empty($identity['signature'])) { $bg = ''; @@ -139,9 +144,11 @@ $return_str .= '<tr>' . "\n"; $return_str .= ' <th style="text-align:center;background-color:' . $color[9] . ';" colspan="2">' . $title . '</th> '. "\n"; $return_str .= '</tr>' . "\n"; - $return_str .= sti_input( _("Full Name") , sprintf($name, $id, 'full_name'), $identity['full_name'], $bg); - $return_str .= sti_input( _("E-Mail Address") , sprintf($name, $id, 'email_address'), $identity['email_address'], $bg); - $return_str .= sti_input( _("Reply To"), sprintf($name, $id, 'reply_to'), $identity['reply_to'], $bg); + $return_str .= sti_input( _("Full Name") , sprintf($name, $id, 'full_name'), $identity['full_name'], $bg, ($edit_identity || ($cnt > 1 && $edit_name))); + $return_str .= sti_input( _("E-Mail Address") , sprintf($name, $id, 'email_address'), $identity['email_address'], $bg, $edit_identity); + // don't show reply-to AT ALL if it's not editable + if ($edit_identity || ($cnt > 1 && $edit_reply_to)) + $return_str .= sti_input( _("Reply To"), sprintf($name, $id, 'reply_to'), $identity['reply_to'], $bg, ($edit_identity || ($cnt > 1 && $edit_reply_to))); $return_str .= sti_textarea( _("Signature"), sprintf($name, $id, 'signature'), $identity['signature'], $bg); $return_str .= concat_hook_function('options_identities_table', array($bg, $empty, $id)); $return_str .= '<tr' . $bg . '> ' . "\n"; @@ -151,7 +158,8 @@ if (!$empty && $id > 0) { $return_str .= ' <input type="submit" name="smaction[makedefault][' . $id . ']" value="' . _("Make Default") . '" />' . "\n"; - $return_str .= ' <input type="submit" name="smaction[delete]['.$id.']" value="' . _("Delete") . '" />' . "\n"; + if ($edit_identity) + $return_str .= ' <input type="submit" name="smaction[delete]['.$id.']" value="' . _("Delete") . '" />' . "\n"; if ($id > 1) { $return_str .= ' <input type="submit" name="smaction[move]['.$id.']" value="' . _("Move Up") . '" />' . "\n"; @@ -170,11 +178,14 @@ } -function sti_input( $title, $name, $data, $bgcolor ) { +function sti_input( $title, $name, $data, $bgcolor, $can_edit ) { $str = ''; $str .= '<tr' . $bgcolor . ">\n"; - $str .= ' <td style="white-space: nowrap;text-align:right;">' . $title . ' </td>' . "\n"; - $str .= ' <td> <input type="text" name="' . $name . '" size="50" value="'. sm_encode_html_special_chars($data) . '"> </td>' . "\n"; + $str .= ' <td style="white-space: nowrap;text-align:right;">' . $title . ': </td>' . "\n"; + if ($can_edit) + $str .= ' <td> <input type="text" name="' . $name . '" size="50" value="'. sm_encode_html_special_chars($data) . '"> </td>' . "\n"; + else + $str .= ' <td> ' . sm_encode_html_special_chars($data) . ' </td>' . "\n"; $str .= '</tr>'; return $str; @@ -184,7 +195,7 @@ function sti_textarea( $title, $name, $data, $bgcolor ) { $str = ''; $str .= '<tr' . $bgcolor . ">\n"; - $str .= ' <td style="white-space: nowrap;text-align:right;">' . $title . ' </td>' . "\n"; + $str .= ' <td style="white-space: nowrap;text-align:right;">' . $title . ': </td>' . "\n"; $str .= ' <td> <textarea name="' . $name . '" cols="50" rows="5">'. "\n" . sm_encode_html_special_chars($data) . '</textarea> </td>' . "\n"; $str .= '</tr>'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2018-04-19 07:41:13
|
Revision: 14758 http://sourceforge.net/p/squirrelmail/code/14758 Author: pdontthink Date: 2018-04-19 07:41:12 +0000 (Thu, 19 Apr 2018) Log Message: ----------- Bug fixes for reordering and better sanity checks Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/identity.php branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php Modified: branches/SM-1_4-STABLE/squirrelmail/functions/identity.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/identity.php 2018-04-19 04:14:31 UTC (rev 14757) +++ branches/SM-1_4-STABLE/squirrelmail/functions/identity.php 2018-04-19 07:41:12 UTC (rev 14758) @@ -66,7 +66,7 @@ */ function save_identities($identities) { - global $username, $data_dir, $domain, $edit_identity, $edit_name, $edit_reply_to; + global $username, $data_dir; if (empty($identities) || !is_array($identities)) { return; @@ -73,7 +73,7 @@ } - $num_cur = getPref($data_dir, $username, 'identities'); + $num_cur = getPref($data_dir, $username, 'identities', 0); $cnt = count($identities); @@ -89,16 +89,8 @@ $key = ($id?$id:''); - if (!$edit_identity && !$edit_name) - $ident['full_name'] = getPref($data_dir, $username, 'full_name' . $key); setPref($data_dir, $username, 'full_name' . $key, $ident['full_name']); - - if (!$edit_identity) - $ident['email_address'] = getPref($data_dir, $username, 'email_address' . $key); setPref($data_dir, $username, 'email_address' . $key, $ident['email_address']); - - if (!$edit_identity && !$edit_reply_to) - $ident['reply_to'] = getPref($data_dir, $username, 'reply_to' . $key); setPref($data_dir, $username, 'reply_to' . $key, $ident['reply_to']); if ($id === 0) { @@ -123,8 +115,9 @@ */ function sqfixidentities( $identities, $id, $action ) { - global $edit_identity; - $num_cur = getPref($data_dir, $username, 'identities'); + global $edit_identity, $data_dir, $username, + $edit_name, $edit_reply_to; + $num_cur = (int)getPref($data_dir, $username, 'identities', 0); $fixed = array(); $tmp_hold = array(); $i = 0; @@ -133,6 +126,16 @@ return $fixed; } + // make sure no one is being sneaky trying to add identities when they shouldn't + if (!$edit_identity && $num_cur !== count($identities)) { + exit; + } + // make sure someone not trying to mess with index numbers + for ($x = 0; $x < $num_cur ; $x++) { + if (!isset($identities[$x])) + exit; + } + foreach( $identities as $key=>$ident ) { // we already have a delete action; legit empty array @@ -141,6 +144,15 @@ // continue; // } + // when user isn't allowed to edit some fields, make sure they are unchanged + $pref_index = ($key ? $key : ''); + if (!$edit_identity && !$edit_name) + $ident['full_name'] = getPref($data_dir, $username, 'full_name' . $pref_index); + if (!$edit_identity) + $ident['email_address'] = getPref($data_dir, $username, 'email_address' . $pref_index); + if (!$edit_identity && !$edit_reply_to) + $ident['reply_to'] = getPref($data_dir, $username, 'reply_to' . $pref_index); + switch($action) { case 'makedefault': @@ -199,10 +211,6 @@ // Process actions from plugins and save/update action // default: - // make sure no one is being sneaky trying to add identities when they shouldn't - if (!$edit_identity && $num_cur !== count($identities)) { - exit; - } /** * send action and id information. number of hook arguments * differs from 1.4.4 or older and 1.5.0. count($args) can Modified: branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php 2018-04-19 04:14:31 UTC (rev 14757) +++ branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php 2018-04-19 07:41:12 UTC (rev 14758) @@ -13,7 +13,6 @@ /** SquirrelMail required files. */ require_once(SM_PATH . 'functions/imap.php'); -include_once(SM_PATH . 'functions/identity.php'); /* Define the group constants for the personal options page. */ define('SMOPT_GRP_CONTACT', 0); @@ -130,8 +129,7 @@ 'save' => 'save_option_signature' ); -//TODO: use getPref(...'identities'...)? - $identities_count = count(get_identities()); + $identities_count = getPref($data_dir, $username, 'identities', 0); if ($identities_count > 1 || $edit_identity) { $identities_link_value = '<a href="options_identities.php">' . _("Edit Advanced Identities") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2018-10-13 04:37:41
|
Revision: 14787 http://sourceforge.net/p/squirrelmail/code/14787 Author: pdontthink Date: 2018-10-13 04:37:38 +0000 (Sat, 13 Oct 2018) Log Message: ----------- Add favicon and ability for admins to use their own by setting $head_tag_extra in config_local.php (see documented comments in, for example, src/webmail.php) Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php branches/SM-1_4-STABLE/squirrelmail/src/addrbook_popup.php branches/SM-1_4-STABLE/squirrelmail/src/signout.php branches/SM-1_4-STABLE/squirrelmail/src/webmail.php Added Paths: ----------- branches/SM-1_4-STABLE/squirrelmail/favicon.ico Added: branches/SM-1_4-STABLE/squirrelmail/favicon.ico =================================================================== (Binary files differ) Index: branches/SM-1_4-STABLE/squirrelmail/favicon.ico =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/favicon.ico 2018-10-09 00:53:29 UTC (rev 14786) +++ branches/SM-1_4-STABLE/squirrelmail/favicon.ico 2018-10-13 04:37:38 UTC (rev 14787) Property changes on: branches/SM-1_4-STABLE/squirrelmail/favicon.ico ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/x-icon \ No newline at end of property Modified: branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php 2018-10-09 00:53:29 UTC (rev 14786) +++ branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php 2018-10-13 04:37:38 UTC (rev 14787) @@ -62,7 +62,7 @@ if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) { global $base_uri; } - global $theme_css, $custom_css, $pageheader_sent, $browser_rendering_mode; + global $theme_css, $custom_css, $pageheader_sent, $browser_rendering_mode, $head_tag_extra; // prevent clickjack attempts // FIXME: should we use DENY instead? We can also make this a configurable value, including giving the admin the option of removing this entirely in case they WANT to be framed by an external domain @@ -75,8 +75,19 @@ : /* "quirks" */ '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">')) . "\n\n" . html_tag( 'html' ,'' , '', '', '' ) . "\n<head>\n" . "<meta name=\"robots\" content=\"noindex,nofollow\">\n" . - "<meta http-equiv=\"x-dns-prefetch-control\" content=\"off\">\n"; + "<meta http-equiv=\"x-dns-prefetch-control\" content=\"off\">\n" + // For adding a favicon or anything else that should be inserted in *ALL* <head> for *ALL* documents, + // define $head_tag_extra in config/config_local.php + // The string "###SM BASEURI###" will be replaced with the base URI for this SquirrelMail installation. + // When not defined, a default is provided that displays the default favicon.ico. + // If you override this and still want to use the default favicon.ico, you'll have to include the following + // following in your $head_tag_extra string: + // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico">...<YOUR CONTENT HERE>...'; + // + . (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico">' + : str_replace('###SM BASEURI###', sqm_baseuri(), $head_tag_extra)) + // prevent clickjack attempts using JavaScript for browsers that // don't support the X-Frame-Options header... // we check to see if we are *not* the top page, and if not, check @@ -84,7 +95,7 @@ // if not, log out immediately -- this is an attempt to do the same // thing that the X-Frame-Options does using JavaScript (never a good // idea to rely on JavaScript-based solutions, though) - echo '<script type="text/javascript" language="JavaScript">' + . '<script type="text/javascript" language="JavaScript">' . "\n<!--\n" . 'if (self != top) { try { if (document.domain != top.document.domain) {' . ' throw "Clickjacking security violation! Please log out immediately!"; /* this code should never execute - exception should already have been thrown since it\'s a security violation in this case to even try to access top.document.domain (but it\'s left here just to be extra safe) */ } } catch (e) { self.location = "' Modified: branches/SM-1_4-STABLE/squirrelmail/src/addrbook_popup.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/addrbook_popup.php 2018-10-09 00:53:29 UTC (rev 14786) +++ branches/SM-1_4-STABLE/squirrelmail/src/addrbook_popup.php 2018-10-13 04:37:38 UTC (rev 14787) @@ -30,6 +30,19 @@ <html> <head> +<?php + // For adding a favicon or anything else that should be inserted in *ALL* <head> for *ALL* documents, + // define $head_tag_extra in config/config_local.php + // The string "###SM BASEURI###" will be replaced with the base URI for this SquirrelMail installation. + // When not defined, a default is provided that displays the default favicon.ico. + // If you override this and still want to use the default favicon.ico, you'll have to include the following + // following in your $head_tag_extra string: + // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico">...<YOUR CONTENT HERE>...'; + // + global $head_tag_extra; + echo (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico">' + : str_replace('###SM BASEURI###', sqm_baseuri(), $head_tag_extra)); +?> <meta name="robots" content="noindex,nofollow"> <title><?php echo "$org_title: " . _("Address Book"); ?></title> </head> @@ -44,4 +57,4 @@ border="0" src="addrbook_search.php?show=blank" /> </frameset> -</html> \ No newline at end of file +</html> Modified: branches/SM-1_4-STABLE/squirrelmail/src/signout.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/signout.php 2018-10-09 00:53:29 UTC (rev 14786) +++ branches/SM-1_4-STABLE/squirrelmail/src/signout.php 2018-10-13 04:37:38 UTC (rev 14787) @@ -63,6 +63,18 @@ <head> <meta name="robots" content="noindex,nofollow"> <?php + // For adding a favicon or anything else that should be inserted in *ALL* <head> for *ALL* documents, + // define $head_tag_extra in config/config_local.php + // The string "###SM BASEURI###" will be replaced with the base URI for this SquirrelMail installation. + // When not defined, a default is provided that displays the default favicon.ico. + // If you override this and still want to use the default favicon.ico, you'll have to include the following + // following in your $head_tag_extra string: + // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico">...<YOUR CONTENT HERE>...'; + // + global $head_tag_extra; + echo (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico">' + : str_replace('###SM BASEURI###', sqm_baseuri(), $head_tag_extra)); + if ($theme_css != '') { ?> <link rel="stylesheet" type="text/css" href="<?php echo $theme_css; ?>"> Modified: branches/SM-1_4-STABLE/squirrelmail/src/webmail.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/webmail.php 2018-10-09 00:53:29 UTC (rev 14786) +++ branches/SM-1_4-STABLE/squirrelmail/src/webmail.php 2018-10-13 04:37:38 UTC (rev 14787) @@ -72,12 +72,23 @@ // FIXME: should we use DENY instead? We can also make this a configurable value, including giving the admin the option of removing this entirely in case they WANT to be framed by an external domain header('X-Frame-Options: SAMEORIGIN'); -global $browser_rendering_mode; +global $browser_rendering_mode, $head_tag_extra; $output = ($browser_rendering_mode === 'standards' || $browser_rendering_mode === 'almost' ? '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">' : /* "quirks" */ '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN">'). "\n<html><head>\n" + // For adding a favicon or anything else that should be inserted in *ALL* <head> for *ALL* documents, + // define $head_tag_extra in config/config_local.php + // The string "###SM BASEURI###" will be replaced with the base URI for this SquirrelMail installation. + // When not defined, a default is provided that displays the default favicon.ico. + // If you override this and still want to use the default favicon.ico, you'll have to include the following + // following in your $head_tag_extra string: + // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico">...<YOUR CONTENT HERE>...'; + // + . (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico">' + : str_replace('###SM BASEURI###', sqm_baseuri(), $head_tag_extra)) + // prevent clickjack attempts using JavaScript for browsers that // don't support the X-Frame-Options header... // we check to see if we are *not* the top page, and if not, check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2018-10-13 22:55:31
|
Revision: 14791 http://sourceforge.net/p/squirrelmail/code/14791 Author: pdontthink Date: 2018-10-13 22:55:29 +0000 (Sat, 13 Oct 2018) Log Message: ----------- Make sure link tags are proper XHTML Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php branches/SM-1_4-STABLE/squirrelmail/src/addrbook_popup.php branches/SM-1_4-STABLE/squirrelmail/src/signout.php branches/SM-1_4-STABLE/squirrelmail/src/webmail.php Modified: branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php 2018-10-13 15:40:11 UTC (rev 14790) +++ branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php 2018-10-13 22:55:29 UTC (rev 14791) @@ -83,9 +83,9 @@ // When not defined, a default is provided that displays the default favicon.ico. // If you override this and still want to use the default favicon.ico, you'll have to include the following // following in your $head_tag_extra string: - // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico">...<YOUR CONTENT HERE>...'; + // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico" />...<YOUR CONTENT HERE>...'; // - . (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico">' + . (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico" />' : str_replace('###SM BASEURI###', sqm_baseuri(), $head_tag_extra)) // prevent clickjack attempts using JavaScript for browsers that Modified: branches/SM-1_4-STABLE/squirrelmail/src/addrbook_popup.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/addrbook_popup.php 2018-10-13 15:40:11 UTC (rev 14790) +++ branches/SM-1_4-STABLE/squirrelmail/src/addrbook_popup.php 2018-10-13 22:55:29 UTC (rev 14791) @@ -37,10 +37,10 @@ // When not defined, a default is provided that displays the default favicon.ico. // If you override this and still want to use the default favicon.ico, you'll have to include the following // following in your $head_tag_extra string: - // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico">...<YOUR CONTENT HERE>...'; + // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico" />...<YOUR CONTENT HERE>...'; // global $head_tag_extra; - echo (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico">' + echo (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico" />' : str_replace('###SM BASEURI###', sqm_baseuri(), $head_tag_extra)); ?> <meta name="robots" content="noindex,nofollow"> Modified: branches/SM-1_4-STABLE/squirrelmail/src/signout.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/signout.php 2018-10-13 15:40:11 UTC (rev 14790) +++ branches/SM-1_4-STABLE/squirrelmail/src/signout.php 2018-10-13 22:55:29 UTC (rev 14791) @@ -69,10 +69,10 @@ // When not defined, a default is provided that displays the default favicon.ico. // If you override this and still want to use the default favicon.ico, you'll have to include the following // following in your $head_tag_extra string: - // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico">...<YOUR CONTENT HERE>...'; + // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico" />...<YOUR CONTENT HERE>...'; // global $head_tag_extra; - echo (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico">' + echo (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico" />' : str_replace('###SM BASEURI###', sqm_baseuri(), $head_tag_extra)); if ($theme_css != '') { Modified: branches/SM-1_4-STABLE/squirrelmail/src/webmail.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/webmail.php 2018-10-13 15:40:11 UTC (rev 14790) +++ branches/SM-1_4-STABLE/squirrelmail/src/webmail.php 2018-10-13 22:55:29 UTC (rev 14791) @@ -84,9 +84,9 @@ // When not defined, a default is provided that displays the default favicon.ico. // If you override this and still want to use the default favicon.ico, you'll have to include the following // following in your $head_tag_extra string: - // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico">...<YOUR CONTENT HERE>...'; + // $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico" />...<YOUR CONTENT HERE>...'; // - . (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico">' + . (empty($head_tag_extra) ? '<link rel="shortcut icon" href="' . sqm_baseuri() . 'favicon.ico" />' : str_replace('###SM BASEURI###', sqm_baseuri(), $head_tag_extra)) // prevent clickjack attempts using JavaScript for browsers that This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2018-10-14 18:25:13
|
Revision: 14793 http://sourceforge.net/p/squirrelmail/code/14793 Author: pdontthink Date: 2018-10-14 18:25:11 +0000 (Sun, 14 Oct 2018) Log Message: ----------- Alter hook types "do_hook_function" and "concat_hook_function" such that the ultimate hook return value (in its current state, as computed (or not) by the plugins that have executed previously) is both globalized and passed as an additional argument to each plugin. This allows plugins to cooperate better and not overwrite each others return values. Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog branches/SM-1_4-STABLE/squirrelmail/functions/plugin.php Modified: branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2018-10-13 22:59:15 UTC (rev 14792) +++ branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2018-10-14 18:25:11 UTC (rev 14793) @@ -125,6 +125,12 @@ - Added favicon and ability for admins to use their own by setting $head_tag_extra in config_local.php (see documented comments in, for example, src/webmail.php) + - Altered hook types "do_hook_function" and "concat_hook_function" + such that the ultimate hook return value (in its current state, + as computed (or not) by the plugins that have executed previously) + is both globalized and passed as an additional argument to each + plugin. This allows plugins to cooperate better and not overwrite + each other's return values. Version 1.4.22 - 12 July 2011 ----------------------------- Modified: branches/SM-1_4-STABLE/squirrelmail/functions/plugin.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/plugin.php 2018-10-13 22:59:15 UTC (rev 14792) +++ branches/SM-1_4-STABLE/squirrelmail/functions/plugin.php 2018-10-14 18:25:11 UTC (rev 14793) @@ -67,8 +67,8 @@ * @return mixed the return value of the hook function */ function do_hook_function($name,$parm=NULL) { - global $squirrelmail_plugin_hooks; - $ret = NULL; + global $squirrelmail_plugin_hooks, $hook_return_value; + $hook_return_value = NULL; if (isset($squirrelmail_plugin_hooks[$name]) && is_array($squirrelmail_plugin_hooks[$name])) { @@ -75,7 +75,7 @@ foreach ($squirrelmail_plugin_hooks[$name] as $function) { /* Add something to set correct gettext domain for plugin. */ if (function_exists($function)) { - $ret = $function($parm); + $hook_return_value = $function($parm, $hook_return_value); } } } @@ -82,7 +82,7 @@ /* Variable-length argument lists have a slight problem when */ /* passing values by reference. Pity. This is a workaround. */ - return $ret; + return $hook_return_value; } /** @@ -94,8 +94,8 @@ * @return string a concatenation of the results of each plugin function */ function concat_hook_function($name,$parm=NULL) { - global $squirrelmail_plugin_hooks; - $ret = ''; + global $squirrelmail_plugin_hooks, $hook_return_value; + $hook_return_value = ''; if (isset($squirrelmail_plugin_hooks[$name]) && is_array($squirrelmail_plugin_hooks[$name])) { @@ -102,7 +102,7 @@ foreach ($squirrelmail_plugin_hooks[$name] as $function) { /* Concatenate results from hook. */ if (function_exists($function)) { - $ret .= $function($parm); + $hook_return_value .= $function($parm, $hook_return_value); } } } @@ -109,7 +109,7 @@ /* Variable-length argument lists have a slight problem when */ /* passing values by reference. Pity. This is a workaround. */ - return $ret; + return $hook_return_value; } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2019-01-08 04:27:20
|
Revision: 14800 http://sourceforge.net/p/squirrelmail/code/14800 Author: pdontthink Date: 2019-01-08 04:27:15 +0000 (Tue, 08 Jan 2019) Log Message: ----------- Happy New Year Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php branches/SM-1_4-STABLE/squirrelmail/class/html.class.php branches/SM-1_4-STABLE/squirrelmail/class/index.php branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php branches/SM-1_4-STABLE/squirrelmail/config/conf.pl branches/SM-1_4-STABLE/squirrelmail/config/config_default.php branches/SM-1_4-STABLE/squirrelmail/config/config_local.php branches/SM-1_4-STABLE/squirrelmail/config/index.php branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php branches/SM-1_4-STABLE/squirrelmail/data/index.php branches/SM-1_4-STABLE/squirrelmail/doc/index.php branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php branches/SM-1_4-STABLE/squirrelmail/functions/auth.php branches/SM-1_4-STABLE/squirrelmail/functions/constants.php branches/SM-1_4-STABLE/squirrelmail/functions/date.php branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_4.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_5.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_6.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_7.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_8.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_9.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_ir_111.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_r.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_u.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/ns_4551_1.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/tis_620.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/us_ascii.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/utf_8.php branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1251.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1255.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1256.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/index.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_1.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_15.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_2.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_7.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_9.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_r.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_u.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/tis_620.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/us_ascii.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/utf_8.php branches/SM-1_4-STABLE/squirrelmail/functions/file_prefs.php branches/SM-1_4-STABLE/squirrelmail/functions/forms.php branches/SM-1_4-STABLE/squirrelmail/functions/gettext.php branches/SM-1_4-STABLE/squirrelmail/functions/global.php branches/SM-1_4-STABLE/squirrelmail/functions/html.php branches/SM-1_4-STABLE/squirrelmail/functions/i18n.php branches/SM-1_4-STABLE/squirrelmail/functions/identity.php branches/SM-1_4-STABLE/squirrelmail/functions/imap.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_mailbox.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_search.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_utf7_local.php branches/SM-1_4-STABLE/squirrelmail/functions/index.php branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php branches/SM-1_4-STABLE/squirrelmail/functions/mime.php branches/SM-1_4-STABLE/squirrelmail/functions/options.php branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php branches/SM-1_4-STABLE/squirrelmail/functions/plugin.php branches/SM-1_4-STABLE/squirrelmail/functions/prefs.php branches/SM-1_4-STABLE/squirrelmail/functions/strings.php branches/SM-1_4-STABLE/squirrelmail/functions/tree.php branches/SM-1_4-STABLE/squirrelmail/functions/url_parser.php branches/SM-1_4-STABLE/squirrelmail/help/index.php branches/SM-1_4-STABLE/squirrelmail/images/index.php branches/SM-1_4-STABLE/squirrelmail/include/index.php branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php branches/SM-1_4-STABLE/squirrelmail/include/options/display.php branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php branches/SM-1_4-STABLE/squirrelmail/include/options/index.php branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php branches/SM-1_4-STABLE/squirrelmail/include/validate.php branches/SM-1_4-STABLE/squirrelmail/index.php branches/SM-1_4-STABLE/squirrelmail/locale/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/auth.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/defines.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/bug_report.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/calendar.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/calendar_data.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/day.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/event_create.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/event_delete.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/event_edit.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/delete_move_next/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/delete_move_next/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/README branches/SM-1_4-STABLE/squirrelmail/plugins/demo/demo.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/bulkquery/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/filters.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/spamoptions.php branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/fortune_functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/listcommands/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/listcommands/mailout.php branches/SM-1_4-STABLE/squirrelmail/plugins/listcommands/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/class.POP3.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/config_example.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_bottom.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_main.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_top.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/newmail.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/newmail_opt.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/sounds/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/testsound.php branches/SM-1_4-STABLE/squirrelmail/plugins/sent_subfolders/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/sent_subfolders/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/spamcop.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/INSTALL branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/doc/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/js/check_me.js branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/js/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/js/init.js branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/change_main_options.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/check_me.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/crypto.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/edit_dic.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/enc_setup.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/forget_me.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/init.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/lang_change.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/options_main.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_config.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_interface.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_options.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/README branches/SM-1_4-STABLE/squirrelmail/plugins/test/decodeheader.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/ngettext.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/test.php branches/SM-1_4-STABLE/squirrelmail/plugins/translate/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/translate/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/translate/setup.php branches/SM-1_4-STABLE/squirrelmail/po/independent_strings.txt branches/SM-1_4-STABLE/squirrelmail/po/index.php branches/SM-1_4-STABLE/squirrelmail/po/squirrelmail.pot branches/SM-1_4-STABLE/squirrelmail/scripts/common.js branches/SM-1_4-STABLE/squirrelmail/scripts/index.php branches/SM-1_4-STABLE/squirrelmail/scripts/reload_page.js branches/SM-1_4-STABLE/squirrelmail/scripts/remote_request.js branches/SM-1_4-STABLE/squirrelmail/src/addrbook_popup.php branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search.php branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search_html.php branches/SM-1_4-STABLE/squirrelmail/src/addressbook.php branches/SM-1_4-STABLE/squirrelmail/src/compose.php branches/SM-1_4-STABLE/squirrelmail/src/configtest.php branches/SM-1_4-STABLE/squirrelmail/src/delete_message.php branches/SM-1_4-STABLE/squirrelmail/src/download.php branches/SM-1_4-STABLE/squirrelmail/src/empty_trash.php branches/SM-1_4-STABLE/squirrelmail/src/folders.php branches/SM-1_4-STABLE/squirrelmail/src/folders_create.php branches/SM-1_4-STABLE/squirrelmail/src/folders_delete.php branches/SM-1_4-STABLE/squirrelmail/src/folders_rename_do.php branches/SM-1_4-STABLE/squirrelmail/src/folders_rename_getname.php branches/SM-1_4-STABLE/squirrelmail/src/folders_subscribe.php branches/SM-1_4-STABLE/squirrelmail/src/help.php branches/SM-1_4-STABLE/squirrelmail/src/image.php branches/SM-1_4-STABLE/squirrelmail/src/index.php branches/SM-1_4-STABLE/squirrelmail/src/left_main.php branches/SM-1_4-STABLE/squirrelmail/src/login.php branches/SM-1_4-STABLE/squirrelmail/src/mailto.php branches/SM-1_4-STABLE/squirrelmail/src/move_messages.php branches/SM-1_4-STABLE/squirrelmail/src/options.php branches/SM-1_4-STABLE/squirrelmail/src/options_highlight.php branches/SM-1_4-STABLE/squirrelmail/src/options_identities.php branches/SM-1_4-STABLE/squirrelmail/src/options_order.php branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_main.php branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_top.php branches/SM-1_4-STABLE/squirrelmail/src/read_body.php branches/SM-1_4-STABLE/squirrelmail/src/redirect.php branches/SM-1_4-STABLE/squirrelmail/src/right_main.php branches/SM-1_4-STABLE/squirrelmail/src/search.php branches/SM-1_4-STABLE/squirrelmail/src/signout.php branches/SM-1_4-STABLE/squirrelmail/src/vcard.php branches/SM-1_4-STABLE/squirrelmail/src/view_header.php branches/SM-1_4-STABLE/squirrelmail/src/view_text.php branches/SM-1_4-STABLE/squirrelmail/src/webmail.php branches/SM-1_4-STABLE/squirrelmail/themes/alien_glow.php branches/SM-1_4-STABLE/squirrelmail/themes/autumn.php branches/SM-1_4-STABLE/squirrelmail/themes/autumn2.php branches/SM-1_4-STABLE/squirrelmail/themes/black_bean_burrito_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/blue_grey_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/blue_on_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/bluesnews_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/bluesome.php branches/SM-1_4-STABLE/squirrelmail/themes/bluesteel_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/christmas.php branches/SM-1_4-STABLE/squirrelmail/themes/classic_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/classic_blue2.php branches/SM-1_4-STABLE/squirrelmail/themes/css/index.php branches/SM-1_4-STABLE/squirrelmail/themes/dark_green.php branches/SM-1_4-STABLE/squirrelmail/themes/dark_grey_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/darkness.php branches/SM-1_4-STABLE/squirrelmail/themes/deepocean2_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/deepocean_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/default_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/dompie_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/forest_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/greenhouse_effect.php branches/SM-1_4-STABLE/squirrelmail/themes/high_contrast_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/ice_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/in_the_pink.php branches/SM-1_4-STABLE/squirrelmail/themes/index.php branches/SM-1_4-STABLE/squirrelmail/themes/kind_of_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/maize_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/methodical_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/midnight.php branches/SM-1_4-STABLE/squirrelmail/themes/minimal_bw.php branches/SM-1_4-STABLE/squirrelmail/themes/monostochastic.php branches/SM-1_4-STABLE/squirrelmail/themes/netstyle_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/penguin.php branches/SM-1_4-STABLE/squirrelmail/themes/plain_blue_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/powder_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/purple_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/random.php branches/SM-1_4-STABLE/squirrelmail/themes/redmond.php branches/SM-1_4-STABLE/squirrelmail/themes/sandstorm_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/seaspray_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/servery_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/shades_of_grey.php branches/SM-1_4-STABLE/squirrelmail/themes/silver_steel_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/simple_green2.php branches/SM-1_4-STABLE/squirrelmail/themes/simple_green_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/simple_purple.php branches/SM-1_4-STABLE/squirrelmail/themes/slashdot_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/spice_of_life.php branches/SM-1_4-STABLE/squirrelmail/themes/spice_of_life_dark.php branches/SM-1_4-STABLE/squirrelmail/themes/spice_of_life_lite.php branches/SM-1_4-STABLE/squirrelmail/themes/techno_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/turquoise.php branches/SM-1_4-STABLE/squirrelmail/themes/wood_theme.php Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -7,7 +7,7 @@ * a delivery backend. * * @author Marc Groot Koerkamp - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * Delivery backend for the Deliver class. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * SMTP delivery backend for the Deliver class. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -6,7 +6,7 @@ * Delivery backend for the Deliver class. * * @author Marc Groot Koerkamp - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -7,7 +7,7 @@ * * http://www.imc.org/pdi/vcard-21.txt * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/html.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/html.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/html.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * This contains functions needed to generate html output. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/index.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/index.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -6,7 +6,7 @@ * This file contains functions needed to extract email address headers from * mime messages. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content type headers * (rfc2045) in mime messages. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content disposition headers * in mime messages. See RFC 2183. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -6,7 +6,7 @@ * This file should contain class needed to handle Language properties in * mime messages. I suspect that it is RFC2231 * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle mime messages. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -6,7 +6,7 @@ * This file contains class needed to handle SMIME mime messages. * * @link http://www.ietf.org/html.charters/smime-charter.html - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * This file loads classes needed to handle mime messages. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/config/conf.pl =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/conf.pl 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/config/conf.pl 2019-01-08 04:27:15 UTC (rev 14800) @@ -1,7 +1,7 @@ #!/usr/bin/env perl # conf.pl # -# Copyright (c) 1999-2018 The SquirrelMail Project Team +# Copyright (c) 1999-2019 The SquirrelMail Project Team # Licensed under the GNU GPL. For full terms see COPYING. # # A simple configure script to configure SquirrelMail Modified: branches/SM-1_4-STABLE/squirrelmail/config/config_default.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/config_default.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/config/config_default.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -15,7 +15,7 @@ * passwords being leaked to e.g. other system users. Take extra care when * the webserver is shared with untrusted users. * - * @copyright 2000-2018 The SquirrelMail Project Team + * @copyright 2000-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/config/config_local.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/config_local.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/config/config_local.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -7,7 +7,7 @@ * Don't do it unless you know what you're doing. * Use standard PHP syntax, see config.php for examples. * - * @copyright 2002-2018 The SquirrelMail Project Team + * @copyright 2002-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/config/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/index.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/config/index.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 2019-01-08 04:27:15 UTC (rev 14800) @@ -30,7 +30,7 @@ .SH "AUTHOR" Tomas Kuliavas <to...@us...> .SH "COPYRIGHT" -Copyright (c) 2006-2018 The SquirrelMail Project Team +Copyright (c) 2006-2019 The SquirrelMail Project Team .SH "LICENSE" This manual is licensed under GNU General Public License. See COPYING file included in the SquirrelMail package or Modified: branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -3,7 +3,7 @@ /** * Script provides form to decode encrypted header information. * - * @copyright 2005-2018 The SquirrelMail Project Team + * @copyright 2005-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/data/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/data/index.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/data/index.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/doc/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/doc/index.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/doc/index.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * Redirects to the index.html file. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -3,7 +3,7 @@ /** * abook_database.php * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * Address book backend for LDAP server * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -3,7 +3,7 @@ /** * abook_local_file.php * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * Functions require SM_PATH and support of forms.php functions * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * This file provides the handling of often-used attachment types. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/auth.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/auth.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/auth.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -5,7 +5,7 @@ * * Contains functions used to do authentication. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/constants.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/constants.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/constants.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -7,7 +7,7 @@ * This file is include by src/login.php, src/redirect.php and * src/load_prefs.php. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/date.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/date.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/date.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -8,7 +8,7 @@ * <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT) * (as specified in RFC 822) -- 'Tue' is optional * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -47,7 +47,7 @@ * NOT to quote identifiers by setting * this to "none" * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -16,7 +16,7 @@ * Date: 1/7/2000 * Contact: cp...@mi... * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -16,7 +16,7 @@ * Date: 01/5/99 * Contact: cp...@mi... * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -16,7 +16,7 @@ * Authors: Lori Brownell <lo...@mi...> * K.D. Chang <a-k...@mi...> * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -18,7 +18,7 @@ K.D. Chang <a-k...@mi...> The entries are in cp866_DOSCyrillicRussian order * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2018 The SquirrelMail Project Team + * @copyright 1999-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -6,7 +6,7 @@ * This file contains iso-8859-1 decoding function that is needed to read * iso-8859-1 encoded mails in non-iso-8859-1 locale. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -34,7 +34,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -34,7 +34,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php 2018-11-25 20:25:43 UTC (rev 14799) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php 2019-01-08 04:27:15 UTC (rev 14800) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2018 The SquirrelMail Project Team + * @copyright 2003-2019 The SquirrelMail Project... [truncated message content] |
From: <pdo...@us...> - 2019-04-06 18:32:30
|
Revision: 14813 http://sourceforge.net/p/squirrelmail/code/14813 Author: pdontthink Date: 2019-04-06 18:32:29 +0000 (Sat, 06 Apr 2019) Log Message: ----------- Add IMAP ID command (RFC2971), sent after every login - use by setting $imap_id_command_args in config/config_local.php (see notes in functions/imap_general.php for more details) Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php Modified: branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2019-03-27 07:32:26 UTC (rev 14812) +++ branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2019-04-06 18:32:29 UTC (rev 14813) @@ -134,6 +134,9 @@ - Updated SVG handling, closing several related vulnerabilities (#2831) [CVE-2018-14950] [CVE-2018-14951] [CVE-2018-14952] [CVE-2018-14953] [CVE-2018-14954] [CVE-2018-14955] + - Added IMAP ID command (RFC2971), sent after every login - use + by setting $imap_id_command_args in config/config_local.php + (see notes in functions/imap_general.php for more details) Version 1.4.22 - 12 July 2011 ----------------------------- Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php 2019-03-27 07:32:26 UTC (rev 14812) +++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php 2019-04-06 18:32:29 UTC (rev 14813) @@ -715,6 +715,130 @@ exit; } } + + // Run ID command if configured - RFC 2971 + // + // Administrator must declare a configuration variable called + // $imap_id_command_args in config/config_local.php which must + // be an array, where each key is an attibute to be sent in the + // IMAP ID command to the server. Values will be sent as-is + // except if the value is "###REMOTE ADDRESS###" (without quotes) + // in which case the current user's real IP address will be + // substituted. If "###X-FORWARDED-FOR###" is used and a + // "X-FORWARDED-FOR" header is present in the client request, + // the contents of that header are used (careful, this can be + // forged). If "###X-FORWARDED-FOR OR REMOTE ADDRESS###" is + // used, then the "X-FORWARDED-FOR" header is used if it is + // present in the request, otherwise, the client's connecting + // IP address is used. The following attributes will always be + // added unless they are specifically overridden with a blank + // value: + // name, vendor, support-url, version + // A parsed representation of server's response is made available + // to plugins as both a global and session variable named + // "imap_server_id_response" (a simple key/value array) unless + // response parsing is turned off by way of setting a variable + // named $do_not_parse_imap_id_command_response in + // config/config_local.php to TRUE, in which case, the stored + // response will be the unparsed IMAP response. + // + global $imap_id_command_args, $do_not_parse_imap_id_command_response; + if (!empty($imap_id_command_args) && is_array($imap_id_command_args) + && sqimap_capability($imap_stream, 'ID')) { + + static $args = array(); + if (empty($args)) { + if (!isset($imap_id_command_args['name'])) + $imap_id_command_args['name'] = 'SquirrelMail'; + if (!isset($imap_id_command_args['vendor'])) + $imap_id_command_args['vendor'] = 'SquirrelMail Project Team'; + if (!isset($imap_id_command_args['support-url'])) + $imap_id_command_args['support-url'] = 'https://squirrelmail.org'; + if (!isset($imap_id_command_args['version'])) { + global $version; + $imap_id_command_args['version'] = $version; + } + foreach ($imap_id_command_args as $key => $value) { + $key = trim($key); + $value = trim($value); + if ($key === '' || $value === '') + continue; + if ($value === '###REMOTE ADDRESS###' && sqGetGlobalVar('REMOTE_ADDR', $remote_addr, SQ_SERVER)) + $value = $remote_addr; + else if ($value === '###X-FORWARDED-FOR###' && sqGetGlobalVar('HTTP_X_FORWARDED_FOR', $remote_addr, SQ_SERVER)) + $value = $remote_addr; + else if ($value === '###X-FORWARDED-FOR OR REMOTE ADDRESS###') { + if (sqGetGlobalVar('HTTP_X_FORWARDED_FOR', $remote_addr, SQ_SERVER)) + $value = $remote_addr; + else if (sqGetGlobalVar('REMOTE_ADDR', $remote_addr, SQ_SERVER)) + $value = $remote_addr; + } + else if ($value === '###REMOTE ADDRESS###' && sqGetGlobalVar('REMOTE_ADDR', $remote_addr, SQ_SERVER)) { + $value = $remote_addr; + } + $args[] = '"' . str_replace(array('"', '\\'), array('\\"', '\\\\'), $key) + . '" "' . str_replace(array('"', '\\'), array('\\"', '\\\\'), $value) . '"'; + } + } + $read_ary = sqimap_run_command($imap_stream, 'ID (' . implode(' ', $args) . ')', false, $response, $message); + if (!empty($read_ary) && is_array($read_ary)) { + global $imap_server_id_response; + if ($do_not_parse_imap_id_command_response) + $imap_server_id_response = $read_ary; + else + { + $imap_server_id_response = array(); + + // NOTE that this parser ignores closing ) sign, so + // technically some kind of malformed server + // response could cause extra junk to be included here + foreach ($read_ary as $info) + { + $parsed_info = explode('(', $info, 2); + if (!empty($parsed_info[1])) + { + // find opening quote for the next key name + while ($parsed_info = explode('"', $parsed_info[1], 2)) + { + if (empty($parsed_info[1])) + break; + else + { + // find closing quote for the key name + $pos = strpos($parsed_info[1], '"'); + if ($pos === FALSE) + break; + else + { + $key = substr($parsed_info[1], 0, $pos); + $parsed_info[1] = substr($parsed_info[1], $pos + 1); + + // find opening quote for the key's value + $parsed_info = explode('"', $parsed_info[1], 2); + if (empty($parsed_info[1])) + break; + else + { + // find closing quote for the key's value + $pos = strpos($parsed_info[1], '"'); + if ($pos === FALSE) + break; + else + { + $imap_server_id_response[$key] = substr($parsed_info[1], 0, $pos); + $parsed_info[1] = substr($parsed_info[1], $pos + 1); + } + } + } + } + } + } + } + } + sqsession_register($imap_server_id_response, 'imap_server_id_response'); + } + } + return $imap_stream; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2019-04-16 09:52:47
|
Revision: 14815 http://sourceforge.net/p/squirrelmail/code/14815 Author: pdontthink Date: 2019-04-16 09:52:45 +0000 (Tue, 16 Apr 2019) Log Message: ----------- Fix PHP7 warning (#2847) Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog branches/SM-1_4-STABLE/squirrelmail/functions/global.php Modified: branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2019-04-06 19:06:29 UTC (rev 14814) +++ branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2019-04-16 09:52:45 UTC (rev 14815) @@ -137,6 +137,7 @@ - Added IMAP ID command (RFC2971), sent after every login - use by setting $imap_id_command_args in config/config_local.php (see notes in functions/imap_general.php for more details) + - Fixed PHP7 warnings (#2847) Version 1.4.22 - 12 July 2011 ----------------------------- Modified: branches/SM-1_4-STABLE/squirrelmail/functions/global.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/global.php 2019-04-06 19:06:29 UTC (rev 14814) +++ branches/SM-1_4-STABLE/squirrelmail/functions/global.php 2019-04-16 09:52:45 UTC (rev 14815) @@ -463,7 +463,8 @@ * (IE6 only) * Note that as sqsession_is_active() no longer discriminates as to when * it calls this function, session_start() has to have E_NOTICE suppression - * (thus the @ sign). + * (thus the @ sign). Update: with PHP7.2+, session_set_cookie_params() is + * similarly affected. * * @return void * @@ -473,7 +474,7 @@ function sqsession_start() { global $base_uri; - session_set_cookie_params (0, $base_uri); + @session_set_cookie_params (0, $base_uri); @session_start(); // could be: sq_call_function_suppress_errors('session_start'); $session_id = session_id(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2020-01-07 07:42:55
|
Revision: 14840 http://sourceforge.net/p/squirrelmail/code/14840 Author: pdontthink Date: 2020-01-07 07:42:38 +0000 (Tue, 07 Jan 2020) Log Message: ----------- Happy New Year Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php branches/SM-1_4-STABLE/squirrelmail/class/html.class.php branches/SM-1_4-STABLE/squirrelmail/class/index.php branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php branches/SM-1_4-STABLE/squirrelmail/config/conf.pl branches/SM-1_4-STABLE/squirrelmail/config/config_default.php branches/SM-1_4-STABLE/squirrelmail/config/config_local.php branches/SM-1_4-STABLE/squirrelmail/config/index.php branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php branches/SM-1_4-STABLE/squirrelmail/data/index.php branches/SM-1_4-STABLE/squirrelmail/doc/index.php branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php branches/SM-1_4-STABLE/squirrelmail/functions/auth.php branches/SM-1_4-STABLE/squirrelmail/functions/constants.php branches/SM-1_4-STABLE/squirrelmail/functions/date.php branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_4.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_5.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_6.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_7.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_8.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_9.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_ir_111.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_r.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_u.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/ns_4551_1.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/tis_620.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/us_ascii.php branches/SM-1_4-STABLE/squirrelmail/functions/decode/utf_8.php branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1251.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1255.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1256.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/index.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_1.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_15.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_2.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_7.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_9.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_r.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_u.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/tis_620.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/us_ascii.php branches/SM-1_4-STABLE/squirrelmail/functions/encode/utf_8.php branches/SM-1_4-STABLE/squirrelmail/functions/file_prefs.php branches/SM-1_4-STABLE/squirrelmail/functions/forms.php branches/SM-1_4-STABLE/squirrelmail/functions/gettext.php branches/SM-1_4-STABLE/squirrelmail/functions/global.php branches/SM-1_4-STABLE/squirrelmail/functions/html.php branches/SM-1_4-STABLE/squirrelmail/functions/i18n.php branches/SM-1_4-STABLE/squirrelmail/functions/identity.php branches/SM-1_4-STABLE/squirrelmail/functions/imap.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_mailbox.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_search.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_utf7_local.php branches/SM-1_4-STABLE/squirrelmail/functions/index.php branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php branches/SM-1_4-STABLE/squirrelmail/functions/mime.php branches/SM-1_4-STABLE/squirrelmail/functions/options.php branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php branches/SM-1_4-STABLE/squirrelmail/functions/plugin.php branches/SM-1_4-STABLE/squirrelmail/functions/prefs.php branches/SM-1_4-STABLE/squirrelmail/functions/strings.php branches/SM-1_4-STABLE/squirrelmail/functions/tree.php branches/SM-1_4-STABLE/squirrelmail/functions/url_parser.php branches/SM-1_4-STABLE/squirrelmail/help/index.php branches/SM-1_4-STABLE/squirrelmail/images/index.php branches/SM-1_4-STABLE/squirrelmail/include/index.php branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php branches/SM-1_4-STABLE/squirrelmail/include/options/display.php branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php branches/SM-1_4-STABLE/squirrelmail/include/options/index.php branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php branches/SM-1_4-STABLE/squirrelmail/include/validate.php branches/SM-1_4-STABLE/squirrelmail/index.php branches/SM-1_4-STABLE/squirrelmail/locale/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/auth.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/defines.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/bug_report.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/bug_report/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/calendar.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/calendar_data.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/day.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/event_create.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/event_delete.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/event_edit.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/delete_move_next/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/delete_move_next/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/README branches/SM-1_4-STABLE/squirrelmail/plugins/demo/demo.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/demo/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/bulkquery/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/filters.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/filters/spamoptions.php branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/fortune_functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/info/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/listcommands/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/listcommands/mailout.php branches/SM-1_4-STABLE/squirrelmail/plugins/listcommands/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/class.POP3.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/config_example.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_bottom.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_main.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_top.php branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/newmail.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/newmail_opt.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/sounds/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/newmail/testsound.php branches/SM-1_4-STABLE/squirrelmail/plugins/sent_subfolders/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/sent_subfolders/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/spamcop.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/INSTALL branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/doc/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/js/check_me.js branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/js/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/js/init.js branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/change_main_options.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/check_me.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/crypto.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/edit_dic.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/enc_setup.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/forget_me.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/init.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/lang_change.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/options_main.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_config.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_interface.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/sqspell_options.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/README branches/SM-1_4-STABLE/squirrelmail/plugins/test/decodeheader.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/functions.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/ngettext.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/setup.php branches/SM-1_4-STABLE/squirrelmail/plugins/test/test.php branches/SM-1_4-STABLE/squirrelmail/plugins/translate/index.php branches/SM-1_4-STABLE/squirrelmail/plugins/translate/options.php branches/SM-1_4-STABLE/squirrelmail/plugins/translate/setup.php branches/SM-1_4-STABLE/squirrelmail/po/independent_strings.txt branches/SM-1_4-STABLE/squirrelmail/po/index.php branches/SM-1_4-STABLE/squirrelmail/po/squirrelmail.pot branches/SM-1_4-STABLE/squirrelmail/scripts/common.js branches/SM-1_4-STABLE/squirrelmail/scripts/index.php branches/SM-1_4-STABLE/squirrelmail/scripts/reload_page.js branches/SM-1_4-STABLE/squirrelmail/scripts/remote_request.js branches/SM-1_4-STABLE/squirrelmail/src/addrbook_popup.php branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search.php branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search_html.php branches/SM-1_4-STABLE/squirrelmail/src/addressbook.php branches/SM-1_4-STABLE/squirrelmail/src/compose.php branches/SM-1_4-STABLE/squirrelmail/src/configtest.php branches/SM-1_4-STABLE/squirrelmail/src/delete_message.php branches/SM-1_4-STABLE/squirrelmail/src/download.php branches/SM-1_4-STABLE/squirrelmail/src/empty_trash.php branches/SM-1_4-STABLE/squirrelmail/src/folders.php branches/SM-1_4-STABLE/squirrelmail/src/folders_create.php branches/SM-1_4-STABLE/squirrelmail/src/folders_delete.php branches/SM-1_4-STABLE/squirrelmail/src/folders_rename_do.php branches/SM-1_4-STABLE/squirrelmail/src/folders_rename_getname.php branches/SM-1_4-STABLE/squirrelmail/src/folders_subscribe.php branches/SM-1_4-STABLE/squirrelmail/src/help.php branches/SM-1_4-STABLE/squirrelmail/src/image.php branches/SM-1_4-STABLE/squirrelmail/src/index.php branches/SM-1_4-STABLE/squirrelmail/src/left_main.php branches/SM-1_4-STABLE/squirrelmail/src/login.php branches/SM-1_4-STABLE/squirrelmail/src/mailto.php branches/SM-1_4-STABLE/squirrelmail/src/move_messages.php branches/SM-1_4-STABLE/squirrelmail/src/options.php branches/SM-1_4-STABLE/squirrelmail/src/options_highlight.php branches/SM-1_4-STABLE/squirrelmail/src/options_identities.php branches/SM-1_4-STABLE/squirrelmail/src/options_order.php branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_main.php branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_top.php branches/SM-1_4-STABLE/squirrelmail/src/read_body.php branches/SM-1_4-STABLE/squirrelmail/src/redirect.php branches/SM-1_4-STABLE/squirrelmail/src/right_main.php branches/SM-1_4-STABLE/squirrelmail/src/search.php branches/SM-1_4-STABLE/squirrelmail/src/signout.php branches/SM-1_4-STABLE/squirrelmail/src/vcard.php branches/SM-1_4-STABLE/squirrelmail/src/view_header.php branches/SM-1_4-STABLE/squirrelmail/src/view_text.php branches/SM-1_4-STABLE/squirrelmail/src/webmail.php branches/SM-1_4-STABLE/squirrelmail/themes/alien_glow.php branches/SM-1_4-STABLE/squirrelmail/themes/autumn.php branches/SM-1_4-STABLE/squirrelmail/themes/autumn2.php branches/SM-1_4-STABLE/squirrelmail/themes/black_bean_burrito_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/blue_grey_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/blue_on_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/bluesnews_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/bluesome.php branches/SM-1_4-STABLE/squirrelmail/themes/bluesteel_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/christmas.php branches/SM-1_4-STABLE/squirrelmail/themes/classic_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/classic_blue2.php branches/SM-1_4-STABLE/squirrelmail/themes/css/index.php branches/SM-1_4-STABLE/squirrelmail/themes/dark_green.php branches/SM-1_4-STABLE/squirrelmail/themes/dark_grey_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/darkness.php branches/SM-1_4-STABLE/squirrelmail/themes/deepocean2_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/deepocean_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/default_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/dompie_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/forest_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/greenhouse_effect.php branches/SM-1_4-STABLE/squirrelmail/themes/high_contrast_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/ice_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/in_the_pink.php branches/SM-1_4-STABLE/squirrelmail/themes/index.php branches/SM-1_4-STABLE/squirrelmail/themes/kind_of_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/maize_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/methodical_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/midnight.php branches/SM-1_4-STABLE/squirrelmail/themes/minimal_bw.php branches/SM-1_4-STABLE/squirrelmail/themes/monostochastic.php branches/SM-1_4-STABLE/squirrelmail/themes/netstyle_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/penguin.php branches/SM-1_4-STABLE/squirrelmail/themes/plain_blue_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/powder_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/purple_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/random.php branches/SM-1_4-STABLE/squirrelmail/themes/redmond.php branches/SM-1_4-STABLE/squirrelmail/themes/sandstorm_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/seaspray_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/servery_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/shades_of_grey.php branches/SM-1_4-STABLE/squirrelmail/themes/silver_steel_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/simple_green2.php branches/SM-1_4-STABLE/squirrelmail/themes/simple_green_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/simple_purple.php branches/SM-1_4-STABLE/squirrelmail/themes/slashdot_theme.php branches/SM-1_4-STABLE/squirrelmail/themes/spice_of_life.php branches/SM-1_4-STABLE/squirrelmail/themes/spice_of_life_dark.php branches/SM-1_4-STABLE/squirrelmail/themes/spice_of_life_lite.php branches/SM-1_4-STABLE/squirrelmail/themes/techno_blue.php branches/SM-1_4-STABLE/squirrelmail/themes/turquoise.php branches/SM-1_4-STABLE/squirrelmail/themes/wood_theme.php Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -7,7 +7,7 @@ * a delivery backend. * * @author Marc Groot Koerkamp - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * Delivery backend for the Deliver class. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * SMTP delivery backend for the Deliver class. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -6,7 +6,7 @@ * Delivery backend for the Deliver class. * * @author Marc Groot Koerkamp - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -7,7 +7,7 @@ * * http://www.imc.org/pdi/vcard-21.txt * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/html.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/html.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/html.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * This contains functions needed to generate html output. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/index.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/index.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -6,7 +6,7 @@ * This file contains functions needed to extract email address headers from * mime messages. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/ContentType.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content type headers * (rfc2045) in mime messages. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content disposition headers * in mime messages. See RFC 2183. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -6,7 +6,7 @@ * This file should contain class needed to handle Language properties in * mime messages. I suspect that it is RFC2231 * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle mime messages. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -6,7 +6,7 @@ * This file contains class needed to handle SMIME mime messages. * * @link http://www.ietf.org/html.charters/smime-charter.html - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * This file loads classes needed to handle mime messages. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/config/conf.pl =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/conf.pl 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/config/conf.pl 2020-01-07 07:42:38 UTC (rev 14840) @@ -1,7 +1,7 @@ #!/usr/bin/env perl # conf.pl # -# Copyright (c) 1999-2019 The SquirrelMail Project Team +# Copyright (c) 1999-2020 The SquirrelMail Project Team # Licensed under the GNU GPL. For full terms see COPYING. # # A simple configure script to configure SquirrelMail Modified: branches/SM-1_4-STABLE/squirrelmail/config/config_default.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/config_default.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/config/config_default.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -15,7 +15,7 @@ * passwords being leaked to e.g. other system users. Take extra care when * the webserver is shared with untrusted users. * - * @copyright 2000-2019 The SquirrelMail Project Team + * @copyright 2000-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/config/config_local.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/config_local.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/config/config_local.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -7,7 +7,7 @@ * Don't do it unless you know what you're doing. * Use standard PHP syntax, see config.php for examples. * - * @copyright 2002-2019 The SquirrelMail Project Team + * @copyright 2002-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/config/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/config/index.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/config/index.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/contrib/conf.pl.8 2020-01-07 07:42:38 UTC (rev 14840) @@ -30,7 +30,7 @@ .SH "AUTHOR" Tomas Kuliavas <to...@us...> .SH "COPYRIGHT" -Copyright (c) 2006-2019 The SquirrelMail Project Team +Copyright (c) 2006-2020 The SquirrelMail Project Team .SH "LICENSE" This manual is licensed under GNU General Public License. See COPYING file included in the SquirrelMail package or Modified: branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/contrib/decrypt_headers.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -3,7 +3,7 @@ /** * Script provides form to decode encrypted header information. * - * @copyright 2005-2019 The SquirrelMail Project Team + * @copyright 2005-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/data/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/data/index.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/data/index.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/doc/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/doc/index.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/doc/index.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * Redirects to the index.html file. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -3,7 +3,7 @@ /** * abook_database.php * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * Address book backend for LDAP server * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/abook_local_file.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -3,7 +3,7 @@ /** * abook_local_file.php * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * Functions require SM_PATH and support of forms.php functions * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * This file provides the handling of often-used attachment types. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/auth.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/auth.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/auth.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -5,7 +5,7 @@ * * Contains functions used to do authentication. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/constants.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/constants.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/constants.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -7,7 +7,7 @@ * This file is include by src/login.php, src/redirect.php and * src/load_prefs.php. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/date.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/date.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/date.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -8,7 +8,7 @@ * <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT) * (as specified in RFC 822) -- 'Tue' is optional * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -47,7 +47,7 @@ * NOT to quote identifiers by setting * this to "none" * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -16,7 +16,7 @@ * Date: 1/7/2000 * Contact: cp...@mi... * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -16,7 +16,7 @@ * Date: 01/5/99 * Contact: cp...@mi... * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -16,7 +16,7 @@ * Authors: Lori Brownell <lo...@mi...> * K.D. Chang <a-k...@mi...> * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp866.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -18,7 +18,7 @@ K.D. Chang <a-k...@mi...> The entries are in cp866_DOSCyrillicRussian order * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -7,7 +7,7 @@ * people to the login screen. At this point no attempt is made to see if the * person is logged in or not. * - * @copyright 1999-2019 The SquirrelMail Project Team + * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -6,7 +6,7 @@ * This file contains iso-8859-1 decoding function that is needed to read * iso-8859-1 encoded mails in non-iso-8859-1 locale. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -34,7 +34,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -34,7 +34,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php 2020-01-07 06:49:42 UTC (rev 14839) +++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php 2020-01-07 07:42:38 UTC (rev 14840) @@ -33,7 +33,7 @@ * internal or external distribution as long as this notice remains * attached. * - * @copyright 2003-2019 The SquirrelMail Project Team + * @copyright 2003-2020 The SquirrelMail Project... [truncated message content] |
From: <pdo...@us...> - 2020-05-23 18:43:29
|
Revision: 14857 http://sourceforge.net/p/squirrelmail/code/14857 Author: pdontthink Date: 2020-05-23 18:43:27 +0000 (Sat, 23 May 2020) Log Message: ----------- Uploaded file sizes seem to be reported differently by PHP filesize(); changing divisor from 1024 to 1000 in this case. You can set $upload_filesize_divisor in config/config_local.php to 1024 if this breaks things for you. Feedback appreciated for this one. Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/strings.php branches/SM-1_4-STABLE/squirrelmail/src/compose.php Modified: branches/SM-1_4-STABLE/squirrelmail/functions/strings.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/strings.php 2020-05-08 00:59:52 UTC (rev 14856) +++ branches/SM-1_4-STABLE/squirrelmail/functions/strings.php 2020-05-23 18:43:27 UTC (rev 14857) @@ -577,14 +577,16 @@ * Returns a string showing the size of the message/attachment. * * @param int bytes the filesize in bytes + * @param int filesize_divisor the divisor we'll use (OPTIONAL; default 1024) * @return string the filesize in human readable format */ -function show_readable_size($bytes) { - $bytes /= 1024; +function show_readable_size($bytes, $filesize_divisor=1024) { + + $bytes /= $filesize_divisor; $type = 'k'; - if ($bytes / 1024 > 1) { - $bytes /= 1024; + if ($bytes / $filesize_divisor > 1) { + $bytes /= $filesize_divisor; $type = 'M'; } Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/compose.php 2020-05-08 00:59:52 UTC (rev 14856) +++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php 2020-05-23 18:43:27 UTC (rev 14857) @@ -1434,7 +1434,9 @@ ' </tr>' . "\n"; $s_a = array(); - global $username, $attachment_dir; + global $username, $attachment_dir, $upload_filesize_divisor; + if (empty($upload_filesize_divisor)) + $upload_filesize_divisor = 1000; // *not* 1024 -- does this break for some users? $hashed_attachment_dir = getHashedDir($username, $attachment_dir); if (!empty($attach_array)) { $attachment_count = 0; @@ -1450,7 +1452,7 @@ addCheckBox('delete[]', FALSE, $key, 'id="delete' . ++$attachment_count . '"'). "</td><td><label for='delete" . $attachment_count . "'>\n" . $attached_filename . '</label></td><td><label for="delete' . $attachment_count . '">-</label></td><td><label for="delete' . $attachment_count . '"> ' . $type . '</label></td><td><label for="delete' . $attachment_count . '">('. - show_readable_size( filesize( $hashed_attachment_dir . '/' . $attached_file ) ) . + show_readable_size(filesize($hashed_attachment_dir . '/' . $attached_file), $upload_filesize_divisor) . ')</label></td></tr></table>'."\n"; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2020-05-23 18:54:33
|
Revision: 14860 http://sourceforge.net/p/squirrelmail/code/14860 Author: pdontthink Date: 2020-05-23 18:54:31 +0000 (Sat, 23 May 2020) Log Message: ----------- Also fix printable page Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2020-05-23 18:46:03 UTC (rev 14859) +++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2020-05-23 18:54:31 UTC (rev 14860) @@ -546,7 +546,7 @@ $defaultlink = $hookresults[6]; // base64 encoded file sizes are misleading, so approximate real size - if (!empty($header->encoding) && $header->encoding == 'base64') + if (!empty($header->encoding) && strtolower($header->encoding) == 'base64') $size = $header->size / 4 * 3; else $size = $header->size; Modified: branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php 2020-05-23 18:46:03 UTC (rev 14859) +++ branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php 2020-05-23 18:54:31 UTC (rev 14860) @@ -274,11 +274,17 @@ $display_filename = $filename; + // base64 encoded file sizes are misleading, so approximate real size + if (!empty($header->encoding) && strtolower($header->encoding) == 'base64') + $size = $header->size / 4 * 3; + else + $size = $header->size; + // TODO: maybe make it nicer? $attachments .= '<table cellpadding="0" cellspacing="0" border="1"><tr><th colspan="2">'.decodeHeader($display_filename).'</th></tr>' . '<tr border="0">'. html_tag( 'td',_("Size:"), 'right') . - html_tag( 'td',show_readable_size($header->size), 'left') . + html_tag( 'td',show_readable_size($size), 'left') . '</tr><tr>' . html_tag( 'td',_("Type:"), 'right') . html_tag( 'td',sm_encode_html_special_chars($type0).'/'.sm_encode_html_special_chars($type1), 'left') . This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Barbara T. <ba...@ba...> - 2020-05-23 19:40:25
|
I don't know what this is. --- (¯`v´¯) `*.¸.*´ Barbara ¸.•´¸.•*¨) ¸.•*¨) (¸.•´ (¸.•´ .•´ ¸¸.•¨¯`• On 2020-05-23 11:54, pdontthink--- via squirrelmail-cvs wrote: > Revision: 14860 > http://sourceforge.net/p/squirrelmail/code/14860 > Author: pdontthink > Date: 2020-05-23 18:54:31 +0000 (Sat, 23 May 2020) > Log Message: > ----------- > Also fix printable page > > Modified Paths: > -------------- > branches/SM-1_4-STABLE/squirrelmail/functions/mime.php > branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php > > Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php > =================================================================== > --- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2020-05-23 > 18:46:03 UTC (rev 14859) > +++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2020-05-23 > 18:54:31 UTC (rev 14860) > @@ -546,7 +546,7 @@ > $defaultlink = $hookresults[6]; > > // base64 encoded file sizes are misleading, so approximate > real size > - if (!empty($header->encoding) && $header->encoding == > 'base64') > + if (!empty($header->encoding) && > strtolower($header->encoding) == 'base64') > $size = $header->size / 4 * 3; > else > $size = $header->size; > > Modified: > branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php > =================================================================== > --- > branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php 2020-05-23 > 18:46:03 UTC (rev 14859) > +++ > branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php 2020-05-23 > 18:54:31 UTC (rev 14860) > @@ -274,11 +274,17 @@ > > $display_filename = $filename; > > + // base64 encoded file sizes are misleading, so approximate > real size > + if (!empty($header->encoding) && > strtolower($header->encoding) == 'base64') > + $size = $header->size / 4 * 3; > + else > + $size = $header->size; > + > // TODO: maybe make it nicer? > $attachments .= '<table cellpadding="0" cellspacing="0" > border="1"><tr><th > colspan="2">'.decodeHeader($display_filename).'</th></tr>' . > '<tr border="0">'. > html_tag( 'td',_("Size:"), 'right') . > - html_tag( 'td',show_readable_size($header->size), 'left') > . > + html_tag( 'td',show_readable_size($size), 'left') . > '</tr><tr>' . > html_tag( 'td',_("Type:"), 'right') . > html_tag( > 'td',sm_encode_html_special_chars($type0).'/'.sm_encode_html_special_chars($type1), > 'left') . > > This was sent by the SourceForge.net collaborative development > platform, the world's largest Open Source development site. > > > > ----- > squirrelmail-cvs mailing list > List address: squ...@li... > List info (subscribe/unsubscribe/change options): > https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs > Repository: http://squirrelmail.org/svn |
From: Paul L. <pa...@sq...> - 2020-05-23 20:04:59
|
Barbara, You'll need to go here to unsubscribe yourself: https://sourceforge.net/projects/squirrelmail/lists/squirrelmail-cvs On Sat, May 23, 2020 6:58 pm, Barbara Thompson wrote: > I don't know what this is. > > --- > (¯`v´¯) > `*.¸.*´ Barbara > ¸.•´¸.•*¨) ¸.•*¨) > (¸.•´ (¸.•´ .•´ ¸¸.•¨¯`• > > On 2020-05-23 11:54, pdontthink--- via squirrelmail-cvs wrote: >> Revision: 14860 >> http://sourceforge.net/p/squirrelmail/code/14860 >> Author: pdontthink >> Date: 2020-05-23 18:54:31 +0000 (Sat, 23 May 2020) >> Log Message: >> ----------- >> Also fix printable page >> >> Modified Paths: >> -------------- >> branches/SM-1_4-STABLE/squirrelmail/functions/mime.php >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php >> >> Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php >> =================================================================== >> --- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2020-05-23 >> 18:46:03 UTC (rev 14859) >> +++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2020-05-23 >> 18:54:31 UTC (rev 14860) >> @@ -546,7 +546,7 @@ >> $defaultlink = $hookresults[6]; >> >> // base64 encoded file sizes are misleading, so approximate >> real size >> - if (!empty($header->encoding) && $header->encoding == >> 'base64') >> + if (!empty($header->encoding) && >> strtolower($header->encoding) == 'base64') >> $size = $header->size / 4 * 3; >> else >> $size = $header->size; >> >> Modified: >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php >> =================================================================== >> --- >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php 2020-05-23 >> 18:46:03 UTC (rev 14859) >> +++ >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php 2020-05-23 >> 18:54:31 UTC (rev 14860) >> @@ -274,11 +274,17 @@ >> >> $display_filename = $filename; >> >> + // base64 encoded file sizes are misleading, so approximate >> real size >> + if (!empty($header->encoding) && >> strtolower($header->encoding) == 'base64') >> + $size = $header->size / 4 * 3; >> + else >> + $size = $header->size; >> + >> // TODO: maybe make it nicer? >> $attachments .= '<table cellpadding="0" cellspacing="0" >> border="1"><tr><th >> colspan="2">'.decodeHeader($display_filename).'</th></tr>' . >> '<tr border="0">'. >> html_tag( 'td',_("Size:"), 'right') . >> - html_tag( 'td',show_readable_size($header->size), 'left') >> . >> + html_tag( 'td',show_readable_size($size), 'left') . >> '</tr><tr>' . >> html_tag( 'td',_("Type:"), 'right') . >> html_tag( >> 'td',sm_encode_html_special_chars($type0).'/'.sm_encode_html_special_chars($type1), >> 'left') . >> >> This was sent by the SourceForge.net collaborative development >> platform, the world's largest Open Source development site. >> >> >> >> ----- >> squirrelmail-cvs mailing list >> List address: squ...@li... >> List info (subscribe/unsubscribe/change options): >> https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs >> Repository: http://squirrelmail.org/svn > > > ----- > squirrelmail-cvs mailing list > List address: squ...@li... > List info (subscribe/unsubscribe/change options): > https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs > Repository: http://squirrelmail.org/svn |
From: JAMES s. <aty...@gm...> - 2020-05-24 22:19:43
|
hello , is it possible to recover a password from your email account please? ind...@sq... On Sat, May 23, 2020 at 3:05 PM Paul Lesniewski <pa...@sq...> wrote: > Barbara, > > You'll need to go here to unsubscribe yourself: > > https://sourceforge.net/projects/squirrelmail/lists/squirrelmail-cvs > > On Sat, May 23, 2020 6:58 pm, Barbara Thompson wrote: > > I don't know what this is. > > > > --- > > (¯`v´¯) > > `*.¸.*´ Barbara > > ¸.•´¸.•*¨) ¸.•*¨) > > (¸.•´ (¸.•´ .•´ ¸¸.•¨¯`• > > > > On 2020-05-23 11:54, pdontthink--- via squirrelmail-cvs wrote: > >> Revision: 14860 > >> http://sourceforge.net/p/squirrelmail/code/14860 > >> Author: pdontthink > >> Date: 2020-05-23 18:54:31 +0000 (Sat, 23 May 2020) > >> Log Message: > >> ----------- > >> Also fix printable page > >> > >> Modified Paths: > >> -------------- > >> branches/SM-1_4-STABLE/squirrelmail/functions/mime.php > >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php > >> > >> Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php > >> =================================================================== > >> --- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2020-05-23 > >> 18:46:03 UTC (rev 14859) > >> +++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2020-05-23 > >> 18:54:31 UTC (rev 14860) > >> @@ -546,7 +546,7 @@ > >> $defaultlink = $hookresults[6]; > >> > >> // base64 encoded file sizes are misleading, so approximate > >> real size > >> - if (!empty($header->encoding) && $header->encoding == > >> 'base64') > >> + if (!empty($header->encoding) && > >> strtolower($header->encoding) == 'base64') > >> $size = $header->size / 4 * 3; > >> else > >> $size = $header->size; > >> > >> Modified: > >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php > >> =================================================================== > >> --- > >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php > 2020-05-23 > >> 18:46:03 UTC (rev 14859) > >> +++ > >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php > 2020-05-23 > >> 18:54:31 UTC (rev 14860) > >> @@ -274,11 +274,17 @@ > >> > >> $display_filename = $filename; > >> > >> + // base64 encoded file sizes are misleading, so approximate > >> real size > >> + if (!empty($header->encoding) && > >> strtolower($header->encoding) == 'base64') > >> + $size = $header->size / 4 * 3; > >> + else > >> + $size = $header->size; > >> + > >> // TODO: maybe make it nicer? > >> $attachments .= '<table cellpadding="0" cellspacing="0" > >> border="1"><tr><th > >> colspan="2">'.decodeHeader($display_filename).'</th></tr>' . > >> '<tr border="0">'. > >> html_tag( 'td',_("Size:"), 'right') . > >> - html_tag( 'td',show_readable_size($header->size), 'left') > >> . > >> + html_tag( 'td',show_readable_size($size), 'left') . > >> '</tr><tr>' . > >> html_tag( 'td',_("Type:"), 'right') . > >> html_tag( > >> > 'td',sm_encode_html_special_chars($type0).'/'.sm_encode_html_special_chars($type1), > >> 'left') . > >> > >> This was sent by the SourceForge.net collaborative development > >> platform, the world's largest Open Source development site. > >> > >> > >> > >> ----- > >> squirrelmail-cvs mailing list > >> List address: squ...@li... > >> List info (subscribe/unsubscribe/change options): > >> https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs > >> Repository: http://squirrelmail.org/svn > > > > > > ----- > > squirrelmail-cvs mailing list > > List address: squ...@li... > > List info (subscribe/unsubscribe/change options): > > https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs > > Repository: http://squirrelmail.org/svn > > > > > ----- > squirrelmail-cvs mailing list > List address: squ...@li... > List info (subscribe/unsubscribe/change options): > https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs > Repository: http://squirrelmail.org/svn |
From: Paul L. <pa...@sq...> - 2020-05-25 05:22:32
|
James, SquirrelMail is not a service provider. SquirrelMail is webmail software that anyone can download and install, and your service provider has done just that. You'll need to contact them to resolve your issue. We are not affiliated with your service provider. See: http://squirrelmail.org/support/enduser.php If you have administrative access to your mail system and are looking for a consultant to help resolve a problem, I am available in that capacity, but usually, you just need to contact your provider and they can fix the issue. Good luck, Paul -- Paul Lesniewski SquirrelMail Team Please support Open Source Software by donating to SquirrelMail! http://squirrelmail.org/donate_paul_lesniewski.php On Sun, May 24, 2020 10:19 pm, JAMES sinclaire wrote: > hello , is it possible to recover a password from your email account > please? ind...@sq... > > On Sat, May 23, 2020 at 3:05 PM Paul Lesniewski <pa...@sq...> > wrote: > >> Barbara, >> >> You'll need to go here to unsubscribe yourself: >> >> https://sourceforge.net/projects/squirrelmail/lists/squirrelmail-cvs >> >> On Sat, May 23, 2020 6:58 pm, Barbara Thompson wrote: >> > I don't know what this is. >> > >> > --- >> > (¯`v´¯) >> > `*.¸.*´ Barbara >> > ¸.•´¸.•*¨) ¸.•*¨) >> > (¸.•´ (¸.•´ .•´ ¸¸.•¨¯`• >> > >> > On 2020-05-23 11:54, pdontthink--- via squirrelmail-cvs wrote: >> >> Revision: 14860 >> >> http://sourceforge.net/p/squirrelmail/code/14860 >> >> Author: pdontthink >> >> Date: 2020-05-23 18:54:31 +0000 (Sat, 23 May 2020) >> >> Log Message: >> >> ----------- >> >> Also fix printable page >> >> >> >> Modified Paths: >> >> -------------- >> >> branches/SM-1_4-STABLE/squirrelmail/functions/mime.php >> >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php >> >> >> >> Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php >> >> =================================================================== >> >> --- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php >> 2020-05-23 >> >> 18:46:03 UTC (rev 14859) >> >> +++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php >> 2020-05-23 >> >> 18:54:31 UTC (rev 14860) >> >> @@ -546,7 +546,7 @@ >> >> $defaultlink = $hookresults[6]; >> >> >> >> // base64 encoded file sizes are misleading, so approximate >> >> real size >> >> - if (!empty($header->encoding) && $header->encoding == >> >> 'base64') >> >> + if (!empty($header->encoding) && >> >> strtolower($header->encoding) == 'base64') >> >> $size = $header->size / 4 * 3; >> >> else >> >> $size = $header->size; >> >> >> >> Modified: >> >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php >> >> =================================================================== >> >> --- >> >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php >> 2020-05-23 >> >> 18:46:03 UTC (rev 14859) >> >> +++ >> >> branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php >> 2020-05-23 >> >> 18:54:31 UTC (rev 14860) >> >> @@ -274,11 +274,17 @@ >> >> >> >> $display_filename = $filename; >> >> >> >> + // base64 encoded file sizes are misleading, so approximate >> >> real size >> >> + if (!empty($header->encoding) && >> >> strtolower($header->encoding) == 'base64') >> >> + $size = $header->size / 4 * 3; >> >> + else >> >> + $size = $header->size; >> >> + >> >> // TODO: maybe make it nicer? >> >> $attachments .= '<table cellpadding="0" cellspacing="0" >> >> border="1"><tr><th >> >> colspan="2">'.decodeHeader($display_filename).'</th></tr>' . >> >> '<tr border="0">'. >> >> html_tag( 'td',_("Size:"), 'right') . >> >> - html_tag( 'td',show_readable_size($header->size), >> 'left') >> >> . >> >> + html_tag( 'td',show_readable_size($size), 'left') . >> >> '</tr><tr>' . >> >> html_tag( 'td',_("Type:"), 'right') . >> >> html_tag( >> >> >> 'td',sm_encode_html_special_chars($type0).'/'.sm_encode_html_special_chars($type1), >> >> 'left') . >> >> >> >> This was sent by the SourceForge.net collaborative development >> >> platform, the world's largest Open Source development site. >> >> >> >> >> >> >> >> ----- >> >> squirrelmail-cvs mailing list >> >> List address: squ...@li... >> >> List info (subscribe/unsubscribe/change options): >> >> https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs >> >> Repository: http://squirrelmail.org/svn >> > >> > >> > ----- >> > squirrelmail-cvs mailing list >> > List address: squ...@li... >> > List info (subscribe/unsubscribe/change options): >> > https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs >> > Repository: http://squirrelmail.org/svn >> >> >> >> >> ----- >> squirrelmail-cvs mailing list >> List address: squ...@li... >> List info (subscribe/unsubscribe/change options): >> https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs >> Repository: http://squirrelmail.org/svn > |
From: <pdo...@us...> - 2021-01-16 03:48:21
|
Revision: 14880 http://sourceforge.net/p/squirrelmail/code/14880 Author: pdontthink Date: 2021-01-16 03:48:14 +0000 (Sat, 16 Jan 2021) Log Message: ----------- Remove use of each() since it is deprecated Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php branches/SM-1_4-STABLE/squirrelmail/functions/mime.php branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/calendar.php branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/check_me.mod branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search.php branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search_html.php branches/SM-1_4-STABLE/squirrelmail/src/addressbook.php Modified: branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php 2021-01-16 02:51:48 UTC (rev 14879) +++ branches/SM-1_4-STABLE/squirrelmail/functions/abook_database.php 2021-01-16 03:48:14 UTC (rev 14880) @@ -656,7 +656,7 @@ $sepstr = ''; $where_clause = ''; $where_clause_args = array(); - while (list($undef, $nickname) = each($alias)) { + foreach ($alias as $nickname) { $where_clause .= $sepstr . $this->identifier_quote_char . 'nickname' . $this->identifier_quote_char . ' = ?'; $where_clause_args[] = $nickname; $sepstr = ' OR '; @@ -680,7 +680,7 @@ $this->table, $this->owner); $sepstr = ''; - while (list($undef, $nickname) = each($alias)) { + foreach ($alias as $nickname) { $query .= sprintf("%s nickname='%s' ", $sepstr, $this->dbh->quoteString($nickname)); $sepstr = 'OR'; Modified: branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php 2021-01-16 02:51:48 UTC (rev 14879) +++ branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php 2021-01-16 03:48:14 UTC (rev 14880) @@ -136,7 +136,7 @@ /* Load configured LDAP servers (if PHP has LDAP support) */ if (isset($ldap_server) && is_array($ldap_server) && function_exists('ldap_connect')) { reset($ldap_server); - while (list($undef,$param) = each($ldap_server)) { + foreach ($ldap_server as $param) { if (is_array($param)) { $r = $abook->add_backend('ldap_server', $param); if (!$r && $showerr) { Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php 2021-01-16 02:51:48 UTC (rev 14879) +++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php 2021-01-16 03:48:14 UTC (rev 14880) @@ -1061,7 +1061,7 @@ $pn = $data2[1]; $pna = explode(')(', $pn); $delnew = array(); - while (list($k, $v) = each($pna)) { + foreach ($pna as $v) { $lst = explode('"', $v); if (isset($lst[3])) { $delnew[$lst[1]] = $lst[3]; Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2021-01-16 02:51:48 UTC (rev 14879) +++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2021-01-16 03:48:14 UTC (rev 14880) @@ -1183,7 +1183,7 @@ $fulltag = '<' . $tagname; if (is_array($attary) && sizeof($attary)){ $atts = Array(); - while (list($attname, $attvalue) = each($attary)){ + foreach ($attary as $attname => $attvalue){ array_push($atts, "$attname=$attvalue"); } $fulltag .= ' ' . join(" ", $atts); @@ -1616,7 +1616,7 @@ $mailbox ){ $me = 'sq_fixatts'; - while (list($attname, $attvalue) = each($attary)){ + foreach ($attary as $attname => $attvalue){ /** * See if this attribute should be removed. */ Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/calendar.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/calendar.php 2021-01-16 02:51:48 UTC (rev 14879) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/calendar/calendar.php 2021-01-16 03:48:14 UTC (rev 14880) @@ -110,10 +110,10 @@ } if (isset($calendardata[$cdate])){ $i=0; - while ($calfoo = each($calendardata[$cdate])) { - $calbar = $calendardata[$cdate][$calfoo['key']]; + foreach ($calendardata[$cdate] as $key => $value) { + $calbar = $calendardata[$cdate][$key]; // FIXME: how to display multiline task - $title = '['. $calfoo['key']. '] ' . + $title = '['. $key. '] ' . str_replace(array("\r","\n"),array(' ',' '),sm_encode_html_special_chars($calbar['message'])); // FIXME: link to nowhere echo "<a href=\"#\" style=\"text-decoration:none; color: " @@ -177,4 +177,4 @@ endcalendar(); ?> -</body></html> \ No newline at end of file +</body></html> Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/check_me.mod =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/check_me.mod 2021-01-16 02:51:48 UTC (rev 14879) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/check_me.mod 2021-01-16 03:48:14 UTC (rev 14880) @@ -290,7 +290,7 @@ */ $extrajs.= "var suggestions = new Array();\n"; $i=0; - while (list($word, $value) = each($misses)){ + foreach ($misses as $value){ if ($value=='_NONE') $value=''; $extrajs.= "suggestions[$i] = \"$value\";\n"; $i++; @@ -302,7 +302,7 @@ */ $extrajs.= "var locations= new Array();\n"; $i=0; - while (list($word, $value) = each($locations)){ + foreach ($locations as $value){ $extrajs.= "locations[$i] = \"$value\";\n"; $i++; } Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod 2021-01-16 02:51:48 UTC (rev 14879) +++ branches/SM-1_4-STABLE/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod 2021-01-16 03:48:14 UTC (rev 14880) @@ -36,7 +36,7 @@ $add = '<p>' . _("Make this dictionary my default selection:") . " <select name=\"lang_default\">\n"; -while (list($avail_lang, $junk) = each($SQSPELL_APP)){ +foreach ($SQSPELL_APP as $avail_lang => $ignore){ $msg .= "<input type=\"checkbox\" name=\"use_langs[]\" " . "value=\"$avail_lang\""; if (in_array($avail_lang, $langs)) { Modified: branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search.php 2021-01-16 02:51:48 UTC (rev 14879) +++ branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search.php 2021-01-16 03:48:14 UTC (rev 14880) @@ -137,7 +137,7 @@ } echo "</tr>\n"; - while (list($undef, $row) = each($res)) { + foreach ($res as $row) { $email = sm_encode_html_special_chars(addcslashes(AddressBook::full_address($row), "'"), ENT_QUOTES); if ($line % 2) { $tr_bgcolor = $color[12]; @@ -220,7 +220,7 @@ $selopts['-1'] = _("All address books"); $ret = $abook->get_backend_list(); - while (list($undef,$v) = each($ret)) { + foreach ($ret as $v) { $selopts[$v->bnum] = $v->sname; } echo addSelect('backend', $selopts, '-1', TRUE); @@ -303,4 +303,4 @@ } ?> -</body></html> \ No newline at end of file +</body></html> Modified: branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search_html.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search_html.php 2021-01-16 02:51:48 UTC (rev 14879) +++ branches/SM-1_4-STABLE/squirrelmail/src/addrbook_search_html.php 2021-01-16 03:48:14 UTC (rev 14880) @@ -223,7 +223,7 @@ $selopts['-1'] = _("All address books"); $ret = $abook->get_backend_list(); - while (list($undef,$v) = each($ret)) { + foreach ($ret as $v) { $selopts[$v->bnum] = $v->sname; } echo addSelect('backend', $selopts, $backend, TRUE); Modified: branches/SM-1_4-STABLE/squirrelmail/src/addressbook.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/addressbook.php 2021-01-16 02:51:48 UTC (rev 14879) +++ branches/SM-1_4-STABLE/squirrelmail/src/addressbook.php 2021-01-16 03:48:14 UTC (rev 14880) @@ -132,7 +132,7 @@ if ( $abook->numbackends > 1 ) { $backends = $abook->get_backend_list(); $writeable_abooks=array(); - while (list($undef,$v) = each($backends)) { + foreach ($backends as $v) { if ($v->writeable) { // add each backend to array $writeable_abooks[$v->bnum]=$v->sname; @@ -439,7 +439,7 @@ $abook_fields = 5; } $count = 0; - while(list($undef,$row) = each($alist)) { + foreach ($alist as $row) { /* New table header for each backend */ if($prevbackend != $row['backend']) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2021-02-06 00:49:16
|
Revision: 14887 http://sourceforge.net/p/squirrelmail/code/14887 Author: pdontthink Date: 2021-02-06 00:49:08 +0000 (Sat, 06 Feb 2021) Log Message: ----------- Stop using curly braces Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php branches/SM-1_4-STABLE/squirrelmail/functions/auth.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php 2021-02-05 19:29:03 UTC (rev 14886) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php 2021-02-06 00:49:08 UTC (rev 14887) @@ -214,7 +214,7 @@ $ent_a = explode('.', $ent); for ($i = 0,$entCount = count($ent_a) - 1; $i < $entCount; ++$i) { - if (isset($cur_ent_a[$i]) && ($cur_ent_a[$i] != $ent_a[$i])) { + if (isset($cur_ent_a[$i]) && ($cur_ent_a[$i] != $ent_a[$i]) && is_object($msg->parent)) { $msg = $msg->parent; $cur_ent_a = explode('.', $msg->entity_id); --$i; @@ -352,7 +352,7 @@ } for ($cnt = strlen($read); $i < $cnt; ++$i) { - $char = strtoupper($read{$i}); + $char = strtoupper($read[$i]); switch ($char) { case '(': switch($arg_no) { @@ -367,7 +367,7 @@ } else { $msg->header->type0 = 'multipart'; $msg->type0 = 'multipart'; - while ($read{$i} == '(') { + while ($read[$i] == '(') { $msg->addEntity($msg->parseBodyStructure($read, $i, $msg)); } } @@ -400,7 +400,7 @@ $msg->type1 = $arg_a[1]; $rfc822_hdr = new Rfc822Header(); $msg->rfc822_header = $msg->parseEnvelope($read, $i, $rfc822_hdr); - while (($i < $cnt) && ($read{$i} != '(')) { + while (($i < $cnt) && ($read[$i] != '(')) { ++$i; } $msg->addEntity($msg->parseBodyStructure($read, $i,$msg)); @@ -463,9 +463,9 @@ ++$arg_no; break; case '0': - case is_numeric($read{$i}): + case is_numeric($read[$i]): /* process integers */ - if ($read{$i} == ' ') { break; } + if ($read[$i] == ' ') { break; } ++$arg_no; if (preg_match('/^([0-9]+).*/',substr($read,$i), $regs)) { $i += strlen($regs[1])-1; @@ -527,11 +527,11 @@ $properties = array(); $prop_name = ''; - for (; $read{$i} != ')'; ++$i) { + for (; $read[$i] != ')'; ++$i) { $arg_s = ''; - if ($read{$i} == '"') { + if ($read[$i] == '"') { $arg_s = $this->parseQuote($read, $i); - } else if ($read{$i} == '{') { + } else if ($read[$i] == '{') { $arg_s = $this->parseLiteral($read, $i); } @@ -558,8 +558,8 @@ $arg_no = 0; $arg_a = array(); ++$i; - for ($cnt = strlen($read); ($i < $cnt) && ($read{$i} != ')'); ++$i) { - $char = strtoupper($read{$i}); + for ($cnt = strlen($read); ($i < $cnt) && ($read[$i] != ')'); ++$i) { + $char = strtoupper($read[$i]); switch ($char) { case '"': $arg_a[] = $this->parseQuote($read, $i); @@ -588,8 +588,8 @@ $addr_a = array(); $group = ''; $a=0; - for (; $i < $cnt && $read{$i} != ')'; ++$i) { - if ($read{$i} == '(') { + for (; $i < $cnt && $read[$i] != ')'; ++$i) { + if ($read[$i] == '(') { $addr = $this->parseAddress($read, $i); if (($addr->host == '') && ($addr->mailbox != '')) { /* start of group */ @@ -687,11 +687,11 @@ while (true) { $iPos = strpos($read,'"',$iPos); if (!$iPos) break; - if ($iPos && $read{$iPos -1} != '\\') { + if ($iPos && $read[$iPos -1] != '\\') { $s = substr($read,$i,($iPos-$i)); $i = $iPos; break; - } else if ($iPos > 1 && $read{$iPos -1} == '\\' && $read{$iPos-2} == '\\') { + } else if ($iPos > 1 && $read[$iPos -1] == '\\' && $read[$iPos-2] == '\\') { // This is an unique situation where the fast detection of the string // fails. If the quote string ends with \\ then we need to iterate // through the entire string to make sure we detect the unexcaped @@ -700,7 +700,7 @@ $bEscaped = false; $k = 0; for ($j=$iPosStart,$iCnt=strlen($read);$j<$iCnt;++$j) { - $cChar = $read{$j}; + $cChar = $read[$j]; switch ($cChar) { case '\\': $bEscaped = !$bEscaped; @@ -739,8 +739,8 @@ */ function parseAddress($read, &$i) { $arg_a = array(); - for (; $read{$i} != ')'; ++$i) { - $char = strtoupper($read{$i}); + for (; $read[$i] != ')'; ++$i) { + $char = strtoupper($read[$i]); switch ($char) { case '"': $arg_a[] = $this->parseQuote($read, $i); break; case '{': $arg_a[] = $this->parseLiteral($read, $i); break; @@ -774,8 +774,8 @@ */ function parseDisposition($read, &$i) { $arg_a = array(); - for (; $read{$i} != ')'; ++$i) { - switch ($read{$i}) { + for (; $read[$i] != ')'; ++$i) { + switch ($read[$i]) { case '"': $arg_a[] = $this->parseQuote($read, $i); break; case '{': $arg_a[] = $this->parseLiteral($read, $i); break; case '(': $arg_a[] = $this->parseProperties($read, $i); break; @@ -801,8 +801,8 @@ /* no idea how to process this one without examples */ $arg_a = array(); - for (; $read{$i} != ')'; ++$i) { - switch ($read{$i}) { + for (; $read[$i] != ')'; ++$i) { + switch ($read[$i]) { case '"': $arg_a[] = $this->parseQuote($read, $i); break; case '{': $arg_a[] = $this->parseLiteral($read, $i); break; case '(': $arg_a[] = $this->parseProperties($read, $i); break; @@ -826,8 +826,8 @@ * @return integer */ function parseParenthesis($read, $i) { - for ($i++; $read{$i} != ')'; ++$i) { - switch ($read{$i}) { + for ($i++; $read[$i] != ')'; ++$i) { + switch ($read[$i]) { case '"': $this->parseQuote($read, $i); break; case '{': $this->parseLiteral($read, $i); break; case '(': $this->parseProperties($read, $i); break; @@ -880,7 +880,7 @@ } } - if ((($line{0} == '-') || $rfc822_header) && isset($boundaries[0])) { + if ((($line[0] == '-') || $rfc822_header) && isset($boundaries[0])) { $cnt = count($boundaries)-1; $bnd = $boundaries[$cnt]['bnd']; $bndreg = $boundaries[$cnt]['bndreg']; @@ -890,7 +890,7 @@ $bndlen = strlen($reg[1]); $bndend = false; if (strlen($line) > ($bndlen + 3)) { - if (($line{$bndlen+2} == '-') && ($line{$bndlen+3} == '-')) { + if (($line[$bndlen+2] == '-') && ($line[$bndlen+3] == '-')) { $bndend = true; } } Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php 2021-02-05 19:29:03 UTC (rev 14886) +++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php 2021-02-06 00:49:08 UTC (rev 14887) @@ -177,22 +177,22 @@ $result = ''; $cnt = strlen($value); for ($i = 0; $i < $cnt; ++$i) { - switch ($value{$i}) { + switch ($value[$i]) { case '"': $result .= '"'; - while ((++$i < $cnt) && ($value{$i} != '"')) { - if ($value{$i} == '\\') { + while ((++$i < $cnt) && ($value[$i] != '"')) { + if ($value[$i] == '\\') { $result .= '\\'; ++$i; } - $result .= $value{$i}; + $result .= $value[$i]; } - $result .= $value{$i}; + $result .= $value[$i]; break; case '(': $depth = 1; while (($depth > 0) && (++$i < $cnt)) { - switch($value{$i}) { + switch($value[$i]) { case '\\': ++$i; break; @@ -208,7 +208,7 @@ } break; default: - $result .= $value{$i}; + $result .= $value[$i]; break; } } @@ -349,7 +349,7 @@ $iCnt = strlen($address); $i = 0; while ($i < $iCnt) { - $cChar = $address{$i}; + $cChar = $address[$i]; switch($cChar) { case '<': @@ -368,11 +368,11 @@ $iEnd = strpos($address,$cChar,$i+1); if ($iEnd) { // skip escaped quotes - $prev_char = $address{$iEnd-1}; + $prev_char = $address[$iEnd-1]; while ($prev_char === '\\' && substr($address,$iEnd-2,2) !== '\\\\') { $iEnd = strpos($address,$cChar,$iEnd+1); if ($iEnd) { - $prev_char = $address{$iEnd-1}; + $prev_char = $address[$iEnd-1]; } else { $prev_char = false; } @@ -399,7 +399,7 @@ $iDepth = 1; $iComment = $i; while (($iDepth > 0) && (++$iComment < $iCnt)) { - $cCharComment = $address{$iComment}; + $cCharComment = $address[$iComment]; switch($cCharComment) { case '\\': ++$iComment; @@ -425,7 +425,7 @@ // check the next token in case comments appear in the middle of email addresses $prevToken = end($aTokens); if (!in_array($prevToken,$aSpecials,true)) { - if ($i+1<strlen($address) && !in_array($address{$i+1},$aSpecials,true)) { + if ($i+1<strlen($address) && !in_array($address[$i+1],$aSpecials,true)) { $iEnd = strpos($address,' ',$i+1); if ($iEnd) { $sNextToken = trim(substr($address,$i+1,$iEnd - $i -1)); @@ -531,7 +531,7 @@ $sPersonal = $sEmail = $sComment = $sGroup = ''; $aStack = $aComment = array(); foreach ($aTokens as $sToken) { - $cChar = $sToken{0}; + $cChar = $sToken[0]; switch ($cChar) { case '=': @@ -737,7 +737,7 @@ if ($pos > 0) { $key = trim(substr($prop, 0, $pos)); $val = trim(substr($prop, $pos+1)); - if (strlen($val) > 0 && $val{0} == '"') { + if (strlen($val) > 0 && $val[0] == '"') { $val = substr($val, 1, -1); } $propResultArray[$key] = $val; @@ -775,7 +775,7 @@ $value_a = explode(',', $value); foreach ($value_a as $val) { $val = trim($val); - if ($val{0} == '<') { + if ($val[0] == '<') { $val = substr($val, 1, -1); } if (substr($val, 0, 7) == 'mailto:') { Modified: branches/SM-1_4-STABLE/squirrelmail/functions/auth.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/auth.php 2021-02-05 19:29:03 UTC (rev 14886) +++ branches/SM-1_4-STABLE/squirrelmail/functions/auth.php 2021-02-06 00:49:08 UTC (rev 14887) @@ -227,13 +227,13 @@ $challenge=base64_decode($challenge); $parsed = array(); while (!empty($challenge)) { - if ($challenge{0} == ',') { // First char is a comma, must not be 1st time through loop + if ($challenge[0] == ',') { // First char is a comma, must not be 1st time through loop $challenge=substr($challenge,1); } $key=explode('=',$challenge,2); $challenge=$key[1]; $key=$key[0]; - if ($challenge{0} == '"') { + if ($challenge[0] == '"') { // We're in a quoted value // Drop the first quote, since we don't care about it $challenge=substr($challenge,1); Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php 2021-02-05 19:29:03 UTC (rev 14886) +++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php 2021-02-06 00:49:08 UTC (rev 14887) @@ -211,7 +211,7 @@ $i = 0; while ($read) { - $char = $read{0}; + $char = $read[0]; switch ($char) { case '+': @@ -223,7 +223,7 @@ $read = sqimap_fgets($imap_stream); break; - case $tag{0}: + case $tag[0]: { /* get the command */ $arg = ''; @@ -256,7 +256,7 @@ $read = sqimap_fgets($imap_stream); break; } - } // end case $tag{0} + } // end case $tag[0] case '*': { @@ -308,11 +308,11 @@ break 4; /* while while switch while */ } /* check for next untagged reponse and break */ - if ($read{0} == '*') break 2; + if ($read[0] == '*') break 2; $s = substr($read,-3); } while ($s === "}\r\n" || $read_literal); $s = substr($read,-3); - } while ($read{0} !== '*' && + } while ($read[0] !== '*' && substr($read,0,strlen($tag)) !== $tag); $resultlist[] = $fetch_data; /* release not neaded data */ @@ -344,7 +344,7 @@ $read = sqimap_fgets($imap_stream); if ($read === false) { break 3; /* while switch while */ - } else if ($read{0} == '*') { + } else if ($read[0] == '*') { break; } $s = substr($read,-3); @@ -695,7 +695,7 @@ // Skip any rfc5530 response code: '[something]' at the // start of the message if (!empty($message) - && $message{0} == '[' + && $message[0] == '[' && ($end = strstr($message, ']')) && $end != ']') { $message = substr($end, 1); @@ -1120,7 +1120,7 @@ $address = str_replace($aSpecials,$aReplace,$address); $i = 0; while ($i < $iCnt) { - $cChar = $address{$i}; + $cChar = $address[$i]; switch($cChar) { case '<': @@ -1139,11 +1139,11 @@ $iEnd = strpos($address,$cChar,$i+1); if ($iEnd) { // skip escaped quotes - $prev_char = $address{$iEnd-1}; + $prev_char = $address[$iEnd-1]; while ($prev_char === '\\' && substr($address,$iEnd-2,2) !== '\\\\') { $iEnd = strpos($address,$cChar,$iEnd+1); if ($iEnd) { - $prev_char = $address{$iEnd-1}; + $prev_char = $address[$iEnd-1]; } else { $prev_char = false; } @@ -1197,7 +1197,7 @@ if ($max && $max == count($aAddress)) { return $aAddress; } - $cChar = $sToken{0}; + $cChar = $sToken[0]; switch ($cChar) { case '=': Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php 2021-02-05 19:29:03 UTC (rev 14886) +++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php 2021-02-06 00:49:08 UTC (rev 14887) @@ -465,7 +465,7 @@ * @return string $s parsed string without the double quotes or literal count */ function parseString($read,&$i) { - $char = $read{$i}; + $char = $read[$i]; $s = ''; if ($char == '"') { $iPos = ++$i; @@ -472,7 +472,7 @@ while (true) { $iPos = strpos($read,'"',$iPos); if (!$iPos) break; - if ($iPos && $read{$iPos -1} != '\\') { + if ($iPos && $read[$iPos -1] != '\\') { $s = substr($read,$i,($iPos-$i)); $i = $iPos; break; @@ -634,7 +634,7 @@ case 'date': $aMsg['date'] = trim(str_replace(' ', ' ', $value)); break; - case 'x-priority': $aMsg['x-priority'] = ($value) ? (int) $value{0} : 3; break; + case 'x-priority': $aMsg['x-priority'] = ($value) ? (int) $value[0] : 3; break; case 'priority': case 'importance': // duplicate code with Rfc822Header.cls:parsePriority() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2021-02-06 01:55:53
|
Revision: 14890 http://sourceforge.net/p/squirrelmail/code/14890 Author: pdontthink Date: 2021-02-06 01:55:51 +0000 (Sat, 06 Feb 2021) Log Message: ----------- Stop using curly braces Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php branches/SM-1_4-STABLE/squirrelmail/src/configtest.php Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2021-02-06 01:43:56 UTC (rev 14889) +++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php 2021-02-06 01:55:51 UTC (rev 14890) @@ -2281,9 +2281,9 @@ if ($tagname == "body"){ $tagname = "div"; } - if (isset($open_tags{$tagname}) && - $open_tags{$tagname} > 0){ - $open_tags{$tagname}--; + if (isset($open_tags[$tagname]) && + $open_tags[$tagname] > 0){ + $open_tags[$tagname]--; } else { $tagname = false; } @@ -2325,10 +2325,10 @@ $message, $id); } if ($tagtype == 1){ - if (isset($open_tags{$tagname})){ - $open_tags{$tagname}++; + if (isset($open_tags[$tagname])){ + $open_tags[$tagname]++; } else { - $open_tags{$tagname}=1; + $open_tags[$tagname]=1; } } /** @@ -2547,13 +2547,13 @@ * Remove any references to http/https if view_unsafe_images set * to false. */ - array_push($bad_attvals{'/.*/'}{'/^src|background/i'}[0], + array_push($bad_attvals['/.*/']['/^src|background/i'][0], '/^([\'\"])\s*https*:.*([\'\"])/si'); - array_push($bad_attvals{'/.*/'}{'/^src|background/i'}[1], + array_push($bad_attvals['/.*/']['/^src|background/i'][1], "\\1$secremoveimg\\1"); - array_push($bad_attvals{'/.*/'}{'/^style/i'}[0], + array_push($bad_attvals['/.*/']['/^style/i'][0], '/url\([\'\"]?https?:[^\)]*[\'\"]?\)/si'); - array_push($bad_attvals{'/.*/'}{'/^style/i'}[1], + array_push($bad_attvals['/.*/']['/^style/i'][1], "url(\\1$secremoveimg\\1)"); } Modified: branches/SM-1_4-STABLE/squirrelmail/src/configtest.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/src/configtest.php 2021-02-06 01:43:56 UTC (rev 14889) +++ branches/SM-1_4-STABLE/squirrelmail/src/configtest.php 2021-02-06 01:55:51 UTC (rev 14890) @@ -411,7 +411,7 @@ // check for SMTP code; should be 2xx to allow us access $smtpline = fgets($stream, 1024); - if(((int) $smtpline{0}) > 3) { + if(((int) $smtpline[0]) > 3) { do_err("Error connecting to SMTP server. Server error: ". sm_encode_html_special_chars($smtpline)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |