From: <pdo...@us...> - 2015-06-20 12:52:39
|
Revision: 14509 http://sourceforge.net/p/squirrelmail/code/14509 Author: pdontthink Date: 2015-06-20 12:52:36 +0000 (Sat, 20 Jun 2015) Log Message: ----------- Add ability for administrator to control whether or not users can edit their reply-to address Modified Paths: -------------- trunk/squirrelmail/config/conf.pl trunk/squirrelmail/config/config_default.php trunk/squirrelmail/doc/ChangeLog trunk/squirrelmail/include/options/personal.php trunk/squirrelmail/plugins/administrator/defines.php Modified: trunk/squirrelmail/config/conf.pl =================================================================== --- trunk/squirrelmail/config/conf.pl 2015-06-20 11:53:28 UTC (rev 14508) +++ trunk/squirrelmail/config/conf.pl 2015-06-20 12:52:36 UTC (rev 14509) @@ -426,6 +426,8 @@ # since 1.2.5 $edit_identity = 'true' if ( !$edit_identity ); $edit_name = 'true' if ( !$edit_name ); +# since 1.4.23/1.5.2 +$edit_reply_to = 'true' if ( !$edit_reply_to ); # since 1.4.0 $use_smtp_tls= 'false' if ( !$use_smtp_tls); @@ -732,6 +734,7 @@ print "8. Allow use of receipts : $WHT$default_use_mdn$NRM\n"; print "9. Allow editing of identity : $WHT$edit_identity$NRM\n"; print " Allow editing of name : $WHT$edit_name$NRM\n"; + print " Allow editing of reply-to : $WHT$edit_reply_to$NRM\n"; print " Remove username from header : $WHT$hide_auth_header$NRM\n"; print "10. Disable server thread sort : $WHT$disable_thread_sort$NRM\n"; print "11. Disable server-side sorting : $WHT$disable_server_sort$NRM\n"; @@ -2577,11 +2580,13 @@ if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { $edit_identity = 'true'; $edit_name = 'true'; - $hide_auth_header = command311b(); + $edit_reply_to = 'true'; + $hide_auth_header = command311c(); } else { $edit_identity = 'false'; $edit_name = command311(); - $hide_auth_header = command311b(); + $edit_reply_to = command311b(); + $hide_auth_header = command311c(); } return $edit_identity; } @@ -2610,6 +2615,28 @@ sub command311b { print "$NRM"; + print "\n Given that users are not allowed to modify their + email address, can they edit their reply-to address? + + "; + + if ( lc($edit_reply_to) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Allow the user to edit their reply-to address? (y/n) [$WHT$default_value$NRM]: $WHT"; + $new_edit = <STDIN>; + if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $edit_reply_to = 'true'; + } else { + $edit_reply_to = 'false'; + } + return $edit_reply_to; +} + +sub command311c { + print "$NRM"; print "\n SquirrelMail adds username information to every outgoing email in order to prevent possible sender forging by users that are allowed to change their email and/or full name. @@ -5009,6 +5036,8 @@ # boolean print CF "\$edit_name = $edit_name;\n"; # boolean + print CF "\$edit_reply_to = $edit_reply_to;\n"; + # boolean print CF "\$hide_auth_header = $hide_auth_header;\n"; # boolean print CF "\$disable_thread_sort = $disable_thread_sort;\n"; Modified: trunk/squirrelmail/config/config_default.php =================================================================== --- trunk/squirrelmail/config/config_default.php 2015-06-20 11:53:28 UTC (rev 14508) +++ trunk/squirrelmail/config/config_default.php 2015-06-20 12:52:36 UTC (rev 14509) @@ -601,15 +601,18 @@ * Identity Controls * * If you don't want to allow users to change their email address - * then you can set $edit_identity to false, if you want them to + * then you can set $edit_identity to false; if you want them to * not be able to change their full name too then set $edit_name - * to false as well. $edit_name has no effect unless $edit_identity - * is false; + * to false as well. $edit_reply_to likewise controls users' ability + * to change their reply-to address. $edit_name and $edit_reply_to + * have no effect unless $edit_identity is false; * @global bool $edit_identity * @global bool $edit_name + * @global bool $edit_reply_to */ $edit_identity = true; $edit_name = true; +$edit_reply_to = true; /** * SquirrelMail adds username information to every sent email. Modified: trunk/squirrelmail/doc/ChangeLog =================================================================== --- trunk/squirrelmail/doc/ChangeLog 2015-06-20 11:53:28 UTC (rev 14508) +++ trunk/squirrelmail/doc/ChangeLog 2015-06-20 12:52:36 UTC (rev 14509) @@ -396,6 +396,8 @@ - Prevent session lock-up caused by filters plugin trying to move messages in an account that is over quota. - Added MD5 alternative to directory hash calculation + - Added ability for administrator to control whether or not users + can edit their reply-to address ($edit_reply_to in config.php) Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/include/options/personal.php =================================================================== --- trunk/squirrelmail/include/options/personal.php 2015-06-20 11:53:28 UTC (rev 14508) +++ trunk/squirrelmail/include/options/personal.php 2015-06-20 12:52:36 UTC (rev 14509) @@ -34,7 +34,7 @@ * @return array all option information */ function load_optpage_data_personal() { - global $data_dir, $username, $edit_identity, $edit_name, + global $data_dir, $username, $edit_identity, $edit_name, $edit_reply_to, $full_name, $reply_to, $email_address, $signature, $tzChangeAllowed, $timeZone, $domain; @@ -108,13 +108,26 @@ ); } - $optvals[SMOPT_GRP_CONTACT][] = array( - 'name' => 'reply_to', - 'caption' => _("Reply To"), - 'type' => SMOPT_TYPE_STRING, - 'refresh' => SMOPT_REFRESH_NONE, - 'size' => SMOPT_SIZE_HUGE - ); + if ($edit_identity || $edit_reply_to) { + $optvals[SMOPT_GRP_CONTACT][] = array( + 'name' => 'reply_to', + 'caption' => _("Reply To"), + 'type' => SMOPT_TYPE_STRING, + 'refresh' => SMOPT_REFRESH_NONE, + 'size' => SMOPT_SIZE_HUGE + ); + } else { +//TODO: For many users, this is redundant to the email address above, especially if not editable -- so here instead of a comment, we could just hide it... in fact, that's what we'll do, but keep this code for posterity in case someone decides we shouldn't do this +/* + $optvals[SMOPT_GRP_CONTACT][] = array( + 'name' => 'reply_to', + 'caption' => _("Reply To"), + 'type' => SMOPT_TYPE_COMMENT, + 'refresh' => SMOPT_REFRESH_NONE, + 'comment' => sm_encode_html_special_chars($reply_to), + ); +*/ + } $optvals[SMOPT_GRP_CONTACT][] = array( 'name' => 'signature', Modified: trunk/squirrelmail/plugins/administrator/defines.php =================================================================== --- trunk/squirrelmail/plugins/administrator/defines.php 2015-06-20 11:53:28 UTC (rev 14508) +++ trunk/squirrelmail/plugins/administrator/defines.php 2015-06-20 12:52:36 UTC (rev 14509) @@ -261,6 +261,7 @@ '$edit_identity' => array( 'name' => _("Allow editing of identities"), 'type' => SMOPT_TYPE_BOOLEAN ), '$edit_name' => array( 'name' => _("Allow editing of full name"), + '$edit_reply_to' => array( 'name' => _("Allow editing of reply-to address"), 'type' => SMOPT_TYPE_BOOLEAN ), '$hide_auth_header' => array( 'name' => _("Remove username from headers"), 'comment' => _("Used only when identities can't be modified"), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2015-08-01 04:32:50
|
Revision: 14518 http://sourceforge.net/p/squirrelmail/code/14518 Author: pdontthink Date: 2015-08-01 04:32:48 +0000 (Sat, 01 Aug 2015) Log Message: ----------- Add new login_before_page_header (boolean) hook; allows plugins to have more explicit control over login page header Modified Paths: -------------- trunk/squirrelmail/doc/ChangeLog trunk/squirrelmail/src/login.php Modified: trunk/squirrelmail/doc/ChangeLog =================================================================== --- trunk/squirrelmail/doc/ChangeLog 2015-08-01 04:29:17 UTC (rev 14517) +++ trunk/squirrelmail/doc/ChangeLog 2015-08-01 04:32:48 UTC (rev 14518) @@ -398,6 +398,8 @@ - Added MD5 alternative to directory hash calculation - Added ability for administrator to control whether or not users can edit their reply-to address ($edit_reply_to in config.php) + - Added new "login_before_page_header" (boolean) hook; allows + plugins to have more explicit control over login page header Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/src/login.php =================================================================== --- trunk/squirrelmail/src/login.php 2015-08-01 04:29:17 UTC (rev 14517) +++ trunk/squirrelmail/src/login.php 2015-08-01 04:32:48 UTC (rev 14518) @@ -100,7 +100,9 @@ $color[8] = '#000000'; /* black Normal text */ } -displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE ); +// if any plugin returns TRUE here, the standard page header will be skipped +if (!boolean_hook_function('login_before_page_header', array($header), 1)) + displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2016-01-01 20:59:58
|
Revision: 14539 http://sourceforge.net/p/squirrelmail/code/14539 Author: pdontthink Date: 2016-01-01 20:59:53 +0000 (Fri, 01 Jan 2016) Log Message: ----------- Happy New Year Modified Paths: -------------- trunk/squirrelmail/class/deliver/Deliver.class.php trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php trunk/squirrelmail/class/deliver/index.php trunk/squirrelmail/class/error.class.php trunk/squirrelmail/class/helper/VCard.class.php trunk/squirrelmail/class/helper/index.php trunk/squirrelmail/class/index.php trunk/squirrelmail/class/l10n/gettext.class.php trunk/squirrelmail/class/l10n/index.php trunk/squirrelmail/class/l10n/streams.class.php trunk/squirrelmail/class/l10n.class.php trunk/squirrelmail/class/mime/AddressStructure.class.php trunk/squirrelmail/class/mime/ContentType.class.php trunk/squirrelmail/class/mime/Disposition.class.php trunk/squirrelmail/class/mime/Language.class.php trunk/squirrelmail/class/mime/Message.class.php trunk/squirrelmail/class/mime/MessageHeader.class.php trunk/squirrelmail/class/mime/Rfc822Header.class.php trunk/squirrelmail/class/mime/SMimeMessage.class.php trunk/squirrelmail/class/mime/index.php trunk/squirrelmail/class/mime.class.php trunk/squirrelmail/class/template/PHP_Template.class.php trunk/squirrelmail/class/template/Smarty_Template.class.php trunk/squirrelmail/class/template/Template.class.php trunk/squirrelmail/class/template/index.php trunk/squirrelmail/config/conf.pl trunk/squirrelmail/config/config_default.php trunk/squirrelmail/config/config_local.example.php trunk/squirrelmail/config/index.php trunk/squirrelmail/contrib/conf.pl.8 trunk/squirrelmail/contrib/decrypt_headers.php trunk/squirrelmail/contrib/flat2sql.pl trunk/squirrelmail/doc/index.php trunk/squirrelmail/functions/abook_database.php trunk/squirrelmail/functions/abook_ldap_server.php trunk/squirrelmail/functions/abook_local_file.php trunk/squirrelmail/functions/addressbook.php trunk/squirrelmail/functions/arrays.php trunk/squirrelmail/functions/attachment_common.php trunk/squirrelmail/functions/auth.php trunk/squirrelmail/functions/compose.php trunk/squirrelmail/functions/constants.php trunk/squirrelmail/functions/date.php trunk/squirrelmail/functions/db_prefs.php trunk/squirrelmail/functions/decode/cp1250.php trunk/squirrelmail/functions/decode/cp1251.php trunk/squirrelmail/functions/decode/cp1252.php trunk/squirrelmail/functions/decode/cp1253.php trunk/squirrelmail/functions/decode/cp1254.php trunk/squirrelmail/functions/decode/cp1255.php trunk/squirrelmail/functions/decode/cp1256.php trunk/squirrelmail/functions/decode/cp1257.php trunk/squirrelmail/functions/decode/cp1258.php trunk/squirrelmail/functions/decode/cp855.php trunk/squirrelmail/functions/decode/cp866.php trunk/squirrelmail/functions/decode/index.php trunk/squirrelmail/functions/decode/iso_8859_1.php trunk/squirrelmail/functions/decode/iso_8859_10.php trunk/squirrelmail/functions/decode/iso_8859_11.php trunk/squirrelmail/functions/decode/iso_8859_13.php trunk/squirrelmail/functions/decode/iso_8859_14.php trunk/squirrelmail/functions/decode/iso_8859_15.php trunk/squirrelmail/functions/decode/iso_8859_16.php trunk/squirrelmail/functions/decode/iso_8859_2.php trunk/squirrelmail/functions/decode/iso_8859_3.php trunk/squirrelmail/functions/decode/iso_8859_4.php trunk/squirrelmail/functions/decode/iso_8859_5.php trunk/squirrelmail/functions/decode/iso_8859_6.php trunk/squirrelmail/functions/decode/iso_8859_7.php trunk/squirrelmail/functions/decode/iso_8859_8.php trunk/squirrelmail/functions/decode/iso_8859_9.php trunk/squirrelmail/functions/decode/iso_ir_111.php trunk/squirrelmail/functions/decode/koi8_r.php trunk/squirrelmail/functions/decode/koi8_u.php trunk/squirrelmail/functions/decode/ns_4551_1.php trunk/squirrelmail/functions/decode/tis_620.php trunk/squirrelmail/functions/decode/us_ascii.php trunk/squirrelmail/functions/decode/utf_8.php trunk/squirrelmail/functions/display_messages.php trunk/squirrelmail/functions/encode/cp1251.php trunk/squirrelmail/functions/encode/cp1255.php trunk/squirrelmail/functions/encode/cp1256.php trunk/squirrelmail/functions/encode/index.php trunk/squirrelmail/functions/encode/iso_8859_1.php trunk/squirrelmail/functions/encode/iso_8859_15.php trunk/squirrelmail/functions/encode/iso_8859_2.php trunk/squirrelmail/functions/encode/iso_8859_7.php trunk/squirrelmail/functions/encode/iso_8859_9.php trunk/squirrelmail/functions/encode/koi8_r.php trunk/squirrelmail/functions/encode/koi8_u.php trunk/squirrelmail/functions/encode/tis_620.php trunk/squirrelmail/functions/encode/us_ascii.php trunk/squirrelmail/functions/encode/utf_8.php trunk/squirrelmail/functions/file_prefs.php trunk/squirrelmail/functions/files.php trunk/squirrelmail/functions/folder_manip.php trunk/squirrelmail/functions/forms.php trunk/squirrelmail/functions/gettext.php trunk/squirrelmail/functions/global.php trunk/squirrelmail/functions/html.php trunk/squirrelmail/functions/htmlentities/index.php trunk/squirrelmail/functions/htmlentities/iso-8859-1.php trunk/squirrelmail/functions/htmlentities/readme.php trunk/squirrelmail/functions/htmlentities/utf-8.php trunk/squirrelmail/functions/i18n.php trunk/squirrelmail/functions/identity.php trunk/squirrelmail/functions/imap.php trunk/squirrelmail/functions/imap_asearch.php trunk/squirrelmail/functions/imap_general.php trunk/squirrelmail/functions/imap_mailbox.php trunk/squirrelmail/functions/imap_messages.php trunk/squirrelmail/functions/imap_utf7_local.php trunk/squirrelmail/functions/index.php trunk/squirrelmail/functions/mailbox_display.php trunk/squirrelmail/functions/mime.php trunk/squirrelmail/functions/ngettext.php trunk/squirrelmail/functions/options.php trunk/squirrelmail/functions/page_header.php trunk/squirrelmail/functions/plugin.php trunk/squirrelmail/functions/prefs.php trunk/squirrelmail/functions/rfc822address.php trunk/squirrelmail/functions/strings.php trunk/squirrelmail/functions/template/abook_util.php trunk/squirrelmail/functions/template/folder_list_util.php trunk/squirrelmail/functions/template/general_util.php trunk/squirrelmail/functions/template/message_list_util.php trunk/squirrelmail/functions/template/paginator_util.php trunk/squirrelmail/functions/tree.php trunk/squirrelmail/functions/url_parser.php trunk/squirrelmail/help/index.php trunk/squirrelmail/images/index.php trunk/squirrelmail/images/themes/default/index.php trunk/squirrelmail/images/themes/default/theme.php trunk/squirrelmail/images/themes/index.php trunk/squirrelmail/images/themes/xp/index.php trunk/squirrelmail/images/themes/xp/theme.php trunk/squirrelmail/include/constants.php trunk/squirrelmail/include/errors.php trunk/squirrelmail/include/index.php trunk/squirrelmail/include/init.php trunk/squirrelmail/include/languages.php trunk/squirrelmail/include/load_prefs.php trunk/squirrelmail/include/options/accessibility.php trunk/squirrelmail/include/options/compose.php trunk/squirrelmail/include/options/display.php trunk/squirrelmail/include/options/folder.php trunk/squirrelmail/include/options/index.php trunk/squirrelmail/include/options/personal.php trunk/squirrelmail/include/timezones/check.php trunk/squirrelmail/include/timezones/index.php trunk/squirrelmail/include/timezones/standard.php trunk/squirrelmail/include/timezones/standard_orig.php trunk/squirrelmail/include/timezones.php trunk/squirrelmail/include/validate.php trunk/squirrelmail/index.php trunk/squirrelmail/locale/index.php trunk/squirrelmail/plugins/administrator/auth.php trunk/squirrelmail/plugins/administrator/defines.php trunk/squirrelmail/plugins/administrator/index.php trunk/squirrelmail/plugins/administrator/options.php trunk/squirrelmail/plugins/administrator/setup.php trunk/squirrelmail/plugins/bug_report/bug_report.php trunk/squirrelmail/plugins/bug_report/config_default.php trunk/squirrelmail/plugins/bug_report/functions.php trunk/squirrelmail/plugins/bug_report/index.php trunk/squirrelmail/plugins/bug_report/setup.php trunk/squirrelmail/plugins/bug_report/show_system_specs.php trunk/squirrelmail/plugins/bug_report/system_specs.php trunk/squirrelmail/plugins/bug_report/templates/default/index.php trunk/squirrelmail/plugins/bug_report/templates/default/system_specs.tpl trunk/squirrelmail/plugins/bug_report/templates/default/usage.tpl trunk/squirrelmail/plugins/bug_report/templates/index.php trunk/squirrelmail/plugins/calendar/calendar.php trunk/squirrelmail/plugins/calendar/calendar_data.php trunk/squirrelmail/plugins/calendar/day.php trunk/squirrelmail/plugins/calendar/event_create.php trunk/squirrelmail/plugins/calendar/event_delete.php trunk/squirrelmail/plugins/calendar/event_edit.php trunk/squirrelmail/plugins/calendar/functions.php trunk/squirrelmail/plugins/calendar/index.php trunk/squirrelmail/plugins/calendar/setup.php trunk/squirrelmail/plugins/change_password/backend/index.php trunk/squirrelmail/plugins/change_password/backend/ldap.php trunk/squirrelmail/plugins/change_password/backend/merak.php trunk/squirrelmail/plugins/change_password/backend/mysql.php trunk/squirrelmail/plugins/change_password/backend/peardb.php trunk/squirrelmail/plugins/change_password/backend/poppassd.php trunk/squirrelmail/plugins/change_password/backend/template.php trunk/squirrelmail/plugins/change_password/backend/vmailmgrd.php trunk/squirrelmail/plugins/change_password/config_default.php trunk/squirrelmail/plugins/change_password/functions.php trunk/squirrelmail/plugins/change_password/index.php trunk/squirrelmail/plugins/change_password/options.php trunk/squirrelmail/plugins/change_password/setup.php trunk/squirrelmail/plugins/demo/README trunk/squirrelmail/plugins/demo/demo.php trunk/squirrelmail/plugins/demo/functions.php trunk/squirrelmail/plugins/demo/index.php trunk/squirrelmail/plugins/demo/setup.php trunk/squirrelmail/plugins/demo/templates/default/demo.tpl trunk/squirrelmail/plugins/filters/bulkquery/index.php trunk/squirrelmail/plugins/filters/config_default.php trunk/squirrelmail/plugins/filters/filters.php trunk/squirrelmail/plugins/filters/index.php trunk/squirrelmail/plugins/filters/options.php trunk/squirrelmail/plugins/filters/setup.php trunk/squirrelmail/plugins/filters/spamoptions.php trunk/squirrelmail/plugins/fortune/config_sample.php trunk/squirrelmail/plugins/fortune/functions.php trunk/squirrelmail/plugins/fortune/index.php trunk/squirrelmail/plugins/fortune/setup.php trunk/squirrelmail/plugins/index.php trunk/squirrelmail/plugins/info/functions.php trunk/squirrelmail/plugins/info/index.php trunk/squirrelmail/plugins/info/options.php trunk/squirrelmail/plugins/info/setup.php trunk/squirrelmail/plugins/listcommands/config_sample.php trunk/squirrelmail/plugins/listcommands/functions.php trunk/squirrelmail/plugins/listcommands/index.php trunk/squirrelmail/plugins/listcommands/mailout.php trunk/squirrelmail/plugins/listcommands/options.php trunk/squirrelmail/plugins/listcommands/setup.php trunk/squirrelmail/plugins/listcommands/templates/default/mailout.tpl trunk/squirrelmail/plugins/listcommands/templates/default/non_rfc_lists.tpl trunk/squirrelmail/plugins/mail_fetch/class.mail_fetch.php trunk/squirrelmail/plugins/mail_fetch/config_default.php trunk/squirrelmail/plugins/mail_fetch/constants.php trunk/squirrelmail/plugins/mail_fetch/fetch.php trunk/squirrelmail/plugins/mail_fetch/functions.php trunk/squirrelmail/plugins/mail_fetch/index.php trunk/squirrelmail/plugins/mail_fetch/options.php trunk/squirrelmail/plugins/mail_fetch/setup.php trunk/squirrelmail/plugins/message_details/index.php trunk/squirrelmail/plugins/message_details/message_details_bottom.php trunk/squirrelmail/plugins/message_details/message_details_main.php trunk/squirrelmail/plugins/message_details/message_details_top.php trunk/squirrelmail/plugins/message_details/setup.php trunk/squirrelmail/plugins/newmail/config_default.php trunk/squirrelmail/plugins/newmail/config_sample.php trunk/squirrelmail/plugins/newmail/functions.php trunk/squirrelmail/plugins/newmail/index.php trunk/squirrelmail/plugins/newmail/loadfile.php trunk/squirrelmail/plugins/newmail/media/index.php trunk/squirrelmail/plugins/newmail/newmail.php trunk/squirrelmail/plugins/newmail/newmail_opt.php trunk/squirrelmail/plugins/newmail/setup.php trunk/squirrelmail/plugins/newmail/sounds/index.php trunk/squirrelmail/plugins/newmail/testsound.php trunk/squirrelmail/plugins/preview_pane/empty_frame.php trunk/squirrelmail/plugins/preview_pane/functions.php trunk/squirrelmail/plugins/preview_pane/index.php trunk/squirrelmail/plugins/preview_pane/setup.php trunk/squirrelmail/plugins/preview_pane/templates/default_advanced/collapse_buttons.tpl trunk/squirrelmail/plugins/preview_pane/templates/default_advanced/empty_frame.tpl trunk/squirrelmail/plugins/sent_subfolders/functions.php trunk/squirrelmail/plugins/sent_subfolders/index.php trunk/squirrelmail/plugins/sent_subfolders/setup.php trunk/squirrelmail/plugins/spamcop/functions.php trunk/squirrelmail/plugins/spamcop/index.php trunk/squirrelmail/plugins/spamcop/options.php trunk/squirrelmail/plugins/spamcop/setup.php trunk/squirrelmail/plugins/spamcop/spamcop.php trunk/squirrelmail/plugins/squirrelspell/INSTALL trunk/squirrelmail/plugins/squirrelspell/class/cmd_spell.php trunk/squirrelmail/plugins/squirrelspell/class/common.php trunk/squirrelmail/plugins/squirrelspell/class/php_pspell.php trunk/squirrelmail/plugins/squirrelspell/doc/index.php trunk/squirrelmail/plugins/squirrelspell/index.php trunk/squirrelmail/plugins/squirrelspell/js/check_me.js trunk/squirrelmail/plugins/squirrelspell/js/crypto_settings.js trunk/squirrelmail/plugins/squirrelspell/js/decrypt_error.js trunk/squirrelmail/plugins/squirrelspell/js/index.php trunk/squirrelmail/plugins/squirrelspell/js/init.js trunk/squirrelmail/plugins/squirrelspell/modules/check_me.mod trunk/squirrelmail/plugins/squirrelspell/modules/crypto.mod trunk/squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod trunk/squirrelmail/plugins/squirrelspell/modules/edit_dic.mod trunk/squirrelmail/plugins/squirrelspell/modules/enc_setup.mod trunk/squirrelmail/plugins/squirrelspell/modules/forget_me.mod trunk/squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod trunk/squirrelmail/plugins/squirrelspell/modules/index.php trunk/squirrelmail/plugins/squirrelspell/modules/init.mod trunk/squirrelmail/plugins/squirrelspell/modules/lang_change.mod trunk/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod trunk/squirrelmail/plugins/squirrelspell/modules/options_main.mod trunk/squirrelmail/plugins/squirrelspell/setup.php trunk/squirrelmail/plugins/squirrelspell/sqspell_config.php trunk/squirrelmail/plugins/squirrelspell/sqspell_functions.php trunk/squirrelmail/plugins/squirrelspell/sqspell_interface.php trunk/squirrelmail/plugins/squirrelspell/sqspell_options.php trunk/squirrelmail/plugins/test/README trunk/squirrelmail/plugins/test/decodeheader.php trunk/squirrelmail/plugins/test/functions.php trunk/squirrelmail/plugins/test/index.php trunk/squirrelmail/plugins/test/ngettext.php trunk/squirrelmail/plugins/test/setup.php trunk/squirrelmail/plugins/test/templates/default/test_menu.tpl trunk/squirrelmail/plugins/test/test.php trunk/squirrelmail/plugins/translate/config_default.php trunk/squirrelmail/plugins/translate/config_sample.php trunk/squirrelmail/plugins/translate/functions.php trunk/squirrelmail/plugins/translate/index.php trunk/squirrelmail/plugins/translate/options.php trunk/squirrelmail/plugins/translate/setup.php trunk/squirrelmail/po/independent_strings.txt trunk/squirrelmail/po/index.php trunk/squirrelmail/po/squirrelmail.pot trunk/squirrelmail/src/about.php trunk/squirrelmail/src/addrbook_popup.php trunk/squirrelmail/src/addrbook_search.php trunk/squirrelmail/src/addrbook_search_html.php trunk/squirrelmail/src/addressbook.php trunk/squirrelmail/src/compose.php trunk/squirrelmail/src/configtest.php trunk/squirrelmail/src/delete_message.php trunk/squirrelmail/src/download.php trunk/squirrelmail/src/empty_trash.php trunk/squirrelmail/src/folders.php trunk/squirrelmail/src/help.php trunk/squirrelmail/src/image.php trunk/squirrelmail/src/index.php trunk/squirrelmail/src/left_main.php trunk/squirrelmail/src/login.php trunk/squirrelmail/src/mailto.php trunk/squirrelmail/src/options.php trunk/squirrelmail/src/options_highlight.php trunk/squirrelmail/src/options_identities.php trunk/squirrelmail/src/options_order.php trunk/squirrelmail/src/read_body.php trunk/squirrelmail/src/redirect.php trunk/squirrelmail/src/right_main.php trunk/squirrelmail/src/search.php trunk/squirrelmail/src/signout.php trunk/squirrelmail/src/squirrelmail_rpc.php trunk/squirrelmail/src/style.php trunk/squirrelmail/src/vcard.php trunk/squirrelmail/src/view_header.php trunk/squirrelmail/src/view_html.php trunk/squirrelmail/src/view_text.php trunk/squirrelmail/src/webmail.php trunk/squirrelmail/templates/default/addrbook_addedit.tpl trunk/squirrelmail/templates/default/addrbook_search_list.tpl trunk/squirrelmail/templates/default/addressbook_list.tpl trunk/squirrelmail/templates/default/addressbook_paginator.tpl trunk/squirrelmail/templates/default/addressbook_popup.tpl trunk/squirrelmail/templates/default/addressbook_search_form.tpl trunk/squirrelmail/templates/default/body.tpl trunk/squirrelmail/templates/default/compose_attachments.tpl trunk/squirrelmail/templates/default/compose_body.tpl trunk/squirrelmail/templates/default/compose_buttons.tpl trunk/squirrelmail/templates/default/compose_form_close.tpl trunk/squirrelmail/templates/default/compose_header.tpl trunk/squirrelmail/templates/default/compose_newwin_close.tpl trunk/squirrelmail/templates/default/config.php trunk/squirrelmail/templates/default/edit_list_associative_widget.tpl trunk/squirrelmail/templates/default/edit_list_associative_widget_list_style.tpl trunk/squirrelmail/templates/default/edit_list_widget.tpl trunk/squirrelmail/templates/default/edit_list_widget_list_style.tpl trunk/squirrelmail/templates/default/empty_folder.tpl trunk/squirrelmail/templates/default/error_box.tpl trunk/squirrelmail/templates/default/error_logout.tpl trunk/squirrelmail/templates/default/error_message.tpl trunk/squirrelmail/templates/default/folder_manip.tpl trunk/squirrelmail/templates/default/folder_manip_dialog.tpl trunk/squirrelmail/templates/default/footer.tpl trunk/squirrelmail/templates/default/form.tpl trunk/squirrelmail/templates/default/form_close.tpl trunk/squirrelmail/templates/default/header.tpl trunk/squirrelmail/templates/default/help_chapter.tpl trunk/squirrelmail/templates/default/help_toc.tpl trunk/squirrelmail/templates/default/horizontal_rule.tpl trunk/squirrelmail/templates/default/hyperlink.tpl trunk/squirrelmail/templates/default/image.tpl trunk/squirrelmail/templates/default/index.php trunk/squirrelmail/templates/default/input.tpl trunk/squirrelmail/templates/default/js/default.js trunk/squirrelmail/templates/default/js/index.php trunk/squirrelmail/templates/default/label.tpl trunk/squirrelmail/templates/default/left_main.tpl trunk/squirrelmail/templates/default/line_break.tpl trunk/squirrelmail/templates/default/login.tpl trunk/squirrelmail/templates/default/message_list.tpl trunk/squirrelmail/templates/default/message_list_controls.tpl trunk/squirrelmail/templates/default/motd.tpl trunk/squirrelmail/templates/default/non_breaking_space.tpl trunk/squirrelmail/templates/default/note.tpl trunk/squirrelmail/templates/default/option_groups.tpl trunk/squirrelmail/templates/default/options.tpl trunk/squirrelmail/templates/default/options_advidentity_list.tpl trunk/squirrelmail/templates/default/options_highlight_addedit.tpl trunk/squirrelmail/templates/default/options_highlight_list.tpl trunk/squirrelmail/templates/default/options_order.tpl trunk/squirrelmail/templates/default/page_header.tpl trunk/squirrelmail/templates/default/paginator.tpl trunk/squirrelmail/templates/default/plugins/fortune/mailbox_index_before.tpl trunk/squirrelmail/templates/default/plugins/listcommands/read_body_header.tpl trunk/squirrelmail/templates/default/protocol_header.tpl trunk/squirrelmail/templates/default/read_attachments.tpl trunk/squirrelmail/templates/default/read_display_images_inline.tpl trunk/squirrelmail/templates/default/read_handle_receipt.tpl trunk/squirrelmail/templates/default/read_headers.tpl trunk/squirrelmail/templates/default/read_html_iframe.tpl trunk/squirrelmail/templates/default/read_menubar_buttons.tpl trunk/squirrelmail/templates/default/read_menubar_nav.tpl trunk/squirrelmail/templates/default/read_message_body.tpl trunk/squirrelmail/templates/default/read_message_print.tpl trunk/squirrelmail/templates/default/read_message_priority.tpl trunk/squirrelmail/templates/default/read_recipient_list.tpl trunk/squirrelmail/templates/default/read_toolbar.tpl trunk/squirrelmail/templates/default/read_xmailer.tpl trunk/squirrelmail/templates/default/search.tpl trunk/squirrelmail/templates/default/search_advanced.tpl trunk/squirrelmail/templates/default/search_list.tpl trunk/squirrelmail/templates/default/search_result_empty.tpl trunk/squirrelmail/templates/default/search_result_mailbox.tpl trunk/squirrelmail/templates/default/search_result_top.tpl trunk/squirrelmail/templates/default/select.tpl trunk/squirrelmail/templates/default/signout.tpl trunk/squirrelmail/templates/default/span.tpl trunk/squirrelmail/templates/default/table.tpl trunk/squirrelmail/templates/default/table_close.tpl trunk/squirrelmail/templates/default/table_data.tpl trunk/squirrelmail/templates/default/table_data_close.tpl trunk/squirrelmail/templates/default/table_row.tpl trunk/squirrelmail/templates/default/table_row_close.tpl trunk/squirrelmail/templates/default/textarea.tpl trunk/squirrelmail/templates/default/vcard.tpl trunk/squirrelmail/templates/default/view_header.tpl trunk/squirrelmail/templates/default/view_text.tpl trunk/squirrelmail/templates/default/webmail.tpl trunk/squirrelmail/templates/default_advanced/compose_body.tpl trunk/squirrelmail/templates/default_advanced/config.php trunk/squirrelmail/templates/default_advanced/left_main.tpl trunk/squirrelmail/templates/default_advanced/login.tpl trunk/squirrelmail/templates/default_advanced/options_highlight_addedit.tpl trunk/squirrelmail/templates/default_advanced/options_highlight_list.tpl trunk/squirrelmail/templates/default_advanced/options_order.tpl trunk/squirrelmail/templates/default_advanced/page_header.tpl trunk/squirrelmail/templates/default_advanced/read_headers.tpl trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl trunk/squirrelmail/templates/default_advanced/read_menubar_nav.tpl trunk/squirrelmail/templates/default_advanced/webmail.tpl trunk/squirrelmail/templates/default_rpc/config.php trunk/squirrelmail/templates/default_rpc/rpc_response_error.tpl trunk/squirrelmail/templates/default_rpc/rpc_response_success.tpl trunk/squirrelmail/templates/index.php trunk/squirrelmail/templates/util_addressbook.php trunk/squirrelmail/templates/util_read.php trunk/squirrelmail/themes/alien_glow.php trunk/squirrelmail/themes/autumn.php trunk/squirrelmail/themes/autumn2.php trunk/squirrelmail/themes/black_bean_burrito_theme.php trunk/squirrelmail/themes/blue_grey_theme.php trunk/squirrelmail/themes/blue_on_blue.php trunk/squirrelmail/themes/bluesnews_theme.php trunk/squirrelmail/themes/bluesome.php trunk/squirrelmail/themes/bluesteel_theme.php trunk/squirrelmail/themes/christmas.php trunk/squirrelmail/themes/classic_blue.php trunk/squirrelmail/themes/classic_blue2.php trunk/squirrelmail/themes/color_theme_to_css.php trunk/squirrelmail/themes/css/index.php trunk/squirrelmail/themes/dark_green.php trunk/squirrelmail/themes/dark_grey_theme.php trunk/squirrelmail/themes/darkness.php trunk/squirrelmail/themes/deepocean2_theme.php trunk/squirrelmail/themes/deepocean_theme.php trunk/squirrelmail/themes/default_theme.php trunk/squirrelmail/themes/dompie_theme.php trunk/squirrelmail/themes/forest_theme.php trunk/squirrelmail/themes/greenhouse_effect.php trunk/squirrelmail/themes/high_contrast_theme.php trunk/squirrelmail/themes/ice_theme.php trunk/squirrelmail/themes/in_the_pink.php trunk/squirrelmail/themes/index.php trunk/squirrelmail/themes/kind_of_blue.php trunk/squirrelmail/themes/maize_theme.php trunk/squirrelmail/themes/methodical_theme.php trunk/squirrelmail/themes/midnight.php trunk/squirrelmail/themes/minimal_bw.php trunk/squirrelmail/themes/monostochastic.php trunk/squirrelmail/themes/netstyle_theme.php trunk/squirrelmail/themes/penguin.php trunk/squirrelmail/themes/plain_blue_theme.php trunk/squirrelmail/themes/powder_blue.php trunk/squirrelmail/themes/purple_theme.php trunk/squirrelmail/themes/random.php trunk/squirrelmail/themes/redmond.php trunk/squirrelmail/themes/sandstorm_theme.php trunk/squirrelmail/themes/seaspray_theme.php trunk/squirrelmail/themes/servery_theme.php trunk/squirrelmail/themes/shades_of_grey.php trunk/squirrelmail/themes/silver_steel_theme.php trunk/squirrelmail/themes/simple_green2.php trunk/squirrelmail/themes/simple_green_theme.php trunk/squirrelmail/themes/simple_purple.php trunk/squirrelmail/themes/slashdot_theme.php trunk/squirrelmail/themes/spice_of_life.php trunk/squirrelmail/themes/spice_of_life_dark.php trunk/squirrelmail/themes/spice_of_life_lite.php trunk/squirrelmail/themes/techno_blue.php trunk/squirrelmail/themes/turquoise.php trunk/squirrelmail/themes/wood_theme.php Modified: trunk/squirrelmail/class/deliver/Deliver.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/deliver/Deliver.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -7,7 +7,7 @@ * a delivery backend. * * @author Marc Groot Koerkamp - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -5,7 +5,7 @@ * * Delivery backend for the Deliver class. * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -5,7 +5,7 @@ * * SMTP delivery backend for the Deliver class. * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -6,7 +6,7 @@ * Delivery backend for the Deliver class. * * @author Marc Groot Koerkamp - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/deliver/index.php =================================================================== --- trunk/squirrelmail/class/deliver/index.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/deliver/index.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -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-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/error.class.php =================================================================== --- trunk/squirrelmail/class/error.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/error.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -5,7 +5,7 @@ * * This contains the custom error handler for SquirrelMail. * - * @copyright 2005-2015 The SquirrelMail Project Team + * @copyright 2005-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/helper/VCard.class.php =================================================================== --- trunk/squirrelmail/class/helper/VCard.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/helper/VCard.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -7,7 +7,7 @@ * * http://www.imc.org/pdi/vcard-21.txt * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/helper/index.php =================================================================== --- trunk/squirrelmail/class/helper/index.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/helper/index.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -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-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/index.php =================================================================== --- trunk/squirrelmail/class/index.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/index.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -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-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/l10n/gettext.class.php =================================================================== --- trunk/squirrelmail/class/l10n/gettext.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/l10n/gettext.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -19,7 +19,7 @@ * along with PHP-gettext; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @copyright 2004-2015 The SquirrelMail Project Team + * @copyright 2004-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/l10n/index.php =================================================================== --- trunk/squirrelmail/class/l10n/index.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/l10n/index.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -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-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/l10n/streams.class.php =================================================================== --- trunk/squirrelmail/class/l10n/streams.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/l10n/streams.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, * MA 02110-1301, USA * - * @copyright 2004-2015 The SquirrelMail Project Team + * @copyright 2004-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/l10n.class.php =================================================================== --- trunk/squirrelmail/class/l10n.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/l10n.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -7,7 +7,7 @@ * translations when php gettext extension is missing or some functions * are not available. * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/AddressStructure.class.php =================================================================== --- trunk/squirrelmail/class/mime/AddressStructure.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/mime/AddressStructure.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -6,7 +6,7 @@ * This file contains functions needed to extract email address headers from * mime messages. * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/ContentType.class.php =================================================================== --- trunk/squirrelmail/class/mime/ContentType.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/mime/ContentType.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content type headers * (rfc2045) in mime messages. * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/Disposition.class.php =================================================================== --- trunk/squirrelmail/class/mime/Disposition.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/mime/Disposition.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content disposition headers * in mime messages. See RFC 2183. * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/Language.class.php =================================================================== --- trunk/squirrelmail/class/mime/Language.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/mime/Language.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -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-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/Message.class.php =================================================================== --- trunk/squirrelmail/class/mime/Message.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/mime/Message.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle mime messages. * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/MessageHeader.class.php =================================================================== --- trunk/squirrelmail/class/mime/MessageHeader.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/mime/MessageHeader.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/Rfc822Header.class.php =================================================================== --- trunk/squirrelmail/class/mime/Rfc822Header.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/mime/Rfc822Header.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/SMimeMessage.class.php =================================================================== --- trunk/squirrelmail/class/mime/SMimeMessage.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/mime/SMimeMessage.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -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-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/index.php =================================================================== --- trunk/squirrelmail/class/mime/index.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/mime/index.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -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-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime.class.php =================================================================== --- trunk/squirrelmail/class/mime.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/mime.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -5,7 +5,7 @@ * * This file loads classes needed to handle mime messages. * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/template/PHP_Template.class.php =================================================================== --- trunk/squirrelmail/class/template/PHP_Template.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/template/PHP_Template.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -9,7 +9,7 @@ * The SquirrelMail (Foowd) template implementation. * Derived from the foowd template implementation and adapted * for squirrelmail - * @copyright 2005-2015 The SquirrelMail Project Team + * @copyright 2005-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/template/Smarty_Template.class.php =================================================================== --- trunk/squirrelmail/class/template/Smarty_Template.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/template/Smarty_Template.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -7,7 +7,7 @@ * SquirrelMail and Smarty. All abstract methods from the Template class * are implemented here. * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/template/Template.class.php =================================================================== --- trunk/squirrelmail/class/template/Template.class.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/template/Template.class.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -8,7 +8,7 @@ * class with any custom functionality needed to interface a target * templating engine with SquirrelMail. * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/template/index.php =================================================================== --- trunk/squirrelmail/class/template/index.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/class/template/index.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -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-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/config/conf.pl =================================================================== --- trunk/squirrelmail/config/conf.pl 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/config/conf.pl 2016-01-01 20:59:53 UTC (rev 14539) @@ -1,7 +1,7 @@ #!/usr/bin/env perl # conf.pl # -# Copyright (c) 1999-2015 The SquirrelMail Project Team +# Copyright (c) 1999-2016 The SquirrelMail Project Team # Licensed under the GNU GPL. For full terms see COPYING. # # A simple configure script to configure SquirrelMail Modified: trunk/squirrelmail/config/config_default.php =================================================================== --- trunk/squirrelmail/config/config_default.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/config/config_default.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -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-2015 The SquirrelMail Project Team + * @copyright 2000-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/config/config_local.example.php =================================================================== --- trunk/squirrelmail/config/config_local.example.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/config/config_local.example.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -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-2015 The SquirrelMail Project Team + * @copyright 2002-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/config/index.php =================================================================== --- trunk/squirrelmail/config/index.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/config/index.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -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-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/contrib/conf.pl.8 =================================================================== --- trunk/squirrelmail/contrib/conf.pl.8 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/contrib/conf.pl.8 2016-01-01 20:59:53 UTC (rev 14539) @@ -30,7 +30,7 @@ .SH "AUTHOR" Tomas Kuliavas <to...@us...> .SH "COPYRIGHT" -Copyright (c) 2006-2015 The SquirrelMail Project Team +Copyright (c) 2006-2016 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: trunk/squirrelmail/contrib/decrypt_headers.php =================================================================== --- trunk/squirrelmail/contrib/decrypt_headers.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/contrib/decrypt_headers.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -3,7 +3,7 @@ /** * Script provides form to decode encrypted header information. * - * @copyright 2005-2015 The SquirrelMail Project Team + * @copyright 2005-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/contrib/flat2sql.pl =================================================================== --- trunk/squirrelmail/contrib/flat2sql.pl 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/contrib/flat2sql.pl 2016-01-01 20:59:53 UTC (rev 14539) @@ -8,7 +8,7 @@ # using this script. # # Copyright (c) 2002, Michael Blandford and Tal Yardeni -# Copyright (c) 2005-2015 The SquirrelMail Project Team +# Copyright (c) 2005-2016 The SquirrelMail Project Team # # This script is licensed under the GNU Public License (GPL). # See: http://opensource.org/licenses/gpl-license.php Modified: trunk/squirrelmail/doc/index.php =================================================================== --- trunk/squirrelmail/doc/index.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/doc/index.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -5,7 +5,7 @@ * * Redirects to the index.html file. * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/abook_database.php =================================================================== --- trunk/squirrelmail/functions/abook_database.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/abook_database.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -14,7 +14,7 @@ * PRIMARY KEY (owner,nickname) * </pre> * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/abook_ldap_server.php =================================================================== --- trunk/squirrelmail/functions/abook_ldap_server.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/abook_ldap_server.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -18,7 +18,7 @@ * and inetOrgPerson (RFC2798) objects and dn, description, sn, givenname, * cn, mail attributes. Other attributes are ignored. * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/abook_local_file.php =================================================================== --- trunk/squirrelmail/functions/abook_local_file.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/abook_local_file.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -3,7 +3,7 @@ /** * abook_local_file.php * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/addressbook.php =================================================================== --- trunk/squirrelmail/functions/addressbook.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/addressbook.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -4,7 +4,7 @@ * * Functions require SM_PATH and support of forms.php functions * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/arrays.php =================================================================== --- trunk/squirrelmail/functions/arrays.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/arrays.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -5,7 +5,7 @@ * * Contains utility functions for array operations * - * @copyright 2004-2015 The SquirrelMail Project Team + * @copyright 2004-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/attachment_common.php =================================================================== --- trunk/squirrelmail/functions/attachment_common.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/attachment_common.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -5,7 +5,7 @@ * * This file provides the handling of often-used attachment types. * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/auth.php =================================================================== --- trunk/squirrelmail/functions/auth.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/auth.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -9,7 +9,7 @@ * functions/global.php * functions/strings.php. * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/compose.php =================================================================== --- trunk/squirrelmail/functions/compose.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/compose.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -6,7 +6,7 @@ * Functions for message compositon: writing a message, attaching files etc. * * @author Thijs Kinkhorst <kink at squirrelmail.org> - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/constants.php =================================================================== --- trunk/squirrelmail/functions/constants.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/constants.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -2,7 +2,7 @@ /** * old constants function file location * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/date.php =================================================================== --- trunk/squirrelmail/functions/date.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/date.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -8,7 +8,7 @@ * <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT) * (as specified in RFC 822) -- 'Tue' is optional * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/db_prefs.php =================================================================== --- trunk/squirrelmail/functions/db_prefs.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/db_prefs.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -21,7 +21,7 @@ * Configuration of databasename, username and password is done * by using conf.pl or the administrator plugin * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1250.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1250.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/decode/cp1250.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1251.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1251.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/decode/cp1251.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1252.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1252.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/decode/cp1252.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1253.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1253.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/decode/cp1253.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1254.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1254.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/decode/cp1254.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1255.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1255.php 2016-01-01 20:04:30 UTC (rev 14538) +++ trunk/squirrelmail/functions/decode/cp1255.php 2016-01-01 20:59:53 UTC (rev 14539) @@ -16,7 +16,7 @@ * Date: 1/7/2000 * Contact: cp...@mi... * - * @copyright 2003-2015 The SquirrelMail Project Team + * @copyright 2003-2016 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1256.php ===============================================... [truncated message content] |
From: <pdo...@us...> - 2017-01-27 20:34:13
|
Revision: 14643 http://sourceforge.net/p/squirrelmail/code/14643 Author: pdontthink Date: 2017-01-27 20:34:08 +0000 (Fri, 27 Jan 2017) Log Message: ----------- Happy 2017 Modified Paths: -------------- trunk/squirrelmail/class/deliver/Deliver.class.php trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php trunk/squirrelmail/class/deliver/index.php trunk/squirrelmail/class/error.class.php trunk/squirrelmail/class/helper/VCard.class.php trunk/squirrelmail/class/helper/index.php trunk/squirrelmail/class/index.php trunk/squirrelmail/class/l10n/gettext.class.php trunk/squirrelmail/class/l10n/index.php trunk/squirrelmail/class/l10n/streams.class.php trunk/squirrelmail/class/l10n.class.php trunk/squirrelmail/class/mime/AddressStructure.class.php trunk/squirrelmail/class/mime/ContentType.class.php trunk/squirrelmail/class/mime/Disposition.class.php trunk/squirrelmail/class/mime/Language.class.php trunk/squirrelmail/class/mime/Message.class.php trunk/squirrelmail/class/mime/MessageHeader.class.php trunk/squirrelmail/class/mime/Rfc822Header.class.php trunk/squirrelmail/class/mime/SMimeMessage.class.php trunk/squirrelmail/class/mime/index.php trunk/squirrelmail/class/mime.class.php trunk/squirrelmail/class/template/PHP_Template.class.php trunk/squirrelmail/class/template/Smarty_Template.class.php trunk/squirrelmail/class/template/Template.class.php trunk/squirrelmail/class/template/index.php trunk/squirrelmail/config/conf.pl trunk/squirrelmail/config/config_default.php trunk/squirrelmail/config/config_local.example.php trunk/squirrelmail/config/index.php trunk/squirrelmail/contrib/conf.pl.8 trunk/squirrelmail/contrib/decrypt_headers.php trunk/squirrelmail/contrib/flat2sql.pl trunk/squirrelmail/doc/index.php trunk/squirrelmail/functions/abook_database.php trunk/squirrelmail/functions/abook_ldap_server.php trunk/squirrelmail/functions/abook_local_file.php trunk/squirrelmail/functions/addressbook.php trunk/squirrelmail/functions/arrays.php trunk/squirrelmail/functions/attachment_common.php trunk/squirrelmail/functions/auth.php trunk/squirrelmail/functions/compose.php trunk/squirrelmail/functions/constants.php trunk/squirrelmail/functions/date.php trunk/squirrelmail/functions/db_prefs.php trunk/squirrelmail/functions/decode/cp1250.php trunk/squirrelmail/functions/decode/cp1251.php trunk/squirrelmail/functions/decode/cp1252.php trunk/squirrelmail/functions/decode/cp1253.php trunk/squirrelmail/functions/decode/cp1254.php trunk/squirrelmail/functions/decode/cp1255.php trunk/squirrelmail/functions/decode/cp1256.php trunk/squirrelmail/functions/decode/cp1257.php trunk/squirrelmail/functions/decode/cp1258.php trunk/squirrelmail/functions/decode/cp855.php trunk/squirrelmail/functions/decode/cp866.php trunk/squirrelmail/functions/decode/index.php trunk/squirrelmail/functions/decode/iso_8859_1.php trunk/squirrelmail/functions/decode/iso_8859_10.php trunk/squirrelmail/functions/decode/iso_8859_11.php trunk/squirrelmail/functions/decode/iso_8859_13.php trunk/squirrelmail/functions/decode/iso_8859_14.php trunk/squirrelmail/functions/decode/iso_8859_15.php trunk/squirrelmail/functions/decode/iso_8859_16.php trunk/squirrelmail/functions/decode/iso_8859_2.php trunk/squirrelmail/functions/decode/iso_8859_3.php trunk/squirrelmail/functions/decode/iso_8859_4.php trunk/squirrelmail/functions/decode/iso_8859_5.php trunk/squirrelmail/functions/decode/iso_8859_6.php trunk/squirrelmail/functions/decode/iso_8859_7.php trunk/squirrelmail/functions/decode/iso_8859_8.php trunk/squirrelmail/functions/decode/iso_8859_9.php trunk/squirrelmail/functions/decode/iso_ir_111.php trunk/squirrelmail/functions/decode/koi8_r.php trunk/squirrelmail/functions/decode/koi8_u.php trunk/squirrelmail/functions/decode/ns_4551_1.php trunk/squirrelmail/functions/decode/tis_620.php trunk/squirrelmail/functions/decode/us_ascii.php trunk/squirrelmail/functions/decode/utf_8.php trunk/squirrelmail/functions/display_messages.php trunk/squirrelmail/functions/encode/cp1251.php trunk/squirrelmail/functions/encode/cp1255.php trunk/squirrelmail/functions/encode/cp1256.php trunk/squirrelmail/functions/encode/index.php trunk/squirrelmail/functions/encode/iso_8859_1.php trunk/squirrelmail/functions/encode/iso_8859_15.php trunk/squirrelmail/functions/encode/iso_8859_2.php trunk/squirrelmail/functions/encode/iso_8859_7.php trunk/squirrelmail/functions/encode/iso_8859_9.php trunk/squirrelmail/functions/encode/koi8_r.php trunk/squirrelmail/functions/encode/koi8_u.php trunk/squirrelmail/functions/encode/tis_620.php trunk/squirrelmail/functions/encode/us_ascii.php trunk/squirrelmail/functions/encode/utf_8.php trunk/squirrelmail/functions/file_prefs.php trunk/squirrelmail/functions/files.php trunk/squirrelmail/functions/folder_manip.php trunk/squirrelmail/functions/forms.php trunk/squirrelmail/functions/gettext.php trunk/squirrelmail/functions/global.php trunk/squirrelmail/functions/html.php trunk/squirrelmail/functions/htmlentities/index.php trunk/squirrelmail/functions/htmlentities/iso-8859-1.php trunk/squirrelmail/functions/htmlentities/readme.php trunk/squirrelmail/functions/htmlentities/utf-8.php trunk/squirrelmail/functions/i18n.php trunk/squirrelmail/functions/identity.php trunk/squirrelmail/functions/imap.php trunk/squirrelmail/functions/imap_asearch.php trunk/squirrelmail/functions/imap_general.php trunk/squirrelmail/functions/imap_mailbox.php trunk/squirrelmail/functions/imap_messages.php trunk/squirrelmail/functions/imap_utf7_local.php trunk/squirrelmail/functions/index.php trunk/squirrelmail/functions/mailbox_display.php trunk/squirrelmail/functions/mime.php trunk/squirrelmail/functions/ngettext.php trunk/squirrelmail/functions/options.php trunk/squirrelmail/functions/page_header.php trunk/squirrelmail/functions/plugin.php trunk/squirrelmail/functions/prefs.php trunk/squirrelmail/functions/rfc822address.php trunk/squirrelmail/functions/strings.php trunk/squirrelmail/functions/template/abook_util.php trunk/squirrelmail/functions/template/folder_list_util.php trunk/squirrelmail/functions/template/general_util.php trunk/squirrelmail/functions/template/message_list_util.php trunk/squirrelmail/functions/template/paginator_util.php trunk/squirrelmail/functions/tree.php trunk/squirrelmail/functions/url_parser.php trunk/squirrelmail/help/index.php trunk/squirrelmail/images/index.php trunk/squirrelmail/images/themes/default/index.php trunk/squirrelmail/images/themes/default/theme.php trunk/squirrelmail/images/themes/index.php trunk/squirrelmail/images/themes/xp/index.php trunk/squirrelmail/images/themes/xp/theme.php trunk/squirrelmail/include/constants.php trunk/squirrelmail/include/errors.php trunk/squirrelmail/include/index.php trunk/squirrelmail/include/init.php trunk/squirrelmail/include/languages.php trunk/squirrelmail/include/load_prefs.php trunk/squirrelmail/include/options/accessibility.php trunk/squirrelmail/include/options/compose.php trunk/squirrelmail/include/options/display.php trunk/squirrelmail/include/options/folder.php trunk/squirrelmail/include/options/index.php trunk/squirrelmail/include/options/personal.php trunk/squirrelmail/include/timezones/check.php trunk/squirrelmail/include/timezones/index.php trunk/squirrelmail/include/timezones/standard.php trunk/squirrelmail/include/timezones/standard_orig.php trunk/squirrelmail/include/timezones.php trunk/squirrelmail/include/validate.php trunk/squirrelmail/index.php trunk/squirrelmail/locale/index.php trunk/squirrelmail/plugins/administrator/auth.php trunk/squirrelmail/plugins/administrator/defines.php trunk/squirrelmail/plugins/administrator/index.php trunk/squirrelmail/plugins/administrator/options.php trunk/squirrelmail/plugins/administrator/setup.php trunk/squirrelmail/plugins/bug_report/bug_report.php trunk/squirrelmail/plugins/bug_report/config_default.php trunk/squirrelmail/plugins/bug_report/functions.php trunk/squirrelmail/plugins/bug_report/index.php trunk/squirrelmail/plugins/bug_report/setup.php trunk/squirrelmail/plugins/bug_report/show_system_specs.php trunk/squirrelmail/plugins/bug_report/system_specs.php trunk/squirrelmail/plugins/bug_report/templates/default/index.php trunk/squirrelmail/plugins/bug_report/templates/default/system_specs.tpl trunk/squirrelmail/plugins/bug_report/templates/default/usage.tpl trunk/squirrelmail/plugins/bug_report/templates/index.php trunk/squirrelmail/plugins/calendar/calendar.php trunk/squirrelmail/plugins/calendar/calendar_data.php trunk/squirrelmail/plugins/calendar/day.php trunk/squirrelmail/plugins/calendar/event_create.php trunk/squirrelmail/plugins/calendar/event_delete.php trunk/squirrelmail/plugins/calendar/event_edit.php trunk/squirrelmail/plugins/calendar/functions.php trunk/squirrelmail/plugins/calendar/index.php trunk/squirrelmail/plugins/calendar/setup.php trunk/squirrelmail/plugins/change_password/backend/index.php trunk/squirrelmail/plugins/change_password/backend/ldap.php trunk/squirrelmail/plugins/change_password/backend/merak.php trunk/squirrelmail/plugins/change_password/backend/mysql.php trunk/squirrelmail/plugins/change_password/backend/peardb.php trunk/squirrelmail/plugins/change_password/backend/poppassd.php trunk/squirrelmail/plugins/change_password/backend/template.php trunk/squirrelmail/plugins/change_password/backend/vmailmgrd.php trunk/squirrelmail/plugins/change_password/config_default.php trunk/squirrelmail/plugins/change_password/functions.php trunk/squirrelmail/plugins/change_password/index.php trunk/squirrelmail/plugins/change_password/options.php trunk/squirrelmail/plugins/change_password/setup.php trunk/squirrelmail/plugins/demo/README trunk/squirrelmail/plugins/demo/demo.php trunk/squirrelmail/plugins/demo/functions.php trunk/squirrelmail/plugins/demo/index.php trunk/squirrelmail/plugins/demo/setup.php trunk/squirrelmail/plugins/demo/templates/default/demo.tpl trunk/squirrelmail/plugins/filters/bulkquery/index.php trunk/squirrelmail/plugins/filters/config_default.php trunk/squirrelmail/plugins/filters/filters.php trunk/squirrelmail/plugins/filters/index.php trunk/squirrelmail/plugins/filters/options.php trunk/squirrelmail/plugins/filters/setup.php trunk/squirrelmail/plugins/filters/spamoptions.php trunk/squirrelmail/plugins/fortune/config_sample.php trunk/squirrelmail/plugins/fortune/functions.php trunk/squirrelmail/plugins/fortune/index.php trunk/squirrelmail/plugins/fortune/setup.php trunk/squirrelmail/plugins/index.php trunk/squirrelmail/plugins/info/functions.php trunk/squirrelmail/plugins/info/index.php trunk/squirrelmail/plugins/info/options.php trunk/squirrelmail/plugins/info/setup.php trunk/squirrelmail/plugins/listcommands/config_sample.php trunk/squirrelmail/plugins/listcommands/functions.php trunk/squirrelmail/plugins/listcommands/index.php trunk/squirrelmail/plugins/listcommands/mailout.php trunk/squirrelmail/plugins/listcommands/options.php trunk/squirrelmail/plugins/listcommands/setup.php trunk/squirrelmail/plugins/listcommands/templates/default/mailout.tpl trunk/squirrelmail/plugins/listcommands/templates/default/non_rfc_lists.tpl trunk/squirrelmail/plugins/mail_fetch/class.mail_fetch.php trunk/squirrelmail/plugins/mail_fetch/config_default.php trunk/squirrelmail/plugins/mail_fetch/constants.php trunk/squirrelmail/plugins/mail_fetch/fetch.php trunk/squirrelmail/plugins/mail_fetch/functions.php trunk/squirrelmail/plugins/mail_fetch/index.php trunk/squirrelmail/plugins/mail_fetch/options.php trunk/squirrelmail/plugins/mail_fetch/setup.php trunk/squirrelmail/plugins/message_details/index.php trunk/squirrelmail/plugins/message_details/message_details_bottom.php trunk/squirrelmail/plugins/message_details/message_details_main.php trunk/squirrelmail/plugins/message_details/message_details_top.php trunk/squirrelmail/plugins/message_details/setup.php trunk/squirrelmail/plugins/newmail/config_default.php trunk/squirrelmail/plugins/newmail/config_sample.php trunk/squirrelmail/plugins/newmail/functions.php trunk/squirrelmail/plugins/newmail/index.php trunk/squirrelmail/plugins/newmail/loadfile.php trunk/squirrelmail/plugins/newmail/media/index.php trunk/squirrelmail/plugins/newmail/newmail.php trunk/squirrelmail/plugins/newmail/newmail_opt.php trunk/squirrelmail/plugins/newmail/setup.php trunk/squirrelmail/plugins/newmail/sounds/index.php trunk/squirrelmail/plugins/newmail/testsound.php trunk/squirrelmail/plugins/preview_pane/empty_frame.php trunk/squirrelmail/plugins/preview_pane/functions.php trunk/squirrelmail/plugins/preview_pane/index.php trunk/squirrelmail/plugins/preview_pane/setup.php trunk/squirrelmail/plugins/preview_pane/templates/default_advanced/collapse_buttons.tpl trunk/squirrelmail/plugins/preview_pane/templates/default_advanced/empty_frame.tpl trunk/squirrelmail/plugins/sent_subfolders/functions.php trunk/squirrelmail/plugins/sent_subfolders/index.php trunk/squirrelmail/plugins/sent_subfolders/setup.php trunk/squirrelmail/plugins/spamcop/functions.php trunk/squirrelmail/plugins/spamcop/index.php trunk/squirrelmail/plugins/spamcop/options.php trunk/squirrelmail/plugins/spamcop/setup.php trunk/squirrelmail/plugins/spamcop/spamcop.php trunk/squirrelmail/plugins/squirrelspell/INSTALL trunk/squirrelmail/plugins/squirrelspell/class/cmd_spell.php trunk/squirrelmail/plugins/squirrelspell/class/common.php trunk/squirrelmail/plugins/squirrelspell/class/php_pspell.php trunk/squirrelmail/plugins/squirrelspell/doc/index.php trunk/squirrelmail/plugins/squirrelspell/index.php trunk/squirrelmail/plugins/squirrelspell/js/check_me.js trunk/squirrelmail/plugins/squirrelspell/js/crypto_settings.js trunk/squirrelmail/plugins/squirrelspell/js/decrypt_error.js trunk/squirrelmail/plugins/squirrelspell/js/index.php trunk/squirrelmail/plugins/squirrelspell/js/init.js trunk/squirrelmail/plugins/squirrelspell/modules/check_me.mod trunk/squirrelmail/plugins/squirrelspell/modules/crypto.mod trunk/squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod trunk/squirrelmail/plugins/squirrelspell/modules/edit_dic.mod trunk/squirrelmail/plugins/squirrelspell/modules/enc_setup.mod trunk/squirrelmail/plugins/squirrelspell/modules/forget_me.mod trunk/squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod trunk/squirrelmail/plugins/squirrelspell/modules/index.php trunk/squirrelmail/plugins/squirrelspell/modules/init.mod trunk/squirrelmail/plugins/squirrelspell/modules/lang_change.mod trunk/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod trunk/squirrelmail/plugins/squirrelspell/modules/options_main.mod trunk/squirrelmail/plugins/squirrelspell/setup.php trunk/squirrelmail/plugins/squirrelspell/sqspell_config.php trunk/squirrelmail/plugins/squirrelspell/sqspell_functions.php trunk/squirrelmail/plugins/squirrelspell/sqspell_interface.php trunk/squirrelmail/plugins/squirrelspell/sqspell_options.php trunk/squirrelmail/plugins/test/README trunk/squirrelmail/plugins/test/decodeheader.php trunk/squirrelmail/plugins/test/functions.php trunk/squirrelmail/plugins/test/index.php trunk/squirrelmail/plugins/test/ngettext.php trunk/squirrelmail/plugins/test/setup.php trunk/squirrelmail/plugins/test/templates/default/test_menu.tpl trunk/squirrelmail/plugins/test/test.php trunk/squirrelmail/plugins/translate/config_default.php trunk/squirrelmail/plugins/translate/config_sample.php trunk/squirrelmail/plugins/translate/functions.php trunk/squirrelmail/plugins/translate/index.php trunk/squirrelmail/plugins/translate/options.php trunk/squirrelmail/plugins/translate/setup.php trunk/squirrelmail/po/independent_strings.txt trunk/squirrelmail/po/index.php trunk/squirrelmail/po/squirrelmail.pot trunk/squirrelmail/src/about.php trunk/squirrelmail/src/addrbook_popup.php trunk/squirrelmail/src/addrbook_search.php trunk/squirrelmail/src/addrbook_search_html.php trunk/squirrelmail/src/addressbook.php trunk/squirrelmail/src/compose.php trunk/squirrelmail/src/configtest.php trunk/squirrelmail/src/delete_message.php trunk/squirrelmail/src/download.php trunk/squirrelmail/src/empty_trash.php trunk/squirrelmail/src/folders.php trunk/squirrelmail/src/help.php trunk/squirrelmail/src/image.php trunk/squirrelmail/src/index.php trunk/squirrelmail/src/left_main.php trunk/squirrelmail/src/login.php trunk/squirrelmail/src/mailto.php trunk/squirrelmail/src/options.php trunk/squirrelmail/src/options_highlight.php trunk/squirrelmail/src/options_identities.php trunk/squirrelmail/src/options_order.php trunk/squirrelmail/src/read_body.php trunk/squirrelmail/src/redirect.php trunk/squirrelmail/src/right_main.php trunk/squirrelmail/src/search.php trunk/squirrelmail/src/signout.php trunk/squirrelmail/src/squirrelmail_rpc.php trunk/squirrelmail/src/style.php trunk/squirrelmail/src/vcard.php trunk/squirrelmail/src/view_header.php trunk/squirrelmail/src/view_html.php trunk/squirrelmail/src/view_text.php trunk/squirrelmail/src/webmail.php trunk/squirrelmail/templates/default/addrbook_addedit.tpl trunk/squirrelmail/templates/default/addrbook_search_list.tpl trunk/squirrelmail/templates/default/addressbook_list.tpl trunk/squirrelmail/templates/default/addressbook_paginator.tpl trunk/squirrelmail/templates/default/addressbook_popup.tpl trunk/squirrelmail/templates/default/addressbook_search_form.tpl trunk/squirrelmail/templates/default/body.tpl trunk/squirrelmail/templates/default/compose_attachments.tpl trunk/squirrelmail/templates/default/compose_body.tpl trunk/squirrelmail/templates/default/compose_buttons.tpl trunk/squirrelmail/templates/default/compose_form_close.tpl trunk/squirrelmail/templates/default/compose_header.tpl trunk/squirrelmail/templates/default/compose_newwin_close.tpl trunk/squirrelmail/templates/default/config.php trunk/squirrelmail/templates/default/edit_list_associative_widget.tpl trunk/squirrelmail/templates/default/edit_list_associative_widget_list_style.tpl trunk/squirrelmail/templates/default/edit_list_widget.tpl trunk/squirrelmail/templates/default/edit_list_widget_list_style.tpl trunk/squirrelmail/templates/default/empty_folder.tpl trunk/squirrelmail/templates/default/error_box.tpl trunk/squirrelmail/templates/default/error_logout.tpl trunk/squirrelmail/templates/default/error_message.tpl trunk/squirrelmail/templates/default/folder_manip.tpl trunk/squirrelmail/templates/default/folder_manip_dialog.tpl trunk/squirrelmail/templates/default/footer.tpl trunk/squirrelmail/templates/default/form.tpl trunk/squirrelmail/templates/default/form_close.tpl trunk/squirrelmail/templates/default/header.tpl trunk/squirrelmail/templates/default/help_chapter.tpl trunk/squirrelmail/templates/default/help_toc.tpl trunk/squirrelmail/templates/default/horizontal_rule.tpl trunk/squirrelmail/templates/default/hyperlink.tpl trunk/squirrelmail/templates/default/image.tpl trunk/squirrelmail/templates/default/index.php trunk/squirrelmail/templates/default/input.tpl trunk/squirrelmail/templates/default/js/default.js trunk/squirrelmail/templates/default/js/index.php trunk/squirrelmail/templates/default/label.tpl trunk/squirrelmail/templates/default/left_main.tpl trunk/squirrelmail/templates/default/line_break.tpl trunk/squirrelmail/templates/default/login.tpl trunk/squirrelmail/templates/default/message_list.tpl trunk/squirrelmail/templates/default/message_list_controls.tpl trunk/squirrelmail/templates/default/motd.tpl trunk/squirrelmail/templates/default/non_breaking_space.tpl trunk/squirrelmail/templates/default/note.tpl trunk/squirrelmail/templates/default/option_groups.tpl trunk/squirrelmail/templates/default/options.tpl trunk/squirrelmail/templates/default/options_advidentity_list.tpl trunk/squirrelmail/templates/default/options_highlight_addedit.tpl trunk/squirrelmail/templates/default/options_highlight_list.tpl trunk/squirrelmail/templates/default/options_order.tpl trunk/squirrelmail/templates/default/page_header.tpl trunk/squirrelmail/templates/default/paginator.tpl trunk/squirrelmail/templates/default/plugins/fortune/mailbox_index_before.tpl trunk/squirrelmail/templates/default/plugins/listcommands/read_body_header.tpl trunk/squirrelmail/templates/default/protocol_header.tpl trunk/squirrelmail/templates/default/read_attachments.tpl trunk/squirrelmail/templates/default/read_display_images_inline.tpl trunk/squirrelmail/templates/default/read_handle_receipt.tpl trunk/squirrelmail/templates/default/read_headers.tpl trunk/squirrelmail/templates/default/read_html_iframe.tpl trunk/squirrelmail/templates/default/read_menubar_buttons.tpl trunk/squirrelmail/templates/default/read_menubar_nav.tpl trunk/squirrelmail/templates/default/read_message_body.tpl trunk/squirrelmail/templates/default/read_message_print.tpl trunk/squirrelmail/templates/default/read_message_priority.tpl trunk/squirrelmail/templates/default/read_recipient_list.tpl trunk/squirrelmail/templates/default/read_toolbar.tpl trunk/squirrelmail/templates/default/read_xmailer.tpl trunk/squirrelmail/templates/default/search.tpl trunk/squirrelmail/templates/default/search_advanced.tpl trunk/squirrelmail/templates/default/search_list.tpl trunk/squirrelmail/templates/default/search_result_empty.tpl trunk/squirrelmail/templates/default/search_result_mailbox.tpl trunk/squirrelmail/templates/default/search_result_top.tpl trunk/squirrelmail/templates/default/select.tpl trunk/squirrelmail/templates/default/signout.tpl trunk/squirrelmail/templates/default/span.tpl trunk/squirrelmail/templates/default/table.tpl trunk/squirrelmail/templates/default/table_close.tpl trunk/squirrelmail/templates/default/table_data.tpl trunk/squirrelmail/templates/default/table_data_close.tpl trunk/squirrelmail/templates/default/table_row.tpl trunk/squirrelmail/templates/default/table_row_close.tpl trunk/squirrelmail/templates/default/textarea.tpl trunk/squirrelmail/templates/default/vcard.tpl trunk/squirrelmail/templates/default/view_header.tpl trunk/squirrelmail/templates/default/view_text.tpl trunk/squirrelmail/templates/default/webmail.tpl trunk/squirrelmail/templates/default_advanced/compose_body.tpl trunk/squirrelmail/templates/default_advanced/config.php trunk/squirrelmail/templates/default_advanced/left_main.tpl trunk/squirrelmail/templates/default_advanced/login.tpl trunk/squirrelmail/templates/default_advanced/options_highlight_addedit.tpl trunk/squirrelmail/templates/default_advanced/options_highlight_list.tpl trunk/squirrelmail/templates/default_advanced/options_order.tpl trunk/squirrelmail/templates/default_advanced/page_header.tpl trunk/squirrelmail/templates/default_advanced/read_headers.tpl trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl trunk/squirrelmail/templates/default_advanced/read_menubar_nav.tpl trunk/squirrelmail/templates/default_advanced/webmail.tpl trunk/squirrelmail/templates/default_rpc/config.php trunk/squirrelmail/templates/default_rpc/rpc_response_error.tpl trunk/squirrelmail/templates/default_rpc/rpc_response_success.tpl trunk/squirrelmail/templates/index.php trunk/squirrelmail/templates/util_addressbook.php trunk/squirrelmail/templates/util_read.php trunk/squirrelmail/themes/alien_glow.php trunk/squirrelmail/themes/autumn.php trunk/squirrelmail/themes/autumn2.php trunk/squirrelmail/themes/black_bean_burrito_theme.php trunk/squirrelmail/themes/blue_grey_theme.php trunk/squirrelmail/themes/blue_on_blue.php trunk/squirrelmail/themes/bluesnews_theme.php trunk/squirrelmail/themes/bluesome.php trunk/squirrelmail/themes/bluesteel_theme.php trunk/squirrelmail/themes/christmas.php trunk/squirrelmail/themes/classic_blue.php trunk/squirrelmail/themes/classic_blue2.php trunk/squirrelmail/themes/color_theme_to_css.php trunk/squirrelmail/themes/css/index.php trunk/squirrelmail/themes/dark_green.php trunk/squirrelmail/themes/dark_grey_theme.php trunk/squirrelmail/themes/darkness.php trunk/squirrelmail/themes/deepocean2_theme.php trunk/squirrelmail/themes/deepocean_theme.php trunk/squirrelmail/themes/default_theme.php trunk/squirrelmail/themes/dompie_theme.php trunk/squirrelmail/themes/forest_theme.php trunk/squirrelmail/themes/greenhouse_effect.php trunk/squirrelmail/themes/high_contrast_theme.php trunk/squirrelmail/themes/ice_theme.php trunk/squirrelmail/themes/in_the_pink.php trunk/squirrelmail/themes/index.php trunk/squirrelmail/themes/kind_of_blue.php trunk/squirrelmail/themes/maize_theme.php trunk/squirrelmail/themes/methodical_theme.php trunk/squirrelmail/themes/midnight.php trunk/squirrelmail/themes/minimal_bw.php trunk/squirrelmail/themes/monostochastic.php trunk/squirrelmail/themes/netstyle_theme.php trunk/squirrelmail/themes/penguin.php trunk/squirrelmail/themes/plain_blue_theme.php trunk/squirrelmail/themes/powder_blue.php trunk/squirrelmail/themes/purple_theme.php trunk/squirrelmail/themes/random.php trunk/squirrelmail/themes/redmond.php trunk/squirrelmail/themes/sandstorm_theme.php trunk/squirrelmail/themes/seaspray_theme.php trunk/squirrelmail/themes/servery_theme.php trunk/squirrelmail/themes/shades_of_grey.php trunk/squirrelmail/themes/silver_steel_theme.php trunk/squirrelmail/themes/simple_green2.php trunk/squirrelmail/themes/simple_green_theme.php trunk/squirrelmail/themes/simple_purple.php trunk/squirrelmail/themes/slashdot_theme.php trunk/squirrelmail/themes/spice_of_life.php trunk/squirrelmail/themes/spice_of_life_dark.php trunk/squirrelmail/themes/spice_of_life_lite.php trunk/squirrelmail/themes/techno_blue.php trunk/squirrelmail/themes/turquoise.php trunk/squirrelmail/themes/wood_theme.php Modified: trunk/squirrelmail/class/deliver/Deliver.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/deliver/Deliver.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -7,7 +7,7 @@ * a delivery backend. * * @author Marc Groot Koerkamp - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -5,7 +5,7 @@ * * Delivery backend for the Deliver class. * - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -5,7 +5,7 @@ * * SMTP delivery backend for the Deliver class. * - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -6,7 +6,7 @@ * Delivery backend for the Deliver class. * * @author Marc Groot Koerkamp - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/deliver/index.php =================================================================== --- trunk/squirrelmail/class/deliver/index.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/deliver/index.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -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-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/error.class.php =================================================================== --- trunk/squirrelmail/class/error.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/error.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -5,7 +5,7 @@ * * This contains the custom error handler for SquirrelMail. * - * @copyright 2005-2016 The SquirrelMail Project Team + * @copyright 2005-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/helper/VCard.class.php =================================================================== --- trunk/squirrelmail/class/helper/VCard.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/helper/VCard.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -7,7 +7,7 @@ * * http://www.imc.org/pdi/vcard-21.txt * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/helper/index.php =================================================================== --- trunk/squirrelmail/class/helper/index.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/helper/index.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -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-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/index.php =================================================================== --- trunk/squirrelmail/class/index.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/index.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -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-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/l10n/gettext.class.php =================================================================== --- trunk/squirrelmail/class/l10n/gettext.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/l10n/gettext.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -19,7 +19,7 @@ * along with PHP-gettext; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @copyright 2004-2016 The SquirrelMail Project Team + * @copyright 2004-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/l10n/index.php =================================================================== --- trunk/squirrelmail/class/l10n/index.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/l10n/index.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -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-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/l10n/streams.class.php =================================================================== --- trunk/squirrelmail/class/l10n/streams.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/l10n/streams.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, * MA 02110-1301, USA * - * @copyright 2004-2016 The SquirrelMail Project Team + * @copyright 2004-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/l10n.class.php =================================================================== --- trunk/squirrelmail/class/l10n.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/l10n.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -7,7 +7,7 @@ * translations when php gettext extension is missing or some functions * are not available. * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/AddressStructure.class.php =================================================================== --- trunk/squirrelmail/class/mime/AddressStructure.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/mime/AddressStructure.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -6,7 +6,7 @@ * This file contains functions needed to extract email address headers from * mime messages. * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/ContentType.class.php =================================================================== --- trunk/squirrelmail/class/mime/ContentType.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/mime/ContentType.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content type headers * (rfc2045) in mime messages. * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/Disposition.class.php =================================================================== --- trunk/squirrelmail/class/mime/Disposition.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/mime/Disposition.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content disposition headers * in mime messages. See RFC 2183. * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/Language.class.php =================================================================== --- trunk/squirrelmail/class/mime/Language.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/mime/Language.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -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-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/Message.class.php =================================================================== --- trunk/squirrelmail/class/mime/Message.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/mime/Message.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle mime messages. * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/MessageHeader.class.php =================================================================== --- trunk/squirrelmail/class/mime/MessageHeader.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/mime/MessageHeader.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/Rfc822Header.class.php =================================================================== --- trunk/squirrelmail/class/mime/Rfc822Header.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/mime/Rfc822Header.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/SMimeMessage.class.php =================================================================== --- trunk/squirrelmail/class/mime/SMimeMessage.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/mime/SMimeMessage.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -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-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime/index.php =================================================================== --- trunk/squirrelmail/class/mime/index.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/mime/index.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -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-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/mime.class.php =================================================================== --- trunk/squirrelmail/class/mime.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/mime.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -5,7 +5,7 @@ * * This file loads classes needed to handle mime messages. * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/template/PHP_Template.class.php =================================================================== --- trunk/squirrelmail/class/template/PHP_Template.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/template/PHP_Template.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -9,7 +9,7 @@ * The SquirrelMail (Foowd) template implementation. * Derived from the foowd template implementation and adapted * for squirrelmail - * @copyright 2005-2016 The SquirrelMail Project Team + * @copyright 2005-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/template/Smarty_Template.class.php =================================================================== --- trunk/squirrelmail/class/template/Smarty_Template.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/template/Smarty_Template.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -7,7 +7,7 @@ * SquirrelMail and Smarty. All abstract methods from the Template class * are implemented here. * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/template/Template.class.php =================================================================== --- trunk/squirrelmail/class/template/Template.class.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/template/Template.class.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -8,7 +8,7 @@ * class with any custom functionality needed to interface a target * templating engine with SquirrelMail. * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/template/index.php =================================================================== --- trunk/squirrelmail/class/template/index.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/class/template/index.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -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-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/config/conf.pl =================================================================== --- trunk/squirrelmail/config/conf.pl 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/config/conf.pl 2017-01-27 20:34:08 UTC (rev 14643) @@ -1,7 +1,7 @@ #!/usr/bin/env perl # conf.pl # -# Copyright (c) 1999-2016 The SquirrelMail Project Team +# Copyright (c) 1999-2017 The SquirrelMail Project Team # Licensed under the GNU GPL. For full terms see COPYING. # # A simple configure script to configure SquirrelMail Modified: trunk/squirrelmail/config/config_default.php =================================================================== --- trunk/squirrelmail/config/config_default.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/config/config_default.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -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-2016 The SquirrelMail Project Team + * @copyright 2000-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/config/config_local.example.php =================================================================== --- trunk/squirrelmail/config/config_local.example.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/config/config_local.example.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -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-2016 The SquirrelMail Project Team + * @copyright 2002-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/config/index.php =================================================================== --- trunk/squirrelmail/config/index.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/config/index.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -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-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/contrib/conf.pl.8 =================================================================== --- trunk/squirrelmail/contrib/conf.pl.8 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/contrib/conf.pl.8 2017-01-27 20:34:08 UTC (rev 14643) @@ -30,7 +30,7 @@ .SH "AUTHOR" Tomas Kuliavas <to...@us...> .SH "COPYRIGHT" -Copyright (c) 2006-2016 The SquirrelMail Project Team +Copyright (c) 2006-2017 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: trunk/squirrelmail/contrib/decrypt_headers.php =================================================================== --- trunk/squirrelmail/contrib/decrypt_headers.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/contrib/decrypt_headers.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -3,7 +3,7 @@ /** * Script provides form to decode encrypted header information. * - * @copyright 2005-2016 The SquirrelMail Project Team + * @copyright 2005-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/contrib/flat2sql.pl =================================================================== --- trunk/squirrelmail/contrib/flat2sql.pl 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/contrib/flat2sql.pl 2017-01-27 20:34:08 UTC (rev 14643) @@ -8,7 +8,7 @@ # using this script. # # Copyright (c) 2002, Michael Blandford and Tal Yardeni -# Copyright (c) 2005-2016 The SquirrelMail Project Team +# Copyright (c) 2005-2017 The SquirrelMail Project Team # # This script is licensed under the GNU Public License (GPL). # See: http://opensource.org/licenses/gpl-license.php Modified: trunk/squirrelmail/doc/index.php =================================================================== --- trunk/squirrelmail/doc/index.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/doc/index.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -5,7 +5,7 @@ * * Redirects to the index.html file. * - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/abook_database.php =================================================================== --- trunk/squirrelmail/functions/abook_database.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/abook_database.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -14,7 +14,7 @@ * PRIMARY KEY (owner,nickname) * </pre> * - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/abook_ldap_server.php =================================================================== --- trunk/squirrelmail/functions/abook_ldap_server.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/abook_ldap_server.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -18,7 +18,7 @@ * and inetOrgPerson (RFC2798) objects and dn, description, sn, givenname, * cn, mail attributes. Other attributes are ignored. * - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/abook_local_file.php =================================================================== --- trunk/squirrelmail/functions/abook_local_file.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/abook_local_file.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -3,7 +3,7 @@ /** * abook_local_file.php * - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/addressbook.php =================================================================== --- trunk/squirrelmail/functions/addressbook.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/addressbook.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -4,7 +4,7 @@ * * Functions require SM_PATH and support of forms.php functions * - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/arrays.php =================================================================== --- trunk/squirrelmail/functions/arrays.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/arrays.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -5,7 +5,7 @@ * * Contains utility functions for array operations * - * @copyright 2004-2016 The SquirrelMail Project Team + * @copyright 2004-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/attachment_common.php =================================================================== --- trunk/squirrelmail/functions/attachment_common.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/attachment_common.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -5,7 +5,7 @@ * * This file provides the handling of often-used attachment types. * - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/auth.php =================================================================== --- trunk/squirrelmail/functions/auth.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/auth.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -9,7 +9,7 @@ * functions/global.php * functions/strings.php. * - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/compose.php =================================================================== --- trunk/squirrelmail/functions/compose.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/compose.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -6,7 +6,7 @@ * Functions for message compositon: writing a message, attaching files etc. * * @author Thijs Kinkhorst <kink at squirrelmail.org> - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/constants.php =================================================================== --- trunk/squirrelmail/functions/constants.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/constants.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -2,7 +2,7 @@ /** * old constants function file location * - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/date.php =================================================================== --- trunk/squirrelmail/functions/date.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/date.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -8,7 +8,7 @@ * <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT) * (as specified in RFC 822) -- 'Tue' is optional * - * @copyright 1999-2016 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/db_prefs.php =================================================================== --- trunk/squirrelmail/functions/db_prefs.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/db_prefs.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -47,7 +47,7 @@ * NOT to quote identifiers by setting * this to "none" * - * @copyright 1999-2015 The SquirrelMail Project Team + * @copyright 1999-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1250.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1250.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/decode/cp1250.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1251.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1251.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/decode/cp1251.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1252.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1252.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/decode/cp1252.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1253.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1253.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/decode/cp1253.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1254.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1254.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/decode/cp1254.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -16,7 +16,7 @@ * Date: 04/15/98 * Contact: cp...@mi... * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1255.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1255.php 2017-01-27 20:31:33 UTC (rev 14642) +++ trunk/squirrelmail/functions/decode/cp1255.php 2017-01-27 20:34:08 UTC (rev 14643) @@ -16,7 +16,7 @@ * Date: 1/7/2000 * Contact: cp...@mi... * - * @copyright 2003-2016 The SquirrelMail Project Team + * @copyright 2003-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/decode/cp1256.php ================================... [truncated message content] |
From: <pdo...@us...> - 2017-04-24 19:46:16
|
Revision: 14650 http://sourceforge.net/p/squirrelmail/code/14650 Author: pdontthink Date: 2017-04-24 19:46:13 +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: -------------- trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php trunk/squirrelmail/doc/ChangeLog Modified: trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php 2017-04-24 19:45:40 UTC (rev 14649) +++ trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php 2017-04-24 19:46:13 UTC (rev 14650) @@ -106,11 +106,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: trunk/squirrelmail/doc/ChangeLog =================================================================== --- trunk/squirrelmail/doc/ChangeLog 2017-04-24 19:45:40 UTC (rev 14649) +++ trunk/squirrelmail/doc/ChangeLog 2017-04-24 19:46:13 UTC (rev 14650) @@ -404,6 +404,9 @@ the HELO host sent to the SMTP server when sending messages - Added PDO support for database connections, so no external database module needs to be installed + - 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.5.1 (branched on 2006-02-12) -------------------------------------- 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:36:53
|
Revision: 14699 http://sourceforge.net/p/squirrelmail/code/14699 Author: pdontthink Date: 2017-07-06 02:36:51 +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: -------------- trunk/squirrelmail/src/options_identities.php trunk/squirrelmail/templates/default/compose_body.tpl trunk/squirrelmail/templates/default/options_advidentity_list.tpl trunk/squirrelmail/templates/default/textarea.tpl trunk/squirrelmail/templates/default_advanced/compose_body.tpl Modified: trunk/squirrelmail/src/options_identities.php =================================================================== --- trunk/squirrelmail/src/options_identities.php 2017-07-06 02:16:28 UTC (rev 14698) +++ trunk/squirrelmail/src/options_identities.php 2017-07-06 02:36:51 UTC (rev 14699) @@ -230,7 +230,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; Modified: trunk/squirrelmail/templates/default/compose_body.tpl =================================================================== --- trunk/squirrelmail/templates/default/compose_body.tpl 2017-07-06 02:16:28 UTC (rev 14698) +++ trunk/squirrelmail/templates/default/compose_body.tpl 2017-07-06 02:36:51 UTC (rev 14699) @@ -26,7 +26,8 @@ <table cellspacing="0" class="table1"> <tr> <td style="text-align: center"> - <textarea name="body" id="body" rows="<?php echo $editor_height; ?>" cols="<?php echo $editor_width; ?>" <?php if ($accesskey_compose_body != 'NONE') echo 'accesskey="' . $accesskey_compose_body . '" '; echo $input_onfocus; ?>><?php echo $body; ?></textarea> + <textarea name="body" id="body" rows="<?php echo $editor_height; ?>" cols="<?php echo $editor_width; ?>" <?php if ($accesskey_compose_body != 'NONE') echo 'accesskey="' . $accesskey_compose_body . '" '; echo $input_onfocus; ?>> +<?php echo $body; ?></textarea> </td> </tr> <?php Modified: trunk/squirrelmail/templates/default/options_advidentity_list.tpl =================================================================== --- trunk/squirrelmail/templates/default/options_advidentity_list.tpl 2017-07-06 02:16:28 UTC (rev 14698) +++ trunk/squirrelmail/templates/default/options_advidentity_list.tpl 2017-07-06 02:36:51 UTC (rev 14699) @@ -82,7 +82,8 @@ <?php echo _("Signature"); ?> </td> <td class="fieldValue"> - <textarea name="newidentities[<?php echo $index; ?>][signature]" cols="50" rows="5"><?php echo $identity['Signature']; ?></textarea> + <textarea name="newidentities[<?php echo $index; ?>][signature]" cols="50" rows="5"> +<?php echo $identity['Signature']; ?></textarea> </td> </tr> <?php /* FIXME: No hooks in templates! */ $temp = array('', &$identity['New'], &$index); echo concat_hook_function('options_identities_table', $temp); ?> Modified: trunk/squirrelmail/templates/default/textarea.tpl =================================================================== --- trunk/squirrelmail/templates/default/textarea.tpl 2017-07-06 02:16:28 UTC (rev 14698) +++ trunk/squirrelmail/templates/default/textarea.tpl 2017-07-06 02:36:51 UTC (rev 14699) @@ -32,6 +32,6 @@ foreach ($aAttribs as $key => $value) { echo ' ' . $key . (is_null($value) ? '' : '="' . $value . '"'); } -echo '>' . $text . "</textarea>\n"; +echo ">\n" . $text . "</textarea>\n"; Modified: trunk/squirrelmail/templates/default_advanced/compose_body.tpl =================================================================== --- trunk/squirrelmail/templates/default_advanced/compose_body.tpl 2017-07-06 02:16:28 UTC (rev 14698) +++ trunk/squirrelmail/templates/default_advanced/compose_body.tpl 2017-07-06 02:36:51 UTC (rev 14699) @@ -26,7 +26,8 @@ <table cellspacing="0" class="table1"> <tr> <td style="text-align: center"> - <textarea name="body" id="body" rows="<?php echo $editor_height; ?>" cols="<?php echo $editor_width; ?>" <?php if ($accesskey_compose_body != 'NONE') echo 'accesskey="' . $accesskey_compose_body . '" '; echo $input_onfocus; ?>><?php echo $body; ?></textarea> + <textarea name="body" id="body" rows="<?php echo $editor_height; ?>" cols="<?php echo $editor_width; ?>" <?php if ($accesskey_compose_body != 'NONE') echo 'accesskey="' . $accesskey_compose_body . '" '; echo $input_onfocus; ?>> +<?php echo $body; ?></textarea> <?php if (checkForJavascript()) // Display text area resizing handle This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2017-11-18 22:58:13
|
Revision: 14736 http://sourceforge.net/p/squirrelmail/code/14736 Author: pdontthink Date: 2017-11-18 22:58:10 +0000 (Sat, 18 Nov 2017) Log Message: ----------- Add ability for saved drafts to indicate if they are a reply or forward and if so, to which message, and mark that message as replied or forwarded when the draft is finally sent Modified Paths: -------------- trunk/squirrelmail/class/mime/Rfc822Header.class.php trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/class/mime/Rfc822Header.class.php =================================================================== --- trunk/squirrelmail/class/mime/Rfc822Header.class.php 2017-11-18 22:44:10 UTC (rev 14735) +++ trunk/squirrelmail/class/mime/Rfc822Header.class.php 2017-11-18 22:58:10 UTC (rev 14736) @@ -352,6 +352,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: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2017-11-18 22:44:10 UTC (rev 14735) +++ trunk/squirrelmail/src/compose.php 2017-11-18 22:58:10 UTC (rev 14736) @@ -926,6 +926,8 @@ // rewrap the body to clean up quotations and line lengths sqBodyWrap($body, $editor_size); $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'); @@ -1788,6 +1790,16 @@ //$temp = array(&$composeMessage, &$draft); //do_hook('compose_send', $temp); + // 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; + // tricks the code below that marks the reply + list($action, $passed_id, $mailbox) = explode('::', $rfc822_header->x_sm_flag_reply, 3); + unset($composeMessage->rfc822_header->x_sm_flag_reply); + unset($composeMessage->rfc822_header->more_headers['X-SM-Flag-Reply']); + } + if (!$useSendmail && !$draft) { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); $deliver = new Deliver_SMTP(); @@ -1816,6 +1828,13 @@ $imap_stream = sqimap_login($username, false, $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; + if ($action == 'reply' || $action == 'reply_all' || $action == 'forward' || $action == 'forward_as_attachment') { + $composeMessage->rfc822_header->more_headers['X-SM-Flag-Reply'] = $action . '::' . $passed_id . '::' . $mailbox; + } + require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); $imap_deliver = new Deliver_IMAP(); $success = $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $imap_stream, $draft_folder); @@ -1859,60 +1878,64 @@ if ($action=='reply' || $action=='reply_all' || $action=='forward' || $action=='forward_as_attachment') { require(SM_PATH . 'functions/mailbox_display.php'); - $aMailbox = sqm_api_mailbox_select($imap_stream, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array()); - switch($action) { - case 'reply': - case 'reply_all': - // check if we are allowed to set the \\Answered flag - if (in_array('\\answered',$aMailbox['PERMANENTFLAGS'], true)) { - $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, array($passed_id), '\\Answered', true, false); - if (isset($aUpdatedMsgs[$passed_id]['FLAGS'])) { - /** - * Only update the cached headers if the header is - * cached. - */ - if (isset($aMailbox['MSG_HEADERS'][$passed_id])) { - $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'] = $aMsg['FLAGS']; + // select errors here could be due to a draft reply being sent + // after the original message's mailbox is moved or deleted + $aMailbox = sqm_api_mailbox_select($imap_stream, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array(), false); + // a non-empty return from above means we can proceed + if (!empty($aMailbox)) { + switch($action) { + case 'reply': + case 'reply_all': + // check if we are allowed to set the \\Answered flag + if (in_array('\\answered',$aMailbox['PERMANENTFLAGS'], true)) { + $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, array($passed_id), '\\Answered', true, false); + if (isset($aUpdatedMsgs[$passed_id]['FLAGS'])) { + /** + * Only update the cached headers if the header is + * cached. + */ + if (isset($aMailbox['MSG_HEADERS'][$passed_id])) { + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'] = $aMsg['FLAGS']; + } } } - } - break; - case 'forward': - case 'forward_as_attachment': - // check if we are allowed to set the $Forwarded flag (RFC 4550 paragraph 2.8) - if (in_array('$forwarded',$aMailbox['PERMANENTFLAGS'], true) || - in_array('\\*',$aMailbox['PERMANENTFLAGS'])) { + break; + case 'forward': + case 'forward_as_attachment': + // check if we are allowed to set the $Forwarded flag (RFC 4550 paragraph 2.8) + if (in_array('$forwarded',$aMailbox['PERMANENTFLAGS'], true) || + in_array('\\*',$aMailbox['PERMANENTFLAGS'])) { - // when forwarding as an attachment from the message - // list, passed_id is not used, need to get UID(s) - // from the query string - // - if (empty($passed_id) && !empty($fwduid)) - $ids = explode('_', $fwduid); - else - $ids = array($passed_id); + // when forwarding as an attachment from the message + // list, passed_id is not used, need to get UID(s) + // from the query string + // + if (empty($passed_id) && !empty($fwduid)) + $ids = explode('_', $fwduid); + else + $ids = array($passed_id); - $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, $ids, '$Forwarded', true, false); + $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, $ids, '$Forwarded', true, false); - foreach ($ids as $id) { - if (isset($aUpdatedMsgs[$id]['FLAGS'])) { - if (isset($aMailbox['MSG_HEADERS'][$id])) { - $aMailbox['MSG_HEADERS'][$id]['FLAGS'] = $aMsg['FLAGS']; + foreach ($ids as $id) { + if (isset($aUpdatedMsgs[$id]['FLAGS'])) { + if (isset($aMailbox['MSG_HEADERS'][$id])) { + $aMailbox['MSG_HEADERS'][$id]['FLAGS'] = $aMsg['FLAGS']; + } } } } + break; } - break; - } - /** - * Write mailbox with updated seen flag information back to cache. - */ - if(isset($aUpdatedMsgs[$passed_id])) { - $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; - sqsession_register($mailbox_cache,'mailbox_cache'); + /** + * Write mailbox with updated seen flag information back to cache. + */ + if(isset($aUpdatedMsgs[$passed_id])) { + $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; + sqsession_register($mailbox_cache,'mailbox_cache'); + } } - } 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:08:41
|
Revision: 14741 http://sourceforge.net/p/squirrelmail/code/14741 Author: pdontthink Date: 2017-11-22 06:08:38 +0000 (Wed, 22 Nov 2017) Log Message: ----------- Add option to allow returning to the message one had been replying to after sending Modified Paths: -------------- trunk/squirrelmail/include/load_prefs.php trunk/squirrelmail/include/options/compose.php trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/include/load_prefs.php =================================================================== --- trunk/squirrelmail/include/load_prefs.php 2017-11-22 04:41:03 UTC (rev 14740) +++ trunk/squirrelmail/include/load_prefs.php 2017-11-22 06:08:38 UTC (rev 14741) @@ -281,6 +281,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); $compact_paginator = getPref($data_dir, $username, 'compact_paginator', SMPREF_OFF); Modified: trunk/squirrelmail/include/options/compose.php =================================================================== --- trunk/squirrelmail/include/options/compose.php 2017-11-22 04:41:03 UTC (rev 14740) +++ trunk/squirrelmail/include/options/compose.php 2017-11-22 06:08:38 UTC (rev 14741) @@ -133,6 +133,13 @@ ); $optvals[SMOPT_GRP_COMPOSE_REPLY][] = 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_COMPOSE_REPLY][] = array( 'name' => 'sig_first', 'caption' => _("Prepend Signature before Reply/Forward Text"), 'type' => SMOPT_TYPE_BOOLEAN, Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2017-11-22 04:41:03 UTC (rev 14740) +++ trunk/squirrelmail/src/compose.php 2017-11-22 06:08:38 UTC (rev 14741) @@ -573,8 +573,13 @@ exit(); } else { if ( !isset($pageheader_sent) || !$pageheader_sent ) { - header("Location: $location/right_main.php?mailbox=$urlMailbox". - "&startMessage=$startMessage&mail_sent=$mail_sent"); + 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". + "&startMessage=$startMessage&mail_sent=$mail_sent"); + else + header("Location: $location/right_main.php?mailbox=$urlMailbox". + "&startMessage=$startMessage&mail_sent=$mail_sent"); } else { //FIXME: DON'T ECHO HTML FROM CORE! echo ' <br><br><div style="text-align: center;"><a href="' . $location This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2018-04-04 03:19:42
|
Revision: 14753 http://sourceforge.net/p/squirrelmail/code/14753 Author: pdontthink Date: 2018-04-04 03:19:39 +0000 (Wed, 04 Apr 2018) Log Message: ----------- Sanitize user-supplied attachment filename [CVE-2018-8741] Modified Paths: -------------- trunk/squirrelmail/doc/ChangeLog trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/doc/ChangeLog =================================================================== --- trunk/squirrelmail/doc/ChangeLog 2018-04-04 03:12:06 UTC (rev 14752) +++ trunk/squirrelmail/doc/ChangeLog 2018-04-04 03:19:39 UTC (rev 14753) @@ -417,6 +417,7 @@ as replied or forwarded when the draft is finally sent - Added option to allow returning to the message one had been replying to after sending + - Sanitize user-supplied attachment filenames [CVE-2017-7692] Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2018-04-04 03:12:06 UTC (rev 14752) +++ trunk/squirrelmail/src/compose.php 2018-04-04 03:19:39 UTC (rev 14753) @@ -405,8 +405,25 @@ // should never directly manipulate an object like this if (!empty($attachments)) { $attachments = unserialize(urldecode($attachments)); - if (!empty($attachments) && is_array($attachments)) - $composeMessage->entities = $attachments; + if (!empty($attachments) && is_array($attachments)) { + // sanitize the "att_local_name" since it is user-supplied and used to access the file system + // it must be alpha-numeric and 32 characters long (see the use of GenerateRandomString() below) + foreach ($attachments as $i => $attachment) { + if (empty($attachment->att_local_name) || strlen($attachment->att_local_name) !== 32) { + unset($attachments[$i]); + continue; + } + // probably marginal difference between (ctype_alnum + function_exists) and preg_match + if (function_exists('ctype_alnum')) { + if (!ctype_alnum($attachment->att_local_name)) + unset($attachments[$i]); + } + else if (preg_match('/[^0-9a-zA-Z]/', $attachment->att_local_name)) + unset($attachments[$i]); + } + if (!empty($attachments)) + $composeMessage->entities = $attachments; + } } if (empty($mailbox)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2018-10-13 07:18:34
|
Revision: 14789 http://sourceforge.net/p/squirrelmail/code/14789 Author: pdontthink Date: 2018-10-13 07:18:33 +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 documentation in config/config_local.php) Modified Paths: -------------- trunk/squirrelmail/config/config_local.example.php trunk/squirrelmail/doc/ChangeLog trunk/squirrelmail/functions/page_header.php Modified: trunk/squirrelmail/config/config_local.example.php =================================================================== --- trunk/squirrelmail/config/config_local.example.php 2018-10-13 07:12:48 UTC (rev 14788) +++ trunk/squirrelmail/config/config_local.example.php 2018-10-13 07:18:33 UTC (rev 14789) @@ -136,4 +136,14 @@ * sm_validate_security_token() (only relevant when * $use_expiring_security_tokens is enabled). * + * $head_tag_extra can be used to add custom tags inside + * the <head> section of *ALL* pages. The string + * "###SM BASEURI###" will be replaced with the base URI + * for this SquirrelMail installation. This may be used, + * for example, to add custom favicon tags. If this + * setting is empty here, SquirrelMail will add a favicon + * tag by default. If you want to retain the default favicon + * while using this setting, you must include the following + * as part of this setting: + * $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico">...<YOUR CONTENT HERE>...'; */ Modified: trunk/squirrelmail/doc/ChangeLog =================================================================== --- trunk/squirrelmail/doc/ChangeLog 2018-10-13 07:12:48 UTC (rev 14788) +++ trunk/squirrelmail/doc/ChangeLog 2018-10-13 07:18:33 UTC (rev 14789) @@ -420,6 +420,9 @@ - Sanitize user-supplied attachment filenames (thanks to Florian Grunow for reporting this issue) [CVE-2018-8741] - Changed anti-CSRF security token lifetime to be session-based. + - Added favicon and ability for admins to use their own by setting + $head_tag_extra in config_local.php (see documentation in + config/config_local.php) Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/functions/page_header.php =================================================================== --- trunk/squirrelmail/functions/page_header.php 2018-10-13 07:12:48 UTC (rev 14788) +++ trunk/squirrelmail/functions/page_header.php 2018-10-13 07:18:33 UTC (rev 14789) @@ -37,7 +37,8 @@ } global $custom_css, $pageheader_sent, $theme, $theme_default, $text_direction, $default_fontset, $chosen_fontset, $default_fontsize, $chosen_fontsize, - $chosen_theme, $chosen_theme_path, $user_themes, $user_theme_default; + $chosen_theme, $chosen_theme_path, $user_themes, $user_theme_default, + $head_tag_extra; // add no cache headers here // @@ -79,8 +80,19 @@ $oTemplate->assign('frames', $frames); $oTemplate->assign('lang', $squirrelmail_language); - $header_tags .= "<meta name=\"robots\" content=\"noindex,nofollow\" />\n"; + $header_tags .= "<meta name=\"robots\" content=\"noindex,nofollow\" />\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)); + $used_fontset = (!empty($chosen_fontset) ? $chosen_fontset : $default_fontset); $used_fontsize = (!empty($chosen_fontsize) ? $chosen_fontsize : $default_fontsize); $used_theme = !isset($chosen_theme) && $user_theme_default != 'none' && is_dir($chosen_theme) && is_readable($chosen_theme)? $user_themes[$user_theme_default]['PATH'].'/default.css' : $chosen_theme_path; 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:59:17
|
Revision: 14792 http://sourceforge.net/p/squirrelmail/code/14792 Author: pdontthink Date: 2018-10-13 22:59:15 +0000 (Sat, 13 Oct 2018) Log Message: ----------- Make sure link tags are proper XHTML Modified Paths: -------------- trunk/squirrelmail/config/config_local.example.php trunk/squirrelmail/functions/page_header.php Modified: trunk/squirrelmail/config/config_local.example.php =================================================================== --- trunk/squirrelmail/config/config_local.example.php 2018-10-13 22:55:29 UTC (rev 14791) +++ trunk/squirrelmail/config/config_local.example.php 2018-10-13 22:59:15 UTC (rev 14792) @@ -145,5 +145,5 @@ * tag by default. If you want to retain the default favicon * while using this setting, you must include the following * as part of this setting: - * $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>...'; */ Modified: trunk/squirrelmail/functions/page_header.php =================================================================== --- trunk/squirrelmail/functions/page_header.php 2018-10-13 22:55:29 UTC (rev 14791) +++ trunk/squirrelmail/functions/page_header.php 2018-10-13 22:59:15 UTC (rev 14792) @@ -88,9 +88,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)); $used_fontset = (!empty($chosen_fontset) ? $chosen_fontset : $default_fontset); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2019-04-06 19:06:31
|
Revision: 14814 http://sourceforge.net/p/squirrelmail/code/14814 Author: pdontthink Date: 2019-04-06 19:06: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 config/config_local.example.php for more details) Modified Paths: -------------- trunk/squirrelmail/config/config_local.example.php trunk/squirrelmail/doc/ChangeLog trunk/squirrelmail/functions/imap_general.php Modified: trunk/squirrelmail/config/config_local.example.php =================================================================== --- trunk/squirrelmail/config/config_local.example.php 2019-04-06 18:32:29 UTC (rev 14813) +++ trunk/squirrelmail/config/config_local.example.php 2019-04-06 19:06:29 UTC (rev 14814) @@ -146,4 +146,32 @@ * while using this setting, you must include the following * as part of this setting: * $head_tag_extra = '<link rel="shortcut icon" href="###SM BASEURI###favicon.ico" />...<YOUR CONTENT HERE>...'; + * + * $imap_id_command_args (array) causes the IMAP ID + * command (RFC 2971) to be sent after every login, + * identifying the client to the server. Each key in this + * array is an attibute to be sent in the 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 in this file named + * $do_not_parse_imap_id_command_response to TRUE, in which + * case, the stored response will be the unparsed IMAP response. + * $imap_id_command_args = array('remote-host' => '###REMOTE ADDRESS###'); + * $do_not_parse_imap_id_command_response = FALSE; + * */ Modified: trunk/squirrelmail/doc/ChangeLog =================================================================== --- trunk/squirrelmail/doc/ChangeLog 2019-04-06 18:32:29 UTC (rev 14813) +++ trunk/squirrelmail/doc/ChangeLog 2019-04-06 19:06:29 UTC (rev 14814) @@ -426,6 +426,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 config/config_local.example.php for more details) Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/functions/imap_general.php =================================================================== --- trunk/squirrelmail/functions/imap_general.php 2019-04-06 18:32:29 UTC (rev 14813) +++ trunk/squirrelmail/functions/imap_general.php 2019-04-06 19:06:29 UTC (rev 14814) @@ -1052,6 +1052,128 @@ 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'])) { + $imap_id_command_args['version'] = SM_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...> - 2020-01-07 08:09:44
|
Revision: 14845 http://sourceforge.net/p/squirrelmail/code/14845 Author: pdontthink Date: 2020-01-07 08:09:34 +0000 (Tue, 07 Jan 2020) Log Message: ----------- Happy New Year Modified Paths: -------------- trunk/squirrelmail/class/deliver/Deliver.class.php trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php trunk/squirrelmail/class/deliver/index.php trunk/squirrelmail/class/error.class.php trunk/squirrelmail/class/helper/VCard.class.php trunk/squirrelmail/class/helper/index.php trunk/squirrelmail/class/index.php trunk/squirrelmail/class/l10n/gettext.class.php trunk/squirrelmail/class/l10n/index.php trunk/squirrelmail/class/l10n/streams.class.php trunk/squirrelmail/class/l10n.class.php trunk/squirrelmail/class/mime/AddressStructure.class.php trunk/squirrelmail/class/mime/ContentType.class.php trunk/squirrelmail/class/mime/Disposition.class.php trunk/squirrelmail/class/mime/Language.class.php trunk/squirrelmail/class/mime/Message.class.php trunk/squirrelmail/class/mime/MessageHeader.class.php trunk/squirrelmail/class/mime/Rfc822Header.class.php trunk/squirrelmail/class/mime/SMimeMessage.class.php trunk/squirrelmail/class/mime/index.php trunk/squirrelmail/class/mime.class.php trunk/squirrelmail/class/template/PHP_Template.class.php trunk/squirrelmail/class/template/Smarty_Template.class.php trunk/squirrelmail/class/template/Template.class.php trunk/squirrelmail/class/template/index.php trunk/squirrelmail/config/conf.pl trunk/squirrelmail/config/config_default.php trunk/squirrelmail/config/config_local.example.php trunk/squirrelmail/config/index.php trunk/squirrelmail/contrib/conf.pl.8 trunk/squirrelmail/contrib/decrypt_headers.php trunk/squirrelmail/contrib/flat2sql.pl trunk/squirrelmail/doc/index.php trunk/squirrelmail/functions/abook_database.php trunk/squirrelmail/functions/abook_ldap_server.php trunk/squirrelmail/functions/abook_local_file.php trunk/squirrelmail/functions/addressbook.php trunk/squirrelmail/functions/arrays.php trunk/squirrelmail/functions/attachment_common.php trunk/squirrelmail/functions/auth.php trunk/squirrelmail/functions/compose.php trunk/squirrelmail/functions/constants.php trunk/squirrelmail/functions/date.php trunk/squirrelmail/functions/db_prefs.php trunk/squirrelmail/functions/decode/cp1250.php trunk/squirrelmail/functions/decode/cp1251.php trunk/squirrelmail/functions/decode/cp1252.php trunk/squirrelmail/functions/decode/cp1253.php trunk/squirrelmail/functions/decode/cp1254.php trunk/squirrelmail/functions/decode/cp1255.php trunk/squirrelmail/functions/decode/cp1256.php trunk/squirrelmail/functions/decode/cp1257.php trunk/squirrelmail/functions/decode/cp1258.php trunk/squirrelmail/functions/decode/cp855.php trunk/squirrelmail/functions/decode/cp866.php trunk/squirrelmail/functions/decode/index.php trunk/squirrelmail/functions/decode/iso_8859_1.php trunk/squirrelmail/functions/decode/iso_8859_10.php trunk/squirrelmail/functions/decode/iso_8859_11.php trunk/squirrelmail/functions/decode/iso_8859_13.php trunk/squirrelmail/functions/decode/iso_8859_14.php trunk/squirrelmail/functions/decode/iso_8859_15.php trunk/squirrelmail/functions/decode/iso_8859_16.php trunk/squirrelmail/functions/decode/iso_8859_2.php trunk/squirrelmail/functions/decode/iso_8859_3.php trunk/squirrelmail/functions/decode/iso_8859_4.php trunk/squirrelmail/functions/decode/iso_8859_5.php trunk/squirrelmail/functions/decode/iso_8859_6.php trunk/squirrelmail/functions/decode/iso_8859_7.php trunk/squirrelmail/functions/decode/iso_8859_8.php trunk/squirrelmail/functions/decode/iso_8859_9.php trunk/squirrelmail/functions/decode/iso_ir_111.php trunk/squirrelmail/functions/decode/koi8_r.php trunk/squirrelmail/functions/decode/koi8_u.php trunk/squirrelmail/functions/decode/ns_4551_1.php trunk/squirrelmail/functions/decode/tis_620.php trunk/squirrelmail/functions/decode/us_ascii.php trunk/squirrelmail/functions/decode/utf_8.php trunk/squirrelmail/functions/display_messages.php trunk/squirrelmail/functions/encode/cp1251.php trunk/squirrelmail/functions/encode/cp1255.php trunk/squirrelmail/functions/encode/cp1256.php trunk/squirrelmail/functions/encode/index.php trunk/squirrelmail/functions/encode/iso_8859_1.php trunk/squirrelmail/functions/encode/iso_8859_15.php trunk/squirrelmail/functions/encode/iso_8859_2.php trunk/squirrelmail/functions/encode/iso_8859_7.php trunk/squirrelmail/functions/encode/iso_8859_9.php trunk/squirrelmail/functions/encode/koi8_r.php trunk/squirrelmail/functions/encode/koi8_u.php trunk/squirrelmail/functions/encode/tis_620.php trunk/squirrelmail/functions/encode/us_ascii.php trunk/squirrelmail/functions/encode/utf_8.php trunk/squirrelmail/functions/file_prefs.php trunk/squirrelmail/functions/files.php trunk/squirrelmail/functions/folder_manip.php trunk/squirrelmail/functions/forms.php trunk/squirrelmail/functions/gettext.php trunk/squirrelmail/functions/global.php trunk/squirrelmail/functions/html.php trunk/squirrelmail/functions/htmlentities/index.php trunk/squirrelmail/functions/htmlentities/iso-8859-1.php trunk/squirrelmail/functions/htmlentities/readme.php trunk/squirrelmail/functions/htmlentities/utf-8.php trunk/squirrelmail/functions/i18n.php trunk/squirrelmail/functions/identity.php trunk/squirrelmail/functions/imap.php trunk/squirrelmail/functions/imap_asearch.php trunk/squirrelmail/functions/imap_general.php trunk/squirrelmail/functions/imap_mailbox.php trunk/squirrelmail/functions/imap_messages.php trunk/squirrelmail/functions/imap_utf7_local.php trunk/squirrelmail/functions/index.php trunk/squirrelmail/functions/mailbox_display.php trunk/squirrelmail/functions/mime.php trunk/squirrelmail/functions/ngettext.php trunk/squirrelmail/functions/options.php trunk/squirrelmail/functions/page_header.php trunk/squirrelmail/functions/plugin.php trunk/squirrelmail/functions/prefs.php trunk/squirrelmail/functions/rfc822address.php trunk/squirrelmail/functions/strings.php trunk/squirrelmail/functions/template/abook_util.php trunk/squirrelmail/functions/template/folder_list_util.php trunk/squirrelmail/functions/template/general_util.php trunk/squirrelmail/functions/template/message_list_util.php trunk/squirrelmail/functions/template/paginator_util.php trunk/squirrelmail/functions/tree.php trunk/squirrelmail/functions/url_parser.php trunk/squirrelmail/help/index.php trunk/squirrelmail/images/index.php trunk/squirrelmail/images/themes/default/index.php trunk/squirrelmail/images/themes/default/theme.php trunk/squirrelmail/images/themes/index.php trunk/squirrelmail/images/themes/xp/index.php trunk/squirrelmail/images/themes/xp/theme.php trunk/squirrelmail/include/constants.php trunk/squirrelmail/include/errors.php trunk/squirrelmail/include/index.php trunk/squirrelmail/include/init.php trunk/squirrelmail/include/languages.php trunk/squirrelmail/include/load_prefs.php trunk/squirrelmail/include/options/accessibility.php trunk/squirrelmail/include/options/compose.php trunk/squirrelmail/include/options/display.php trunk/squirrelmail/include/options/folder.php trunk/squirrelmail/include/options/index.php trunk/squirrelmail/include/options/personal.php trunk/squirrelmail/include/timezones/check.php trunk/squirrelmail/include/timezones/index.php trunk/squirrelmail/include/timezones/standard.php trunk/squirrelmail/include/timezones/standard_orig.php trunk/squirrelmail/include/timezones.php trunk/squirrelmail/include/validate.php trunk/squirrelmail/index.php trunk/squirrelmail/locale/index.php trunk/squirrelmail/plugins/administrator/auth.php trunk/squirrelmail/plugins/administrator/defines.php trunk/squirrelmail/plugins/administrator/index.php trunk/squirrelmail/plugins/administrator/options.php trunk/squirrelmail/plugins/administrator/setup.php trunk/squirrelmail/plugins/bug_report/bug_report.php trunk/squirrelmail/plugins/bug_report/config_default.php trunk/squirrelmail/plugins/bug_report/functions.php trunk/squirrelmail/plugins/bug_report/index.php trunk/squirrelmail/plugins/bug_report/setup.php trunk/squirrelmail/plugins/bug_report/show_system_specs.php trunk/squirrelmail/plugins/bug_report/system_specs.php trunk/squirrelmail/plugins/bug_report/templates/default/index.php trunk/squirrelmail/plugins/bug_report/templates/default/system_specs.tpl trunk/squirrelmail/plugins/bug_report/templates/default/usage.tpl trunk/squirrelmail/plugins/bug_report/templates/index.php trunk/squirrelmail/plugins/calendar/calendar.php trunk/squirrelmail/plugins/calendar/calendar_data.php trunk/squirrelmail/plugins/calendar/day.php trunk/squirrelmail/plugins/calendar/event_create.php trunk/squirrelmail/plugins/calendar/event_delete.php trunk/squirrelmail/plugins/calendar/event_edit.php trunk/squirrelmail/plugins/calendar/functions.php trunk/squirrelmail/plugins/calendar/index.php trunk/squirrelmail/plugins/calendar/setup.php trunk/squirrelmail/plugins/change_password/backend/index.php trunk/squirrelmail/plugins/change_password/backend/ldap.php trunk/squirrelmail/plugins/change_password/backend/merak.php trunk/squirrelmail/plugins/change_password/backend/mysql.php trunk/squirrelmail/plugins/change_password/backend/peardb.php trunk/squirrelmail/plugins/change_password/backend/poppassd.php trunk/squirrelmail/plugins/change_password/backend/template.php trunk/squirrelmail/plugins/change_password/backend/vmailmgrd.php trunk/squirrelmail/plugins/change_password/config_default.php trunk/squirrelmail/plugins/change_password/functions.php trunk/squirrelmail/plugins/change_password/index.php trunk/squirrelmail/plugins/change_password/options.php trunk/squirrelmail/plugins/change_password/setup.php trunk/squirrelmail/plugins/demo/README trunk/squirrelmail/plugins/demo/demo.php trunk/squirrelmail/plugins/demo/functions.php trunk/squirrelmail/plugins/demo/index.php trunk/squirrelmail/plugins/demo/setup.php trunk/squirrelmail/plugins/demo/templates/default/demo.tpl trunk/squirrelmail/plugins/filters/bulkquery/index.php trunk/squirrelmail/plugins/filters/config_default.php trunk/squirrelmail/plugins/filters/filters.php trunk/squirrelmail/plugins/filters/index.php trunk/squirrelmail/plugins/filters/options.php trunk/squirrelmail/plugins/filters/setup.php trunk/squirrelmail/plugins/filters/spamoptions.php trunk/squirrelmail/plugins/fortune/config_sample.php trunk/squirrelmail/plugins/fortune/functions.php trunk/squirrelmail/plugins/fortune/index.php trunk/squirrelmail/plugins/fortune/setup.php trunk/squirrelmail/plugins/index.php trunk/squirrelmail/plugins/info/functions.php trunk/squirrelmail/plugins/info/index.php trunk/squirrelmail/plugins/info/options.php trunk/squirrelmail/plugins/info/setup.php trunk/squirrelmail/plugins/listcommands/config_sample.php trunk/squirrelmail/plugins/listcommands/functions.php trunk/squirrelmail/plugins/listcommands/index.php trunk/squirrelmail/plugins/listcommands/mailout.php trunk/squirrelmail/plugins/listcommands/options.php trunk/squirrelmail/plugins/listcommands/setup.php trunk/squirrelmail/plugins/listcommands/templates/default/mailout.tpl trunk/squirrelmail/plugins/listcommands/templates/default/non_rfc_lists.tpl trunk/squirrelmail/plugins/mail_fetch/class.mail_fetch.php trunk/squirrelmail/plugins/mail_fetch/config_default.php trunk/squirrelmail/plugins/mail_fetch/constants.php trunk/squirrelmail/plugins/mail_fetch/fetch.php trunk/squirrelmail/plugins/mail_fetch/functions.php trunk/squirrelmail/plugins/mail_fetch/index.php trunk/squirrelmail/plugins/mail_fetch/options.php trunk/squirrelmail/plugins/mail_fetch/setup.php trunk/squirrelmail/plugins/message_details/index.php trunk/squirrelmail/plugins/message_details/message_details_bottom.php trunk/squirrelmail/plugins/message_details/message_details_main.php trunk/squirrelmail/plugins/message_details/message_details_top.php trunk/squirrelmail/plugins/message_details/setup.php trunk/squirrelmail/plugins/newmail/config_default.php trunk/squirrelmail/plugins/newmail/config_sample.php trunk/squirrelmail/plugins/newmail/functions.php trunk/squirrelmail/plugins/newmail/index.php trunk/squirrelmail/plugins/newmail/loadfile.php trunk/squirrelmail/plugins/newmail/media/index.php trunk/squirrelmail/plugins/newmail/newmail.php trunk/squirrelmail/plugins/newmail/newmail_opt.php trunk/squirrelmail/plugins/newmail/setup.php trunk/squirrelmail/plugins/newmail/sounds/index.php trunk/squirrelmail/plugins/newmail/testsound.php trunk/squirrelmail/plugins/preview_pane/empty_frame.php trunk/squirrelmail/plugins/preview_pane/functions.php trunk/squirrelmail/plugins/preview_pane/index.php trunk/squirrelmail/plugins/preview_pane/setup.php trunk/squirrelmail/plugins/preview_pane/templates/default_advanced/collapse_buttons.tpl trunk/squirrelmail/plugins/preview_pane/templates/default_advanced/empty_frame.tpl trunk/squirrelmail/plugins/sent_subfolders/functions.php trunk/squirrelmail/plugins/sent_subfolders/index.php trunk/squirrelmail/plugins/sent_subfolders/setup.php trunk/squirrelmail/plugins/spamcop/functions.php trunk/squirrelmail/plugins/spamcop/index.php trunk/squirrelmail/plugins/spamcop/options.php trunk/squirrelmail/plugins/spamcop/setup.php trunk/squirrelmail/plugins/spamcop/spamcop.php trunk/squirrelmail/plugins/squirrelspell/INSTALL trunk/squirrelmail/plugins/squirrelspell/class/cmd_spell.php trunk/squirrelmail/plugins/squirrelspell/class/common.php trunk/squirrelmail/plugins/squirrelspell/class/php_pspell.php trunk/squirrelmail/plugins/squirrelspell/doc/index.php trunk/squirrelmail/plugins/squirrelspell/index.php trunk/squirrelmail/plugins/squirrelspell/js/check_me.js trunk/squirrelmail/plugins/squirrelspell/js/crypto_settings.js trunk/squirrelmail/plugins/squirrelspell/js/decrypt_error.js trunk/squirrelmail/plugins/squirrelspell/js/index.php trunk/squirrelmail/plugins/squirrelspell/js/init.js trunk/squirrelmail/plugins/squirrelspell/modules/change_main_options.mod trunk/squirrelmail/plugins/squirrelspell/modules/check_me.mod trunk/squirrelmail/plugins/squirrelspell/modules/crypto.mod trunk/squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod trunk/squirrelmail/plugins/squirrelspell/modules/edit_dic.mod trunk/squirrelmail/plugins/squirrelspell/modules/enc_setup.mod trunk/squirrelmail/plugins/squirrelspell/modules/forget_me.mod trunk/squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod trunk/squirrelmail/plugins/squirrelspell/modules/index.php trunk/squirrelmail/plugins/squirrelspell/modules/init.mod trunk/squirrelmail/plugins/squirrelspell/modules/lang_change.mod trunk/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod trunk/squirrelmail/plugins/squirrelspell/modules/options_main.mod trunk/squirrelmail/plugins/squirrelspell/setup.php trunk/squirrelmail/plugins/squirrelspell/sqspell_config.php trunk/squirrelmail/plugins/squirrelspell/sqspell_functions.php trunk/squirrelmail/plugins/squirrelspell/sqspell_interface.php trunk/squirrelmail/plugins/squirrelspell/sqspell_options.php trunk/squirrelmail/plugins/test/README trunk/squirrelmail/plugins/test/decodeheader.php trunk/squirrelmail/plugins/test/functions.php trunk/squirrelmail/plugins/test/index.php trunk/squirrelmail/plugins/test/ngettext.php trunk/squirrelmail/plugins/test/setup.php trunk/squirrelmail/plugins/test/templates/default/test_menu.tpl trunk/squirrelmail/plugins/test/test.php trunk/squirrelmail/plugins/translate/config_default.php trunk/squirrelmail/plugins/translate/config_sample.php trunk/squirrelmail/plugins/translate/functions.php trunk/squirrelmail/plugins/translate/index.php trunk/squirrelmail/plugins/translate/options.php trunk/squirrelmail/plugins/translate/setup.php trunk/squirrelmail/po/independent_strings.txt trunk/squirrelmail/po/index.php trunk/squirrelmail/po/squirrelmail.pot trunk/squirrelmail/src/about.php trunk/squirrelmail/src/addrbook_popup.php trunk/squirrelmail/src/addrbook_search.php trunk/squirrelmail/src/addrbook_search_html.php trunk/squirrelmail/src/addressbook.php trunk/squirrelmail/src/compose.php trunk/squirrelmail/src/configtest.php trunk/squirrelmail/src/delete_message.php trunk/squirrelmail/src/download.php trunk/squirrelmail/src/empty_trash.php trunk/squirrelmail/src/folders.php trunk/squirrelmail/src/help.php trunk/squirrelmail/src/image.php trunk/squirrelmail/src/index.php trunk/squirrelmail/src/left_main.php trunk/squirrelmail/src/login.php trunk/squirrelmail/src/mailto.php trunk/squirrelmail/src/options.php trunk/squirrelmail/src/options_highlight.php trunk/squirrelmail/src/options_identities.php trunk/squirrelmail/src/options_order.php trunk/squirrelmail/src/read_body.php trunk/squirrelmail/src/redirect.php trunk/squirrelmail/src/right_main.php trunk/squirrelmail/src/search.php trunk/squirrelmail/src/signout.php trunk/squirrelmail/src/squirrelmail_rpc.php trunk/squirrelmail/src/style.php trunk/squirrelmail/src/vcard.php trunk/squirrelmail/src/view_header.php trunk/squirrelmail/src/view_html.php trunk/squirrelmail/src/view_text.php trunk/squirrelmail/src/webmail.php trunk/squirrelmail/templates/default/addrbook_addedit.tpl trunk/squirrelmail/templates/default/addrbook_search_list.tpl trunk/squirrelmail/templates/default/addressbook_list.tpl trunk/squirrelmail/templates/default/addressbook_paginator.tpl trunk/squirrelmail/templates/default/addressbook_popup.tpl trunk/squirrelmail/templates/default/addressbook_search_form.tpl trunk/squirrelmail/templates/default/body.tpl trunk/squirrelmail/templates/default/compose_attachments.tpl trunk/squirrelmail/templates/default/compose_body.tpl trunk/squirrelmail/templates/default/compose_buttons.tpl trunk/squirrelmail/templates/default/compose_form_close.tpl trunk/squirrelmail/templates/default/compose_header.tpl trunk/squirrelmail/templates/default/compose_newwin_close.tpl trunk/squirrelmail/templates/default/config.php trunk/squirrelmail/templates/default/edit_list_associative_widget.tpl trunk/squirrelmail/templates/default/edit_list_associative_widget_list_style.tpl trunk/squirrelmail/templates/default/edit_list_widget.tpl trunk/squirrelmail/templates/default/edit_list_widget_list_style.tpl trunk/squirrelmail/templates/default/empty_folder.tpl trunk/squirrelmail/templates/default/error_box.tpl trunk/squirrelmail/templates/default/error_logout.tpl trunk/squirrelmail/templates/default/error_message.tpl trunk/squirrelmail/templates/default/folder_manip.tpl trunk/squirrelmail/templates/default/folder_manip_dialog.tpl trunk/squirrelmail/templates/default/footer.tpl trunk/squirrelmail/templates/default/form.tpl trunk/squirrelmail/templates/default/form_close.tpl trunk/squirrelmail/templates/default/header.tpl trunk/squirrelmail/templates/default/help_chapter.tpl trunk/squirrelmail/templates/default/help_toc.tpl trunk/squirrelmail/templates/default/horizontal_rule.tpl trunk/squirrelmail/templates/default/hyperlink.tpl trunk/squirrelmail/templates/default/image.tpl trunk/squirrelmail/templates/default/index.php trunk/squirrelmail/templates/default/input.tpl trunk/squirrelmail/templates/default/js/default.js trunk/squirrelmail/templates/default/js/index.php trunk/squirrelmail/templates/default/label.tpl trunk/squirrelmail/templates/default/left_main.tpl trunk/squirrelmail/templates/default/line_break.tpl trunk/squirrelmail/templates/default/login.tpl trunk/squirrelmail/templates/default/message_list.tpl trunk/squirrelmail/templates/default/message_list_controls.tpl trunk/squirrelmail/templates/default/motd.tpl trunk/squirrelmail/templates/default/non_breaking_space.tpl trunk/squirrelmail/templates/default/note.tpl trunk/squirrelmail/templates/default/option_groups.tpl trunk/squirrelmail/templates/default/options.tpl trunk/squirrelmail/templates/default/options_advidentity_list.tpl trunk/squirrelmail/templates/default/options_highlight_addedit.tpl trunk/squirrelmail/templates/default/options_highlight_list.tpl trunk/squirrelmail/templates/default/options_order.tpl trunk/squirrelmail/templates/default/page_header.tpl trunk/squirrelmail/templates/default/paginator.tpl trunk/squirrelmail/templates/default/plugins/fortune/mailbox_index_before.tpl trunk/squirrelmail/templates/default/plugins/listcommands/read_body_header.tpl trunk/squirrelmail/templates/default/protocol_header.tpl trunk/squirrelmail/templates/default/read_attachments.tpl trunk/squirrelmail/templates/default/read_display_images_inline.tpl trunk/squirrelmail/templates/default/read_handle_receipt.tpl trunk/squirrelmail/templates/default/read_headers.tpl trunk/squirrelmail/templates/default/read_html_iframe.tpl trunk/squirrelmail/templates/default/read_menubar_buttons.tpl trunk/squirrelmail/templates/default/read_menubar_nav.tpl trunk/squirrelmail/templates/default/read_message_body.tpl trunk/squirrelmail/templates/default/read_message_print.tpl trunk/squirrelmail/templates/default/read_message_priority.tpl trunk/squirrelmail/templates/default/read_recipient_list.tpl trunk/squirrelmail/templates/default/read_toolbar.tpl trunk/squirrelmail/templates/default/read_xmailer.tpl trunk/squirrelmail/templates/default/search.tpl trunk/squirrelmail/templates/default/search_advanced.tpl trunk/squirrelmail/templates/default/search_list.tpl trunk/squirrelmail/templates/default/search_result_empty.tpl trunk/squirrelmail/templates/default/search_result_mailbox.tpl trunk/squirrelmail/templates/default/search_result_top.tpl trunk/squirrelmail/templates/default/select.tpl trunk/squirrelmail/templates/default/signout.tpl trunk/squirrelmail/templates/default/span.tpl trunk/squirrelmail/templates/default/table.tpl trunk/squirrelmail/templates/default/table_close.tpl trunk/squirrelmail/templates/default/table_data.tpl trunk/squirrelmail/templates/default/table_data_close.tpl trunk/squirrelmail/templates/default/table_row.tpl trunk/squirrelmail/templates/default/table_row_close.tpl trunk/squirrelmail/templates/default/textarea.tpl trunk/squirrelmail/templates/default/vcard.tpl trunk/squirrelmail/templates/default/view_header.tpl trunk/squirrelmail/templates/default/view_text.tpl trunk/squirrelmail/templates/default/webmail.tpl trunk/squirrelmail/templates/default_advanced/compose_body.tpl trunk/squirrelmail/templates/default_advanced/config.php trunk/squirrelmail/templates/default_advanced/left_main.tpl trunk/squirrelmail/templates/default_advanced/login.tpl trunk/squirrelmail/templates/default_advanced/options_highlight_addedit.tpl trunk/squirrelmail/templates/default_advanced/options_highlight_list.tpl trunk/squirrelmail/templates/default_advanced/options_order.tpl trunk/squirrelmail/templates/default_advanced/page_header.tpl trunk/squirrelmail/templates/default_advanced/read_headers.tpl trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl trunk/squirrelmail/templates/default_advanced/read_menubar_nav.tpl trunk/squirrelmail/templates/default_advanced/webmail.tpl trunk/squirrelmail/templates/default_rpc/config.php trunk/squirrelmail/templates/default_rpc/rpc_response_error.tpl trunk/squirrelmail/templates/default_rpc/rpc_response_success.tpl trunk/squirrelmail/templates/index.php trunk/squirrelmail/templates/util_addressbook.php trunk/squirrelmail/templates/util_read.php trunk/squirrelmail/themes/alien_glow.php trunk/squirrelmail/themes/autumn.php trunk/squirrelmail/themes/autumn2.php trunk/squirrelmail/themes/black_bean_burrito_theme.php trunk/squirrelmail/themes/blue_grey_theme.php trunk/squirrelmail/themes/blue_on_blue.php trunk/squirrelmail/themes/bluesnews_theme.php trunk/squirrelmail/themes/bluesome.php trunk/squirrelmail/themes/bluesteel_theme.php trunk/squirrelmail/themes/christmas.php trunk/squirrelmail/themes/classic_blue.php trunk/squirrelmail/themes/classic_blue2.php trunk/squirrelmail/themes/color_theme_to_css.php trunk/squirrelmail/themes/css/index.php trunk/squirrelmail/themes/dark_green.php trunk/squirrelmail/themes/dark_grey_theme.php trunk/squirrelmail/themes/darkness.php trunk/squirrelmail/themes/deepocean2_theme.php trunk/squirrelmail/themes/deepocean_theme.php trunk/squirrelmail/themes/default_theme.php trunk/squirrelmail/themes/dompie_theme.php trunk/squirrelmail/themes/forest_theme.php trunk/squirrelmail/themes/greenhouse_effect.php trunk/squirrelmail/themes/high_contrast_theme.php trunk/squirrelmail/themes/ice_theme.php trunk/squirrelmail/themes/in_the_pink.php trunk/squirrelmail/themes/index.php trunk/squirrelmail/themes/kind_of_blue.php trunk/squirrelmail/themes/maize_theme.php trunk/squirrelmail/themes/methodical_theme.php trunk/squirrelmail/themes/midnight.php trunk/squirrelmail/themes/minimal_bw.php trunk/squirrelmail/themes/monostochastic.php trunk/squirrelmail/themes/netstyle_theme.php trunk/squirrelmail/themes/penguin.php trunk/squirrelmail/themes/plain_blue_theme.php trunk/squirrelmail/themes/powder_blue.php trunk/squirrelmail/themes/purple_theme.php trunk/squirrelmail/themes/random.php trunk/squirrelmail/themes/redmond.php trunk/squirrelmail/themes/sandstorm_theme.php trunk/squirrelmail/themes/seaspray_theme.php trunk/squirrelmail/themes/servery_theme.php trunk/squirrelmail/themes/shades_of_grey.php trunk/squirrelmail/themes/silver_steel_theme.php trunk/squirrelmail/themes/simple_green2.php trunk/squirrelmail/themes/simple_green_theme.php trunk/squirrelmail/themes/simple_purple.php trunk/squirrelmail/themes/slashdot_theme.php trunk/squirrelmail/themes/spice_of_life.php trunk/squirrelmail/themes/spice_of_life_dark.php trunk/squirrelmail/themes/spice_of_life_lite.php trunk/squirrelmail/themes/techno_blue.php trunk/squirrelmail/themes/turquoise.php trunk/squirrelmail/themes/wood_theme.php Modified: trunk/squirrelmail/class/deliver/Deliver.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/deliver/Deliver.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/deliver/index.php =================================================================== --- trunk/squirrelmail/class/deliver/index.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/deliver/index.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/error.class.php =================================================================== --- trunk/squirrelmail/class/error.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/error.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -5,7 +5,7 @@ * * This contains the custom error handler for SquirrelMail. * - * @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: trunk/squirrelmail/class/helper/VCard.class.php =================================================================== --- trunk/squirrelmail/class/helper/VCard.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/helper/VCard.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/helper/index.php =================================================================== --- trunk/squirrelmail/class/helper/index.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/helper/index.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/index.php =================================================================== --- trunk/squirrelmail/class/index.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/index.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/l10n/gettext.class.php =================================================================== --- trunk/squirrelmail/class/l10n/gettext.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/l10n/gettext.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -19,7 +19,7 @@ * along with PHP-gettext; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @copyright 2004-2019 The SquirrelMail Project Team + * @copyright 2004-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/l10n/index.php =================================================================== --- trunk/squirrelmail/class/l10n/index.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/l10n/index.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/l10n/streams.class.php =================================================================== --- trunk/squirrelmail/class/l10n/streams.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/l10n/streams.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, * MA 02110-1301, USA * - * @copyright 2004-2019 The SquirrelMail Project Team + * @copyright 2004-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/class/l10n.class.php =================================================================== --- trunk/squirrelmail/class/l10n.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/l10n.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -7,7 +7,7 @@ * translations when php gettext extension is missing or some functions * are not available. * - * @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: trunk/squirrelmail/class/mime/AddressStructure.class.php =================================================================== --- trunk/squirrelmail/class/mime/AddressStructure.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/mime/AddressStructure.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/mime/ContentType.class.php =================================================================== --- trunk/squirrelmail/class/mime/ContentType.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/mime/ContentType.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/mime/Disposition.class.php =================================================================== --- trunk/squirrelmail/class/mime/Disposition.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/mime/Disposition.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/mime/Language.class.php =================================================================== --- trunk/squirrelmail/class/mime/Language.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/mime/Language.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/mime/Message.class.php =================================================================== --- trunk/squirrelmail/class/mime/Message.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/mime/Message.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/mime/MessageHeader.class.php =================================================================== --- trunk/squirrelmail/class/mime/MessageHeader.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/mime/MessageHeader.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/mime/Rfc822Header.class.php =================================================================== --- trunk/squirrelmail/class/mime/Rfc822Header.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/mime/Rfc822Header.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/mime/SMimeMessage.class.php =================================================================== --- trunk/squirrelmail/class/mime/SMimeMessage.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/mime/SMimeMessage.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/mime/index.php =================================================================== --- trunk/squirrelmail/class/mime/index.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/mime/index.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/mime.class.php =================================================================== --- trunk/squirrelmail/class/mime.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/mime.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/class/template/PHP_Template.class.php =================================================================== --- trunk/squirrelmail/class/template/PHP_Template.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/template/PHP_Template.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -9,7 +9,7 @@ * The SquirrelMail (Foowd) template implementation. * Derived from the foowd template implementation and adapted * for squirrelmail - * @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: trunk/squirrelmail/class/template/Smarty_Template.class.php =================================================================== --- trunk/squirrelmail/class/template/Smarty_Template.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/template/Smarty_Template.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -7,7 +7,7 @@ * SquirrelMail and Smarty. All abstract methods from the Template class * are implemented here. * - * @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: trunk/squirrelmail/class/template/Template.class.php =================================================================== --- trunk/squirrelmail/class/template/Template.class.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/template/Template.class.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -8,7 +8,7 @@ * class with any custom functionality needed to interface a target * templating engine with SquirrelMail. * - * @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: trunk/squirrelmail/class/template/index.php =================================================================== --- trunk/squirrelmail/class/template/index.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/class/template/index.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/config/conf.pl =================================================================== --- trunk/squirrelmail/config/conf.pl 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/config/conf.pl 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/config/config_default.php =================================================================== --- trunk/squirrelmail/config/config_default.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/config/config_default.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/config/config_local.example.php =================================================================== --- trunk/squirrelmail/config/config_local.example.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/config/config_local.example.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/config/index.php =================================================================== --- trunk/squirrelmail/config/index.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/config/index.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/contrib/conf.pl.8 =================================================================== --- trunk/squirrelmail/contrib/conf.pl.8 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/contrib/conf.pl.8 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/contrib/decrypt_headers.php =================================================================== --- trunk/squirrelmail/contrib/decrypt_headers.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/contrib/decrypt_headers.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/contrib/flat2sql.pl =================================================================== --- trunk/squirrelmail/contrib/flat2sql.pl 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/contrib/flat2sql.pl 2020-01-07 08:09:34 UTC (rev 14845) @@ -8,7 +8,7 @@ # using this script. # # Copyright (c) 2002, Michael Blandford and Tal Yardeni -# Copyright (c) 2005-2019 The SquirrelMail Project Team +# Copyright (c) 2005-2020 The SquirrelMail Project Team # # This script is licensed under the GNU Public License (GPL). # See: http://opensource.org/licenses/gpl-license.php Modified: trunk/squirrelmail/doc/index.php =================================================================== --- trunk/squirrelmail/doc/index.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/doc/index.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/functions/abook_database.php =================================================================== --- trunk/squirrelmail/functions/abook_database.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/abook_database.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -14,7 +14,7 @@ * PRIMARY KEY (owner,nickname) * </pre> * - * @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: trunk/squirrelmail/functions/abook_ldap_server.php =================================================================== --- trunk/squirrelmail/functions/abook_ldap_server.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/abook_ldap_server.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -18,7 +18,7 @@ * and inetOrgPerson (RFC2798) objects and dn, description, sn, givenname, * cn, mail attributes. Other attributes are ignored. * - * @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: trunk/squirrelmail/functions/abook_local_file.php =================================================================== --- trunk/squirrelmail/functions/abook_local_file.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/abook_local_file.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/functions/addressbook.php =================================================================== --- trunk/squirrelmail/functions/addressbook.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/addressbook.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -4,7 +4,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: trunk/squirrelmail/functions/arrays.php =================================================================== --- trunk/squirrelmail/functions/arrays.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/arrays.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -5,7 +5,7 @@ * * Contains utility functions for array operations * - * @copyright 2004-2019 The SquirrelMail Project Team + * @copyright 2004-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/attachment_common.php =================================================================== --- trunk/squirrelmail/functions/attachment_common.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/attachment_common.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/functions/auth.php =================================================================== --- trunk/squirrelmail/functions/auth.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/auth.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -9,7 +9,7 @@ * functions/global.php * functions/strings.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: trunk/squirrelmail/functions/compose.php =================================================================== --- trunk/squirrelmail/functions/compose.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/compose.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -6,7 +6,7 @@ * Functions for message compositon: writing a message, attaching files etc. * * @author Thijs Kinkhorst <kink at squirrelmail.org> - * @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: trunk/squirrelmail/functions/constants.php =================================================================== --- trunk/squirrelmail/functions/constants.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/constants.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -2,7 +2,7 @@ /** * old constants function file location * - * @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: trunk/squirrelmail/functions/date.php =================================================================== --- trunk/squirrelmail/functions/date.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/date.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/functions/db_prefs.php =================================================================== --- trunk/squirrelmail/functions/db_prefs.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/db_prefs.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/functions/decode/cp1250.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1250.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/decode/cp1250.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/functions/decode/cp1251.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1251.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/decode/cp1251.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/functions/decode/cp1252.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1252.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/decode/cp1252.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/functions/decode/cp1253.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1253.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/decode/cp1253.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/functions/decode/cp1254.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1254.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/decode/cp1254.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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: trunk/squirrelmail/functions/decode/cp1255.php =================================================================== --- trunk/squirrelmail/functions/decode/cp1255.php 2020-01-07 07:58:03 UTC (rev 14844) +++ trunk/squirrelmail/functions/decode/cp1255.php 2020-01-07 08:09:34 UTC (rev 14845) @@ -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... [truncated message content] |
From: <pdo...@us...> - 2020-05-08 00:59:53
|
Revision: 14856 http://sourceforge.net/p/squirrelmail/code/14856 Author: pdontthink Date: 2020-05-08 00:59:52 +0000 (Fri, 08 May 2020) Log Message: ----------- Implement ability to move to next message after moving the one you are viewing, per the way delete_move_next plugins does from v1.4.x Modified Paths: -------------- trunk/squirrelmail/include/load_prefs.php trunk/squirrelmail/include/options/display.php trunk/squirrelmail/src/read_body.php Modified: trunk/squirrelmail/include/load_prefs.php =================================================================== --- trunk/squirrelmail/include/load_prefs.php 2020-03-31 04:46:51 UTC (rev 14855) +++ trunk/squirrelmail/include/load_prefs.php 2020-05-08 00:59:52 UTC (rev 14856) @@ -354,6 +354,7 @@ $show_recipient_instead = getPref($data_dir, $username, 'show_recipient_instead', SMPREF_OFF); $delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_display', SMPREF_ON); +$return_to_message_list_after_move = getPref($data_dir, $username, 'return_to_message_list_after_move', SMPREF_ON); /** * Access keys Modified: trunk/squirrelmail/include/options/display.php =================================================================== --- trunk/squirrelmail/include/options/display.php 2020-03-31 04:46:51 UTC (rev 14855) +++ trunk/squirrelmail/include/options/display.php 2020-05-08 00:59:52 UTC (rev 14856) @@ -408,8 +408,15 @@ 'refresh' => SMOPT_REFRESH_ALL ); + $optvals[SMOPT_GRP_MESSAGE][] = array( + 'name' => 'return_to_message_list_after_move', + 'caption' => _("Return To Message List After Move"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); + /*** Load the Address Book Options into the array ***/ $optgrps[SMOPT_GRP_ABOOK] = _("Address Book Display Options"); $optvals[SMOPT_GRP_ABOOK] = array(); Modified: trunk/squirrelmail/src/read_body.php =================================================================== --- trunk/squirrelmail/src/read_body.php 2020-03-31 04:46:51 UTC (rev 14855) +++ trunk/squirrelmail/src/read_body.php 2020-05-08 00:59:52 UTC (rev 14856) @@ -37,7 +37,7 @@ * and sorted msgs array and return the index of the next message * * @param int $passed_id The current message UID - * @return the index of the next valid message from the array + * @return the index of the next valid message from the array or -1 if there is no next message */ function findNextMessage($uidset,$passed_id='backwards') { if (!is_array($uidset)) { @@ -59,7 +59,7 @@ * and sorted msgs array and return the index of the previous message * * @param int $passed_id The current message UID - * @return the index of the next valid message from the array + * @return the index of the previous valid message from the array or -1 if there is no previous message */ function findPreviousMessage($uidset, $passed_id) { @@ -479,7 +479,7 @@ $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox, $delete_prev_next_display, $show_copy_buttons, $compose_new_win, $compose_width, $compose_height, - $oTemplate; + $oTemplate, $return_to_message_list_after_move; //FIXME cleanup argument list, use $aMailbox where possible $mailbox = $aMailbox['NAME']; @@ -640,9 +640,12 @@ $oTemplate->assign('mailboxes', sqimap_mailbox_option_array($imapConnection)); if (in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true)) { - $delete_url = $base_uri . "src/$where"; $oTemplate->assign('can_be_deleted', true); - $oTemplate->assign('move_delete_form_action', $base_uri.'src/'.$where); + // force return-to-message-list if this is the only message in the folder + if ($return_to_message_list_after_move || ($next < 0 && $prev < 0)) + $oTemplate->assign('move_delete_form_action', $base_uri.'src/'.$where); + else + $oTemplate->assign('move_delete_form_action', $base_uri.'src/read_body.php'); $oTemplate->assign('delete_form_extra', addHidden('mailbox', $aMailbox['NAME'])."\n" . addHidden('msg[0]', $passed_id)."\n" . addHidden('startMessage', $startMessage)."\n" ); @@ -649,7 +652,10 @@ if (!(isset($passed_ent_id) && $passed_ent_id)) { $oTemplate->assign('can_be_moved', true); $oTemplate->assign('move_form_extra', addHidden('mailbox', $aMailbox['NAME'])."\n" . - addHidden('msg[0]', $passed_id)."\n" ); + addHidden('msg[0]', $passed_id)."\n" . + // only need when $return_to_message_list_after_move is off + addHidden('passed_id', ($next >= 0 ? $next : $prev))."\n" . + addHidden('startMessage', $startMessage)."\n" ); $oTemplate->assign('last_move_target', isset($lastTargetMailbox) && !empty($lastTargetMailbox) ? $lastTargetMailbox : ''); $oTemplate->assign('can_be_copied', $show_copy_buttons==1); } else { @@ -930,6 +936,14 @@ } /** + * or move button... why is handleMessageListForm (per above) conditional anway? + */ +if ( sqgetGlobalVar('moveButton', $ignore, SQ_POST) ) { + $sError = handleMessageListForm($imapConnection,$aMailbox); + sqgetGlobalVar('targetMailbox', $lastTargetMailbox, SQ_POST); +} + +/** * $message contains all information about the message * including header and body */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2020-05-23 19:29:29
|
Revision: 14861 http://sourceforge.net/p/squirrelmail/code/14861 Author: pdontthink Date: 2020-05-23 19:29: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: -------------- trunk/squirrelmail/config/config_local.example.php trunk/squirrelmail/functions/strings.php trunk/squirrelmail/functions/template/general_util.php trunk/squirrelmail/src/compose.php trunk/squirrelmail/templates/default/compose_attachments.tpl Modified: trunk/squirrelmail/config/config_local.example.php =================================================================== --- trunk/squirrelmail/config/config_local.example.php 2020-05-23 18:54:31 UTC (rev 14860) +++ trunk/squirrelmail/config/config_local.example.php 2020-05-23 19:29:27 UTC (rev 14861) @@ -193,4 +193,11 @@ * traffic from a proxy so the normal $PHP_SELF does not resolve * to what it should be for the real client. * + * $upload_filesize_divisor allows the administrator to specify + * the divisor used when converting the size of an uploaded file + * as given by PHP's filesize() and converted to human-digestable + * form. By default, 1000 is used, but 1024 may be necessary in + * some environments. + * $upload_filesize_divisor = 1024; + * */ Modified: trunk/squirrelmail/functions/strings.php =================================================================== --- trunk/squirrelmail/functions/strings.php 2020-05-23 18:54:31 UTC (rev 14860) +++ trunk/squirrelmail/functions/strings.php 2020-05-23 19:29:27 UTC (rev 14861) @@ -654,6 +654,7 @@ * a more easily digested (readable) format * * @param int $bytes the size in bytes + * @param int $filesize_divisor the divisor we'll use (OPTIONAL; default 1024) * * @return string The size in human readable format * @@ -660,12 +661,12 @@ * @since 1.0 * */ -function show_readable_size($bytes) { - $bytes /= 1024; +function show_readable_size($bytes, $filesize_divisor) { + $bytes /= $filesize_divisor; $type = _("KiB"); - if ($bytes / 1024 > 1) { - $bytes /= 1024; + if ($bytes / $filesize_divisor > 1) { + $bytes /= $filesize_divisor; $type = _("MiB"); } Modified: trunk/squirrelmail/functions/template/general_util.php =================================================================== --- trunk/squirrelmail/functions/template/general_util.php 2020-05-23 18:54:31 UTC (rev 14860) +++ trunk/squirrelmail/functions/template/general_util.php 2020-05-23 19:29:27 UTC (rev 14861) @@ -169,9 +169,10 @@ //FIXME: I think this is needless since there is no reason templates cannot just call directly to show_readable_size * * @param int size to be converted to human-readable + * @param int filesize_divisor the divisor we'll use (OPTIONAL; default 1024) * @return string human-readable form * @since 1.5.2 **/ -function humanReadableSize ($size) { - return show_readable_size($size); +function humanReadableSize ($size, $filesize_divisor=1024) { + return show_readable_size($size, $filesize_divisor); } Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2020-05-23 18:54:31 UTC (rev 14860) +++ trunk/squirrelmail/src/compose.php 2020-05-23 19:29:27 UTC (rev 14861) @@ -1484,7 +1484,9 @@ } $attach = 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)) { foreach ($attach_array as $key => $attachment) { @@ -1507,6 +1509,7 @@ $max = min($sizes); $oTemplate->assign('max_file_size', empty($max) ? -1 : $max); $oTemplate->assign('attachments', $attach); + $oTemplate->assign('upload_filesize_divisor', $upload_filesize_divisor); // access keys... // Modified: trunk/squirrelmail/templates/default/compose_attachments.tpl =================================================================== --- trunk/squirrelmail/templates/default/compose_attachments.tpl 2020-05-23 18:54:31 UTC (rev 14860) +++ trunk/squirrelmail/templates/default/compose_attachments.tpl 2020-05-23 19:29:27 UTC (rev 14861) @@ -55,7 +55,7 @@ <input type="checkbox" name="delete[]" id="delete<?php echo $attachment_count; ?>" accesskey="<?php echo ($attachment_count % 10); ?>" value="<?php echo $attach['Key']; ?>" /> </td> <td class="fieldValue"><label for="delete<?php echo $attachment_count; ?>"> - <?php echo $attach['FileName']; ?> - <?php echo $attach['ContentType']; ?> (<?php echo humanReadableSize($attach['Size']); ?>) + <?php echo $attach['FileName']; ?> - <?php echo $attach['ContentType']; ?> (<?php echo humanReadableSize($attach['Size'], $upload_filesize_divisor); ?>) </label></td> </tr> <?php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2020-11-03 20:17:28
|
Revision: 14873 http://sourceforge.net/p/squirrelmail/code/14873 Author: pdontthink Date: 2020-11-03 20:17:15 +0000 (Tue, 03 Nov 2020) Log Message: ----------- Fix what I think was a misunderstanding of what the "extra" attribute was supposed to be for the anchor links for attachment actions Modified Paths: -------------- trunk/squirrelmail/functions/mime.php trunk/squirrelmail/templates/default/read_attachments.tpl Modified: trunk/squirrelmail/functions/mime.php =================================================================== --- trunk/squirrelmail/functions/mime.php 2020-11-03 19:49:34 UTC (rev 14872) +++ trunk/squirrelmail/functions/mime.php 2020-11-03 20:17:15 UTC (rev 14873) @@ -656,12 +656,19 @@ $this_attachment['ViewHREF'] = $val['href']; continue; } - if (empty($val['text']) && empty($val['extra'])) + + // This makes no sense - If 'text' and 'extra' are just concatenated, + // there is no point in having 'extra'.... I am going to assume this + // was a mistake and am changing 'extra' to be what I think it was + // meant to be: additional tag attributes. However, I'm not checking + // extensively for plugins that were using this the wrong way (but why would they?) + if (empty($val['text'])) continue; $temp = array(); $temp['HREF'] = $val['href']; - $temp['Text'] = (empty($val['text']) ? '' : $val['text']) . (empty($val['extra']) ? '' : $val['extra']); + $temp['Text'] = $val['text']; + $temp['Extra'] = (empty($val['extra']) ? '' : $val['extra']); $this_attachment['OtherLinks'][] = $temp; } $attachments[] = $this_attachment; Modified: trunk/squirrelmail/templates/default/read_attachments.tpl =================================================================== --- trunk/squirrelmail/templates/default/read_attachments.tpl 2020-11-03 19:49:34 UTC (rev 14872) +++ trunk/squirrelmail/templates/default/read_attachments.tpl 2020-11-03 20:17:15 UTC (rev 14873) @@ -10,19 +10,20 @@ * $attachments - array containing info for all message attachments. Each * element in the array represents a separate attachment and * contains the following elements: - * $el['Name'] - The name of the attachment - * $el['Description'] - Description of the attachment - * $el['DefaultHREF'] - URL to the action that should occur when the name is clicked - * $el['DownloadHREF'] - URL to download the attachment - * $el['ViewHREF'] - URL to view the attachment. Empty if not available. - * $el['Size'] - Size of attachment in bytes. - * $el['ContentType'] - Content-Type of the attachment - * $el['OtherLinks'] - array containing links to any other actions - * available for this attachment that might be - * provided by plugins, for example. Each element represents - * a different action and contains the following elements: - * $link['HREF'] - URL to access the functionality - * $link['Text'] - Text representing the functionality. + * $el['Name'] - The name of the attachment + * $el['Description'] - Description of the attachment + * $el['DefaultHREF'] - URL to the action that should occur when the name is clicked + * $el['DownloadHREF'] - URL to download the attachment + * $el['ViewHREF'] - URL to view the attachment. Empty if not available. + * $el['Size'] - Size of attachment in bytes. + * $el['ContentType'] - Content-Type of the attachment + * $el['OtherLinks'] - array containing links to any other actions + * available for this attachment that might be + * provided by plugins, for example. Each element represents + * a different action and contains the following elements: + * $link['HREF'] - URL to access the functionality + * $link['Text'] - Text representing the functionality + * $link['Extra'] - Any extra anchor tag attributes provided by a plugin * * @copyright 1999-2020 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License @@ -82,7 +83,7 @@ foreach ($attachment['OtherLinks'] as $link) { ?> | - <a href="<?php echo $link['HREF']; ?>"><?php echo $link['Text']; ?></a> + <a href="<?php echo $link['HREF'] . '" ' . $link['Extra']; ?>><?php echo $link['Text']; ?></a> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2021-01-15 16:30:26
|
Revision: 14876 http://sourceforge.net/p/squirrelmail/code/14876 Author: pdontthink Date: 2021-01-15 16:30:25 +0000 (Fri, 15 Jan 2021) Log Message: ----------- PHP 8 compatibility fix Modified Paths: -------------- trunk/squirrelmail/class/template/Template.class.php trunk/squirrelmail/doc/ChangeLog Modified: trunk/squirrelmail/class/template/Template.class.php =================================================================== --- trunk/squirrelmail/class/template/Template.class.php 2020-11-21 04:00:56 UTC (rev 14875) +++ trunk/squirrelmail/class/template/Template.class.php 2021-01-15 16:30:25 UTC (rev 14876) @@ -159,7 +159,7 @@ * @static * */ - function construct_template($template_set_id) { + static function construct_template($template_set_id) { $template = new Template($template_set_id); $template->override_plugins(); @@ -234,7 +234,7 @@ * @static * */ - function get_fallback_template_set($default='default') { + static function get_fallback_template_set($default='default') { // FIXME: do we want to place any restrictions on the ID such as // making sure no slashes included? @@ -285,7 +285,7 @@ * @static * */ - function get_default_template_set($default='default') { + static function get_default_template_set($default='default') { // FIXME: do we want to place any restrictions on the ID such as // making sure no slashes included? @@ -336,7 +336,7 @@ * @static * */ - function get_rpc_template_set($default='default_rpc') { + static function get_rpc_template_set($default='default_rpc') { // FIXME: do we want to place any restrictions on the ID such as // making sure no slashes included? @@ -475,7 +475,7 @@ * @static * */ - function calculate_template_file_directory($template_set_id) { + static function calculate_template_file_directory($template_set_id) { return 'templates/' . $template_set_id . '/'; @@ -493,7 +493,7 @@ * @static * */ - function calculate_template_images_directory($template_set_id) { + static function calculate_template_images_directory($template_set_id) { return 'templates/' . $template_set_id . '/images/'; @@ -592,7 +592,7 @@ * @static * */ - function get_template_config($template_set_id, $setting, + static function get_template_config($template_set_id, $setting, $default=NULL, $live_config=FALSE) { sqGetGlobalVar('template_configuration_settings', @@ -714,7 +714,7 @@ * @static * */ - function cache_template_file_hierarchy($template_set_id, + static function cache_template_file_hierarchy($template_set_id, $regenerate_cache=FALSE, $additional_files=array()) { @@ -793,7 +793,7 @@ * @static * */ - function catalog_template_files($template_set_id, $file_list=array(), $directory='') { + static function catalog_template_files($template_set_id, $file_list=array(), $directory='') { $template_base_dir = SM_PATH . Template::calculate_template_file_directory($template_set_id); Modified: trunk/squirrelmail/doc/ChangeLog =================================================================== --- trunk/squirrelmail/doc/ChangeLog 2020-11-21 04:00:56 UTC (rev 14875) +++ trunk/squirrelmail/doc/ChangeLog 2021-01-15 16:30:25 UTC (rev 14876) @@ -441,6 +441,7 @@ $PHP_SELF does not resolve to what it should be for the real client. - Show more accurate filesize for uploaded files and base64-encoded attachments (when reading a message) + - Added fixes for PHP version 8 compatibility Version 1.5.1 (branched on 2006-02-12) -------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2021-01-16 09:42:36
|
Revision: 14881 http://sourceforge.net/p/squirrelmail/code/14881 Author: pdontthink Date: 2021-01-16 09:42:31 +0000 (Sat, 16 Jan 2021) Log Message: ----------- Remove use of each() as it is deprecated Modified Paths: -------------- trunk/squirrelmail/functions/abook_database.php trunk/squirrelmail/functions/addressbook.php trunk/squirrelmail/functions/imap_general.php trunk/squirrelmail/functions/imap_mailbox.php trunk/squirrelmail/functions/mime.php trunk/squirrelmail/include/load_prefs.php trunk/squirrelmail/include/options/display.php trunk/squirrelmail/plugins/calendar/calendar.php trunk/squirrelmail/plugins/calendar/day.php trunk/squirrelmail/plugins/calendar/functions.php trunk/squirrelmail/plugins/squirrelspell/modules/check_me.mod trunk/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod trunk/squirrelmail/templates/util_addressbook.php Modified: trunk/squirrelmail/functions/abook_database.php =================================================================== --- trunk/squirrelmail/functions/abook_database.php 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/functions/abook_database.php 2021-01-16 09:42:31 UTC (rev 14881) @@ -681,7 +681,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 '; @@ -705,7 +705,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: trunk/squirrelmail/functions/addressbook.php =================================================================== --- trunk/squirrelmail/functions/addressbook.php 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/functions/addressbook.php 2021-01-16 09:42:31 UTC (rev 14881) @@ -141,7 +141,7 @@ /* Load configured LDAP servers (if PHP has LDAP support) */ if (isset($ldap_server) && is_array($ldap_server)) { reset($ldap_server); - while (list($undef,$param) = each($ldap_server)) { + foreach ($ldap_server as $param) { if (!is_array($param)) continue; @@ -251,7 +251,7 @@ $write = array(); $backends = $abook->get_backend_list(); - while (list($undef,$v) = each($backends)) { + foreach ($backends as $v) { if ($v->writeable) { $write[$v->bnum]=$v->sname; } Modified: trunk/squirrelmail/functions/imap_general.php =================================================================== --- trunk/squirrelmail/functions/imap_general.php 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/functions/imap_general.php 2021-01-16 09:42:31 UTC (rev 14881) @@ -1272,7 +1272,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: trunk/squirrelmail/functions/imap_mailbox.php =================================================================== --- trunk/squirrelmail/functions/imap_mailbox.php 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/functions/imap_mailbox.php 2021-01-16 09:42:31 UTC (rev 14881) @@ -857,10 +857,10 @@ $lowerbox = strtolower(sm_encode_html_special_chars($value)); $sel = false; if ($show_selected != 0) { - reset($show_selected); - while (!$sel && (list($x, $val) = each($show_selected))) { + foreach ($show_selected as $val)) { if (strtolower($value) == strtolower(sm_encode_html_special_chars($val))) { $sel = true; + break; } } } Modified: trunk/squirrelmail/functions/mime.php =================================================================== --- trunk/squirrelmail/functions/mime.php 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/functions/mime.php 2021-01-16 09:42:31 UTC (rev 14881) @@ -1382,7 +1382,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); @@ -1816,7 +1816,7 @@ $mailbox ){ $me = 'sq_fixatts'; - while (list($attname, $attvalue) = each($attary)){ + foreach ($attary as $attname => $attvalue){ /** * See if this attribute should be removed. */ Modified: trunk/squirrelmail/include/load_prefs.php =================================================================== --- trunk/squirrelmail/include/load_prefs.php 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/include/load_prefs.php 2021-01-16 09:42:31 UTC (rev 14881) @@ -511,16 +511,20 @@ // need to adjust $chosen_theme path with SM_PATH $chosen_theme_path = preg_replace("/(\.\.\/){1,}/", SM_PATH, $chosen_theme_path); $found_theme = false; -while (!$found_theme && (list($index, $data) = each($user_themes))) { - if ($data['PATH'] == $chosen_theme_path) +foreach ($user_themes as $data) { + if ($data['PATH'] == $chosen_theme_path) { $found_theme = true; + break; + } } if (!$found_theme) { $template_themes = $oTemplate->get_alternative_stylesheets(true); - while (!$found_theme && (list($path, $name) = each($template_themes))) { - if ($path == $chosen_theme_path) + foreach ($template_themes as $path => $name) { + if ($path == $chosen_theme_path) { $found_theme = true; + break; + } } } Modified: trunk/squirrelmail/include/options/display.php =================================================================== --- trunk/squirrelmail/include/options/display.php 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/include/options/display.php 2021-01-16 09:42:31 UTC (rev 14881) @@ -523,9 +523,11 @@ // Don't assume the new value is there, double check // and only save if found $found = false; - while (!$found && (list($index, $data) = each($icon_themes))) { - if ($data['PATH'] == $option->new_value) + foreach ($icon_themes as $data) { + if ($data['PATH'] == $option->new_value) { $found = true; + break; + } } if (!$found) @@ -540,17 +542,20 @@ // Don't assume the new value is there, double check // and only save if found $found = false; - reset($user_themes); - while (!$found && (list($index, $data) = each($user_themes))) { - if ($data['PATH'] == $option->new_value) + foreach ($user_themes as $data) { + if ($data['PATH'] == $option->new_value) { $found = true; + break; + } } if (!$found) { $template_themes = $oTemplate->get_alternative_stylesheets(true); - while (!$found && (list($path, $name) = each($template_themes))) { - if ($path == $option->new_value) + foreach ($template_themes as $path => $name) { + if ($path == $option->new_value) { $found = true; + break; + } } } Modified: trunk/squirrelmail/plugins/calendar/calendar.php =================================================================== --- trunk/squirrelmail/plugins/calendar/calendar.php 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/plugins/calendar/calendar.php 2021-01-16 09:42:31 UTC (rev 14881) @@ -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: " Modified: trunk/squirrelmail/plugins/calendar/day.php =================================================================== --- trunk/squirrelmail/plugins/calendar/day.php 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/plugins/calendar/day.php 2021-01-16 09:42:31 UTC (rev 14881) @@ -80,8 +80,8 @@ $cdate = $month . $day . $year; if (isset($calendardata[$cdate])){ - while ( $calfoo = each($calendardata[$cdate])){ - $daily_events["$calfoo[key]"] = $calendardata[$cdate][$calfoo['key']]; + foreach ($calendardata[$cdate] as $key => $value){ + $daily_events[$key] = $calendardata[$cdate][$key]; } } } @@ -96,7 +96,7 @@ ksort($daily_events,SORT_STRING); $eo=0; - while ($calfoo = each($daily_events)){ + foreach ($daily_events as $key => $value) { if ($eo==0){ $eo=4; } else { @@ -103,21 +103,21 @@ $eo=0; } - $ehour = substr($calfoo['key'],0,2); - $eminute = substr($calfoo['key'],2,2); - if (!is_array($calfoo['value'])){ + $ehour = substr($key,0,2); + $eminute = substr($key,2,2); + if (!is_array($value)){ echo html_tag( 'tr', html_tag( 'td', $ehour . ':' . $eminute, 'left' ) . html_tag( 'td', ' ', 'left' ) . html_tag( 'td', "<font size=\"-1\"><a href=\"event_create.php?year=$year&month=$month&day=$day&hour=" - .substr($calfoo['key'],0,2)."\">". + .substr($key,0,2)."\">". _("ADD") . "</a></font>" , 'center' ) , '', $color[$eo]); } else { - $calbar=$calfoo['value']; + $calbar=$value; if ($calbar['length']!=0){ $elength = '-'.date_intl(_("H:i"),mktime($ehour,$eminute+$calbar['length'],0,1,1,0)); } else { @@ -133,10 +133,10 @@ html_tag( 'td', "<font size=\"-1\"><nobr>\n" . "<a href=\"event_edit.php?year=$year&month=$month&day=$day&hour=". - substr($calfoo['key'],0,2)."&minute=".substr($calfoo['key'],2,2)."\">". + substr($key,0,2)."&minute=".substr($key,2,2)."\">". _("EDIT") . "</a> | \n" . "<a href=\"event_delete.php?dyear=$year&dmonth=$month&dday=$day&dhour=". - substr($calfoo['key'],0,2)."&dminute=".substr($calfoo['key'],2,2). + substr($key,0,2)."&dminute=".substr($key,2,2). "&year=$year&month=$month&day=$day\">" . _("DEL") . '</a>' . "</nobr></font>\n" , Modified: trunk/squirrelmail/plugins/calendar/functions.php =================================================================== --- trunk/squirrelmail/plugins/calendar/functions.php 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/plugins/calendar/functions.php 2021-01-16 09:42:31 UTC (rev 14881) @@ -71,11 +71,11 @@ '360' => _("6 hr.") ); - while( $bar = each($eventlength)) { - if($bar['key']==$selected){ - echo ' <option value="'.$bar['key'].'" selected="selected">'.$bar['value']."</option>\n"; + foreach($eventlength as $key => $value) { + if($key==$selected){ + echo ' <option value="'.$key.'" selected="selected">'.$value."</option>\n"; } else { - echo ' <option value="'.$bar['key'].'">'.$bar['value']."</option>\n"; + echo ' <option value="'.$key.'">'.$value."</option>\n"; } } } @@ -103,11 +103,11 @@ '55'=>'55' ); - while ( $bar = each($eventminute)) { - if ($bar['key']==$selected){ - echo ' <option value="'.$bar['key'].'" selected="selected">'.$bar['value']."</option>\n"; + foreach ($eventminute as $key => $value) { + if ($key==$selected){ + echo ' <option value="'.$key.'" selected="selected">'.$value."</option>\n"; } else { - echo ' <option value="'.$bar['key'].'">'.$bar['value']."</option>\n"; + echo ' <option value="'.$key.'">'.$value."</option>\n"; } } } @@ -141,11 +141,11 @@ '1' => _("High"), ); - while( $bar = each($eventpriority)) { - if($bar['key']==$selected){ - echo ' <option value="'.$bar['key'].'" selected="selected">'.$bar['value']."</option>\n"; + foreach($eventpriority as $key => $value) { + if($key==$selected){ + echo ' <option value="'.$key.'" selected="selected">'.$value."</option>\n"; } else { - echo ' <option value="'.$bar['key'].'">'.$bar['value']."</option>\n"; + echo ' <option value="'.$key.'">'.$value."</option>\n"; } } } Modified: trunk/squirrelmail/plugins/squirrelspell/modules/check_me.mod =================================================================== --- trunk/squirrelmail/plugins/squirrelspell/modules/check_me.mod 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/plugins/squirrelspell/modules/check_me.mod 2021-01-16 09:42:31 UTC (rev 14881) @@ -201,7 +201,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++; @@ -213,7 +213,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: trunk/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod =================================================================== --- trunk/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod 2021-01-16 09:42:31 UTC (rev 14881) @@ -32,7 +32,7 @@ $add = '<p><label for="lang_default">' . _("Make this dictionary my default selection:") . "</label> <select name=\"lang_default\" id=\"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\" id=\"use_langs_$avail_lang\""; if (in_array($avail_lang, $langs)) { Modified: trunk/squirrelmail/templates/util_addressbook.php =================================================================== --- trunk/squirrelmail/templates/util_addressbook.php 2021-01-16 03:48:14 UTC (rev 14880) +++ trunk/squirrelmail/templates/util_addressbook.php 2021-01-16 09:42:31 UTC (rev 14881) @@ -39,7 +39,7 @@ return array(); $contacts = array(); - while(list($undef,$row) = each($addresses)) { + foreach($addresses as $row) { $contact = array ( 'FirstName' => sm_encode_html_special_chars($row['firstname']), 'LastName' => sm_encode_html_special_chars($row['lastname']), @@ -150,7 +150,7 @@ $backends = array(); $backends['-1'] = _("All address books"); $ret = $abook->get_backend_list(); - while (list($undef,$v) = each($ret)) { + foreach ($ret as $v) { if ($v->btype == 'local' && !$v->listing) { continue; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2021-02-06 07:22:14
|
Revision: 14892 http://sourceforge.net/p/squirrelmail/code/14892 Author: pdontthink Date: 2021-02-06 07:22:06 +0000 (Sat, 06 Feb 2021) Log Message: ----------- Stop using curly braces Modified Paths: -------------- trunk/squirrelmail/class/deliver/Deliver.class.php trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php trunk/squirrelmail/class/mime/Message.class.php trunk/squirrelmail/class/mime/Rfc822Header.class.php trunk/squirrelmail/class/template/Template.class.php trunk/squirrelmail/functions/strings.php trunk/squirrelmail/plugins/mail_fetch/class.mail_fetch.php trunk/squirrelmail/src/configtest.php Modified: trunk/squirrelmail/class/deliver/Deliver.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver.class.php 2021-02-06 02:14:07 UTC (rev 14891) +++ trunk/squirrelmail/class/deliver/Deliver.class.php 2021-02-06 07:22:06 UTC (rev 14892) @@ -892,7 +892,7 @@ if (!$allow_fold_after_header_name && ($header_name_end_pos = strpos($header, ':')) && strlen($header) > $header_name_end_pos + 1 - && in_array($header{$header_name_end_pos + 1}, $whitespace)) + && in_array($header[$header_name_end_pos + 1], $whitespace)) $header_name_end_pos++; // if using an indent string, reduce wrap limits by its size @@ -1073,7 +1073,7 @@ // if (strlen($header) > $pos + 1) { $header = substr($header, $pos + 1); - if (!in_array($header{0}, $whitespace)) + if (!in_array($header[0], $whitespace)) $header = ' ' . $indent . $header; } else { $header = ''; @@ -1098,7 +1098,7 @@ // if (strlen($header) > strlen($hard_wrapped_line)) { $header = substr($header, strlen($hard_wrapped_line)); - if (!in_array($header{0}, $whitespace)) + if (!in_array($header[0], $whitespace)) $header = ' ' . $indent . $header; } else { $header = ''; Modified: trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php 2021-02-06 02:14:07 UTC (rev 14891) +++ trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php 2021-02-06 07:22:06 UTC (rev 14892) @@ -57,7 +57,7 @@ function preWriteToStream(&$s) { if ($s) { - if ($s{0} == '.') $s = '.' . $s; + if ($s[0] == '.') $s = '.' . $s; $s = str_replace("\n.","\n..",$s); } } @@ -408,7 +408,7 @@ $server_msg .= substr($line, 4); } - if ( ((int) $err_num{0}) < 4) { + if ( ((int) $err_num[0]) < 4) { return false; } Modified: trunk/squirrelmail/class/mime/Message.class.php =================================================================== --- trunk/squirrelmail/class/mime/Message.class.php 2021-02-06 02:14:07 UTC (rev 14891) +++ trunk/squirrelmail/class/mime/Message.class.php 2021-02-06 07:22:06 UTC (rev 14892) @@ -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); } @@ -622,8 +622,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); @@ -652,8 +652,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 */ @@ -751,11 +751,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 @@ -764,7 +764,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; @@ -803,8 +803,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; @@ -838,8 +838,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; @@ -865,8 +865,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; @@ -890,8 +890,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; @@ -944,7 +944,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']; @@ -954,7 +954,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: trunk/squirrelmail/class/mime/Rfc822Header.class.php =================================================================== --- trunk/squirrelmail/class/mime/Rfc822Header.class.php 2021-02-06 02:14:07 UTC (rev 14891) +++ trunk/squirrelmail/class/mime/Rfc822Header.class.php 2021-02-06 07:22:06 UTC (rev 14892) @@ -192,24 +192,24 @@ $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]; } if($i < $cnt) { - $result .= $value{$i}; + $result .= $value[$i]; } break; case '(': $depth = 1; while (($depth > 0) && (++$i < $cnt)) { - switch($value{$i}) { + switch($value[$i]) { case '\\': ++$i; break; @@ -225,7 +225,7 @@ } break; default: - $result .= $value{$i}; + $result .= $value[$i]; break; } } @@ -379,7 +379,7 @@ $iCnt = strlen($address); $i = 0; while ($i < $iCnt) { - $cChar = $address{$i}; + $cChar = $address[$i]; switch($cChar) { case '<': @@ -398,11 +398,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; } @@ -429,7 +429,7 @@ $iDepth = 1; $iComment = $i; while (($iDepth > 0) && (++$iComment < $iCnt)) { - $cCharComment = $address{$iComment}; + $cCharComment = $address[$iComment]; switch($cCharComment) { case '\\': ++$iComment; @@ -455,7 +455,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)); @@ -561,7 +561,7 @@ $sPersonal = $sEmail = $sGroup = ''; $aStack = $aComment = array(); foreach ($aTokens as $sToken) { - $cChar = $sToken{0}; + $cChar = $sToken[0]; switch ($cChar) { case '=': @@ -768,7 +768,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; @@ -806,7 +806,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: trunk/squirrelmail/class/template/Template.class.php =================================================================== --- trunk/squirrelmail/class/template/Template.class.php 2021-02-06 02:14:07 UTC (rev 14891) +++ trunk/squirrelmail/class/template/Template.class.php 2021-02-06 07:22:06 UTC (rev 14892) @@ -1018,7 +1018,7 @@ // return list of all files in a directory (and that // of any ancestors) // - if ($filename{strlen($filename) - 1} == '/') { + if ($filename[strlen($filename) - 1] == '/') { $return_array = array(); foreach ($this->template_file_cache as $file => $file_info) { Modified: trunk/squirrelmail/functions/strings.php =================================================================== --- trunk/squirrelmail/functions/strings.php 2021-02-06 02:14:07 UTC (rev 14891) +++ trunk/squirrelmail/functions/strings.php 2021-02-06 07:22:06 UTC (rev 14892) @@ -136,7 +136,7 @@ // (i.e. try to preserve original paragraph breaks) // unless they occur at the very beginning of the text if ((sq_substr($body,$pos,1) == "\n" ) && (sq_strlen($outString) != 0)) { - $outStringLast = $outString{sq_strlen($outString) - 1}; + $outStringLast = $outString[sq_strlen($outString) - 1]; if ($outStringLast != "\n") { $outString .= "\n"; } @@ -227,7 +227,7 @@ /* $ldnspacecnt = 0; if ($mypos == $nextNewline+1) { - while (($mypos < $length) && ($body{$mypos} == ' ')) { + while (($mypos < $length) && ($body[$mypos] == ' ')) { $ldnspacecnt++; } } @@ -236,9 +236,9 @@ $firstword = sq_substr($body,$mypos,sq_strpos($body,' ',$mypos) - $mypos); //if ($dowrap || $ldnspacecnt > 1 || ($firstword && ( if (!$smartwrap || $firstword && ( - $firstword{0} == '-' || - $firstword{0} == '+' || - $firstword{0} == '*' || + $firstword[0] == '-' || + $firstword[0] == '+' || + $firstword[0] == '*' || sq_substr($firstword,0,1) == sq_strtoupper(sq_substr($firstword,0,1)) || strpos($firstword,':'))) { $outString .= sq_substr($body,$pos,($lastRealChar - $pos+1)); @@ -713,7 +713,7 @@ $String = ''; $j = strlen( $chars ) - 1; while (strlen($String) < $size) { - $String .= $chars{mt_rand(0, $j)}; + $String .= $chars[mt_rand(0, $j)]; } return $String; Modified: trunk/squirrelmail/plugins/mail_fetch/class.mail_fetch.php =================================================================== --- trunk/squirrelmail/plugins/mail_fetch/class.mail_fetch.php 2021-02-06 02:14:07 UTC (rev 14891) +++ trunk/squirrelmail/plugins/mail_fetch/class.mail_fetch.php 2021-02-06 07:22:06 UTC (rev 14892) @@ -367,7 +367,7 @@ while($line = fgets($this->conn)) { if ($line == ".\r\n") { break; - } elseif ( $line{0} == '.' ) { + } elseif ( $line[0] == '.' ) { $ret .= substr($line,1); } else { $ret.= $line; Modified: trunk/squirrelmail/src/configtest.php =================================================================== --- trunk/squirrelmail/src/configtest.php 2021-02-06 02:14:07 UTC (rev 14891) +++ trunk/squirrelmail/src/configtest.php 2021-02-06 07:22:06 UTC (rev 14892) @@ -644,7 +644,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. |
From: <pdo...@us...> - 2021-02-06 08:02:28
|
Revision: 14894 http://sourceforge.net/p/squirrelmail/code/14894 Author: pdontthink Date: 2021-02-06 08:02:22 +0000 (Sat, 06 Feb 2021) Log Message: ----------- Stop using curly braces Modified Paths: -------------- trunk/squirrelmail/functions/auth.php trunk/squirrelmail/functions/imap_general.php trunk/squirrelmail/functions/imap_messages.php trunk/squirrelmail/functions/mime.php trunk/squirrelmail/functions/rfc822address.php trunk/squirrelmail/plugins/administrator/options.php trunk/squirrelmail/plugins/message_details/message_details_bottom.php Modified: trunk/squirrelmail/functions/auth.php =================================================================== --- trunk/squirrelmail/functions/auth.php 2021-02-06 07:25:55 UTC (rev 14893) +++ trunk/squirrelmail/functions/auth.php 2021-02-06 08:02:22 UTC (rev 14894) @@ -236,13 +236,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: trunk/squirrelmail/functions/imap_general.php =================================================================== --- trunk/squirrelmail/functions/imap_general.php 2021-02-06 07:25:55 UTC (rev 14893) +++ trunk/squirrelmail/functions/imap_general.php 2021-02-06 08:02:22 UTC (rev 14894) @@ -422,7 +422,7 @@ $read = sqimap_fgets($imap_stream); $i = 0; while ($read) { - $char = $read{0}; + $char = $read[0]; switch ($char) { case '+': @@ -430,7 +430,7 @@ $read = sqimap_fgets($imap_stream); break; - case $tag{0}: + case $tag[0]: { /* get the command */ $arg = ''; @@ -478,7 +478,7 @@ break 2; /* switch while */ } break; - } // end case $tag{0} + } // end case $tag[0] case '*': { @@ -530,11 +530,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 */ @@ -566,7 +566,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); @@ -1015,7 +1015,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); @@ -1542,7 +1542,7 @@ if ($sid) { $imapsid = $sid; } - if ($response{0} == '+') { + if ($response[0] == '+') { // continuation request triggerd by sqimap_append() $bDone = true; } else { Modified: trunk/squirrelmail/functions/imap_messages.php =================================================================== --- trunk/squirrelmail/functions/imap_messages.php 2021-02-06 07:25:55 UTC (rev 14893) +++ trunk/squirrelmail/functions/imap_messages.php 2021-02-06 08:02:22 UTC (rev 14894) @@ -400,7 +400,7 @@ if ($sThreadResponse) { for ($i=0,$iCnt = strlen($sThreadResponse);$i<$iCnt;++$i) { - $cChar = $sThreadResponse{$i}; + $cChar = $sThreadResponse[$i]; switch ($cChar) { case '(': // new sub thread // correction for a subthread of a thread with no parents in thread @@ -468,7 +468,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; @@ -475,7 +475,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; @@ -704,7 +704,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() @@ -773,8 +773,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 '{': case '"': @@ -797,8 +797,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 = sqimap_parse_address($read, $i); if (($addr[3] == '') && ($addr[2] != '')) { /* start of group */ @@ -852,8 +852,8 @@ */ function sqimap_parse_address($read, &$i) { $arg_a = array(); - for (; $read{$i} != ')'; ++$i) { - $char = strtoupper($read{$i}); + for (; $read[$i] != ')'; ++$i) { + $char = strtoupper($read[$i]); switch ($char) { case '{': case '"': $arg_a[] = parseString($read,$i); break; Modified: trunk/squirrelmail/functions/mime.php =================================================================== --- trunk/squirrelmail/functions/mime.php 2021-02-06 07:25:55 UTC (rev 14893) +++ trunk/squirrelmail/functions/mime.php 2021-02-06 08:02:22 UTC (rev 14894) @@ -71,7 +71,7 @@ if (count($flags)) { foreach ($flags as $flag) { //FIXME: please document why it is we have to check the first char of the flag but we then go ahead and do a full string comparison anyway. Is this a speed enhancement? If not, let's keep it simple and just compare the full string and forget the switch block. - $char = strtoupper($flag{1}); + $char = strtoupper($flag[1]); switch ($char) { case 'S': if (strtolower($flag) == '\\seen') { @@ -151,7 +151,7 @@ /* There is some information in the content info header that could be important * in order to parse html messages. Let's get them here. */ -// if ($ret{0} == '<') { +// if ($ret[0] == '<') { // $data = sqimap_run_command ($imap_stream, "FETCH $id BODY[$ent_id.MIME]", true, $response, $message, TRUE); // } } else if (preg_match('/"([^"]*)"/', $topline, $regs)) { @@ -1001,7 +1001,7 @@ $iEncStart = $enc_init = false; $cur_l = $iOffset = 0; for($i = 0; $i < $j; ++$i) { - switch($string{$i}) + switch($string[$i]) { case '"': case '=': @@ -1023,7 +1023,7 @@ $ret = ''; $iEncStart = false; } else { - $ret .= sprintf("=%02X",ord($string{$i})); + $ret .= sprintf("=%02X",ord($string[$i])); } break; case '(': @@ -1053,7 +1053,7 @@ } break; default: - $k = ord($string{$i}); + $k = ord($string[$i]); if ($k > 126) { if ($iEncStart === false) { // do not start encoding in the middle of a string, also take the rest of the word. @@ -1087,7 +1087,7 @@ $cur_l = 0; $ret = ''; } else { - $ret .= $string{$i}; + $ret .= $string[$i]; } } } @@ -1463,12 +1463,12 @@ $matches = Array(); $retarr = Array(); preg_match("%^(.*?)($reg)%si", substr($body, $offset), $matches); - if (!isset($matches{0}) || !$matches{0}){ + if (!isset($matches[0]) || !$matches[0]){ $retarr = false; } else { - $retarr{0} = $offset + strlen($matches{1}); - $retarr{1} = $matches{1}; - $retarr{2} = $matches{2}; + $retarr[0] = $offset + strlen($matches[1]); + $retarr[1] = $matches[1]; + $retarr[2] = $matches[2]; } return $retarr; } @@ -1626,8 +1626,8 @@ /** * Yep. So we did. */ - $pos += strlen($matches{1}); - if ($matches{2} == "/>"){ + $pos += strlen($matches[1]); + if ($matches[2] == "/>"){ $tagtype = 3; $pos++; } @@ -1684,7 +1684,7 @@ return $retary; } case '>': - $attary{$attname} = '"yes"'; + $attary[$attname] = '"yes"'; return Array($tagname, $attary, $tagtype, $lt, $pos); break; default: @@ -1718,7 +1718,7 @@ } list($pos, $attval, $match) = $regary; $pos++; - $attary{$attname} = "'" . $attval . "'"; + $attary[$attname] = "'" . $attval . "'"; } else if ($quot == '"'){ $regary = sq_findnxreg($body, $pos+1, '\"'); if ($regary == false){ @@ -1726,7 +1726,7 @@ } list($pos, $attval, $match) = $regary; $pos++; - $attary{$attname} = '"' . $attval . '"'; + $attary[$attname] = '"' . $attval . '"'; } else { /** * These are hateful. Look for \s, or >. @@ -1740,13 +1740,13 @@ * If it's ">" it will be caught at the top. */ $attval = preg_replace("/\"/s", """, $attval); - $attary{$attname} = '"' . $attval . '"'; + $attary[$attname] = '"' . $attval . '"'; } } else if (preg_match("|[\w/>]|", $char)) { /** * That was attribute type 4. */ - $attary{$attname} = '"yes"'; + $attary[$attname] = '"yes"'; } else { /** * An illegal character. Find next '>' and return. @@ -1785,7 +1785,7 @@ if ($hex){ $numval = hexdec($numval); } - $repl{$matches[0][$i]} = chr($numval); + $repl[$matches[0][$i]] = chr($numval); } $attvalue = strtr($attvalue, $repl); return true; @@ -1824,7 +1824,7 @@ if (preg_match($matchtag, $tagname)){ foreach ($matchattrs as $matchattr){ if (preg_match($matchattr, $attname)){ - unset($attary{$attname}); + unset($attary[$attname]); continue; } } @@ -1845,7 +1845,7 @@ // entities are used in the attribute value. In 99% of the cases it's there as XSS // i.e.<div style="{ left:expʀessioɴ( alert('XSS') ) }"> $attvalue = "idiocy"; - $attary{$attname} = $attvalue; + $attary[$attname] = $attvalue; } sq_unspace($attvalue); @@ -1868,7 +1868,7 @@ $newvalue = preg_replace($valmatch, $valrepl, $attvalue); if ($newvalue != $attvalue){ - $attary{$attname} = $newvalue; + $attary[$attname] = $newvalue; $attvalue = $newvalue; } } @@ -1878,7 +1878,7 @@ if ($attname == 'style') { if (preg_match('/[\0-\37\200-\377]+/',$attvalue)) { // 8bit and control characters in style attribute values can be used for XSS, remove them - $attary{$attname} = '"disallowed character"'; + $attary[$attname] = '"disallowed character"'; } preg_match_all("/url\s*\((.+)\)/si",$attvalue,$aMatch); if (count($aMatch)) { @@ -1886,7 +1886,7 @@ // url value $urlvalue = $sMatch; sq_fix_url($attname, $urlvalue, $message, $id, $mailbox,"'"); - $attary{$attname} = str_replace($sMatch,$urlvalue,$attvalue); + $attary[$attname] = str_replace($sMatch,$urlvalue,$attvalue); } } } @@ -1897,7 +1897,7 @@ || $attname == 'poster' || $attname == 'formaction' || $attname == 'background' || $attname == 'action') { sq_fix_url($attname, $attvalue, $message, $id, $mailbox); - $attary{$attname} = $attvalue; + $attary[$attname] = $attvalue; } } /** @@ -2083,7 +2083,7 @@ $bSucces = false; $bEndTag = false; for ($i=$pos,$iCount=strlen($body);$i<$iCount;++$i) { - $char = $body{$i}; + $char = $body[$i]; switch ($char) { case '<': $sToken = $char; @@ -2114,7 +2114,7 @@ case '!': if ($sToken == '<') { // possible comment - if (isset($body{$i+2}) && substr($body,$i,3) == '!--') { + if (isset($body[$i+2]) && substr($body,$i,3) == '!--') { $i = strpos($body,'-->',$i+3); if ($i === false) { // no end comment $i = strlen($body); @@ -2337,7 +2337,7 @@ $styledef .= "color: $text; "; } if (strlen($styledef) > 0){ - $divattary{"style"} = "\"$styledef\""; + $divattary["style"] = "\"$styledef\""; } } return $divattary; @@ -2488,9 +2488,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; } @@ -2532,10 +2532,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; } } /** @@ -2757,13 +2757,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: trunk/squirrelmail/functions/rfc822address.php =================================================================== --- trunk/squirrelmail/functions/rfc822address.php 2021-02-06 07:25:55 UTC (rev 14893) +++ trunk/squirrelmail/functions/rfc822address.php 2021-02-06 08:02:22 UTC (rev 14894) @@ -31,7 +31,7 @@ if ($iLimit && $iLimit == count($aAddress)) { return $aAddress; } - $cChar = $sToken{0}; + $cChar = $sToken[0]; switch ($cChar) { case '=': @@ -290,7 +290,7 @@ $iCnt = strlen($address); $i = 0; while ($i < $iCnt) { - $cChar = $address{$i}; + $cChar = $address[$i]; switch($cChar) { case '<': @@ -309,11 +309,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; } @@ -340,7 +340,7 @@ $iDepth = 1; $iComment = $i; while (($iDepth > 0) && (++$iComment < $iCnt)) { - $cCharComment = $address{$iComment}; + $cCharComment = $address[$iComment]; switch($cCharComment) { case '\\': ++$iComment; @@ -366,7 +366,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)); Modified: trunk/squirrelmail/plugins/administrator/options.php =================================================================== --- trunk/squirrelmail/plugins/administrator/options.php 2021-02-06 07:25:55 UTC (rev 14893) +++ trunk/squirrelmail/plugins/administrator/options.php 2021-02-06 08:02:22 UTC (rev 14894) @@ -38,10 +38,10 @@ for ($j=0;$j<$s;$j++) { switch ( $mode ) { case '=': - if ( $line{$j} == '=' ) { + if ( $line[$j] == '=' ) { // Ok, we've got a right value, lets detect what type $mode = 'D'; - } else if ( $line{$j} == ';' ) { + } else if ( $line[$j] == ';' ) { // hu! end of command $key = $mode = ''; } @@ -48,12 +48,12 @@ break; case 'K': // Key detect - if ( $line{$j} == ' ' ) { + if ( $line[$j] == ' ' ) { $mode = '='; } else { - $key .= $line{$j}; + $key .= $line[$j]; // FIXME: this is only pour workaround for plugins[] array. - if ($line{$j}=='[' && $line{($j+1)}==']') { + if ($line[$j]=='[' && $line[($j+1)]==']') { $key .= $arraykey; $arraykey++; } @@ -61,36 +61,36 @@ break; case ';': // Skip until next ; - if ( $line{$j} == ';' ) { + if ( $line[$j] == ';' ) { $mode = ''; } break; case 'S': - if ( $line{$j} == '\\' ) { - $value .= $line{$j}; + if ( $line[$j] == '\\' ) { + $value .= $line[$j]; $modifier = TRUE; - } else if ( $line{$j} == $delimiter && $modifier === FALSE ) { + } else if ( $line[$j] == $delimiter && $modifier === FALSE ) { // End of string; $newcfg[$key] = $value . $delimiter; $key = $value = ''; $mode = ';'; } else { - $value .= $line{$j}; + $value .= $line[$j]; $modifier = FALSE; } break; case 'N': - if ( $line{$j} == ';' ) { - $newcfg{$key} = $value; + if ( $line[$j] == ';' ) { + $newcfg[$key] = $value; $key = $mode = ''; } else { - $value .= $line{$j}; + $value .= $line[$j]; } break; case 'C': // Comments if ( $s > $j + 1 && - $line{$j}.$line{$j+1} == '*/' ) { + $line[$j].$line[$j+1] == '*/' ) { $mode = ''; $j++; } @@ -97,11 +97,11 @@ break; case 'D': // Delimiter detect - switch ( $line{$j} ) { + switch ( $line[$j] ) { case '"': case "'": // Double quote string - $delimiter = $value = $line{$j}; + $delimiter = $value = $line[$j]; $mode = 'S'; break; case ' ': @@ -110,22 +110,22 @@ default: if ( strtoupper( substr( $line, $j, 4 ) ) == 'TRUE' ) { // Boolean TRUE - $newcfg{$key} = 'TRUE'; + $newcfg[$key] = 'TRUE'; $key = ''; $mode = ';'; } else if ( strtoupper( substr( $line, $j, 5 ) ) == 'FALSE' ) { - $newcfg{$key} = 'FALSE'; + $newcfg[$key] = 'FALSE'; $key = ''; $mode = ';'; } else { // Number or function call $mode = 'N'; - $value = $line{$j}; + $value = $line[$j[; } } break; default: - if ( $line{$j} == '$' ) { + if ( $line[$j] == '$' ) { // We must detect $key name $mode = 'K'; $key = '$'; @@ -134,10 +134,10 @@ // Skip untill next ; $mode = ';'; $j += 6; - } else if ( $line{$j}.$line{$j+1} == '/*' ) { + } else if ( $line[$j].$line[$j+1] == '/*' ) { $mode = 'C'; $j++; - } else if ( $line{$j} == '#' || $line{$j}.$line{$j+1} == '//' ) { + } else if ( $line[$j] == '#' || $line[$j].$line[$j+1] == '//' ) { // Delete till the end of the line $j = $s; } @@ -309,9 +309,9 @@ } else if ( $l == 'false' ) { $v = 'FALSE'; $type = SMOPT_TYPE_BOOLEAN; - } else if ( $v{0} == "'" ) { + } else if ( $v[0] == "'" ) { $type = SMOPT_TYPE_STRING; - } else if ( $v{0} == '"' ) { + } else if ( $v[0] == '"' ) { $type = SMOPT_TYPE_STRING; } @@ -631,7 +631,7 @@ "\n" ); foreach ( $newcfg as $k => $v ) { - if ( $k{0} == '$' && $v <> '' || is_int($v)) { + if ( $k[0] == '$' && $v <> '' || is_int($v)) { if ( substr( $k, 1, 11 ) == 'ldap_server' ) { $v = substr( $v, 0, strlen( $v ) - 1 ) . "\n)"; $v = str_replace( 'array(', "array(\n\t", $v ); Modified: trunk/squirrelmail/plugins/message_details/message_details_bottom.php =================================================================== --- trunk/squirrelmail/plugins/message_details/message_details_bottom.php 2021-02-06 07:25:55 UTC (rev 14893) +++ trunk/squirrelmail/plugins/message_details/message_details_bottom.php 2021-02-06 08:02:22 UTC (rev 14894) @@ -211,7 +211,7 @@ } } - if (($line != '' && $line{0} == '-' || $header) && isset($boundaries[0])) { + if (($line != '' && $line[0] == '-' || $header) && isset($boundaries[0])) { $cnt=count($boundaries)-1; $bnd = $boundaries[$cnt]['bnd']; $bndreg = $boundaries[$cnt]['bndreg']; @@ -221,7 +221,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; } if ($bndend) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2021-02-08 21:59:53
|
Revision: 14900 http://sourceforge.net/p/squirrelmail/code/14900 Author: pdontthink Date: 2021-02-08 21:59:46 +0000 (Mon, 08 Feb 2021) Log Message: ----------- Migrate away from using create_function as long as PHP 5.3+ is available Modified Paths: -------------- trunk/squirrelmail/doc/ChangeLog trunk/squirrelmail/functions/decode/iso_8859_1.php trunk/squirrelmail/functions/decode/utf_8.php trunk/squirrelmail/functions/imap_messages.php trunk/squirrelmail/functions/mime.php Modified: trunk/squirrelmail/doc/ChangeLog =================================================================== --- trunk/squirrelmail/doc/ChangeLog 2021-02-08 20:52:07 UTC (rev 14899) +++ trunk/squirrelmail/doc/ChangeLog 2021-02-08 21:59:46 UTC (rev 14900) @@ -443,6 +443,7 @@ attachments (when reading a message) - Added fixes for PHP version 8 compatibility (thanks to Marcel Pol for bringing this to our attention) + - Migrate away from create_function() as long as we have PHP 5.3+ Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/functions/decode/iso_8859_1.php =================================================================== --- trunk/squirrelmail/functions/decode/iso_8859_1.php 2021-02-08 20:52:07 UTC (rev 14899) +++ trunk/squirrelmail/functions/decode/iso_8859_1.php 2021-02-08 21:59:46 UTC (rev 14900) @@ -24,14 +24,20 @@ return $string; $string = preg_replace_callback("/([\201-\237])/", - create_function ('$matches', 'return \'&#\' . ord($matches[1]) . \';\';'), - $string); + (check_php_version(5, 3, 0) + ? function($matches) { return '&#' . ord($matches[1]) . ';'; } + : create_function ('$matches', 'return \'&#\' . ord($matches[1]) . \';\';') + ), + $string); /* I don't want to use 0xA0 (\240) in any ranges. RH73 may dislike it */ $string = str_replace("\240", ' ', $string); $string = preg_replace_callback("/([\241-\377])/", - create_function ('$matches', 'return \'&#\' . ord($matches[1]) . \';\';'), - $string); + (check_php_version(5, 3, 0) + ? function($matches) { return '&#' . ord($matches[1]) . ';'; } + : create_function ('$matches', 'return \'&#\' . ord($matches[1]) . \';\';') + ), + $string); return $string; } Modified: trunk/squirrelmail/functions/decode/utf_8.php =================================================================== --- trunk/squirrelmail/functions/decode/utf_8.php 2021-02-08 20:52:07 UTC (rev 14899) +++ trunk/squirrelmail/functions/decode/utf_8.php 2021-02-08 21:59:46 UTC (rev 14900) @@ -74,18 +74,27 @@ // decode four byte unicode characters $string = preg_replace_callback("/([\360-\367])([\200-\277])([\200-\277])([\200-\277])/", - create_function ('$matches', 'return \'&#\'.((ord($matches[1])-240)*262144+(ord($matches[2])-128)*4096+(ord($matches[3])-128)*64+(ord($matches[4])-128)).\';\';'), - $string); + (check_php_version(5, 3, 0) + ? function($matches) { return '&#'.((ord($matches[1])-240)*262144+(ord($matches[2])-128)*4096+(ord($matches[3])-128)*64+(ord($matches[4])-128)).';'; } + : create_function ('$matches', 'return \'&#\'.((ord($matches[1])-240)*262144+(ord($matches[2])-128)*4096+(ord($matches[3])-128)*64+(ord($matches[4])-128)).\';\';') + ), + $string); // decode three byte unicode characters $string = preg_replace_callback("/([\340-\357])([\200-\277])([\200-\277])/", - create_function ('$matches', 'return \'&#\'.((ord($matches[1])-224)*4096+(ord($matches[2])-128)*64+(ord($matches[3])-128)).\';\';'), - $string); + (check_php_version(5, 3, 0) + ? function($matches) { return '&#'.((ord($matches[1])-224)*4096+(ord($matches[2])-128)*64+(ord($matches[3])-128)).';'; } + : create_function ('$matches', 'return \'&#\'.((ord($matches[1])-224)*4096+(ord($matches[2])-128)*64+(ord($matches[3])-128)).\';\';') + ), + $string); // decode two byte unicode characters $string = preg_replace_callback("/([\300-\337])([\200-\277])/", - create_function ('$matches', 'return \'&#\'.((ord($matches[1])-192)*64+(ord($matches[2])-128)).\';\';'), - $string); + (check_php_version(5, 3, 0) + ? function($matches) { return '&#'.((ord($matches[1])-192)*64+(ord($matches[2])-128)).';'; } + : create_function ('$matches', 'return \'&#\'.((ord($matches[1])-192)*64+(ord($matches[2])-128)).\';\';') + ), + $string); // remove broken unicode $string = preg_replace("/[\200-\237]|\240|[\241-\377]/",'?',$string); Modified: trunk/squirrelmail/functions/imap_messages.php =================================================================== --- trunk/squirrelmail/functions/imap_messages.php 2021-02-08 20:52:07 UTC (rev 14899) +++ trunk/squirrelmail/functions/imap_messages.php 2021-02-08 21:59:46 UTC (rev 14900) @@ -241,25 +241,47 @@ case 'TO': case 'CC': if(!$walk) { - array_walk($msgs, create_function('&$v,&$k,$f', - '$v[$f] = (isset($v[$f])) ? $v[$f] : ""; - $addr = reset(parseRFC822Address($v[$f],1)); - $sPersonal = (isset($addr[SQM_ADDR_PERSONAL]) && $addr[SQM_ADDR_PERSONAL]) ? - $addr[SQM_ADDR_PERSONAL] : ""; - $sEmail = ($addr[SQM_ADDR_HOST]) ? - $addr[SQM_ADDR_MAILBOX] . "@".$addr[SQM_ADDR_HOST] : - $addr[SQM_ADDR_HOST]; - $v[$f] = ($sPersonal) ? decodeHeader($sPersonal, true, false):$sEmail;'),$sSortField); + if (check_php_version(5, 3, 0)) + $walk_function = function(&$v,&$k,$f) { + $v[$f] = (isset($v[$f])) ? $v[$f] : ""; + $addr = reset(parseRFC822Address($v[$f],1)); + $sPersonal = (isset($addr[SQM_ADDR_PERSONAL]) && $addr[SQM_ADDR_PERSONAL]) ? + $addr[SQM_ADDR_PERSONAL] : ""; + $sEmail = ($addr[SQM_ADDR_HOST]) ? + $addr[SQM_ADDR_MAILBOX] . "@".$addr[SQM_ADDR_HOST] : + $addr[SQM_ADDR_HOST]; + $v[$f] = ($sPersonal) ? decodeHeader($sPersonal, true, false):$sEmail; + }; + else + $walk_function = create_function('&$v,&$k,$f', + '$v[$f] = (isset($v[$f])) ? $v[$f] : ""; + $addr = reset(parseRFC822Address($v[$f],1)); + $sPersonal = (isset($addr[SQM_ADDR_PERSONAL]) && $addr[SQM_ADDR_PERSONAL]) ? + $addr[SQM_ADDR_PERSONAL] : ""; + $sEmail = ($addr[SQM_ADDR_HOST]) ? + $addr[SQM_ADDR_MAILBOX] . "@".$addr[SQM_ADDR_HOST] : + $addr[SQM_ADDR_HOST]; + $v[$f] = ($sPersonal) ? decodeHeader($sPersonal, true, false):$sEmail;'); + array_walk($msgs, $walk_function, $sSortField); $walk = true; } // nobreak case 'SUBJECT': if(!$walk) { - array_walk($msgs, create_function('&$v,&$k,$f', - '$v[$f] = (isset($v[$f])) ? $v[$f] : ""; - $v[$f] = strtolower(decodeHeader(trim($v[$f]), true, false)); - $v[$f] = (preg_match("/^(?:(?:vedr|sv|re|aw|fw|fwd|\[\w\]):\s*)*\s*(.*)$/si", $v[$f], $matches)) ? - $matches[1] : $v[$f];'),$sSortField); + if (check_php_version(5, 3, 0)) + $walk_function = function(&$v,&$k,$f) { + $v[$f] = (isset($v[$f])) ? $v[$f] : ""; + $v[$f] = strtolower(decodeHeader(trim($v[$f]), true, false)); + $v[$f] = (preg_match("/^(?:(?:vedr|sv|re|aw|fw|fwd|\[\w\]):\s*)*\s*(.*)$/si", $v[$f], $matches)) ? + $matches[1] : $v[$f]; + }; + else + $walk_function = create_function('&$v,&$k,$f', + '$v[$f] = (isset($v[$f])) ? $v[$f] : ""; + $v[$f] = strtolower(decodeHeader(trim($v[$f]), true, false)); + $v[$f] = (preg_match("/^(?:(?:vedr|sv|re|aw|fw|fwd|\[\w\]):\s*)*\s*(.*)$/si", $v[$f], $matches)) ? + $matches[1] : $v[$f];'); + array_walk($msgs, $walk_function, $sSortField); $walk = true; } foreach ($msgs as $item) { @@ -276,9 +298,16 @@ case 'DATE': case 'INTERNALDATE': if(!$walk) { - array_walk($msgs, create_function('&$v,$k,$f', - '$v[$f] = (isset($v[$f])) ? $v[$f] : ""; - $v[$f] = getTimeStamp(explode(" ",$v[$f]));'),$sSortField); + if (check_php_version(5, 3, 0)) + $walk_function = function(&$v,$k,$f) { + $v[$f] = (isset($v[$f])) ? $v[$f] : ""; + $v[$f] = getTimeStamp(explode(" ",$v[$f])); + }; + else + $walk_function = create_function('&$v,$k,$f', + '$v[$f] = (isset($v[$f])) ? $v[$f] : ""; + $v[$f] = getTimeStamp(explode(" ",$v[$f]));'); + array_walk($msgs, $walk_function, $sSortField); $walk = true; } // nobreak; Modified: trunk/squirrelmail/functions/mime.php =================================================================== --- trunk/squirrelmail/functions/mime.php 2021-02-08 20:52:07 UTC (rev 14899) +++ trunk/squirrelmail/functions/mime.php 2021-02-08 21:59:46 UTC (rev 14900) @@ -903,8 +903,11 @@ case 'Q': $replace = str_replace('_', ' ', $res[4]); $replace = preg_replace_callback('/=([0-9a-f]{2})/i', - create_function ('$matches', 'return chr(hexdec($matches[1]));'), - $replace); + (check_php_version(5, 3, 0) + ? function($matches) { return chr(hexdec($matches[1])); } + : create_function ('$matches', 'return chr(hexdec($matches[1]));') + ), + $replace); if ($utfencode) { if ($can_be_encoded) { /* convert string to different charset, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2021-03-13 00:20:25
|
Revision: 14903 http://sourceforge.net/p/squirrelmail/code/14903 Author: pdontthink Date: 2021-03-13 00:20:23 +0000 (Sat, 13 Mar 2021) Log Message: ----------- Fix a couple functions with required parameters after optional ones Modified Paths: -------------- trunk/squirrelmail/class/deliver/Deliver.class.php trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/class/deliver/Deliver.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver.class.php 2021-03-13 00:14:46 UTC (rev 14902) +++ trunk/squirrelmail/class/deliver/Deliver.class.php 2021-03-13 00:20:23 UTC (rev 14903) @@ -165,7 +165,7 @@ * */ function send_mail($message, $header, $boundary, $stream=false, - &$raw_length, $extra=NULL) { + &$raw_length=0, $extra=NULL) { if ($stream) { Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2021-03-13 00:14:46 UTC (rev 14902) +++ trunk/squirrelmail/src/compose.php 2021-03-13 00:20:23 UTC (rev 14903) @@ -1204,7 +1204,7 @@ } function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, - $passed_ent_id='', $imapConnection) { + $passed_ent_id='', $imapConnection=NULL) { if (!$passed_ent_id) { $body_a = sqimap_run_command($imapConnection, 'FETCH '.$passed_id.' RFC822', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2021-05-07 09:32:04
|
Revision: 14918 http://sourceforge.net/p/squirrelmail/code/14918 Author: pdontthink Date: 2021-05-07 09:32:04 +0000 (Fri, 07 May 2021) Log Message: ----------- Add cookie SameSite attribute; uses default if "Strict" but can be overridden by $same_site_cookies in config_local.php Modified Paths: -------------- trunk/squirrelmail/config/config_local.example.php trunk/squirrelmail/functions/global.php Modified: trunk/squirrelmail/config/config_local.example.php =================================================================== --- trunk/squirrelmail/config/config_local.example.php 2021-05-07 08:56:16 UTC (rev 14917) +++ trunk/squirrelmail/config/config_local.example.php 2021-05-07 09:32:04 UTC (rev 14918) @@ -200,4 +200,10 @@ * some environments. * $upload_filesize_divisor = 1024; * + * $same_site_cookies allows override of how cookies are set + * with the "SameSite" attribute. Normally you won't want to + * do anything with this. If you do, you can set it to "Lax" + * "Strict" (which is default) or "None" -- or set it to an + * empty string to cause cookies to be sent without adding + * the SameSite attribute at all and use the browser's default */ Modified: trunk/squirrelmail/functions/global.php =================================================================== --- trunk/squirrelmail/functions/global.php 2021-05-07 08:56:16 UTC (rev 14917) +++ trunk/squirrelmail/functions/global.php 2021-05-07 09:32:04 UTC (rev 14918) @@ -580,6 +580,16 @@ * transmitted over a secure HTTPS connection. * @param boolean $bHttpOnly Disallow JS to access the cookie (IE6 only) * @param boolean $bReplace Replace previous cookies with same name? + * @param string $sSameSite Optional override of the default SameSite + * cookie policy detemined from the global + * configuration item $same_site_cookies + * (which can be set in config/config_local.php) + * (should be NULL to accept the configured global + * default or one of "Lax" "Strict" or "None" + * but "None" will not work if $bSecure is FALSE. + * Can also be set set to an empty string in order + * to NOT specify the SameSite cookie attribute at + * all and accept whatever the browser default is) * * @return void * @@ -587,7 +597,7 @@ * */ function sqsetcookie($sName, $sValue='deleted', $iExpire=0, $sPath="", $sDomain="", - $bSecure=false, $bHttpOnly=true, $bReplace=false) { + $bSecure=false, $bHttpOnly=true, $bReplace=false, $sSameSite=NULL) { // some environments can get overwhelmed by an excessive // setting of the same cookie over and over (e.g., many @@ -614,6 +624,21 @@ if (!$only_secure_cookies) $bSecure = false; + // use global SameSite setting, but allow override + // The global $same_site_cookies (for which an override value + // can be specified in config/config_local.php) defaults to + // "Strict" when it is NULL (when not given in the config file), + // or can be manually set to "Lax" "Strict" or "None" if desired + // or can be set to an empty string in order to not specify + // SameSite at all and use the browser default + if (is_null($sSameSite)) { + global $same_site_cookies; + if (is_null($same_site_cookies)) + $sSameSite = 'Strict'; + else + $sSameSite = $same_site_cookies; + } + if (false && check_php_version(5,2)) { // php 5 supports the httponly attribute in setcookie, but because setcookie seems a bit // broken we use the header function for php 5.2 as well. We might change that later. @@ -634,7 +659,8 @@ . (empty($sPath) ? '' : '; path=' . $sPath) . (empty($sDomain) ? '' : '; domain=' . $sDomain) . (!$bSecure ? '' : '; secure') - . (!$bHttpOnly ? '' : '; HttpOnly'), $bReplace); + . (!$bHttpOnly ? '' : '; HttpOnly') + . (empty($sSameSite) ? '' : '; SameSite=' . $sSameSite), $bReplace); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2021-08-25 03:38:31
|
Revision: 14927 http://sourceforge.net/p/squirrelmail/code/14927 Author: pdontthink Date: 2021-08-25 03:38:28 +0000 (Wed, 25 Aug 2021) Log Message: ----------- Fix certain messages with headers in unknown charsets encoded as quoted printable showing up as blank sender/subject in message list. There are two ways to fix it, and the more accurate but costly one is left unfinished since the easy fix seems to have helped in every case I know of Modified Paths: -------------- trunk/squirrelmail/config/config_local.example.php trunk/squirrelmail/functions/strings.php trunk/squirrelmail/include/languages.php Modified: trunk/squirrelmail/config/config_local.example.php =================================================================== --- trunk/squirrelmail/config/config_local.example.php 2021-08-25 03:33:09 UTC (rev 14926) +++ trunk/squirrelmail/config/config_local.example.php 2021-08-25 03:38:28 UTC (rev 14927) @@ -61,6 +61,14 @@ * part (beginning with "@") will be stripped before * calculating the CRC or MD5. * + * $default_htmlspecialchars_encoding (string) is used to + * specify the charset that is used for htmlspecialchars() + * calls when an invalid charset was requested (PHP's + * htmlspecialchars() only supports a limited number of + * encodings). SquirrelMail defaults to iso-8859-1, but if + * you want to change the default to something like utf-8, + * you can use this setting for that. + * * $smtp_stream_options allows more control over the SSL context * used when connecting to the SMTP server over SSL/TLS. See: * http://www.php.net/manual/context.php and in particular Modified: trunk/squirrelmail/functions/strings.php =================================================================== --- trunk/squirrelmail/functions/strings.php 2021-08-25 03:33:09 UTC (rev 14926) +++ trunk/squirrelmail/functions/strings.php 2021-08-25 03:38:28 UTC (rev 14927) @@ -1729,21 +1729,75 @@ * attempts to add the correct character encoding * * @param string $string The string to be converted - * @param int $flags A bitmask that controls the behavior of htmlspecialchars() + * @param int $flags A bitmask that controls the behavior of + * htmlspecialchars() -- NOTE that this parameter + * should only be used to dictate handling of + * quotes; handling invalid code sequences is done + * using the $invalid_sequence_flag parameter below * (See http://php.net/manual/function.htmlspecialchars.php ) - * (OPTIONAL; default ENT_COMPAT, ENT_COMPAT | ENT_SUBSTITUTE for PHP >=5.4) + * (OPTIONAL; default ENT_COMPAT) * @param string $encoding The character encoding to use in the conversion - * (OPTIONAL; default automatic detection) + * (if not one of the character sets supported + * by PHP's htmlspecialchars(), then $encoding + * will be ignored and iso-8859-1 will be used, + * unless a default has been specified in + * $default_htmlspecialchars_encoding in + * config_local.php) (OPTIONAL; default automatic + * detection) * @param boolean $double_encode Whether or not to convert entities that are * already in the string (only supported in * PHP 5.2.3+) (OPTIONAL; default TRUE) + * @param mixed $invalid_sequence_flag A bitmask that controls how invalid + * code sequences should be handled; + * When calling htmlspecialchars(), + * this value will be combined with + * the $flags parameter above + * (See http://php.net/manual/function.htmlspecialchars.php ) + * (OPTIONAL; defaults to the string + * "ent_substitute" that, for PHP 5.4+, + * is converted to the ENT_SUBSTITUTE + * constant, otherwise empty) * * @return string The converted text * */ function sm_encode_html_special_chars($string, $flags=ENT_COMPAT, - $encoding=NULL, $double_encode=TRUE) + $encoding=NULL, $double_encode=TRUE, + $invalid_sequence_flag='ent_substitute') { + if ($invalid_sequence_flag === 'ent_substitute') + { + if (check_php_version(5, 4, 0)) + $invalid_sequence_flag = ENT_SUBSTITUTE; + else + $invalid_sequence_flag = 0; + } + + + // charsets supported by PHP's htmlspecialchars + // (move this elsewhere if needed) + // + static $htmlspecialchars_charsets = array( + 'iso-8859-1', 'iso8859-1', + 'iso-8859-5', 'iso8859-5', + 'iso-8859-15', 'iso8859-15', + 'utf-8', + 'cp866', 'ibm866', '866', + 'cp1251', 'windows-1251', 'win-1251', '1251', + 'cp1252', 'windows-1252', '1252', + 'koi8-R', 'koi8-ru', 'koi8r', + 'big5', '950', + 'gb2312', '936', + 'big5-hkscs', + 'shift_jis', 'sjis', 'sjis-win', 'cp932', '932', + 'euc-jp', 'eucjp', 'eucjp-win', + 'macroman', + ); + + + // if not given, set encoding to the charset being + // used by the current user interface language + // if (!$encoding) { global $default_charset; @@ -1752,15 +1806,58 @@ $encoding = $default_charset; } - if (check_php_version(5, 2, 3)) { - // Replace invalid characters with a symbol instead of returning - // empty string for the entire to be encoded string. - if (check_php_version(5, 4, 0) && $flags == ENT_COMPAT) { - $flags = $flags | ENT_SUBSTITUTE; + + // two ways to handle encodings not supported by htmlspecialchars() - + // one takes less CPU cycles but can munge characters in certain + // translations, the other is more exact but requires more resources + // + global $html_special_chars_extended_fix; +//FIXME: need to document that the config switch above can be enabled in config_local... but first, we need to decide if we will implement the second option here -- currently there hasn't been a need for it (munged characters seem quite rare).... see tracker #2806 for some tips https://sourceforge.net/p/squirrelmail/bugs/2806 + if (!in_array(strtolower($encoding), $htmlspecialchars_charsets)) + { + if ($html_special_chars_extended_fix) + { + // convert to utf-8 first, run htmlspecialchars() and convert + // back to original encoding below + // +//FIXME: try conversion functions in this order: recode_string(), iconv(), mbstring (with various charset checks: sq_mb_list_encodings(), mb_check_encoding) -- oh, first check for internal charset_decode_CHARSET() function?? or just use (does this put everything into HTML entities already? shouldn't, but if it does, return right here): + $string = charset_decode($encoding, $string, TRUE, TRUE); + $string = charset_encode($string, $encoding, TRUE); } - return htmlspecialchars($string, $flags, $encoding, $double_encode); + else + { + // simply force use of an encoding that is supported (some + // characters may be munged) + // + // use default from configuration if provided or hard-coded fallback + // + global $default_htmlspecialchars_encoding; + if (!empty($default_htmlspecialchars_encoding)) + $encoding = $default_htmlspecialchars_encoding; + else + $encoding = 'iso-8859-1'; + } } - return htmlspecialchars($string, $flags, $encoding); + +// TODO: Is adding this check an unnecessary performance hit? + if (check_php_version(5, 2, 3)) + $ret = htmlspecialchars($string, $flags | $invalid_sequence_flag, + $encoding, $double_encode); + else + $ret = htmlspecialchars($string, $flags | $invalid_sequence_flag, + $encoding); + + + // convert back to original encoding if needed (see above) + // + if ($html_special_chars_extended_fix + && !in_array(strtolower($encoding), $htmlspecialchars_charsets)) + { +//FIXME: NOT FINISHED - here, we'd convert from utf-8 back to original charset (if we obey $lossy_encoding and end up returning in utf-8 instead of original charset, does that screw up the caller?) + } + + + return $ret; } Modified: trunk/squirrelmail/include/languages.php =================================================================== --- trunk/squirrelmail/include/languages.php 2021-08-25 03:33:09 UTC (rev 14926) +++ trunk/squirrelmail/include/languages.php 2021-08-25 03:38:28 UTC (rev 14927) @@ -180,9 +180,11 @@ } /** - * Converts string from given charset to charset, that can be displayed by user translation. + * Converts a string from the given $charset to a character set that + * can be displayed by the current user interface language (translation) * - * Function by default returns html encoded strings, if translation uses different encoding. + * Function by default returns html encoded strings if translation uses + * different encoding. * If Japanese translation is used - function returns string converted to euc-jp * If iconv or recode functions are enabled and translation uses utf-8 - function returns utf-8 encoded string. * If $charset is not supported - function returns unconverted string. @@ -189,7 +191,7 @@ * * sanitizing of html tags is also done by this function. * - * @param string $charset + * @param string $charset The charset of the incoming string * @param string $string Text to be decoded * @param boolean $force_decode converts string to html without $charset!=$default_charset check. * Argument is available since 1.4.5 and 1.5.1. @@ -218,7 +220,7 @@ // Don't do conversion if charset is the same. if ( ! $force_decode && $charset == strtolower($default_charset) ) - return ($save_html ? $string : sm_encode_html_special_chars($string)); + return ($save_html ? $string : sm_encode_html_special_chars($string, ENT_COMPAT, $charset)); // catch iso-8859-8-i thing if ( $charset == "iso-8859-8-i" ) @@ -234,7 +236,7 @@ // other charsets can be converted to utf-8 without loss. // and output string is smaller $string = recode_string($charset . "..utf-8",$string); - return ($save_html ? $string : sm_encode_html_special_chars($string)); + return ($save_html ? $string : sm_encode_html_special_chars($string, ENT_COMPAT, $charset)); } else { $string = recode_string($charset . "..html",$string); // recode does not convert single quote, sm_encode_html_special_chars does. @@ -250,13 +252,13 @@ // iconv functions does not have html target and can be used only with utf-8 if ( $use_php_iconv && $default_charset=='utf-8') { $string = iconv($charset,$default_charset,$string); - return ($save_html ? $string : sm_encode_html_special_chars($string)); + return ($save_html ? $string : sm_encode_html_special_chars($string, ENT_COMPAT, $charset)); } // If we don't use recode and iconv, we'll do it old way. /* All HTML special characters are 7 bit and can be replaced first */ - if (! $save_html) $string = sm_encode_html_special_chars ($string); + if (! $save_html) $string = sm_encode_html_special_chars($string, ENT_COMPAT, $charset); /* controls cpu and memory intensive decoding cycles */ if (! isset($aggressive_decoding) || $aggressive_decoding=="" ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2022-01-11 09:08:02
|
Revision: 14936 http://sourceforge.net/p/squirrelmail/code/14936 Author: pdontthink Date: 2022-01-11 09:07:59 +0000 (Tue, 11 Jan 2022) Log Message: ----------- Fix mixed use of message ID list (#2859) Modified Paths: -------------- trunk/squirrelmail/functions/imap_messages.php trunk/squirrelmail/src/read_body.php Modified: trunk/squirrelmail/functions/imap_messages.php =================================================================== --- trunk/squirrelmail/functions/imap_messages.php 2021-12-07 19:27:22 UTC (rev 14935) +++ trunk/squirrelmail/functions/imap_messages.php 2022-01-11 09:07:59 UTC (rev 14936) @@ -82,7 +82,8 @@ /** * Set a flag on the provided uid list * @param resource imap connection - * @param array $id list with uid's + * @param mixed $id Normally an array which is a list with message UIDs to be flagged + * or a string range such as "1:*" * @param string $flag Flags to set/unset flags can be i.e.'\Seen', '\Answered', '\Seen \Answered' * @param bool $set add (true) or remove (false) the provided flag * @param bool $handle_errors Show error messages in case of a NO, BAD or BYE response @@ -92,8 +93,12 @@ $msgs_id = sqimap_message_list_squisher($id); $set_string = ($set ? '+' : '-'); - for ($i=0; $i<sizeof($id); $i++) { - $aMessageList["$id[$i]"] = array(); + $aMessageList = array(); + // TODO: There doesn't seem to be a reason to set up $aMessageList anyway because an empty array for each message doesn't add anything to the parseFetch() return value, so this code block could be simply deleted: + if (!is_string($id)) { + for ($i=0; $i<sizeof($id); $i++) { + $aMessageList["$id[$i]"] = array(); + } } $aResponse = sqimap_run_command_list($imap_stream, "STORE $msgs_id ".$set_string."FLAGS ($flag)", $handle_errors, $response, $message, TRUE); @@ -103,8 +108,8 @@ // some broken IMAP servers do not return UID elements on UID STORE // if this is the case, then we need to do a UID FETCH - $testkey=$id[0]; - if (!isset($parseFetchResults[$testkey]['UID'])) { + if (!empty($parseFetchResults) + && !isset(reset($parseFetchResults)['UID'])) { $aResponse = sqimap_run_command_list($imap_stream, "FETCH $msgs_id (FLAGS)", $handle_errors, $response, $message, TRUE); $parseFetchResults = parseFetch($aResponse,$aMessageList); } Modified: trunk/squirrelmail/src/read_body.php =================================================================== --- trunk/squirrelmail/src/read_body.php 2021-12-07 19:27:22 UTC (rev 14935) +++ trunk/squirrelmail/src/read_body.php 2022-01-11 09:07:59 UTC (rev 14936) @@ -987,7 +987,7 @@ // they SHOULD be included as part of the FETCH responses." // if ($imap_server_type == 'gmail') { - sqimap_toggle_flag($imapConnection, $passed_id, '\\Seen', true, true); + sqimap_toggle_flag($imapConnection, array($passed_id), '\\Seen', true, true); } /****************************************/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |