From: <ki...@us...> - 2007-01-13 19:08:23
|
Revision: 12126 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12126&view=rev Author: kink Date: 2007-01-13 11:08:18 -0800 (Sat, 13 Jan 2007) Log Message: ----------- replace CVS with SVN Modified Paths: -------------- trunk/squirrelmail/ChangeLog trunk/squirrelmail/INSTALL trunk/squirrelmail/ReleaseNotes trunk/squirrelmail/doc/translating.txt trunk/squirrelmail/include/init.php Modified: trunk/squirrelmail/ChangeLog =================================================================== --- trunk/squirrelmail/ChangeLog 2007-01-13 19:04:49 UTC (rev 12125) +++ trunk/squirrelmail/ChangeLog 2007-01-13 19:08:18 UTC (rev 12126) @@ -2,7 +2,7 @@ *** SquirrelMail Devel Series 1.5 *** ************************************* -Version 1.5.2 - CVS +Version 1.5.2 - SVN ------------------- - The search expression in the LDAP backend of the Addressbook is now configurable, which can allow the result set to be expanded. Modified: trunk/squirrelmail/INSTALL =================================================================== --- trunk/squirrelmail/INSTALL 2007-01-13 19:04:49 UTC (rev 12125) +++ trunk/squirrelmail/INSTALL 2007-01-13 19:08:18 UTC (rev 12126) @@ -93,7 +93,7 @@ SquirrelMail is constantly being improved. Therefore you should always get the newest version around. Look at http://www.squirrelmail.org to see what it is. If you want to be bleeding edge you might want to - consider using the latest CVS version (with the latest and most + consider using the latest SVN version (with the latest and most fashionable bugs). a. Download SquirrelMail Modified: trunk/squirrelmail/ReleaseNotes =================================================================== --- trunk/squirrelmail/ReleaseNotes 2007-01-13 19:04:49 UTC (rev 12125) +++ trunk/squirrelmail/ReleaseNotes 2007-01-13 19:08:18 UTC (rev 12126) @@ -177,7 +177,7 @@ increase the time we can spend FIXING existing bugs by DECREASING the time we spend sorting through bug reports. Remember to check for CLOSED bug reports also, not just OPEN bug reports, in case a bug you want to report may have been -recently fixed in CVS. +recently fixed in our source code repository. If you want to join us in coding SquirrelMail, or have other things to share with the developers, join the development mailing list: Modified: trunk/squirrelmail/doc/translating.txt =================================================================== --- trunk/squirrelmail/doc/translating.txt 2007-01-13 19:04:49 UTC (rev 12125) +++ trunk/squirrelmail/doc/translating.txt 2007-01-13 19:08:18 UTC (rev 12126) @@ -1,7 +1,7 @@ How to translate SquirrelMail into another language? ==================================================== -This document does not deal with CVS and how to upload translations to +This document does not deal with Subversion and how to upload translations to the repository. 1. First time translation Modified: trunk/squirrelmail/include/init.php =================================================================== --- trunk/squirrelmail/include/init.php 2007-01-13 19:04:49 UTC (rev 12125) +++ trunk/squirrelmail/include/init.php 2007-01-13 19:08:18 UTC (rev 12126) @@ -225,7 +225,7 @@ /** * SquirrelMail version number -- DO NOT CHANGE */ -$version = '1.5.2 [CVS]'; +$version = '1.5.2 [SVN]'; /** * SquirrelMail internal version number -- DO NOT CHANGE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-01-13 20:15:46
|
Revision: 12128 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12128&view=rev Author: kink Date: 2007-01-13 12:15:44 -0800 (Sat, 13 Jan 2007) Log Message: ----------- increment year in copyright notices Modified Paths: -------------- trunk/squirrelmail/ChangeLog 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/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/constants.php trunk/squirrelmail/functions/date.php trunk/squirrelmail/functions/db_prefs.php trunk/squirrelmail/functions/display_messages.php trunk/squirrelmail/functions/file_prefs.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/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/tree.php trunk/squirrelmail/functions/url_parser.php trunk/squirrelmail/include/constants.php trunk/squirrelmail/include/errors.php trunk/squirrelmail/include/index.php trunk/squirrelmail/include/languages.php trunk/squirrelmail/include/load_prefs.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.php trunk/squirrelmail/include/validate.php trunk/squirrelmail/index.php trunk/squirrelmail/plugins/abook_take/functions.php trunk/squirrelmail/plugins/abook_take/index.php trunk/squirrelmail/plugins/abook_take/setup.php trunk/squirrelmail/plugins/abook_take/take.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/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/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/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/functions.php trunk/squirrelmail/plugins/listcommands/index.php trunk/squirrelmail/plugins/listcommands/mailout.php trunk/squirrelmail/plugins/listcommands/setup.php trunk/squirrelmail/plugins/mail_fetch/config_default.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/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/class/cmd_spell.php trunk/squirrelmail/plugins/squirrelspell/class/common.php trunk/squirrelmail/plugins/squirrelspell/doc/index.php trunk/squirrelmail/plugins/squirrelspell/index.php trunk/squirrelmail/plugins/squirrelspell/js/index.php trunk/squirrelmail/plugins/squirrelspell/modules/index.php 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/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/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/printer_friendly_bottom.php trunk/squirrelmail/src/printer_friendly_main.php trunk/squirrelmail/src/printer_friendly_top.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/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/config.php trunk/squirrelmail/templates/default/index.php trunk/squirrelmail/templates/default/js/index.php trunk/squirrelmail/templates/default_advanced/config.php 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/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/ChangeLog =================================================================== --- trunk/squirrelmail/ChangeLog 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/ChangeLog 2007-01-13 20:15:44 UTC (rev 12128) @@ -176,6 +176,7 @@ user-configured non-RFC 2369-compliant lists; admin must enable by configuring plugin. Thanks to Peter Steiner. - Fixed HttpOnly cookies again. + - Update for switch from CVS to Subversion. Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/class/deliver/Deliver.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver.class.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/deliver/Deliver.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -7,7 +7,7 @@ * a delivery backend. * * @author Marc Groot Koerkamp - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/deliver/Deliver_IMAP.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * Delivery backend for the Deliver class. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * SMTP delivery backend for the Deliver class. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/deliver/Deliver_SendMail.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * Delivery backend for the Deliver class. * * @author Marc Groot Koerkamp - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/deliver/index.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/error.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * This contains the custom error handler for SquirrelMail. * - * @copyright © 2005-2006 The SquirrelMail Project Team + * @copyright © 2005-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/helper/VCard.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -7,7 +7,7 @@ * * http://www.imc.org/pdi/vcard-21.txt * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/helper/index.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/index.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/l10n/gettext.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 2004-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/l10n/index.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/l10n/streams.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 2004-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/l10n.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -7,7 +7,7 @@ * translations when php gettext extension is missing or some functions * are not available. * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/mime/AddressStructure.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * This file contains functions needed to extract email address headers from * mime messages. * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/mime/ContentType.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content type headers * (rfc2045) in mime messages. * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/mime/Disposition.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * This file contains functions needed to handle content disposition headers * in mime messages. See RFC 2183. * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/mime/Language.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/mime/Message.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle mime messages. * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/mime/MessageHeader.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/mime/Rfc822Header.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * This file contains functions needed to handle headers in mime messages. * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/mime/SMimeMessage.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/mime/index.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/mime.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * This file loads classes needed to handle mime messages. * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/template/PHP_Template.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -9,7 +9,7 @@ * The SquirrelMail (Foowd) template implementation. * Derived from the foowd template implementation and adapted * for squirrelmail - * @copyright © 2005-2006 The SquirrelMail Project Team + * @copyright © 2005-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/template/Smarty_Template.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -7,7 +7,7 @@ * SquirrelMail and Smarty. All abstract methods from the Template class * are implemented here. * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/template/Template.class.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -8,7 +8,7 @@ * class with any custom functionality needed to interface a target * templating engine with SquirrelMail. * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/class/template/index.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/config/conf.pl 2007-01-13 20:15:44 UTC (rev 12128) @@ -1,7 +1,7 @@ #!/usr/bin/env perl # conf.pl # -# Copyright (c) 1999-2006 The SquirrelMail Project Team +# Copyright (c) 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/config/config_default.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 2000-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/config/config_local.example.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 2002-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/config/index.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/abook_database.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -14,7 +14,7 @@ * PRIMARY KEY (owner,nickname) * </pre> * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/abook_ldap_server.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -18,7 +18,7 @@ * and inetOrgPerson (RFC2798) objects and dn, description, sn, givenname, * cn, mail attributes. Other attributes are ignored. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/abook_local_file.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -3,7 +3,7 @@ /** * abook_local_file.php * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/addressbook.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -4,7 +4,7 @@ * * Functions require SM_PATH and support of forms.php functions * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/arrays.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * Contains utility functions for array operations * - * @copyright © 2004-2006 The SquirrelMail Project Team + * @copyright © 2004-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/attachment_common.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * This file provides the handling of often-used attachment types. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/auth.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -9,7 +9,7 @@ * functions/global.php * functions/strings.php. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/constants.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -2,7 +2,7 @@ /** * old constants function file location * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/date.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -8,7 +8,7 @@ * <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT) * (as specified in RFC 822) -- 'Tue' is optional * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 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 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/db_prefs.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -21,7 +21,7 @@ * Configuration of databasename, username and password is done * by using conf.pl or the administrator plugin * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/display_messages.php =================================================================== --- trunk/squirrelmail/functions/display_messages.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/display_messages.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * This contains all messages, including information, error, and just * about any other message you can think of. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/file_prefs.php =================================================================== --- trunk/squirrelmail/functions/file_prefs.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/file_prefs.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * This contains functions for manipulating user preferences in files * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/folder_manip.php =================================================================== --- trunk/squirrelmail/functions/folder_manip.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/folder_manip.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -7,7 +7,7 @@ * (un)subscribe, create, rename, delete. * * @author Thijs Kinkhorst <kink at squirrelmail.org> - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/forms.php =================================================================== --- trunk/squirrelmail/functions/forms.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/forms.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -25,7 +25,7 @@ * @link http://www.section508.gov/ Section 508 * @link http://www.w3.org/WAI/ Web Accessibility Initiative (WAI) * @link http://www.w3.org/TR/html4/ W3.org HTML 4.01 form specs - * @copyright © 2004-2006 The SquirrelMail Project Team + * @copyright © 2004-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/gettext.php =================================================================== --- trunk/squirrelmail/functions/gettext.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/gettext.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -8,7 +8,7 @@ * * @link http://www.php.net/gettext Original php gettext manual * @link http://savannah.nongnu.org/projects/php-gettext php-gettext classes - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @since 1.1.2 Modified: trunk/squirrelmail/functions/global.php =================================================================== --- trunk/squirrelmail/functions/global.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/global.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -7,7 +7,7 @@ * It also has some session register functions that work across various * php versions. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/html.php =================================================================== --- trunk/squirrelmail/functions/html.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/html.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -7,7 +7,7 @@ * the right to left implementation by "functionize" some * html outputs. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/i18n.php =================================================================== --- trunk/squirrelmail/functions/i18n.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/i18n.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -2,7 +2,7 @@ /** * old i18n function file location * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/identity.php =================================================================== --- trunk/squirrelmail/functions/identity.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/identity.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * This contains utility functions for dealing with multiple identities * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/imap.php =================================================================== --- trunk/squirrelmail/functions/imap.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/imap.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * This just includes the different sections of the imap functions. * They have been organized into these sections for simplicity sake. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/imap_asearch.php =================================================================== --- trunk/squirrelmail/functions/imap_asearch.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/imap_asearch.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -8,7 +8,7 @@ * Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas! * * @author Alex Lemaresquier - Brainstorm <alex at brainstorm.fr> - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/imap_general.php =================================================================== --- trunk/squirrelmail/functions/imap_general.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/imap_general.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * This implements all functions that do general IMAP functions. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/imap_mailbox.php =================================================================== --- trunk/squirrelmail/functions/imap_mailbox.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/imap_mailbox.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * This implements all functions that manipulate mailboxes * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/imap_messages.php =================================================================== --- trunk/squirrelmail/functions/imap_messages.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/imap_messages.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * This implements functions that manipulate messages * NOTE: Quite a few functions in this file are obsolete * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/imap_utf7_local.php =================================================================== --- trunk/squirrelmail/functions/imap_utf7_local.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/imap_utf7_local.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -7,7 +7,7 @@ * Before 1.3.2 functions were stored in imap_utf7_decode_local.php and * imap_utf7_encode_local.php files. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/index.php =================================================================== --- trunk/squirrelmail/functions/index.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/index.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -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-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/mailbox_display.php =================================================================== --- trunk/squirrelmail/functions/mailbox_display.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/mailbox_display.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * This contains functions that display mailbox information, such as the * table row that has sender, date, subject, etc... * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/mime.php =================================================================== --- trunk/squirrelmail/functions/mime.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/mime.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * This contains the functions necessary to detect and decode MIME * messages. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/ngettext.php =================================================================== --- trunk/squirrelmail/functions/ngettext.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/ngettext.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -7,7 +7,7 @@ * * @link http://www.php.net/gettext Original php gettext manual * @link http://savannah.nongnu.org/projects/php-gettext php-gettext classes - * @copyright © 2004-2006 The SquirrelMail Project Team + * @copyright © 2004-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/options.php =================================================================== --- trunk/squirrelmail/functions/options.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/options.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * Functions needed to display the options pages. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/page_header.php =================================================================== --- trunk/squirrelmail/functions/page_header.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/page_header.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * Prints the page header (duh) * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/plugin.php =================================================================== --- trunk/squirrelmail/functions/plugin.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/plugin.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -7,7 +7,7 @@ * * Documentation on how to write plugins might show up some time. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/prefs.php =================================================================== --- trunk/squirrelmail/functions/prefs.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/prefs.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * This contains functions for filebased user prefs locations * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/rfc822address.php =================================================================== --- trunk/squirrelmail/functions/rfc822address.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/rfc822address.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -5,7 +5,7 @@ * * Contains rfc822 email address function parsing functions. * - * @copyright © 2004-2006 The SquirrelMail Project Team + * @copyright © 2004-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/strings.php =================================================================== --- trunk/squirrelmail/functions/strings.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/strings.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * This code provides various string manipulation functions that are * used by the rest of the SquirrelMail code. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/tree.php =================================================================== --- trunk/squirrelmail/functions/tree.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/tree.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * This file provides functions to walk trees of folders, for * instance to delete a whole tree. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/functions/url_parser.php =================================================================== --- trunk/squirrelmail/functions/url_parser.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/functions/url_parser.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * This code provides various string manipulation functions that are * used by the rest of the SquirrelMail code. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/include/constants.php =================================================================== --- trunk/squirrelmail/include/constants.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/include/constants.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -6,7 +6,7 @@ * Loads constants used by the rest of the SquirrelMail source. * * Before 1.5.2 script was stored in functions/constants.php - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail Modified: trunk/squirrelmail/include/errors.php =================================================================== --- trunk/squirrelmail/include/errors.php 2007-01-13 20:07:24 UTC (rev 12127) +++ trunk/squirrelmail/include/errors.php 2007-01-13 20:15:44 UTC (rev 12128) @@ -3,7 +3,7 @@ /** * errors.php * - * @copyright © 2005-2006 The SquirrelMail Project Team + * @copyright © 2005-2007 The SquirrelMail P... [truncated message content] |
From: <pdo...@us...> - 2007-01-15 07:46:55
|
Revision: 12131 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12131&view=rev Author: pdontthink Date: 2007-01-14 23:46:53 -0800 (Sun, 14 Jan 2007) Log Message: ----------- Remove a spec of HTML from login.php Modified Paths: -------------- trunk/squirrelmail/src/login.php trunk/squirrelmail/templates/default/login.tpl Modified: trunk/squirrelmail/src/login.php =================================================================== --- trunk/squirrelmail/src/login.php 2007-01-14 05:46:24 UTC (rev 12130) +++ trunk/squirrelmail/src/login.php 2007-01-15 07:46:53 UTC (rev 12131) @@ -144,9 +144,8 @@ $sm_attribute_str = ''; if (isset($hide_sm_attributions) && !$hide_sm_attributions) { -//FIXME: need to remove *ALL* HTML from this file! - $sm_attribute_str = _("SquirrelMail Webmail Application")."<br />\n" . - _("By the SquirrelMail Project Team")."<br />\n"; + $sm_attribute_str = _("SquirrelMail Webmail Application")."\n" . + _("By the SquirrelMail Project Team"); } if(sqgetGlobalVar('mailtodata', $mailtodata)) { @@ -162,12 +161,12 @@ session_write_close(); -$oTemplate->assign('logo_str', $logo_str); +$oTemplate->assign('logo_str', $logo_str, FALSE); $oTemplate->assign('logo_path', $org_logo); $oTemplate->assign('sm_attribute_str', $sm_attribute_str); $oTemplate->assign('org_name_str', sprintf (_("%s Login"), $org_name)); $oTemplate->assign('login_field_value', $loginname_value); -$oTemplate->assign('login_extra', $login_extra); +$oTemplate->assign('login_extra', $login_extra, FALSE); //FIXME: need to remove *ALL* HTML from this file! echo '<body onLoad="squirrelmail_loginpage_onload()">'."\n"; Modified: trunk/squirrelmail/templates/default/login.tpl =================================================================== --- trunk/squirrelmail/templates/default/login.tpl 2007-01-14 05:46:24 UTC (rev 12130) +++ trunk/squirrelmail/templates/default/login.tpl 2007-01-15 07:46:53 UTC (rev 12131) @@ -34,7 +34,7 @@ <tr> <td class="sqm_loginTop" colspan="2"> <?php echo $logo_str; if (!empty($logo_str)) echo '<br />'; ?> - <?php echo $sm_attribute_str; ?> + <?php echo nl2br($sm_attribute_str); ?> </td> </tr> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2007-01-15 08:27:12
|
Revision: 12135 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12135&view=rev Author: pdontthink Date: 2007-01-15 00:27:10 -0800 (Mon, 15 Jan 2007) Log Message: ----------- Remove HTML from provider_uri and name; also fix default provider_uri when on plugin pages; base path was not part of the link Modified Paths: -------------- trunk/squirrelmail/ChangeLog trunk/squirrelmail/functions/page_header.php trunk/squirrelmail/templates/default/page_header.tpl Modified: trunk/squirrelmail/ChangeLog =================================================================== --- trunk/squirrelmail/ChangeLog 2007-01-15 07:58:55 UTC (rev 12134) +++ trunk/squirrelmail/ChangeLog 2007-01-15 08:27:10 UTC (rev 12135) @@ -177,6 +177,7 @@ configuring plugin. Thanks to Peter Steiner. - Fixed HttpOnly cookies again. - Update for switch from CVS to Subversion. + - Default provider URI link fixed (was broken when on plugin options pages, etc) Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/functions/page_header.php =================================================================== --- trunk/squirrelmail/functions/page_header.php 2007-01-15 07:58:55 UTC (rev 12134) +++ trunk/squirrelmail/functions/page_header.php 2007-01-15 08:27:10 UTC (rev 12135) @@ -240,14 +240,12 @@ $sm_attributes = ''; if (!$hide_sm_attributions) { - $sm_attributes .= '<td class="sqm_providerInfo">' ."\n"; if (empty($provider_uri)) { - $sm_attributes .= ' <a href="about.php">SquirrelMail</a>'; + $sm_attributes .= create_hyperlink($base_uri . 'src/about.php', 'SquirrelMail'); } else { - if (empty($provider_name)) $provider_name= 'SquirrelMail'; - $sm_attributes .= ' <a href="'.$provider_uri.'" target="_blank">'.$provider_name.'</a>'."\n"; + if (empty($provider_name)) $provider_name = 'SquirrelMail'; + $sm_attributes .= create_hyperlink($provider_uri, $provider_name, '_blank'); } - $sm_attributes .= " </td>\n"; } $oTemplate->assign('body_tag_js', $sBodyTagJs); Modified: trunk/squirrelmail/templates/default/page_header.tpl =================================================================== --- trunk/squirrelmail/templates/default/page_header.tpl 2007-01-15 07:58:55 UTC (rev 12134) +++ trunk/squirrelmail/templates/default/page_header.tpl 2007-01-15 08:27:10 UTC (rev 12135) @@ -83,7 +83,10 @@ <?php echo $help_link; ?> <?php /* FIXME: no hooks in templates!! */ global $null; do_hook('menuline', $null); ?> </td> - <?php echo $sm_attribute_str."\n"; ?> + <?php if (!empty($sm_attribute_str)) + echo '<td class="sqm_providerInfo">' + . $sm_attribute_str + . "</td>\n"; ?> </tr> </table> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-01-18 15:19:46
|
Revision: 12142 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12142&view=rev Author: kink Date: 2007-01-18 07:19:38 -0800 (Thu, 18 Jan 2007) Log Message: ----------- Fix URL to send read receipts from read_body (#1637572), thanks to Ce1ta Modified Paths: -------------- trunk/squirrelmail/ChangeLog trunk/squirrelmail/src/read_body.php Modified: trunk/squirrelmail/ChangeLog =================================================================== --- trunk/squirrelmail/ChangeLog 2007-01-18 15:09:24 UTC (rev 12141) +++ trunk/squirrelmail/ChangeLog 2007-01-18 15:19:38 UTC (rev 12142) @@ -178,6 +178,7 @@ - Fixed HttpOnly cookies again. - Update for switch from CVS to Subversion. - Default provider URI link fixed (was broken when on plugin options pages, etc) + - Fix URL to send read receipts from read_body (#1637572). Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/src/read_body.php =================================================================== --- trunk/squirrelmail/src/read_body.php 2007-01-18 15:09:24 UTC (rev 12141) +++ trunk/squirrelmail/src/read_body.php 2007-01-18 15:19:38 UTC (rev 12142) @@ -388,10 +388,10 @@ if ($mdn_user_support) { if ($header->dnt) { $mdn_url = $PHP_SELF; - $mdn_url = set_url_var($PHP_SELF, 'mailbox', urlencode($mailbox)); - $mdn_url = set_url_var($PHP_SELF, 'passed_id', $passed_id); - $mdn_url = set_url_var($PHP_SELF, 'passed_ent_id', $passed_ent_id); - $mdn_url = set_url_var($PHP_SELF, 'sendreceipt', 1); + $mdn_url = set_url_var($mdn_url, 'mailbox', urlencode($mailbox)); + $mdn_url = set_url_var($mdn_url, 'passed_id', $passed_id); + $mdn_url = set_url_var($mdn_url, 'passed_ent_id', $passed_ent_id); + $mdn_url = set_url_var($mdn_url, 'sendreceipt', 1); $oTemplate->assign('read_receipt_sent', $message->is_mdnsent); $oTemplate->assign('first_time_reading', $FirstTimeSee); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2007-01-19 09:11:17
|
Revision: 12146 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12146&view=rev Author: pdontthink Date: 2007-01-19 01:11:16 -0800 (Fri, 19 Jan 2007) Log Message: ----------- Remove HTML from org_logo on logout error page Modified Paths: -------------- trunk/squirrelmail/functions/display_messages.php trunk/squirrelmail/templates/default/error_logout.tpl Modified: trunk/squirrelmail/functions/display_messages.php =================================================================== --- trunk/squirrelmail/functions/display_messages.php 2007-01-19 09:10:10 UTC (rev 12145) +++ trunk/squirrelmail/functions/display_messages.php 2007-01-19 09:11:16 UTC (rev 12146) @@ -77,22 +77,23 @@ /* If they don't have a logo, don't bother.. */ $logo_str = ''; if (isset($org_logo) && $org_logo) { - /* Display width and height like good little people */ - $width_and_height = ''; + if (isset($org_logo_width) && is_numeric($org_logo_width) && $org_logo_width>0) { - $width_and_height = " width=\"$org_logo_width\""; + $width = $org_logo_width; + } else { + $width = ''; } if (isset($org_logo_height) && is_numeric($org_logo_height) && $org_logo_height>0) { - $width_and_height .= " height=\"$org_logo_height\""; + $height = $org_logo_height; + } else { + $height = ''; } - - $logo_str = '<img src="'.$org_logo.'" ' . - 'alt="'. sprintf(_("%s Logo"), $org_name).'" ' . - $width_and_height . - 'class="sqm_loginImage" ' . - ' /><br />'."\n"; + + $logo_str = create_image($org_logo, sprintf(_("%s Logo"), $org_name), + $width, $height, '', 'sqm_loginImage'); + } $sm_attribute_str = ''; Modified: trunk/squirrelmail/templates/default/error_logout.tpl =================================================================== --- trunk/squirrelmail/templates/default/error_logout.tpl 2007-01-19 09:10:10 UTC (rev 12145) +++ trunk/squirrelmail/templates/default/error_logout.tpl 2007-01-19 09:11:16 UTC (rev 12146) @@ -32,7 +32,7 @@ <tr> <td colspan="2"> <?php - echo $logo_str; + echo $logo_str; if (!empty($logo_str)) echo '<br />'; echo nl2br($sm_attribute_str) . (empty($sm_attribute_str) ? '' : '<br /><br />'); ?> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2007-01-24 06:51:18
|
Revision: 12197 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12197&view=rev Author: pdontthink Date: 2007-01-23 22:51:15 -0800 (Tue, 23 Jan 2007) Log Message: ----------- Add preview pane to advanced default template. This serves as an example of how to use a plugin to provide backend functionality introduced by a template (preview pane needs to be turned on/off by settings in the display preferences, which the plugin does; actual preview pane output is done by the template set). Note any plugin can be turned on or off for a given skin using the template's own config file. Modified Paths: -------------- trunk/squirrelmail/templates/default_advanced/config.php Added Paths: ----------- trunk/squirrelmail/plugins/preview_pane/ trunk/squirrelmail/plugins/preview_pane/INSTALL trunk/squirrelmail/plugins/preview_pane/README 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/ trunk/squirrelmail/plugins/preview_pane/templates/default/ trunk/squirrelmail/plugins/preview_pane/templates/default/empty_frame.tpl trunk/squirrelmail/plugins/preview_pane/version trunk/squirrelmail/templates/default_advanced/page_header.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 Added: trunk/squirrelmail/plugins/preview_pane/INSTALL =================================================================== --- trunk/squirrelmail/plugins/preview_pane/INSTALL (rev 0) +++ trunk/squirrelmail/plugins/preview_pane/INSTALL 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,11 @@ +Installing Preview Pane +======================= + +This plugin should only be activated by a skin (template set) +that is capable of displaying a message preview pane. One +such skin (template set) is the "default advanced" one that +comes with the SquirrelMail base package. + +No manual activation or installation steps are required. + + Added: trunk/squirrelmail/plugins/preview_pane/README =================================================================== --- trunk/squirrelmail/plugins/preview_pane/README (rev 0) +++ trunk/squirrelmail/plugins/preview_pane/README 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,106 @@ +Preview Pane plugin for SquirrelMail +==================================== +Ver 2.0, 2007/01/23 + +Original author: Paul Lesniewski <pa...@sq...> + + +Description +=========== + +This plugin allows the user to turn on an extra frame below +the mailbox message list where the messages themselves are +displayed, very similar to many other popular (typically +non-web-based) email clients. + +Note that users must turn this functionality on by going to +the Options-->Display Preferences menu. + +This plugin is part of the SquirrelMail core package and +should never be replaced with a downloaded copy (that which +is available on the SquirrelMail website under Plugins is +only applicable to SquirrelMail 1.4.x). + +This plugin should be activated only by a skin (template set) +that is capable of displaying a message preview pane. One +such skin (template set) is the "default advanced" one that +comes with the SquirrelMail base package. + + + +License +======= + +This plugin is released under the GNU General Public +License (see the file COPYING for details). + + + +Requirements +============ + + * SquirrelMail version 1.5.2+ + + + +Help Requests +============= + +Help requests should be posted to the SquirrelMail Plugins +mailing list. + +Info about the SquirrelMail Plugins mailing list can be found +on the SquirrelMail web site. It is currently located at: + +http://lists.sourceforge.net/mailman/listinfo/squirrelmail-plugins +sq...@li... + + + +Change Log +========== + + v2.0 2007/01/23 Paul Lesniewski + * Integration into SquirrelMail core + * Strip out most interface functionality; migrate to "default + advanced" template set + * Only works with 1.5.2+ + + v1.3 2007/01/19 Paul Lesniewski <pa...@sq...> + * Introduce slight delay refreshing message list so read messages + actually refresh as having been read + * Added 1.4.9 patch; versions between 1.4.3 and 1.4.9 should be + patch-able with the 1.4.3 patch + * Added 1.4.9 patch for delete, move, next plugin + * Added 1.5.1 patch, then removed it ;-p 1.5.2 supports this + functionality natively. + * Patches run from plugin directory now + * Translations now kept in SquirrelMail locales packages, not in + this plugin; translators please send your translations to the + squirrelmail-i18n mailing list + * Added requisite informational functions in setup.php per plugin specs + * Use $PHP_SELF instead of REQUEST_URI, since apparently the latter is not + always 100% reliable. + * No longer support replacement source files; patches are more than enough + * Fully compatible with Windows plugin, version 1.7+ + + v1.2 2004/06/08 Paul Lesniewski <pa...@sq...> + * Added javascript fix so delete link will work when messages are + viewed "in new window" - please give feedback if this causes problems + * Fixed missing locale switch (Thanks to Alexandros Vellis <av...@no...>) + * Added Greek locale (Thanks to Alexandros Vellis <av...@no...>) + * Updated patch for compatibility with Archive Mail plugin version 1.2 + * Fixed placement of Clear button (no, non Archive Mail users, that button + was never supposed to be so blatantly placed in the middle of your screen) + Please report placement problems if they persist. + * Updated patch for 1.5.1 (works only against 1.5.1cvs as of approximately + 06/08/04) + * Added patch for compatibility with the delete_move_next plugin under + SquirrelMail 1.4.x + + v1.1 2004/07/03 Paul Lesniewski <pa...@sq...> + * Added option to split frames vertically instead of horizontally + + v1.0 2004/20/02 Paul Lesniewski <pa...@sq...> + * Initial version + Added: trunk/squirrelmail/plugins/preview_pane/empty_frame.php =================================================================== --- trunk/squirrelmail/plugins/preview_pane/empty_frame.php (rev 0) +++ trunk/squirrelmail/plugins/preview_pane/empty_frame.php 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,23 @@ +<?php + +/** + * SquirrelMail Preview Pane Plugin + * + * @copyright © 1999-2007 The SquirrelMail Project Team + * @author Paul Lesneiwski <pa...@sq...> + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package plugins + * @subpackage preview_pane + * + */ + + +include_once('../../include/init.php'); + +global $org_title; +displayHtmlHeader($org_title, '', FALSE, FALSE); + +$oTemplate->display('plugins/preview_pane/empty_frame.tpl'); + + Added: trunk/squirrelmail/plugins/preview_pane/functions.php =================================================================== --- trunk/squirrelmail/plugins/preview_pane/functions.php (rev 0) +++ trunk/squirrelmail/plugins/preview_pane/functions.php 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,166 @@ +<?php + +/** + * SquirrelMail Preview Pane Plugin + * + * @copyright © 1999-2007 The SquirrelMail Project Team + * @author Paul Lesneiwski <pa...@sq...> + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package plugins + * @subpackage preview_pane + * + */ + + +/** + * Build user options for display on "Display Preferences" page + * + */ +function preview_pane_show_options_do() +{ + + if (!checkForJavascript()) return; + + global $data_dir, $username; + $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0); + $previewPane_vertical_split = getPref($data_dir, $username, 'previewPane_vertical_split', 0); + $previewPane_size = getPref($data_dir, $username, 'previewPane_size', 300); + $pp_refresh_message_list = getPref($data_dir, $username, 'pp_refresh_message_list', 1); + + + global $optpage_data; + $optpage_data['vals'][1][] = array( + 'name' => 'use_previewPane', + 'caption' => _("Show Message Preview Pane"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'initial_value' => $use_previewPane, + 'refresh' => SMOPT_REFRESH_ALL, + ); + $optpage_data['vals'][1][] = array( + 'name' => 'previewPane_vertical_split', + 'caption' => _("Split Preview Pane Vertically"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'initial_value' => $previewPane_vertical_split, + 'refresh' => SMOPT_REFRESH_ALL, + ); + $optpage_data['vals'][1][] = array( + 'name' => 'previewPane_size', + 'caption' => _("Message Preview Pane Size"), + 'type' => SMOPT_TYPE_INTEGER, + 'initial_value' => $previewPane_size, + 'refresh' => SMOPT_REFRESH_ALL, + 'size' => SMOPT_SIZE_TINY, + ); + $optpage_data['vals'][1][] = array( + 'name' => 'pp_refresh_message_list', + 'caption' => _("Always Refresh Message List<br />When Using Preview Pane"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'initial_value' => $pp_refresh_message_list, + 'refresh' => SMOPT_REFRESH_ALL, + ); + +} + + +/** + * This function determines if the preview pane is in use + * (and JavaScript is available) + * + * @return boolean TRUE if the preview pane should be showing currently. + * + */ +function show_preview_pane() +{ + $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0); + return (checkForJavascript() && $use_previewPane); +} + + +/** + * Construct button that clears out any preview pane + * contents and inserts JavaScript function used by + * message subject link onclick handler. Also disallows + * the message list to be loaded into the bottom frame. + * + */ +function preview_pane_message_list_do() +{ + + if (!checkForJavascript()) return; + + global $plugins, $archive_mail_button_has_been_printed, + $username, $data_dir, $PHP_SELF, $base_uri; + + + $output = ''; + $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0); + + + // add refresh function called from code built in function + // preview_pane_change_message_target_do() + // + if ($use_previewPane == 1 + && getPref($data_dir, $username, 'pp_refresh_message_list', 1) == 1) + { +// sqgetGlobalVar('REQUEST_URI', $request_uri, SQ_SERVER); + $request_uri = $PHP_SELF; + $output .= "<script type=\"text/javascript\">\n<!--\n function pp_refresh() { document.location = '$request_uri'; }\n// -->\n</script>\n"; + } + + + if ($use_previewPane == 1) + { + $output .= '<input type="button" value="' . _("Clear Preview") + . '" onclick="parent.bottom.document.location=\'' . SM_PATH + . 'plugins/preview_pane/empty_frame.php\'" />' + + + // don't let message list load into preview pane at all + // + . "\n<script language='javascript' type='text/javascript'>\n" + . "<!--\n" + . "\n" + . " if (self.name == 'bottom')\n" + . " {\n" + . " document.location = '" . $base_uri . "plugins/preview_pane/empty_frame.php'\n" + . " }\n" + . "//-->\n" + . "</script>\n"; + } + + return array('mailbox_index_after' => $output); + +} + + +/** + * Points message targets to open in the preview pane + * (and possibly refresh message list as well) + * + */ +function preview_pane_change_message_target_do() +{ + + if (!checkForJavascript()) return; + + global $data_dir, $username, $target, $onclick, $PHP_SELF; +// sqgetGlobalVar('REQUEST_URI', $request_uri, SQ_SERVER); + $request_uri = $PHP_SELF; + + + if (getPref($data_dir, $username, 'use_previewPane', 0) == 1) + { + $pp_refresh_message_list = getPref($data_dir, $username, 'pp_refresh_message_list', 1); + + $target = 'bottom'; + if ($pp_refresh_message_list) +// introduce a delay so read messages actually refresh after they are read +// $onclick .= ' onclick="document.location=\'' . $request_uri . '\'; " '; + $onclick .= ' setTimeout(\'pp_refresh()\', 500); '; + } + +} + + + Added: trunk/squirrelmail/plugins/preview_pane/index.php =================================================================== --- trunk/squirrelmail/plugins/preview_pane/index.php (rev 0) +++ trunk/squirrelmail/plugins/preview_pane/index.php 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,19 @@ +<?php + +/** + * index.php + * + * Copyright (c) 1999-2003 The SquirrelMail Project Team + * Licensed under the GNU GPL. For full terms see the file COPYING. + * + * This file simply takes any attempt to view source files and sends those + * people to the login screen. At this point no attempt is made to see if + * the person is logged or not. + * + * $Id: index.php,v 1.5 2002/12/31 12:49:33 kink Exp $ + */ + +header("Location:../index.php"); + +/* pretty impressive huh? */ + Added: trunk/squirrelmail/plugins/preview_pane/setup.php =================================================================== --- trunk/squirrelmail/plugins/preview_pane/setup.php (rev 0) +++ trunk/squirrelmail/plugins/preview_pane/setup.php 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,122 @@ +<?php + +/** + * SquirrelMail Preview Pane Plugin + * + * @copyright © 1999-2007 The SquirrelMail Project Team + * @author Paul Lesneiwski <pa...@sq...> + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package plugins + * @subpackage preview_pane + * + */ + + +/** + * Register this plugin with SquirrelMail + * + */ +function squirrelmail_plugin_init_preview_pane() +{ + + global $squirrelmail_plugin_hooks; + + + $squirrelmail_plugin_hooks['subject_link']['preview_pane'] + = 'preview_pane_change_message_target'; + $squirrelmail_plugin_hooks['optpage_loadhook_display']['preview_pane'] + = 'preview_pane_show_options'; + $squirrelmail_plugin_hooks['template_construct_message_list.tpl']['preview_pane'] + = 'preview_pane_message_list'; + +} + + +if (!defined('SM_PATH')) + define('SM_PATH', '../'); + + +/** + * Returns info about this plugin + * + */ +function preview_pane_info() +{ + + return array( + 'english_name' => 'Preview Pane', + 'version' => '2.0', + 'required_sm_version' => '1.5.2', + 'requires_configuration' => 0, + 'requires_source_patch' => 0, + 'required_plugins' => array( + ), + 'summary' => 'Provides a third frame below the message list for viewing message bodies.', + 'details' => 'This plugin allows the user to turn on an extra frame below the mailbox message list where the messages themselves are displayed, very similar to many other popular (typically non-web-based) email clients.', + ); + +} + + + +/** + * Returns version info about this plugin + * + */ +function preview_pane_version() +{ + + $info = preview_pane_info(); + return $info['version']; + +} + + + +/** + * Build user options for display on "Display Preferences" page + * + */ +function preview_pane_show_options() +{ + + include_once(SM_PATH . 'plugins/preview_pane/functions.php'); + preview_pane_show_options_do(); + +} + + + +/** + * Construct button that clears out any preview pane + * contents and inserts JavaScript function used by + * message subject link onclick handler. Also disallows + * the message list to be loaded into the bottom frame. + * + */ +function preview_pane_message_list() +{ + + include_once(SM_PATH . 'plugins/preview_pane/functions.php'); + return preview_pane_message_list_do(); + +} + + + +/** + * Points message targets to open in the preview pane + * (and possibly refresh message list as well) + * + */ +function preview_pane_change_message_target() +{ + + include_once(SM_PATH . 'plugins/preview_pane/functions.php'); + preview_pane_change_message_target_do(); + +} + + + Added: trunk/squirrelmail/plugins/preview_pane/templates/default/empty_frame.tpl =================================================================== --- trunk/squirrelmail/plugins/preview_pane/templates/default/empty_frame.tpl (rev 0) +++ trunk/squirrelmail/plugins/preview_pane/templates/default/empty_frame.tpl 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,25 @@ +<?php + +/** + * empty_frame.tpl + * + * Template for showing a blank frame. + * + * @copyright © 1999-2007 The SquirrelMail Project Team + * @author Paul Lesneiwski <pa...@sq...> + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package plugins + * @subpackage preview_pane + * + */ + + +// retrieve the template vars +// +extract($t); + + +?><body> +</body> +</html> Added: trunk/squirrelmail/plugins/preview_pane/version =================================================================== --- trunk/squirrelmail/plugins/preview_pane/version (rev 0) +++ trunk/squirrelmail/plugins/preview_pane/version 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,2 @@ +Preview Pane +2.0-1.5.2 Modified: trunk/squirrelmail/templates/default_advanced/config.php =================================================================== --- trunk/squirrelmail/templates/default_advanced/config.php 2007-01-23 10:58:23 UTC (rev 12196) +++ trunk/squirrelmail/templates/default_advanced/config.php 2007-01-24 06:51:15 UTC (rev 12197) @@ -39,7 +39,7 @@ * will be disabled, and only those in $add_plugins will be enabled. * */ -$add_plugins = array(); +$add_plugins = array('preview_pane',); $remove_plugins = array(); Added: trunk/squirrelmail/templates/default_advanced/page_header.tpl =================================================================== --- trunk/squirrelmail/templates/default_advanced/page_header.tpl (rev 0) +++ trunk/squirrelmail/templates/default_advanced/page_header.tpl 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,114 @@ +<?php + +/** + * page_header.tpl + * + * Template to create the header for each page. + * + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id: page_header.tpl 12135 2007-01-15 08:27:10Z pdontthink $ + * @package squirrelmail + * @subpackage templates + */ + +/* retrieve the template vars */ +extract($t); + + +$current_folder_str = ''; +if ( $shortBoxName <> '' && strtolower( $shortBoxName ) <> 'none' ) { + $current_folder_str .= _("Current Folder") . ": <em>$shortBoxName </em>\n"; +} else { + $current_folder_str .= ' '; +} + +// Define our default link text. +$signout_link_default = _("Sign Out"); +$compose_link_default = _("Compose"); +$address_link_default = _("Addresses"); +$folders_link_default = _("Folders"); +$options_link_default = _("Options"); +$search_link_default = _("Search"); +$help_link_default = _("Help"); + +/* + * Create strings to use for links. If tempalte authors + * wish to use images instead, they may change the values + * below to img tags. + + * Example w/ image: + * $compose_str = '<img src="compose.png" border="0" ' . + * 'alt="'.$compose_link_default.'" ' . + * 'title="'.$compose_link_default.'" />'; + */ + +$signout_str = $signout_link_default; +$compose_str = $compose_link_default; +$address_str = $address_link_default; +$folders_str = $folders_link_default; +$options_str = $options_link_default; +$search_str = $search_link_default; +$help_str = $help_link_default; + +$compose_link = makeComposeLink ('src/compose.php?mailbox='.$urlMailbox.'&startMessage='.$startMessage, $compose_str); +$signout_link = makeInternalLink ('src/signout.php', $signout_str, $frame_top); +$address_link = makeInternalLink ('src/addressbook.php', $address_str); +$folders_link = makeInternalLink ('src/folders.php', $folders_str); +$search_link = makeInternalLink ('src/search.php?mailbox='.$urlMailbox, $search_str); +$options_link = makeInternalLink ('src/options.php', $options_str); +$help_link = makeInternalLink ('src/help.php', $help_str); + +?> +<body <?php echo $body_tag_js; ?>> +<?php + + /** if preview pane turned on, do not show menubar above message view */ + global $data_dir, $username, $PHP_SELF; + $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0); + $show_preview_pane = checkForJavascript() && $use_previewPane; + $current_page_is_read_body = (strpos($PHP_SELF, '/read_body.php') !== FALSE); + if (!$current_page_is_read_body || !$show_preview_pane) { + +?> +<div id="page_header"> +<a name="pagetop"></a> +<!-- Begin Header Navigation Table --> +<table class="table_empty" cellspacing="0"> + <tr> + <td class="sqm_currentFolder"> + <?php echo $current_folder_str; ?> + </td> + <td class="sqm_headerSignout"> + <?php echo $signout_link; ?> + </td> + </tr> + <tr> + <td class="sqm_topNavigation"<?php echo ($hide_sm_attributions ? ' colspan="2"' : ''); ?>> + <?php echo $compose_link; ?> + <?php echo $address_link; ?> + <?php echo $folders_link; ?> + <?php echo $options_link; ?> + <?php echo $search_link; ?> + <?php echo $help_link; ?> + <?php /* FIXME: no hooks in templates!! */ global $null; do_hook('menuline', $null); ?> + </td> + <?php if (!empty($sm_attribute_str)) + echo '<td class="sqm_providerInfo">' + . $sm_attribute_str + . "</td>\n"; ?> + </tr> +</table> +</div> +<br /> +<!-- End Header Navigation Table --> +<script type="text/javascript"> +<!-- + var delayed_page_load_uri = ''; + function delayed_page_load(page_uri) + { page_load_uri = page_uri; setTimeout('page_load()', 500); } + function page_load() + { document.location = page_load_uri; } +// --> +</script> +<?php } Added: trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl =================================================================== --- trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl (rev 0) +++ trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,187 @@ +<?php +/** + * read_menubar_buttons.tpl + * + * Tempalte for displaying the action buttons, e.g. Reply, Reply All, Forward, + * etc., while reading a message. When combined with the read_menubar_nav template, + * the entire menu bar is displayed. + * + * The following variables are available in this template: + * $nav_on_top - boolean TRUE if the navigation buttons are on top of the + * action buttons generated here. + * $prev_href - URL to move to the previous message. Empty if not avilable. + * $up_href - URL to move up in the message. Empty if not available. + * $next_href - URL to move to the next nessage. Empty when N/A. + * $del_prev_href - URL to delete this message and move to the next one. Empty if N/A. + * $del_next_href - URL to delete this message and move to the next one. Empty if N/A. + * $view_msg_href - URL to go back to the main message. Empty if N/A. + * $msg_list_href - URL to go to the message list. + * $search_href - URL to go back to the serach results. Empty if N/A. + * $form_extra - Extra elements required by the forms to delete, move or copy + * $compose_href - Base URL to forward, reply, etc. Note that a specific action + * must also be given by the form or in this URL. + * $on_click - Onclick event string for all buttons + * $forward_as_attachment_enabled - boolean TRUE if forwarding as attachments + * has been enabled. + * $can_resume_draft - boolean TRUE if the "resume draft" is legitimate for + * this message. + * $can_edit_as_new - boolean TRUE if the "reasume as new" action is legitimate + * for this message + * $mailboxes - array containing list of mailboxes available for move/copy action. + * $can_be_deleted - boolean TRUE if this message can be deleted. + * $can_be_moved - boolean TRUE if this message can be moved. + * $cab_be_copied - boolean TRUE if this message can be copied to another folder. + * $move_delete_form_action - the value for the ACTION attribute of forms to + * move, copy or delete a message + * $delete_form_extra - additional input elements needed by the DELETE form + * $move_form_extra - additional input elements needed by the MOVE form. + * $last_move_target - the last folder that a message was moved/copied to. + * + * + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id: read_menubar_buttons.tpl 11850 2006-10-06 21:57:26Z stevetruckstuff $ + * @package squirrelmail + * @subpackage templates + */ + +/** add required includes **/ + +/** extract template variables **/ +extract($t); + + +/*FIXME: This is a place where Marc's idea for putting all the buttons and + links and other widgets into an array is sorely needed instead of + hard-coding everything. Whomever implements that, PLEASE, PLEASE + look at how the preview pane plugin code is used here to change + some links and buttons and make sure your implementation can support + it (tip: it may or may not be OK to let a plugin do the modification + of the widgets, since a template set can turn on the needed plugin, + but that might not be the most clear way to solve said issue).*/ + + +/** preview pane prep */ +global $data_dir, $username, $base_uri; +$pp_refresh_message_list = getPref($data_dir, $username, 'pp_refresh_message_list', 1); +$use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0); +$show_preview_pane = checkForJavascript() && $use_previewPane; +$empty_frame_uri = $base_uri . 'plugins/preview_pane/empty_frame.php'; +if ($show_preview_pane) { ?> + <script> + <!-- + function refresh_message_list() + { parent.right.delayed_page_load("<?php echo $message_list_href; ?>"); } + // --> + </script> +<?php } + + +/** Begin template **/ +if ($nav_on_top) { + $table_class = 'bottom'; + $plugin_hook = 'read_body_menu_buttons_top'; +} else { + $table_class = 'top'; + $plugin_hook = 'read_body_menu_buttons_bottom'; +} +?> +<div class="readMenuBar"> +<table class="<?php echo $table_class; ?>" cellspacing="0"> + <tr class="buttons"> + <td class="buttons"> + <form name="composeForm" action="<?php echo $compose_href; ?>" <?php echo $form_extra; ?> > + <small> + <?php + if ($can_resume_draft) { + ?> + <input type="submit" name="smaction_draft" value="<?php echo _("Resume Draft"); ?>" <?php echo $button_onclick; ?> /> + <?php + } elseif ($can_edit_as_new) { + ?> + <input type="submit" name="smaction_edit_new" value="<?php echo _("Edit Message as New"); ?>" <?php echo $button_onclick; ?> /> + <?php + } + ?> + <input type="submit" name="smaction_reply" value="<?php echo _("Reply"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_reply_all" value="<?php echo _("Reply All"); ?>" <?php echo $button_onclick; ?> /> + | + <input type="submit" name="smaction_forward" value="<?php echo _("Forward"); ?>" <?php echo $button_onclick; ?> /> + <?php + if ($forward_as_attachment_enabled) { + ?> + <input type="checkbox" name="smaction_attache" id="smaction_attache"> + <label for="smaction_attache"><?php echo _("As Attachment"); ?></label> + <?php + } + ?> + </small> + </form> + | + <?php + if ($can_be_deleted) { + ?> + <form name="deleteMessageForm" action="<?php echo $move_delete_form_action; ?>" method="POST"> + <?php echo $delete_form_extra; ?> + <small> + <input type="submit" name="delete" value="<?php + +echo _("Delete") .'"'; + +/** if preview pane turned on with "always refresh message list", + refresh message list frame too, but only if we are in the bottom frame! */ +if ($show_preview_pane && $pp_refresh_message_list) + echo ' onclick="if (self.name == \'bottom\') { refresh_message_list(); } "'; + +echo ' />'; ?> + + <input type="checkbox" name="bypass_trash" id="bypass_trash"><label for="bypass_trash"><?php echo _("Bypass Trash"); ?></label> + </small> + </form> + <?php + } + ?> + <?php if(!empty($plugin_output[$plugin_hook])) echo $plugin_output[$plugin_hook]; ?> + </td> + <td class="move"> + <?php + if ($can_be_moved) { + ?> + <form name="moveMessageForm" action="<?php echo $move_delete_form_action; ?>" method="POST"> + <?php echo $move_form_extra; ?> + <small> + <?php echo _("Move To"); ?>: + <select name="targetMailbox"> + <?php + foreach ($mailboxes as $value=>$option) { + echo '<option value="'. $value .'"' . ($value==$last_move_target ? ' selected="selected"' : '').'>' . $option .'</option>'."\n"; + } + ?> + </select> + <input type="submit" name="moveButton" value="<?php + +echo _("Move") . '"'; + +/** if preview pane turned on with "always refresh message list", + refresh message list frame too, but only if we are in the bottom frame! */ +if ($show_preview_pane && $pp_refresh_message_list) + echo ' onclick="if (self.name == \'bottom\') { refresh_message_list(); } "'; + +echo ' />'; + + + if ($can_be_copied) { + ?> + <input type="submit" name="copyButton" value="<?php echo _("Copy"); ?>" /> + <?php + } + ?> + </small> + </form> + <?php + } + ?> + </td> + </tr> +</table> +</div> Added: trunk/squirrelmail/templates/default_advanced/read_menubar_nav.tpl =================================================================== --- trunk/squirrelmail/templates/default_advanced/read_menubar_nav.tpl (rev 0) +++ trunk/squirrelmail/templates/default_advanced/read_menubar_nav.tpl 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,212 @@ +<?php +/** + * read_menubar_nav.tpl + * + * Template to generate the nav buttons while reading a message, e.g. "Previous", + * "Next", "Delete & Previous", etc. When used in conjunction with the + * read_menubar_nav tempalte, the entire menubar is generated. + * + * The following variables are available in this template: + * $nav_on_top - boolean TRUE if the navigation buttons are on top of the + * action buttons generated here. + * $prev_href - URL to move to the previous message. Empty if not avilable. + * $up_href - URL to move up in the message. Empty if not available. + * $next_href - URL to move to the next nessage. Empty when N/A. + * $del_prev_href - URL to delete this message and move to the next one. Empty if N/A. + * $del_next_href - URL to delete this message and move to the next one. Empty if N/A. + * $view_msg_href - URL to go back to the main message. Empty if N/A. + * $msg_list_href - URL to go to the message list. + * $search_href - URL to go back to the serach results. Empty if N/A. + * $form_extra - Extra elements required by the forms to delete, move or copy + * $compose_href - Base URL to forward, reply, etc. Note that a specific action + * must also be given by the form or in this URL. + * $on_click - Onclick event string for all buttons + * $forward_as_attachment_enabled - boolean TRUE if forwarding as attachments + * has been enabled. + * $can_resume_draft - boolean TRUE if the "resume draft" is legitimate for + * this message. + * $can_edit_as_new - boolean TRUE if the "reasume as new" action is legitimate + * for this message + * $mailboxes - array containing list of mailboxes available for move/copy action. + * $can_be_deleted - boolean TRUE if this message can be deleted. + * $can_be_moved - boolean TRUE if this message can be moved. + * $cab_be_copied - boolean TRUE if this message can be copied to another folder. + * $move_delete_form_action - the value for the ACTION attribute of forms to + * move, copy or delete a message + * $delete_form_extra - additional input elements needed by the DELETE form + * $move_form_extra - additional input elements needed by the MOVE form. + * $last_move_target - the last folder that a message was moved/copied to. + * * + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id: read_menubar_nav.tpl 11850 2006-10-06 21:57:26Z stevetruckstuff $ + * @package squirrelmail + * @subpackage templates + */ + +/** add required includes **/ + +/** extract template variables **/ +extract($t); + + +/*FIXME: This is a place where Marc's idea for putting all the buttons and + links and other widgets into an array is sorely needed instead of + hard-coding everything. Whomever implements that, PLEASE, PLEASE + look at how the preview pane plugin code is used here to change + some links and buttons and make sure your implementation can support + it (tip: it may or may not be OK to let a plugin do the modification + of the widgets, since a template set can turn on the needed plugin, + but that might not be the most clear way to solve said issue).*/ + + +/** preview pane prep */ +global $data_dir, $username, $base_uri; +$pp_refresh_message_list = getPref($data_dir, $username, 'pp_refresh_message_list', 1); +$use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0); +$show_preview_pane = checkForJavascript() && $use_previewPane; +$empty_frame_uri = $base_uri . 'plugins/preview_pane/empty_frame.php'; +if ($show_preview_pane) { ?> + <script> + <!-- + function refresh_message_list() + { parent.right.delayed_page_load("<?php echo $message_list_href; ?>"); } + // --> + </script> +<?php } + + +/** Begin template **/ + +if ($nav_on_top) { + $table_class = 'top'; + $plugin_hook = 'read_body_menu_nav_top'; +} else { + $table_class = 'bottom'; + $plugin_hook = 'read_body_menu_nav_bottom'; +} +?> +<div class="readMenuBar"> +<table cellspacing="0" class="<?php echo $table_class; ?>"> + <tr class="nav"> + <td class="nav"> + <small> + [ + <?php + if (empty($prev_href)) { + echo _("Previous"); + } else { + ?> + <a href="<?php echo $prev_href; ?>"<?php + +/** if preview pane turned on with "always refresh message list", + refresh message list frame too, but only if we are in the bottom frame! */ +if ($show_preview_pane && $pp_refresh_message_list) + echo ' onclick="if (self.name == \'bottom\') { refresh_message_list(); } "'; + + +echo '>' . _("Previous"); ?></a> + <?php + } + ?> | + <?php + if (empty($up_href)) { + # Do nothing + } else { + ?> + <a href="<?php echo $up_href; ?>"><?php echo _("Up"); ?></a> | + <?php + } + + if (empty($next_href)) { + echo _("Next"); + } else { + ?> + <a href="<?php echo $next_href; ?>"<?php + +/** if preview pane turned on with "always refresh message list", + refresh message list frame too, but only if we are in the bottom frame! */ +if ($show_preview_pane && $pp_refresh_message_list) + echo ' onclick="if (self.name == \'bottom\') { refresh_message_list(); } "'; + + +echo '>' . _("Next"); ?></a> + <?php + } + ?> + ] + + <?php + if (!empty($del_prev_href) || !empty($del_next_href)) { + ?> + [ + <?php + if (empty($del_prev_href)) { + echo _("Delete & Previous"); + } else { + ?> + <a href="<?php echo $del_prev_href; ?>"<?php + +/** if preview pane turned on with "always refresh message list", + refresh message list frame too, but only if we are in the bottom frame! */ +if ($show_preview_pane && $pp_refresh_message_list) + echo ' onclick="if (self.name == \'bottom\') { refresh_message_list(); } "'; + + +echo '>' . _("Delete & Previous"); ?></a> + <?php + } + ?> + | + <?php + if (empty($del_next_href)) { + echo _("Delete & Next"); + } else { + ?> + <a href="<?php echo $del_next_href; ?>"<?php + +/** if preview pane turned on with "always refresh message list", + refresh message list frame too, but only if we are in the bottom frame! */ +if ($show_preview_pane && $pp_refresh_message_list) + echo ' onclick="if (self.name == \'bottom\') { refresh_message_list(); } "'; + + +echo '>' . _("Delete & Next"); ?></a> + <?php + } + ?> + ] + + <?php + } + + if (!empty($view_msg_href)) { + ?> + [ <a href="<?php echo $view_msg_href; ?>"><?php echo _("View Message"); ?></a> ] + + <?php + } + ?> + [ <a href="<?php echo $message_list_href; ?>"<?php + +/** if preview pane turned on, retarget to message list frame & clear + bottom frame, but only if we are in the bottom frame! */ +if ($show_preview_pane) + echo ' onclick="if (self.name == \'bottom\') { parent.right.document.location=\'' . $message_list_href . '\'; document.location=\'' . $empty_frame_uri . '\'; return false; } "'; + + +echo '>' . _("Message List"); ?></a> + <?php + if (!empty($search_href)) { + ?> + | <a href="<?php echo $search_href; ?>"><?php echo _("Search Results"); ?></a> + <?php + } + ?> + ] + </small> + <?php if(!empty($plugin_output[$plugin_hook])) echo $plugin_output[$plugin_hook]; ?> + </td> + </tr> +</table> +</div> Added: trunk/squirrelmail/templates/default_advanced/webmail.tpl =================================================================== --- trunk/squirrelmail/templates/default_advanced/webmail.tpl (rev 0) +++ trunk/squirrelmail/templates/default_advanced/webmail.tpl 2007-01-24 06:51:15 UTC (rev 12197) @@ -0,0 +1,70 @@ +<?php +/** + * webmail.tpl + * + * Template for rendering the main squirrelmail window + * + * The following variables are available in this template: + * $nav_size - integer width of the navigation frame + * $nav_on_left - boolean TRUE if the mavigation from should be on the + * left side of the page. FALSE if it is on the right. + * + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id: webmail.tpl 12092 2007-01-07 15:44:12Z kink $ + * @package squirrelmail + * @subpackage templates + */ + +/** add required includes */ + + +/** extract variables */ +extract($t); + +/** set up for adding preview pane if turned on */ +global $data_dir, $username; +$use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0); +$show_preview_pane = checkForJavascript() && $use_previewPane; +if ($show_preview_pane) { + $previewPane_size = getPref($data_dir, $username, 'previewPane_size', 300); + $previewPane_vertical_split = getPref($data_dir, $username, 'previewPane_vertical_split', 0); + if ($previewPane_vertical_split) + $split = 'cols'; + else + $split = 'rows'; +} + + +$output = ''; +if ($nav_on_left) { + $output .= "<frameset cols=\"$nav_size, *\" id=\"fs1\">\n"; +} +else { + $output .= "<frameset cols=\"*, $nav_size\" id=\"fs1\">\n"; +} + + +$left_frame = '<frame src="left_main.php" name="left" frameborder="1" title="'. _("Folder List") .'" />'."\n"; + + +/** use preview pane? */ +if ($show_preview_pane) { + $right_frame = "<frameset $split=\"*, $previewPane_size\" id=\"fs2\">\n" + . "<frame src=\"$right_frame_url\" name=\"right\" title=\"" . _("Message List") . "\" frameborder=\"1\" />\n" + . "<frame src=\"" . SM_PATH . "plugins/preview_pane/empty_frame.php\" name=\"bottom\" title=\"" . _("Message Preview") . "\" frameborder=\"1\" />\n" + . "</frameset>\n"; + +/** no preview pane */ +} else { + $right_frame = '<frame src="'.$right_frame_url.'" name="right" frameborder="1" title="'. _("Message List") .'" />'."\n"; +} + + +if ($nav_on_left) { + $output .= $left_frame . $right_frame; +} else { + $output .= $right_frame . $left_frame; +} + +echo $output ."\n</frameset>\n</html>"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-01-24 14:50:32
|
Revision: 12200 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12200&view=rev Author: kink Date: 2007-01-24 06:50:31 -0800 (Wed, 24 Jan 2007) Log Message: ----------- misspelled reply_to and in_reply_to attributes Modified Paths: -------------- trunk/squirrelmail/class/mime/Message.class.php trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/class/mime/Message.class.php =================================================================== --- trunk/squirrelmail/class/mime/Message.class.php 2007-01-24 14:49:10 UTC (rev 12199) +++ trunk/squirrelmail/class/mime/Message.class.php 2007-01-24 14:50:31 UTC (rev 12200) @@ -615,17 +615,17 @@ if (count($arg_a) > 9) { $d = strtr($arg_a[0], array(' ' => ' ')); $d = explode(' ', $d); - if (!$arg_a[1]) $arg_a[1] = _("(no subject)"); + if (!$arg_a[1]) $arg_a[1] = _("(no subject)"); $hdr->date = getTimeStamp($d); /* argument 1: date */ $hdr->subject = $arg_a[1]; /* argument 2: subject */ $hdr->from = is_array($arg_a[2]) ? $arg_a[2][0] : ''; /* argument 3: from */ $hdr->sender = is_array($arg_a[3]) ? $arg_a[3][0] : ''; /* argument 4: sender */ - $hdr->replyto = is_array($arg_a[4]) ? $arg_a[4][0] : ''; /* argument 5: reply-to */ + $hdr->reply_to = is_array($arg_a[4]) ? $arg_a[4][0] : ''; /* argument 5: reply-to */ $hdr->to = $arg_a[5]; /* argument 6: to */ $hdr->cc = $arg_a[6]; /* argument 7: cc */ $hdr->bcc = $arg_a[7]; /* argument 8: bcc */ - $hdr->inreplyto = $arg_a[8]; /* argument 9: in-reply-to */ + $hdr->in_reply_to = $arg_a[8]; /* argument 9: in-reply-to */ $hdr->message_id = $arg_a[9]; /* argument 10: message-id */ } return $hdr; Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2007-01-24 14:49:10 UTC (rev 12199) +++ trunk/squirrelmail/src/compose.php 2007-01-24 14:50:31 UTC (rev 12200) @@ -147,8 +147,8 @@ /** * 1) Remove the addresses we'll be sending the message 'to' */ - if (isset($header->replyto)) { - $excl_ar = $header->getAddr_a('replyto'); + if (isset($header->reply_to)) { + $excl_ar = $header->getAddr_a('reply_to'); } /** * 2) Remove our identities from the CC list (they still can be in the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2007-01-25 02:02:26
|
Revision: 12202 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12202&view=rev Author: pdontthink Date: 2007-01-24 18:02:25 -0800 (Wed, 24 Jan 2007) Log Message: ----------- Allow admin to disable secure-only cookie transmission Modified Paths: -------------- trunk/squirrelmail/config/conf.pl trunk/squirrelmail/functions/global.php Modified: trunk/squirrelmail/config/conf.pl =================================================================== --- trunk/squirrelmail/config/conf.pl 2007-01-25 01:22:33 UTC (rev 12201) +++ trunk/squirrelmail/config/conf.pl 2007-01-25 02:02:25 UTC (rev 12202) @@ -471,6 +471,7 @@ $icon_theme_def = '' if ( !$icon_theme_def ); $disable_plugins = 'false' if ( !$disable_plugins ); $disable_plugins_user = '' if ( !$disable_plugins_user ); +$only_secure_cookies = 'true' if ( !$only_secure_cookies ); if ( $ARGV[0] eq '--install-plugin' ) { print "Activating plugin " . $ARGV[1] . "\n"; @@ -657,24 +658,25 @@ print "R Return to Main Menu\n"; } elsif ( $menu == 4 ) { print $WHT. "General Options\n" . $NRM; - print "1. Data Directory : $WHT$data_dir$NRM\n"; - print "2. Attachment Directory : $WHT$attachment_dir$NRM\n"; - print "3. Directory Hash Level : $WHT$dir_hash_level$NRM\n"; - print "4. Default Left Size : $WHT$default_left_size$NRM\n"; - print "5. Usernames in Lowercase : $WHT$force_username_lowercase$NRM\n"; - print "6. Allow use of priority : $WHT$default_use_priority$NRM\n"; - print "7. Hide SM attributions : $WHT$hide_sm_attributions$NRM\n"; - 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 " 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"; - print "12. Allow server charset search : $WHT$allow_charset_search$NRM\n"; - print "13. Allow advanced search : $WHT$allow_advanced_search$NRM\n"; - print "14. PHP session name : $WHT$session_name$NRM\n"; - print "15. Time zone configuration : $WHT$time_zone_type$NRM\n"; - print "16. Location base : $WHT$config_location_base$NRM\n"; + print "1. Data Directory : $WHT$data_dir$NRM\n"; + print "2. Attachment Directory : $WHT$attachment_dir$NRM\n"; + print "3. Directory Hash Level : $WHT$dir_hash_level$NRM\n"; + print "4. Default Left Size : $WHT$default_left_size$NRM\n"; + print "5. Usernames in Lowercase : $WHT$force_username_lowercase$NRM\n"; + print "6. Allow use of priority : $WHT$default_use_priority$NRM\n"; + print "7. Hide SM attributions : $WHT$hide_sm_attributions$NRM\n"; + 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 " 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"; + print "12. Allow server charset search : $WHT$allow_charset_search$NRM\n"; + print "13. Allow advanced search : $WHT$allow_advanced_search$NRM\n"; + print "14. PHP session name : $WHT$session_name$NRM\n"; + print "15. Time zone configuration : $WHT$time_zone_type$NRM\n"; + print "16. Location base : $WHT$config_location_base$NRM\n"; + print "17. Only secure cookies if poss. : $WHT$only_secure_cookies$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 5 ) { @@ -920,6 +922,7 @@ elsif ( $command == 14 ) { $session_name = command317(); } elsif ( $command == 15 ) { $time_zone_type = command318(); } elsif ( $command == 16 ) { $config_location_base = command_config_location_base(); } + elsif ( $command == 17 ) { $only_secure_cookies = command319(); } } elsif ( $menu == 5 ) { if ( $command == 1 ) { $use_icons = commandB3(); } # elsif ( $command == 3 ) { $icon_theme_def = commandB7(); } @@ -2623,7 +2626,33 @@ return $config_location_base; } +# only_secure_cookies (since 1.5.2) +sub command319 { + print "This option allows you to specify that if a user session is initiated\n"; + print "under a secure (HTTPS, SSL-encrypted) connection, the cookies given to\n"; + print "the browser will ONLY be transmitted via a secure connection henceforth.\n\n"; + print "Generally this is a Good Thing, and should NOT be disabled. However,\n"; + print "if you intend to use the Secure Login or Show SSL Link plugins to\n"; + print "encrypt the user login, but not the rest of the SquirrelMail session,\n"; + print "this can be turned off. Think twice before doing so.\n"; + print "\n"; + if ( lc($only_secure_cookies) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Transmit cookies only on secure connection when available? (y/n) [$WHT$default_value$NRM]: $WHT"; + $only_secure_cookies = <STDIN>; + if ( ( $only_secure_cookies =~ /^y\n/i ) || ( ( $only_secure_cookies =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $only_secure_cookies = 'true'; + } else { + $only_secure_cookies = 'false'; + } + return $only_secure_cookies; +} + + sub command_userThemes { print "\nDefine the user themes that you wish to use. If you have added\n"; print "a theme of your own, just follow the instructions (?) about\n"; @@ -4614,17 +4643,19 @@ print CF "\$no_list_for_subscribe = $no_list_for_subscribe;\n"; # string - print CF "\$smtp_auth_mech = '$smtp_auth_mech';\n"; - print CF "\$smtp_sitewide_user = '". quote_single($smtp_sitewide_user) ."';\n"; - print CF "\$smtp_sitewide_pass = '". quote_single($smtp_sitewide_pass) ."';\n"; + print CF "\$smtp_auth_mech = '$smtp_auth_mech';\n"; + print CF "\$smtp_sitewide_user = '". quote_single($smtp_sitewide_user) ."';\n"; + print CF "\$smtp_sitewide_pass = '". quote_single($smtp_sitewide_pass) ."';\n"; # string - print CF "\$imap_auth_mech = '$imap_auth_mech';\n"; + print CF "\$imap_auth_mech = '$imap_auth_mech';\n"; # boolean - print CF "\$use_imap_tls = $use_imap_tls;\n"; + print CF "\$use_imap_tls = $use_imap_tls;\n"; # boolean - print CF "\$use_smtp_tls = $use_smtp_tls;\n"; + print CF "\$use_smtp_tls = $use_smtp_tls;\n"; # string - print CF "\$session_name = '$session_name';\n"; + print CF "\$session_name = '$session_name';\n"; + # boolean + print CF "\$only_secure_cookies = $only_secure_cookies;\n"; print CF "\n"; Modified: trunk/squirrelmail/functions/global.php =================================================================== --- trunk/squirrelmail/functions/global.php 2007-01-25 01:22:33 UTC (rev 12201) +++ trunk/squirrelmail/functions/global.php 2007-01-25 02:02:25 UTC (rev 12202) @@ -385,6 +385,12 @@ if ($sName && isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']) { $bSecure = true; } + + // admin config can override the restriction of secure-only cookies + global $only_secure_cookies; + if (!$only_secure_cookies) + $bSecure = false; + 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. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2007-02-05 06:06:41
|
Revision: 12221 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12221&view=rev Author: pdontthink Date: 2007-02-04 22:06:40 -0800 (Sun, 04 Feb 2007) Log Message: ----------- New get_plugin_version() function, and a couple places to use it. Modified Paths: -------------- trunk/squirrelmail/functions/plugin.php trunk/squirrelmail/plugins/bug_report/system_specs.php trunk/squirrelmail/src/configtest.php Modified: trunk/squirrelmail/functions/plugin.php =================================================================== --- trunk/squirrelmail/functions/plugin.php 2007-02-05 03:43:56 UTC (rev 12220) +++ trunk/squirrelmail/functions/plugin.php 2007-02-05 06:06:40 UTC (rev 12221) @@ -272,6 +272,71 @@ } /** + * Get a plugin's version. + * + * Determines and returns a plugin's version. + * + * By default, the desired plugin must be currently + * activated, and if it is not, this function will + * return FALSE. By overriding the default value + * of $force_inclusion, this function will attempt + * to grab versioning information from the given + * plugin even if it is not activated (plugin still + * has to be unpackaged and set in place in the + * plugins directory). Use with care - some plugins + * might break SquirrelMail when this is used. + * + * @since 1.5.2 + * + * @param string plugin_name name of the plugin to + * check; must precisely + * match the plugin + * directory name + * @param bool force_inclusion try to get version info + * for plugins not activated? + * (default FALSE) + * + * @return mixed The plugin version string if found, otherwise, + * boolean FALSE is returned indicating that no + * version information could be found for the plugin. + * + */ +function get_plugin_version($plugin_name, $force_inclusion = FALSE) +{ + + $info_function = $plugin_name . '_info'; + $version_function = $plugin_name . '_version'; + $plugin_info = array(); + $plugin_version = FALSE; + + + // first attempt to find the plugin info function, wherein + // the plugin version should be available + // + if (function_exists($info_function)) + $plugin_info = $info_function(); + else if ($force_inclusion + && file_exists(SM_PATH . 'plugins/' . $plugin_name . '/setup.php')) + { + include_once(SM_PATH . 'plugins/' . $plugin_name . '/setup.php'); + if (function_exists($info_function)) + $plugin_info = $info_function(); + } + if (!empty($plugin_info['version'])) + $plugin_version = $plugin_info['version']; + + + // otherwise, look for older version function + // + if (!$plugin_version && function_exists($version_function)) + $plugin_version = $version_function(); + + + return $plugin_version; + +} + +/** * Check a plugin's version. * * Returns TRUE if the given plugin is installed, @@ -324,34 +389,7 @@ $force_inclusion = FALSE) { - $info_function = $plugin_name . '_info'; - $version_function = $plugin_name . '_version'; - $plugin_info = array(); - $plugin_version = FALSE; - - - // first attempt to find the plugin info function, wherein - // the plugin version should be available - // - if (function_exists($info_function)) - $plugin_info = $info_function(); - else if ($force_inclusion - && file_exists(SM_PATH . 'plugins/' . $plugin_name . '/setup.php')) - { - include_once(SM_PATH . 'plugins/' . $plugin_name . '/setup.php'); - if (function_exists($info_function)) - $plugin_info = $info_function(); - } - if (!empty($plugin_info['version'])) - $plugin_version = $plugin_info['version']; - - - // otherwise, look for older version function - // - if (!$plugin_version && function_exists($version_function)) - $plugin_version = $version_function(); - - + $plugin_version = get_plugin_version($plugin_name, $force_inclusion); if (!$plugin_version) return FALSE; Modified: trunk/squirrelmail/plugins/bug_report/system_specs.php =================================================================== --- trunk/squirrelmail/plugins/bug_report/system_specs.php 2007-02-05 03:43:56 UTC (rev 12220) +++ trunk/squirrelmail/plugins/bug_report/system_specs.php 2007-02-05 06:06:40 UTC (rev 12221) @@ -57,39 +57,13 @@ if (is_array($plugins) && $plugins!=array()) { foreach ($plugins as $key => $value) { if ($key != 0 || $value != '') { - $str .= " * $key = $value"; - // add plugin version - $version_found = FALSE; - if (function_exists($value . '_info')) { - $info = call_user_func($value . '_info'); - if (!empty($info['version'])) { - $str .= ' ' . $info['version']; - $version_found = TRUE; - } - } - if (!$version_found && function_exists($value . '_version')) { - $str.= ' ' . call_user_func($value . '_version'); - } - $str.="\n"; + $str .= " * $key = $value " . get_plugin_version($value, TRUE) . "\n"; } } - // compatibility plugin can be used without need to enable it in sm config + // compatibility plugin can be used without needing to enable it in sm config if (file_exists(SM_PATH . 'plugins/compatibility/setup.php') && ! in_array('compatibility',$plugins)) { - $str.= ' * compatibility'; - include_once(SM_PATH . 'plugins/compatibility/setup.php'); - $version_found = FALSE; - if (function_exists('compatibility_info')) { - $info = compatibility_info(); - if (!empty($info['version'])) { - $str .= ' ' . $info['version']; - $version_found = TRUE; - } - } - if (!$version_found && function_exists('compatibility_version')) { - $str.= ' ' . compatibility_version(); - } - $str.="\n"; + $str.= ' * compatibility ' . get_plugin_version('compatibility', TRUE) . "\n"; } } if ($str == '') { Modified: trunk/squirrelmail/src/configtest.php =================================================================== --- trunk/squirrelmail/src/configtest.php 2007-02-05 03:43:56 UTC (rev 12220) +++ trunk/squirrelmail/src/configtest.php 2007-02-05 06:06:40 UTC (rev 12221) @@ -354,15 +354,12 @@ * Print plugin versions */ /* DISABLED FOR NOW: takes a lot of screen real estate and not all plugins currently - support the <plugin>_info() function + support the <plugin>_info() or <plugin>_version() functions echo $IND . "Plugin versions...<br />\n"; foreach ($plugins as $name) { - $function = $name . '_info'; - if (function_exists($function)) { - $info = $function(); - if (!empty($info['version'])) - echo $IND . $IND . $name . ' ' . $info['version'] . "<br />\n"; - } + $plugin_version = get_plugin_version($name); + if (!empty($plugin_version)) + echo $IND . $IND . $name . ' ' . $plugin_version . "<br />\n"; } */ /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2007-02-06 09:55:50
|
Revision: 12231 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12231&view=rev Author: pdontthink Date: 2007-02-06 01:55:48 -0800 (Tue, 06 Feb 2007) Log Message: ----------- Pass compose form attributes to template separately, otherwise, is same as constructing arbitrary HTML in the core Modified Paths: -------------- trunk/squirrelmail/src/read_body.php trunk/squirrelmail/templates/default/read_menubar_buttons.tpl trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl Modified: trunk/squirrelmail/src/read_body.php =================================================================== --- trunk/squirrelmail/src/read_body.php 2007-02-06 09:18:41 UTC (rev 12230) +++ trunk/squirrelmail/src/read_body.php 2007-02-06 09:55:48 UTC (rev 12231) @@ -553,7 +553,7 @@ // Start form for reply/reply all/forward.. $target = ''; $on_click=''; - $method='method="post" '; + $method='post'; $onsubmit=''; if ($compose_new_win == '1') { if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) { @@ -565,10 +565,10 @@ if ( checkForJavascript() ) { $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form,'. $compose_width .',' . $compose_height .')"'; $comp_uri = 'javascript:void(0)'; - $method='method="get" '; - $onsubmit = 'onsubmit="return false" '; + $method='get'; + $onsubmit = 'return false'; } else { - $target = 'target="_blank"'; + $target = '_blank'; } } @@ -584,7 +584,10 @@ $oTemplate->assign('message_list_href', $msg_list_href); $oTemplate->assign('search_href', $search_href); - $oTemplate->assign('form_extra', $method . $target . $onsubmit); + $oTemplate->assign('form_extra', ''); + $oTemplate->assign('form_method', $method); + $oTemplate->assign('form_target', $target); + $oTemplate->assign('form_onsubmit', $onsubmit); $oTemplate->assign('compose_href', $comp_uri); $oTemplate->assign('button_onclick', $on_click); $oTemplate->assign('forward_as_attachment_enabled', $enable_forward_as_attachment==1); Modified: trunk/squirrelmail/templates/default/read_menubar_buttons.tpl =================================================================== --- trunk/squirrelmail/templates/default/read_menubar_buttons.tpl 2007-02-06 09:18:41 UTC (rev 12230) +++ trunk/squirrelmail/templates/default/read_menubar_buttons.tpl 2007-02-06 09:55:48 UTC (rev 12231) @@ -17,7 +17,10 @@ * $view_msg_href - URL to go back to the main message. Empty if N/A. * $msg_list_href - URL to go to the message list. * $search_href - URL to go back to the serach results. Empty if N/A. - * $form_extra - Extra elements required by the forms to delete, move or copy + * $form_extra - Extra elements that will be added to the <form> tag verbatim + * $form_method - The value of the <form>'s method attribute (optional, may be blank) + * $form_target - The value of the <form>'s target attribute (optional, may be blank) + * $form_onsubmit - The value of the <form>'s onsubmit handler (optional, may be blank) * $compose_href - Base URL to forward, reply, etc. Note that a specific action * must also be given by the form or in this URL. * $on_click - Onclick event string for all buttons @@ -50,6 +53,17 @@ /** extract template variables **/ extract($t); +/*FIXME: This is a place where Marc's idea for putting all the buttons and + links and other widgets into an array is sorely needed instead of + hard-coding everything. Whomever implements that, PLEASE, PLEASE + look at how the preview pane plugin code is used in this same template + file for the *default_advanced* set to change some links and buttons + and make sure your implementation can support it (tip: it may or may + not be OK to let a plugin do the modification of the widgets, since + a template set can turn on the needed plugin, but that might not be + the most clear way to solve said issue).*/ + + /** Begin template **/ if ($nav_on_top) { $table_class = 'bottom'; @@ -63,7 +77,12 @@ <table class="<?php echo $table_class; ?>" cellspacing="0"> <tr class="buttons"> <td class="buttons"> - <form name="composeForm" action="<?php echo $compose_href; ?>" <?php echo $form_extra; ?> > + <form name="composeForm" action="<?php + echo $compose_href . '" ' + . (!empty($form_method) ? 'method="' . $form_method . '" ' : '') + . (!empty($form_target) ? 'target="' . $form_target . '" ' : '') + . (!empty($form_onsubmit) ? 'onsubmit="' . $form_onsubmit . '" ' : '') + . $form_extra; ?> > <small> <?php if ($can_resume_draft) { Modified: trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl =================================================================== --- trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl 2007-02-06 09:18:41 UTC (rev 12230) +++ trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl 2007-02-06 09:55:48 UTC (rev 12231) @@ -17,7 +17,10 @@ * $view_msg_href - URL to go back to the main message. Empty if N/A. * $msg_list_href - URL to go to the message list. * $search_href - URL to go back to the serach results. Empty if N/A. - * $form_extra - Extra elements required by the forms to delete, move or copy + * $form_extra - Extra elements that will be added to the <form> tag verbatim + * $form_method - The value of the <form>'s method attribute (optional, may be blank) + * $form_target - The value of the <form>'s target attribute (optional, may be blank) + * $form_onsubmit - The value of the <form>'s onsubmit handler (optional, may be blank) * $compose_href - Base URL to forward, reply, etc. Note that a specific action * must also be given by the form or in this URL. * $on_click - Onclick event string for all buttons @@ -90,7 +93,12 @@ <table class="<?php echo $table_class; ?>" cellspacing="0"> <tr class="buttons"> <td class="buttons"> - <form name="composeForm" action="<?php echo $compose_href; ?>" <?php echo $form_extra; ?> > + <form name="composeForm" action="<?php + echo $compose_href . '" ' + . (!empty($form_method) ? 'method="' . $form_method . '" ' : '') + . (!empty($form_target) ? 'target="' . $form_target . '" ' : '') + . (!empty($form_onsubmit) ? 'onsubmit="' . $form_onsubmit . '" ' : '') + . $form_extra; ?> > <small> <?php if ($can_resume_draft) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2007-02-07 20:34:40
|
Revision: 12239 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12239&view=rev Author: pdontthink Date: 2007-02-07 12:34:28 -0800 (Wed, 07 Feb 2007) Log Message: ----------- Add body tag template; stop outputting body tags directly from core (there are still a couple places that need to be updated to use this) Modified Paths: -------------- trunk/squirrelmail/functions/html.php trunk/squirrelmail/functions/page_header.php Added Paths: ----------- trunk/squirrelmail/templates/default/body.tpl Modified: trunk/squirrelmail/functions/html.php =================================================================== --- trunk/squirrelmail/functions/html.php 2007-02-07 09:00:49 UTC (rev 12238) +++ trunk/squirrelmail/functions/html.php 2007-02-07 20:34:28 UTC (rev 12239) @@ -202,9 +202,42 @@ /** + * Generates an opening body tag + * + * @param string $onload Body onload JavaScript handler code + * (OPTIONAL; default not used) + * @param string $class The CSS class name (OPTIONAL; default + * not used) + * @param array $aAttribs Any extra attributes: this must be an + * associative array, where keys will be + * added as the attribute name, and values + * (which are optional - should be null if + * none should be used) will be placed in + * double quotes (pending template implementation) + * as the attribute value (OPTIONAL; default empty). + * + * @return string The desired body tag. + * + * @since 1.5.2 + * + */ +function create_body($onload='', $class='', $aAttribs=array()) { + + global $oTemplate; + + $oTemplate->assign('onload', $onload); + $oTemplate->assign('class', $class); + + $oTemplate->assign('aAttribs', $aAttribs); + + return $oTemplate->fetch('body.tpl'); + +} + + +/** * Generates html tags -//FIXME: this should not be used anywhere in the core, or we should -// convert this to use templates. We sould not be assuming HTML output. +//FIXME: This should not be used anywhere in the core, or we should convert this to use templates. We sould not be assuming HTML output. * * @param string $tag Tag to output * @param string $val Value between tags @@ -282,14 +315,19 @@ /** * handy function to set url vars +//FIXME: You call this documentation? :-) What does "set url vars" mean? Looks like it might take a fully-formed URI (possibly with a query string) and adds a variable/value pair to it(?)... Does $link work on only the var being added or the whole URI? * * especially useful when $url = $PHP_SELF + * * @param string $url url that must be modified * @param string $var variable name * @param string $val variable value * @param boolean $link controls sanitizing of ampersand in urls (since 1.3.2) + * * @return string $url modified url + * * @since 1.3.0 + * */ function set_url_var($url, $var, $val=0, $link=true) { $k = ''; Modified: trunk/squirrelmail/functions/page_header.php =================================================================== --- trunk/squirrelmail/functions/page_header.php 2007-02-07 09:00:49 UTC (rev 12238) +++ trunk/squirrelmail/functions/page_header.php 2007-02-07 20:34:28 UTC (rev 12239) @@ -188,6 +188,7 @@ $provider_name, $provider_uri, $startMessage, $action, $oTemplate, $org_title, $base_uri; +//FIXME: $sBodyTag should be turned into $sOnload and should only contain the contents of the onload attribute (not the attribute name nor any quotes).... only question is if anyone was using $sBodyTag for anything but onload event handlers? (see function compose_Header() below for how to fix it once we confirm it can be changed) if (empty($sBodyTagJs)) { if (strpos($action, 'reply') !== FALSE && $reply_focus) { if ($reply_focus == 'select') @@ -268,24 +269,25 @@ * @param array color the array of theme colors * @param string mailbox the current mailbox name to display * @param string sHeaderJs javascipt code to be inserted in a script block in the header - * @param string sBodyTagJs js events to be inserted in the body tag + * @param string sOnload JavaScript code to be added inside the body's onload handler + * as of 1.5.2, this replaces $sBodyTagJs argument * @return void */ -function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') { +function compose_Header($color, $mailbox, $sHeaderJs='', $sOnload = '') { global $reply_focus, $action, $oTemplate; - if (empty($sBodyTagJs)) { + if (empty($sOnload)) { if (strpos($action, 'reply') !== FALSE && $reply_focus) { - if ($reply_focus == 'select') - $sBodyTagJs = 'onload="checkForm(\'select\');"'; - else if ($reply_focus == 'focus') - $sBodyTagJs = 'onload="checkForm(\'focus\');"'; - else if ($reply_focus != 'none') - $sBodyTagJs = 'onload="checkForm();"'; + if ($reply_focus == 'select') + $sOnload = 'checkForm(\'select\');'; + else if ($reply_focus == 'focus') + $sOnload = 'checkForm(\'focus\');'; + else if ($reply_focus != 'none') + $sOnload = 'checkForm();'; } else - $sBodyTagJs = 'onload="checkForm();"'; + $sOnload = 'checkForm();'; } @@ -313,6 +315,12 @@ displayHtmlHeader(_("Compose")); $onload = ''; } -// FIXME: should let the template echo all these kinds of things - echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $sBodyTagJs>\n\n"; + +// FIXME: change the colorization attributes below to a CSS class! + $class = ''; + $aAttribs = array('text' => $color[8], 'bgcolor' => $color[4], + 'link' => $color[7], 'vlink' => $color[7], + 'alink' => $color[7]); + echo create_body($sOnload, $class, $aAttribs); + } Added: trunk/squirrelmail/templates/default/body.tpl =================================================================== --- trunk/squirrelmail/templates/default/body.tpl (rev 0) +++ trunk/squirrelmail/templates/default/body.tpl 2007-02-07 20:34:28 UTC (rev 12239) @@ -0,0 +1,42 @@ +<?php + +/** + * body.tpl + * + * Template for constructing an opening body tag. + * + * The following variables are available in this template: + * + $class - CSS class name (optional; may not be present) + * + $onload - Body onload JavaScript handler code (optional; + * may not be present) + * + $aAttribs - Any extra attributes: an associative array, where + * keys are attribute names, and values (which are + * optional and might be null) should be placed + * in double quotes as attribute values (optional; + * may not be present) + * + $plugin_output - An array of extra output that may be added by + * plugin(s). + * + * @copyright © 1999-2007 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package squirrelmail + * @subpackage templates + */ + + +// retrieve the template vars +// +extract($t); + + +echo '<body'; +if (!empty($class)) echo ' class="' . $class . '"'; +if (!empty($onload)) echo ' onload="' . $onload . '"'; +foreach ($aAttribs as $key => $value) { + echo ' ' . $key . (is_null($value) ? '' : '="' . $value . '"'); +} +echo '>'; + +if (!empty($plugin_output['body_after'])) echo $plugin_output['body_after']; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2007-02-07 23:19:38
|
Revision: 12241 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12241&view=rev Author: pdontthink Date: 2007-02-07 15:19:21 -0800 (Wed, 07 Feb 2007) Log Message: ----------- Onclick handler should not be submitted as HTML but only as the onclick contents - fixed. Modified Paths: -------------- trunk/squirrelmail/src/read_body.php trunk/squirrelmail/templates/default/read_menubar_buttons.tpl trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl Modified: trunk/squirrelmail/src/read_body.php =================================================================== --- trunk/squirrelmail/src/read_body.php 2007-02-07 20:49:21 UTC (rev 12240) +++ trunk/squirrelmail/src/read_body.php 2007-02-07 23:19:21 UTC (rev 12241) @@ -563,7 +563,7 @@ $compose_height = '550'; } if ( checkForJavascript() ) { - $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form,'. $compose_width .',' . $compose_height .')"'; + $on_click='comp_in_new_form(\''.$comp_uri.'\', this, this.form,'. $compose_width .',' . $compose_height .')'; $comp_uri = 'javascript:void(0)'; $method='get'; $onsubmit = 'return false'; Modified: trunk/squirrelmail/templates/default/read_menubar_buttons.tpl =================================================================== --- trunk/squirrelmail/templates/default/read_menubar_buttons.tpl 2007-02-07 20:49:21 UTC (rev 12240) +++ trunk/squirrelmail/templates/default/read_menubar_buttons.tpl 2007-02-07 23:19:21 UTC (rev 12241) @@ -23,7 +23,7 @@ * $form_onsubmit - The value of the <form>'s onsubmit handler (optional, may be blank) * $compose_href - Base URL to forward, reply, etc. Note that a specific action * must also be given by the form or in this URL. - * $on_click - Onclick event string for all buttons + * $button_onclick - Onclick event string for all buttons * $forward_as_attachment_enabled - boolean TRUE if forwarding as attachments * has been enabled. * $can_resume_draft - boolean TRUE if the "resume draft" is legitimate for @@ -87,18 +87,18 @@ <?php if ($can_resume_draft) { ?> - <input type="submit" name="smaction_draft" value="<?php echo _("Resume Draft"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_draft" value="<?php echo _("Resume Draft"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php } elseif ($can_edit_as_new) { ?> - <input type="submit" name="smaction_edit_new" value="<?php echo _("Edit Message as New"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_edit_new" value="<?php echo _("Edit Message as New"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php } ?> - <input type="submit" name="smaction_reply" value="<?php echo _("Reply"); ?>" <?php echo $button_onclick; ?> /> - <input type="submit" name="smaction_reply_all" value="<?php echo _("Reply All"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_reply" value="<?php echo _("Reply"); ?>" onclick="<?php echo $button_onclick; ?>" /> + <input type="submit" name="smaction_reply_all" value="<?php echo _("Reply All"); ?>" onclick="<?php echo $button_onclick; ?>" /> | - <input type="submit" name="smaction_forward" value="<?php echo _("Forward"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_forward" value="<?php echo _("Forward"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php if ($forward_as_attachment_enabled) { ?> Modified: trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl =================================================================== --- trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl 2007-02-07 20:49:21 UTC (rev 12240) +++ trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl 2007-02-07 23:19:21 UTC (rev 12241) @@ -23,7 +23,7 @@ * $form_onsubmit - The value of the <form>'s onsubmit handler (optional, may be blank) * $compose_href - Base URL to forward, reply, etc. Note that a specific action * must also be given by the form or in this URL. - * $on_click - Onclick event string for all buttons + * $button_onclick - Onclick event string for all buttons * $forward_as_attachment_enabled - boolean TRUE if forwarding as attachments * has been enabled. * $can_resume_draft - boolean TRUE if the "resume draft" is legitimate for @@ -103,18 +103,18 @@ <?php if ($can_resume_draft) { ?> - <input type="submit" name="smaction_draft" value="<?php echo _("Resume Draft"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_draft" value="<?php echo _("Resume Draft"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php } elseif ($can_edit_as_new) { ?> - <input type="submit" name="smaction_edit_new" value="<?php echo _("Edit Message as New"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_edit_new" value="<?php echo _("Edit Message as New"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php } ?> - <input type="submit" name="smaction_reply" value="<?php echo _("Reply"); ?>" <?php echo $button_onclick; ?> /> - <input type="submit" name="smaction_reply_all" value="<?php echo _("Reply All"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_reply" value="<?php echo _("Reply"); ?>" onclick="<?php echo $button_onclick; ?>" /> + <input type="submit" name="smaction_reply_all" value="<?php echo _("Reply All"); ?>" onclick="<?php echo $button_onclick; ?>" /> | - <input type="submit" name="smaction_forward" value="<?php echo _("Forward"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_forward" value="<?php echo _("Forward"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php if ($forward_as_attachment_enabled) { ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-02-08 14:47:33
|
Revision: 12242 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12242&view=rev Author: kink Date: 2007-02-08 06:47:23 -0800 (Thu, 08 Feb 2007) Log Message: ----------- Drop the default top-right 'SquirrelMail' name and link, as discussed on squirrelmail-devel. It's overkill anyway to name and link SquirrelMail so prominently on every page. It also confused users who clicked straight through to our site. It will now only display something if provider_name and provider_uri have been set, i.o.w., it's completely optional. Modified Paths: -------------- trunk/squirrelmail/config/conf.pl trunk/squirrelmail/config/config_default.php trunk/squirrelmail/contrib/RPM/config.php.redhat trunk/squirrelmail/functions/page_header.php trunk/squirrelmail/templates/default/page_header.tpl trunk/squirrelmail/templates/default_advanced/page_header.tpl Modified: trunk/squirrelmail/config/conf.pl =================================================================== --- trunk/squirrelmail/config/conf.pl 2007-02-07 23:19:21 UTC (rev 12241) +++ trunk/squirrelmail/config/conf.pl 2007-02-08 14:47:23 UTC (rev 12242) @@ -385,7 +385,7 @@ $noselect_fix_enable = 'false' if ( !$noselect_fix_enable ); $frame_top = "_top" if ( !$frame_top ); $provider_uri = '' if ( !$provider_uri ); -$provider_name = '' if ( !$provider_name ); +$provider_name = '' if ( !$provider_name || $provider_name eq 'SquirrelMail'); $no_list_for_subscribe = 'false' if ( !$no_list_for_subscribe ); $allow_charset_search = 'true' if ( !$allow_charset_search ); $allow_advanced_search = 0 if ( !$allow_advanced_search) ; @@ -563,7 +563,7 @@ print "5. Signout Page : $WHT$signout_page$NRM\n"; print "6. Top Frame : $WHT$frame_top$NRM\n"; print "7. Provider link : $WHT$provider_uri$NRM\n"; - print "8. Provider name : $WHT$provider_name$NRM\n"; + print "8. Provider link text : $WHT$provider_name$NRM\n"; print "\n"; print "R Return to Main Menu\n"; @@ -1107,8 +1107,8 @@ # Default link to provider sub command7 { - print "Here you can set the link on the right of the page.\n"; - print "If empty, it will link to the SquirrelMail About page.\n"; + print "Here you can set the link on the top-right of the message list.\n"; + print "If empty, it will not be displayed.\n"; print "\n"; print "[$WHT$provider_uri$NRM]: $WHT"; $new_provider_uri = <STDIN>; @@ -1122,13 +1122,13 @@ } sub command8 { - print "Here you can set the name of the link on the right of the page.\n"; - print "The default is 'SquirrelMail'\n"; + print "Here you can set the name of the link on the top-right of the message list.\n"; + print "The default is empty (do not display anything).'\n"; print "\n"; print "[$WHT$provider_name$NRM]: $WHT"; $new_provider_name = <STDIN>; if ( $new_provider_name eq "\n" ) { - $new_provider_name = 'SquirrelMail'; + $new_provider_name = ''; } else { $new_provider_name =~ s/[\r\n]//g; $new_provider_name =~ s/^\s+$//g; Modified: trunk/squirrelmail/config/config_default.php =================================================================== --- trunk/squirrelmail/config/config_default.php 2007-02-07 23:19:21 UTC (rev 12241) +++ trunk/squirrelmail/config/config_default.php 2007-02-08 14:47:23 UTC (rev 12242) @@ -86,21 +86,23 @@ /** * Provider name * - * Here you can set name of the link displayed on the right side of main page. + * Here you can set the text of the link displayed on the top-right + * of the message list. * - * Link will be displayed only if you have $hide_sm_attributions - * option set to true. + * Defaults to empty (no link). + * * @global string $provider_name */ -$provider_name = 'SquirrelMail'; +$provider_name = ''; /** * Provider URI * - * Here you can set URL of the link displayed on the right side of main page. - * When empty, this refers to the SquirrelMail About page. - * Link will be displayed only if you have $hide_sm_attributions - * option set to true. + * Here you can set URL of the link displayed on the top-right of + * the message list. + * + * Defaults to empty (no link). + * * @global string $provider_uri */ $provider_uri = ''; @@ -562,7 +564,7 @@ * SquirrelMail Attributions Control * * This option disables display of "created by SquirrelMail developers" - * strings and provider link + * strings and links. * @global bool $hide_sm_attributions * @since 1.2.0 */ Modified: trunk/squirrelmail/contrib/RPM/config.php.redhat =================================================================== --- trunk/squirrelmail/contrib/RPM/config.php.redhat 2007-02-07 23:19:21 UTC (rev 12241) +++ trunk/squirrelmail/contrib/RPM/config.php.redhat 2007-02-08 14:47:23 UTC (rev 12242) @@ -17,10 +17,9 @@ $signout_page = ''; $frame_top = '_top'; -$provider_uri = 'http://www.squirrelmail.org/'; +$provider_uri = ''; +$provider_name = ''; -$provider_name = 'SquirrelMail'; - $motd = ""; $squirrelmail_default_language = 'en_US'; @@ -174,4 +173,3 @@ * sent and regular output to begin, which will majorly screw * things up when we try to send more headers later. */ -?> \ No newline at end of file Modified: trunk/squirrelmail/functions/page_header.php =================================================================== --- trunk/squirrelmail/functions/page_header.php 2007-02-07 23:19:21 UTC (rev 12241) +++ trunk/squirrelmail/functions/page_header.php 2007-02-08 14:47:23 UTC (rev 12242) @@ -239,19 +239,14 @@ $shortBoxName = _("INBOX"); } - $sm_attributes = ''; - if (!$hide_sm_attributions) { - if (empty($provider_uri)) { - $sm_attributes .= create_hyperlink($base_uri . 'src/about.php', 'SquirrelMail'); - } else { - if (empty($provider_name)) $provider_name = 'SquirrelMail'; - $sm_attributes .= create_hyperlink($provider_uri, $provider_name, '_blank'); - } + $provider_link = ''; + if (!empty($provider_uri) && !empty($provider_name) && $provider_name != 'SquirrelMail') { + $provider_link = create_hyperlink($provider_uri, $provider_name, '_blank'); } $oTemplate->assign('body_tag_js', $sBodyTagJs); $oTemplate->assign('shortBoxName', $shortBoxName); - $oTemplate->assign('sm_attribute_str', $sm_attributes); + $oTemplate->assign('provider_link', $provider_link); $oTemplate->assign('frame_top', $frame_top); $oTemplate->assign('urlMailbox', $urlMailbox); $oTemplate->assign('startMessage', $startMessage); Modified: trunk/squirrelmail/templates/default/page_header.tpl =================================================================== --- trunk/squirrelmail/templates/default/page_header.tpl 2007-02-07 23:19:21 UTC (rev 12241) +++ trunk/squirrelmail/templates/default/page_header.tpl 2007-02-08 14:47:23 UTC (rev 12242) @@ -75,7 +75,7 @@ </td> </tr> <tr> - <td class="sqm_topNavigation"<?php echo ($hide_sm_attributions ? ' colspan="2"' : ''); ?>> + <td class="sqm_topNavigation"<?php echo (empty($provider_link) ? ' colspan="2"' : ''); ?>> <?php echo $compose_link; ?> <?php echo $address_link; ?> <?php echo $folders_link; ?> @@ -84,9 +84,9 @@ <?php echo $help_link; ?> <?php /* FIXME: no hooks in templates!! */ global $null; do_hook('menuline', $null); ?> </td> - <?php if (!empty($sm_attribute_str)) + <?php if (!empty($provider_link)) echo '<td class="sqm_providerInfo">' - . $sm_attribute_str + . $provider_link . "</td>\n"; ?> </tr> </table> Modified: trunk/squirrelmail/templates/default_advanced/page_header.tpl =================================================================== --- trunk/squirrelmail/templates/default_advanced/page_header.tpl 2007-02-07 23:19:21 UTC (rev 12241) +++ trunk/squirrelmail/templates/default_advanced/page_header.tpl 2007-02-08 14:47:23 UTC (rev 12242) @@ -95,7 +95,7 @@ </td> </tr> <tr> - <td class="sqm_topNavigation"<?php echo ($hide_sm_attributions ? ' colspan="2"' : ''); ?>> + <td class="sqm_topNavigation"<?php echo (empty($provider_link) ? ' colspan="2"' : ''); ?>> <?php echo $compose_link; ?> <?php echo $address_link; ?> <?php echo $folders_link; ?> @@ -104,9 +104,9 @@ <?php echo $help_link; ?> <?php /* FIXME: no hooks in templates!! */ global $null; do_hook('menuline', $null); ?> </td> - <?php if (!empty($sm_attribute_str)) + <?php if (!empty($provider_link)) echo '<td class="sqm_providerInfo">' - . $sm_attribute_str + . $provider_link . "</td>\n"; ?> </tr> </table> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-02-18 12:46:52
|
Revision: 12271 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12271&view=rev Author: kink Date: 2007-02-18 04:46:47 -0800 (Sun, 18 Feb 2007) Log Message: ----------- HTTP_SERVER_SERVER should be HTTP_SERVER_VARS, but since we require PHP >= 4.1.x, we need not use it anyware. Modified Paths: -------------- trunk/squirrelmail/include/load_prefs.php trunk/squirrelmail/plugins/bug_report/functions.php trunk/squirrelmail/plugins/bug_report/system_specs.php trunk/squirrelmail/plugins/change_password/backend/ldap.php trunk/squirrelmail/plugins/filters/filters.php trunk/squirrelmail/plugins/translate/functions.php trunk/squirrelmail/themes/greenhouse_effect.php trunk/squirrelmail/themes/in_the_pink.php trunk/squirrelmail/themes/kind_of_blue.php trunk/squirrelmail/themes/monostochastic.php trunk/squirrelmail/themes/random.php trunk/squirrelmail/themes/shades_of_grey.php trunk/squirrelmail/themes/spice_of_life.php trunk/squirrelmail/themes/spice_of_life_dark.php trunk/squirrelmail/themes/spice_of_life_lite.php Modified: trunk/squirrelmail/include/load_prefs.php =================================================================== --- trunk/squirrelmail/include/load_prefs.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/include/load_prefs.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -17,8 +17,7 @@ * FIXME: PHP CGI (at least on IIS 5.1) does not set 'SCRIPT_FILENAME' and * code does not handle magic_quotes_gpc=on. */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { header("Location: ../src/login.php"); die(); } Modified: trunk/squirrelmail/plugins/bug_report/functions.php =================================================================== --- trunk/squirrelmail/plugins/bug_report/functions.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/plugins/bug_report/functions.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -13,8 +13,7 @@ /** * do not allow to call this file directly */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { header("Location: ../../src/login.php"); die(); } Modified: trunk/squirrelmail/plugins/bug_report/system_specs.php =================================================================== --- trunk/squirrelmail/plugins/bug_report/system_specs.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/plugins/bug_report/system_specs.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -13,8 +13,7 @@ /** * do not allow to call this file directly */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { header("Location: ../../src/login.php"); die(); } Modified: trunk/squirrelmail/plugins/change_password/backend/ldap.php =================================================================== --- trunk/squirrelmail/plugins/change_password/backend/ldap.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/plugins/change_password/backend/ldap.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -13,8 +13,7 @@ /** * do not allow to call this file directly */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { header("Location: ../../../src/login.php"); die(); } Modified: trunk/squirrelmail/plugins/filters/filters.php =================================================================== --- trunk/squirrelmail/plugins/filters/filters.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/plugins/filters/filters.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -13,8 +13,7 @@ /** * do not allow to call this file directly */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { header("Location: ../../src/login.php"); die(); } Modified: trunk/squirrelmail/plugins/translate/functions.php =================================================================== --- trunk/squirrelmail/plugins/translate/functions.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/plugins/translate/functions.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -13,8 +13,7 @@ /** * do not allow to call this file directly */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { header("Location: ../../src/login.php"); die(); } Modified: trunk/squirrelmail/themes/greenhouse_effect.php =================================================================== --- trunk/squirrelmail/themes/greenhouse_effect.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/themes/greenhouse_effect.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -15,8 +15,7 @@ */ /** Prevent direct script loading */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { die(); } Modified: trunk/squirrelmail/themes/in_the_pink.php =================================================================== --- trunk/squirrelmail/themes/in_the_pink.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/themes/in_the_pink.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -16,8 +16,7 @@ */ /** Prevent direct script loading */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { die(); } Modified: trunk/squirrelmail/themes/kind_of_blue.php =================================================================== --- trunk/squirrelmail/themes/kind_of_blue.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/themes/kind_of_blue.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -16,8 +16,7 @@ */ /** Prevent direct script loading */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { die(); } Modified: trunk/squirrelmail/themes/monostochastic.php =================================================================== --- trunk/squirrelmail/themes/monostochastic.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/themes/monostochastic.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -16,8 +16,7 @@ */ /** Prevent direct script loading */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { die(); } Modified: trunk/squirrelmail/themes/random.php =================================================================== --- trunk/squirrelmail/themes/random.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/themes/random.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -14,8 +14,7 @@ */ /** Prevent direct script loading */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { die(); } Modified: trunk/squirrelmail/themes/shades_of_grey.php =================================================================== --- trunk/squirrelmail/themes/shades_of_grey.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/themes/shades_of_grey.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -15,8 +15,7 @@ */ /** Prevent direct script loading */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { die(); } Modified: trunk/squirrelmail/themes/spice_of_life.php =================================================================== --- trunk/squirrelmail/themes/spice_of_life.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/themes/spice_of_life.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -15,8 +15,7 @@ */ /** Prevent direct script loading */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { die(); } Modified: trunk/squirrelmail/themes/spice_of_life_dark.php =================================================================== --- trunk/squirrelmail/themes/spice_of_life_dark.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/themes/spice_of_life_dark.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -15,8 +15,7 @@ */ /** Prevent direct script loading */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { die(); } Modified: trunk/squirrelmail/themes/spice_of_life_lite.php =================================================================== --- trunk/squirrelmail/themes/spice_of_life_lite.php 2007-02-16 01:48:34 UTC (rev 12270) +++ trunk/squirrelmail/themes/spice_of_life_lite.php 2007-02-18 12:46:47 UTC (rev 12271) @@ -15,8 +15,7 @@ */ /** Prevent direct script loading */ -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { die(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Paul L. <pa...@sq...> - 2007-02-28 05:22:42
|
On 2/18/07, ki...@us... <ki...@us...> wrote: > Revision: 12271 > http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12271&view=rev > Author: kink > Date: 2007-02-18 04:46:47 -0800 (Sun, 18 Feb 2007) > > Log Message: > ----------- > HTTP_SERVER_SERVER should be HTTP_SERVER_VARS, but since > we require PHP >= 4.1.x, we need not use it anyware. > > Modified Paths: > -------------- > trunk/squirrelmail/include/load_prefs.php > trunk/squirrelmail/plugins/bug_report/functions.php > trunk/squirrelmail/plugins/bug_report/system_specs.php > trunk/squirrelmail/plugins/change_password/backend/ldap.php > trunk/squirrelmail/plugins/filters/filters.php > trunk/squirrelmail/plugins/translate/functions.php > trunk/squirrelmail/themes/greenhouse_effect.php > trunk/squirrelmail/themes/in_the_pink.php > trunk/squirrelmail/themes/kind_of_blue.php > trunk/squirrelmail/themes/monostochastic.php > trunk/squirrelmail/themes/random.php > trunk/squirrelmail/themes/shades_of_grey.php > trunk/squirrelmail/themes/spice_of_life.php > trunk/squirrelmail/themes/spice_of_life_dark.php > trunk/squirrelmail/themes/spice_of_life_lite.php > > Modified: trunk/squirrelmail/include/load_prefs.php > =================================================================== > --- trunk/squirrelmail/include/load_prefs.php 2007-02-16 01:48:34 UTC (rev 12270) > +++ trunk/squirrelmail/include/load_prefs.php 2007-02-18 12:46:47 UTC (rev 12271) > @@ -17,8 +17,7 @@ > * FIXME: PHP CGI (at least on IIS 5.1) does not set 'SCRIPT_FILENAME' and > * code does not handle magic_quotes_gpc=on. > */ > -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) || > - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { > +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) { Why are we doing it this way anyway? How about testing if SM_PATH is defined, if not exit. If it is, we should be safe, but to be pedantic (Chris loves it), we could then proceed to check the global value of $php_self (which SM sets up for us), using strpos() to see if it contains the current filename or not. There are probably other ways too... I suggest something else because of the IIS comment and we generally frown upon directly accessing superglobals in this manner. |
From: Marc G. K. <ma...@sq...> - 2007-02-28 08:15:25
|
On Wed, February 28, 2007 6:22 am, Paul Lesniewski wrote: > On 2/18/07, ki...@us... <ki...@us...> > wrote: > >> Revision: 12271 >> http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12271&view=rev >> Author: kink >> Date: 2007-02-18 04:46:47 -0800 (Sun, 18 Feb 2007) >> >> >> Log Message: >> ----------- >> HTTP_SERVER_SERVER should be HTTP_SERVER_VARS, but since >> we require PHP >= 4.1.x, we need not use it anyware. >> >> Modified Paths: >> -------------- >> trunk/squirrelmail/include/load_prefs.php >> trunk/squirrelmail/plugins/bug_report/functions.php >> trunk/squirrelmail/plugins/bug_report/system_specs.php >> trunk/squirrelmail/plugins/change_password/backend/ldap.php >> trunk/squirrelmail/plugins/filters/filters.php >> trunk/squirrelmail/plugins/translate/functions.php >> trunk/squirrelmail/themes/greenhouse_effect.php >> trunk/squirrelmail/themes/in_the_pink.php >> trunk/squirrelmail/themes/kind_of_blue.php >> trunk/squirrelmail/themes/monostochastic.php >> trunk/squirrelmail/themes/random.php >> trunk/squirrelmail/themes/shades_of_grey.php >> trunk/squirrelmail/themes/spice_of_life.php >> trunk/squirrelmail/themes/spice_of_life_dark.php >> trunk/squirrelmail/themes/spice_of_life_lite.php >> >> Modified: trunk/squirrelmail/include/load_prefs.php >> =================================================================== >> --- trunk/squirrelmail/include/load_prefs.php 2007-02-16 01:48:34 UTC >> (rev 12270) >> +++ trunk/squirrelmail/include/load_prefs.php 2007-02-18 12:46:47 UTC >> (rev 12271) >> @@ -17,8 +17,7 @@ >> * FIXME: PHP CGI (at least on IIS 5.1) does not set 'SCRIPT_FILENAME' >> and * code does not handle magic_quotes_gpc=on. >> */ >> -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] >> == __FILE__) || >> - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && >> $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { >> +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] >> == __FILE__) { >> > > Why are we doing it this way anyway? How about testing if SM_PATH is > defined, if not exit. If it is, we should be safe, but to be pedantic > (Chris loves it), we could then proceed to check the global value of > $php_self (which SM sets up for us), using strpos() to see if it > contains the current filename or not. There are probably other ways too... > I suggest something else because of the IIS comment and we > generally frown upon directly accessing superglobals in this manner. > This is to prohibit direct includes. If a browser points directly to the file then it dies at the beginning or does a redirect to the login page. $php_self are not defined when people directly include files. See it as an extra security measure for files with code outside functions. Marc. |
From: Paul L. <pa...@sq...> - 2007-02-28 08:36:49
|
On 2/28/07, Marc Groot Koerkamp <ma...@sq...> wrote: > On Wed, February 28, 2007 6:22 am, Paul Lesniewski wrote: > > On 2/18/07, ki...@us... <ki...@us...> > > wrote: > > > >> Revision: 12271 > >> http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12271&view=rev > >> Author: kink > >> Date: 2007-02-18 04:46:47 -0800 (Sun, 18 Feb 2007) > >> > >> > >> Log Message: > >> ----------- > >> HTTP_SERVER_SERVER should be HTTP_SERVER_VARS, but since > >> we require PHP >= 4.1.x, we need not use it anyware. > >> > >> Modified Paths: > >> -------------- > >> trunk/squirrelmail/include/load_prefs.php > >> trunk/squirrelmail/plugins/bug_report/functions.php > >> trunk/squirrelmail/plugins/bug_report/system_specs.php > >> trunk/squirrelmail/plugins/change_password/backend/ldap.php > >> trunk/squirrelmail/plugins/filters/filters.php > >> trunk/squirrelmail/plugins/translate/functions.php > >> trunk/squirrelmail/themes/greenhouse_effect.php > >> trunk/squirrelmail/themes/in_the_pink.php > >> trunk/squirrelmail/themes/kind_of_blue.php > >> trunk/squirrelmail/themes/monostochastic.php > >> trunk/squirrelmail/themes/random.php > >> trunk/squirrelmail/themes/shades_of_grey.php > >> trunk/squirrelmail/themes/spice_of_life.php > >> trunk/squirrelmail/themes/spice_of_life_dark.php > >> trunk/squirrelmail/themes/spice_of_life_lite.php > >> > >> Modified: trunk/squirrelmail/include/load_prefs.php > >> =================================================================== > >> --- trunk/squirrelmail/include/load_prefs.php 2007-02-16 01:48:34 UTC > >> (rev 12270) > >> +++ trunk/squirrelmail/include/load_prefs.php 2007-02-18 12:46:47 UTC > >> (rev 12271) > >> @@ -17,8 +17,7 @@ > >> * FIXME: PHP CGI (at least on IIS 5.1) does not set 'SCRIPT_FILENAME' > >> and * code does not handle magic_quotes_gpc=on. > >> */ > >> -if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] > >> == __FILE__) || > >> - (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && > >> $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) { > >> +if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] > >> == __FILE__) { > >> > > > > Why are we doing it this way anyway? How about testing if SM_PATH is > > defined, if not exit. If it is, we should be safe, but to be pedantic > > (Chris loves it), we could then proceed to check the global value of > > $php_self (which SM sets up for us), using strpos() to see if it > > contains the current filename or not. There are probably other ways too... > > I suggest something else because of the IIS comment and we > > generally frown upon directly accessing superglobals in this manner. > > > > This is to prohibit direct includes. If a browser points directly to the > file then it dies at the beginning or does a redirect to the login page. > $php_self are not defined when people directly include files. > See it as an extra security measure for files with code outside functions. I know WHAT it is doing, but I think it can be done better (and without the IIS caveat). If you test for SM_PATH, that should be enough... or surely someone else would have a clever idea. Notice that I said we can check $php_self only if SM_PATH was defined, which means that $php_self will also presumably be defined. But if you like, instead of using $php_self, we could use $_SERVER['PHP_SELF'] which may be more portable across host O/S. -paul |
From: <ki...@us...> - 2007-02-18 18:47:53
|
Revision: 12274 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12274&view=rev Author: kink Date: 2007-02-18 10:47:48 -0800 (Sun, 18 Feb 2007) Log Message: ----------- Add option to ask users for personal information on first login. Many users start sending out mail without a decent or even correct "From" header. Defaults to on. Admin can disable if he has a retrieve_user_info plugin or the guessed defaults are ok. Modified Paths: -------------- trunk/squirrelmail/ChangeLog trunk/squirrelmail/config/conf.pl trunk/squirrelmail/config/config_default.php trunk/squirrelmail/include/options/personal.php trunk/squirrelmail/src/options.php trunk/squirrelmail/src/right_main.php trunk/squirrelmail/templates/default/css/options.css trunk/squirrelmail/templates/default/options.tpl Modified: trunk/squirrelmail/ChangeLog =================================================================== --- trunk/squirrelmail/ChangeLog 2007-02-18 18:11:34 UTC (rev 12273) +++ trunk/squirrelmail/ChangeLog 2007-02-18 18:47:48 UTC (rev 12274) @@ -179,6 +179,7 @@ - Update for switch from CVS to Subversion. - Default provider URI link fixed (was broken when on plugin options pages, etc) - Fix URL to send read receipts from read_body (#1637572). + - Add option to ask users for personal information on first login. Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/config/conf.pl =================================================================== --- trunk/squirrelmail/config/conf.pl 2007-02-18 18:11:34 UTC (rev 12273) +++ trunk/squirrelmail/config/conf.pl 2007-02-18 18:47:48 UTC (rev 12274) @@ -472,6 +472,7 @@ $disable_plugins = 'false' if ( !$disable_plugins ); $disable_plugins_user = '' if ( !$disable_plugins_user ); $only_secure_cookies = 'true' if ( !$only_secure_cookies ); +$ask_user_info = 'true' if ( !$ask_user_info ); if ( $ARGV[0] eq '--install-plugin' ) { print "Activating plugin " . $ARGV[1] . "\n"; @@ -790,6 +791,7 @@ } elsif ( $menu == 11 ) { print $WHT. "Interface tweaks\n" . $NRM; print "1. Display html mails in iframe : $WHT$use_iframe$NRM\n"; + print "2. Ask user info on first login : $WHT$ask_user_info$NRM\n"; print "\n"; print $WHT. "PHP tweaks\n" . $NRM; print "4. Use php recode functions : $WHT$use_php_recode$NRM\n"; @@ -965,6 +967,7 @@ elsif ( $command == 5 ) { $lossy_encoding = commandA5(); } } elsif ( $menu == 11 ) { if ( $command == 1 ) { $use_iframe = commandB2(); } + elsif ( $command == 2 ) { $ask_user_info = command_ask_user_info(); } elsif ( $command == 4 ) { $use_php_recode = commandB4(); } elsif ( $command == 5 ) { $use_php_iconv = commandB5(); } elsif ( $command == 6 ) { $allow_remote_configtest = commandB6(); } @@ -4156,6 +4159,30 @@ } return $use_iframe; } + +# display html emails in iframe +sub command_ask_user_info { + print "New users need to supply their real name and email address to\n"; + print "send out proper mails. When this option is enabled, a user that\n"; + print "logs in for the first time will be redirected to the Personal\n"; + print "Options screen and asked to supply their personal data.\n"; + print "\n"; + + if ( lc($ask_user_info) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Ask user info? (y/n) [$WHT$default_value$NRM]: $WHT"; + $ask_user_info = <STDIN>; + if ( ( $ask_user_info =~ /^y\n/i ) || ( ( $ask_user_info =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $ask_user_info = 'true'; + } else { + $ask_user_info = 'false'; + } + return $ask_user_info; +} + # use icons sub commandB3 { print "Enabling this option will cause icons to be used instead of text\n"; @@ -4661,13 +4688,13 @@ # boolean print CF "\$use_iframe = $use_iframe;\n"; - print CF "\n"; # boolean + print CF "\$ask_user_info = $ask_user_info;\n"; + # boolean print CF "\$use_icons = $use_icons;\n"; print CF "\n"; # boolean print CF "\$use_php_recode = $use_php_recode;\n"; - print CF "\n"; # boolean print CF "\$use_php_iconv = $use_php_iconv;\n"; print CF "\n"; Modified: trunk/squirrelmail/config/config_default.php =================================================================== --- trunk/squirrelmail/config/config_default.php 2007-02-18 18:11:34 UTC (rev 12273) +++ trunk/squirrelmail/config/config_default.php 2007-02-18 18:47:48 UTC (rev 12274) @@ -1151,3 +1151,15 @@ * @global integer $config_use_color */ $config_use_color = 2; + +/** + * Ask User for Personal Information on login + * + * When a user logs in that doesn't have an email address configured, + * redirect him/her to the options page with a request to fill in their + * personal information. + * + * @global bool $ask_user_info + */ +$ask_user_info = true; + Modified: trunk/squirrelmail/include/options/personal.php =================================================================== --- trunk/squirrelmail/include/options/personal.php 2007-02-18 18:11:34 UTC (rev 12273) +++ trunk/squirrelmail/include/options/personal.php 2007-02-18 18:47:48 UTC (rev 12274) @@ -264,3 +264,4 @@ global $data_dir, $username; setSig($data_dir, $username, 'g', $option->new_value); } + Modified: trunk/squirrelmail/src/options.php =================================================================== --- trunk/squirrelmail/src/options.php 2007-02-18 18:11:34 UTC (rev 12273) +++ trunk/squirrelmail/src/options.php 2007-02-18 18:47:48 UTC (rev 12274) @@ -44,9 +44,20 @@ /* Initialize the maximum option refresh level. */ $max_refresh = SMOPT_REFRESH_NONE; + + /* Save each option in each option group. */ foreach ($optpage_data['options'] as $option_grp) { foreach ($option_grp['options'] as $option) { + + /* Special case: need to make sure emailaddress + * is saved if we use it as a test for ask_user_info */ + global $ask_user_info; + if ( $optpage = SMOPT_PAGE_PERSONAL && $ask_user_info && + $option->name == 'email_address' ) { + $option->setValue(''); + } + /* Remove Debug Mode Until Needed echo "name = '$option->name', " . "value = '$option->value', " @@ -415,6 +426,13 @@ // This is the only variable that is needed by *just* the template. $oTemplate->assign('options', $optpage_data['options']); + global $ask_user_info; + if ( $optpage = SMOPT_PAGE_PERSONAL && $ask_user_info + && getPref($data_dir, $username,'email_address') == "" ) { + $oTemplate->assign('topmessage', + _("Welcome to SquirrelMail. Please supply your full name and email address.") ); + } + /** * The variables below should not be needed by the template since all plugin * hooks are called here, not in the template. If we find otherwise, these @@ -456,4 +474,3 @@ } $oTemplate->display('footer.tpl'); -?> Modified: trunk/squirrelmail/src/right_main.php =================================================================== --- trunk/squirrelmail/src/right_main.php 2007-02-18 18:11:34 UTC (rev 12273) +++ trunk/squirrelmail/src/right_main.php 2007-02-18 18:47:48 UTC (rev 12274) @@ -20,6 +20,13 @@ */ include('../include/init.php'); +/* If email_address not set and admin wants us to ask user for it, + * redirect to options page. */ +if ( $ask_user_info && getPref($data_dir, $username,'email_address') == "" ) { + header("Location: " . get_location() . "/options.php?optpage=personal"); + exit; +} + /* SquirrelMail required files. */ require_once(SM_PATH . 'functions/imap_asearch.php'); require_once(SM_PATH . 'functions/imap_general.php'); @@ -29,7 +36,6 @@ require_once(SM_PATH . 'functions/mailbox_display.php'); require_once(SM_PATH . 'functions/compose.php'); - /* lets get the global vars we may need */ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION); Modified: trunk/squirrelmail/templates/default/css/options.css =================================================================== --- trunk/squirrelmail/templates/default/css/options.css 2007-02-18 18:11:34 UTC (rev 12273) +++ trunk/squirrelmail/templates/default/css/options.css 2007-02-18 18:47:48 UTC (rev 12274) @@ -154,4 +154,10 @@ margin-left: auto; margin-right: auto; } - +#optionMessage { + text-align: center; + width: 100%; + font-size: larger; + color: red; + font-weight: bold; +} Modified: trunk/squirrelmail/templates/default/options.tpl =================================================================== --- trunk/squirrelmail/templates/default/options.tpl 2007-02-18 18:11:34 UTC (rev 12273) +++ trunk/squirrelmail/templates/default/options.tpl 2007-02-18 18:47:48 UTC (rev 12274) @@ -21,7 +21,13 @@ /** extract variables */ extract($t); + + +if ( !empty($topmessage) ) { + echo "<div id=\"optionMessage\">\n$topmessage\n</div>\n\n"; +} ?> + <div id="optionDisplay"> <?php foreach ($options as $option) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Paul L. <pa...@sq...> - 2007-02-28 04:57:28
|
On 2/18/07, ki...@us... <ki...@us...> wrote: > Revision: 12274 > http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12274&view=rev > Author: kink > Date: 2007-02-18 10:47:48 -0800 (Sun, 18 Feb 2007) > > Log Message: > ----------- > Add option to ask users for personal information on first login. > Many users start sending out mail without a decent or even correct > "From" header. Defaults to on. Admin can disable if he has a > retrieve_user_info plugin or the guessed defaults are ok. If this is going to be core, OK, but I'm not sure it should default to be turned on...? No way to know, but I am guessing that the majority of SM installs are on systems where mail users are local users, and the default of <username>@<domain> is usually correct, no? I don't feel strongly about this, but it did make me stop and wonder if this is necessary. After more thought, this gets in the way of SM "just working" in virtual setups too, where the username is the same as the full email address. My vote is that this should not default to be on. Only convincing argument to me would be that there is a problem with lots of SM installations on the net that are sending out malformed emails with bad From: headers, but I have never heard that this is a problem. Also, see below: > --- trunk/squirrelmail/config/conf.pl 2007-02-18 18:11:34 UTC (rev 12273) > +++ trunk/squirrelmail/config/conf.pl 2007-02-18 18:47:48 UTC (rev 12274) > @@ -472,6 +472,7 @@ > $disable_plugins = 'false' if ( !$disable_plugins ); > $disable_plugins_user = '' if ( !$disable_plugins_user ); > $only_secure_cookies = 'true' if ( !$only_secure_cookies ); > +$ask_user_info = 'true' if ( !$ask_user_info ); > > if ( $ARGV[0] eq '--install-plugin' ) { > print "Activating plugin " . $ARGV[1] . "\n"; > @@ -790,6 +791,7 @@ > } elsif ( $menu == 11 ) { > print $WHT. "Interface tweaks\n" . $NRM; > print "1. Display html mails in iframe : $WHT$use_iframe$NRM\n"; > + print "2. Ask user info on first login : $WHT$ask_user_info$NRM\n"; > print "\n"; > print $WHT. "PHP tweaks\n" . $NRM; > print "4. Use php recode functions : $WHT$use_php_recode$NRM\n"; > @@ -965,6 +967,7 @@ > elsif ( $command == 5 ) { $lossy_encoding = commandA5(); } > } elsif ( $menu == 11 ) { > if ( $command == 1 ) { $use_iframe = commandB2(); } > + elsif ( $command == 2 ) { $ask_user_info = command_ask_user_info(); } > elsif ( $command == 4 ) { $use_php_recode = commandB4(); } > elsif ( $command == 5 ) { $use_php_iconv = commandB5(); } > elsif ( $command == 6 ) { $allow_remote_configtest = commandB6(); } > @@ -4156,6 +4159,30 @@ > } > return $use_iframe; > } > + > +# display html emails in iframe You forgot to change the comment. :-) I can fix it. > --- trunk/squirrelmail/src/options.php 2007-02-18 18:11:34 UTC (rev 12273) > +++ trunk/squirrelmail/src/options.php 2007-02-18 18:47:48 UTC (rev 12274) > @@ -44,9 +44,20 @@ > /* Initialize the maximum option refresh level. */ > $max_refresh = SMOPT_REFRESH_NONE; > > + > + > /* Save each option in each option group. */ > foreach ($optpage_data['options'] as $option_grp) { > foreach ($option_grp['options'] as $option) { > + > + /* Special case: need to make sure emailaddress > + * is saved if we use it as a test for ask_user_info */ > + global $ask_user_info; > + if ( $optpage = SMOPT_PAGE_PERSONAL && $ask_user_info && > + $option->name == 'email_address' ) { > + $option->setValue(''); > + } > + > /* Remove Debug Mode Until Needed > echo "name = '$option->name', " > . "value = '$option->value', " > @@ -415,6 +426,13 @@ > // This is the only variable that is needed by *just* the template. > $oTemplate->assign('options', $optpage_data['options']); > > + global $ask_user_info; > + if ( $optpage = SMOPT_PAGE_PERSONAL && $ask_user_info > + && getPref($data_dir, $username,'email_address') == "" ) { > + $oTemplate->assign('topmessage', > + _("Welcome to SquirrelMail. Please supply your full name and email address.") ); This string should use something like the provider_name or whatever it is, and not hard-coded "SquirrelMail" |
From: <ki...@us...> - 2007-02-27 18:14:41
|
Revision: 12281 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12281&view=rev Author: kink Date: 2007-02-27 10:14:34 -0800 (Tue, 27 Feb 2007) Log Message: ----------- generalise folder_manip_dialog CSS into dialogbox CSS Modified Paths: -------------- trunk/squirrelmail/css/alien_glow/default.css trunk/squirrelmail/css/autumn/default.css trunk/squirrelmail/css/autumn2/default.css trunk/squirrelmail/css/black_bean_burrito/default.css trunk/squirrelmail/css/blue_grey/default.css trunk/squirrelmail/css/blue_on_blue/default.css trunk/squirrelmail/css/bluesnews/default.css trunk/squirrelmail/css/bluesome/default.css trunk/squirrelmail/css/bluesteel/default.css trunk/squirrelmail/templates/default/css/default.css trunk/squirrelmail/templates/default/folder_manip.tpl trunk/squirrelmail/templates/default/folder_manip_dialog.tpl Modified: trunk/squirrelmail/css/alien_glow/default.css =================================================================== --- trunk/squirrelmail/css/alien_glow/default.css 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/css/alien_glow/default.css 2007-02-27 18:14:34 UTC (rev 12281) @@ -153,11 +153,11 @@ background: #000000; } -/* folder_manip.tpl defs */ -#folderManip table.wrapper { +/* dialog box defs */ +.dialogbox table.wrapper { border: 1px solid #19881a; } -#folderManip td.folderAction { +.dialogbox td.folderAction { background: #19881a; } Modified: trunk/squirrelmail/css/autumn/default.css =================================================================== --- trunk/squirrelmail/css/autumn/default.css 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/css/autumn/default.css 2007-02-27 18:14:34 UTC (rev 12281) @@ -153,11 +153,11 @@ background: #ffffff; } -/* folder_manip.tpl defs */ -#folderManip table.wrapper { +/* dialog box defs */ +.dialogbox table.wrapper { border: 1px solid #bb9d45; } -#folderManip td.folderAction { +.dialogbox td.folderAction { background: #bb9d45; } Modified: trunk/squirrelmail/css/autumn2/default.css =================================================================== --- trunk/squirrelmail/css/autumn2/default.css 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/css/autumn2/default.css 2007-02-27 18:14:34 UTC (rev 12281) @@ -153,11 +153,11 @@ background: #dcddc5; } -/* folder_manip.tpl defs */ -#folderManip table.wrapper { +/* dialog box defs */ +.dialogbox table.wrapper { border: 1px solid #bca87e; } -#folderManip td.folderAction { +.dialogbox td.folderAction { background: #bca87e; } Modified: trunk/squirrelmail/css/black_bean_burrito/default.css =================================================================== --- trunk/squirrelmail/css/black_bean_burrito/default.css 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/css/black_bean_burrito/default.css 2007-02-27 18:14:34 UTC (rev 12281) @@ -153,11 +153,11 @@ background: #000000; } -/* folder_manip.tpl defs */ -#folderManip table.wrapper { +/* dialog box defs */ +.dialogbox table.wrapper { border: 1px solid #595959; } -#folderManip td.folderAction { +.dialogbox td.folderAction { background: #595959; } Modified: trunk/squirrelmail/css/blue_grey/default.css =================================================================== --- trunk/squirrelmail/css/blue_grey/default.css 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/css/blue_grey/default.css 2007-02-27 18:14:34 UTC (rev 12281) @@ -153,11 +153,11 @@ background: #929292; } -/* folder_manip.tpl defs */ -#folderManip table.wrapper { +/* dialog box defs */ +.dialogbox table.wrapper { border: 1px solid #6188a9; } -#folderManip td.folderAction { +.dialogbox td.folderAction { background: #6188a9; } Modified: trunk/squirrelmail/css/blue_on_blue/default.css =================================================================== --- trunk/squirrelmail/css/blue_on_blue/default.css 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/css/blue_on_blue/default.css 2007-02-27 18:14:34 UTC (rev 12281) @@ -153,11 +153,11 @@ background: #19193a; } -/* folder_manip.tpl defs */ -#folderManip table.wrapper { +/* dialog box defs */ +.dialogbox table.wrapper { border: 1px solid #4c4b83; } -#folderManip td.folderAction { +.dialogbox td.folderAction { background: #4c4b83; } Modified: trunk/squirrelmail/css/bluesnews/default.css =================================================================== --- trunk/squirrelmail/css/bluesnews/default.css 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/css/bluesnews/default.css 2007-02-27 18:14:34 UTC (rev 12281) @@ -153,11 +153,11 @@ background: #000000; } -/* folder_manip.tpl defs */ -#folderManip table.wrapper { +/* dialog box defs */ +.dialogbox table.wrapper { border: 1px solid #181818; } -#folderManip td.folderAction { +.dialogbox td.folderAction { background: #181818; } Modified: trunk/squirrelmail/css/bluesome/default.css =================================================================== --- trunk/squirrelmail/css/bluesome/default.css 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/css/bluesome/default.css 2007-02-27 18:14:34 UTC (rev 12281) @@ -153,11 +153,11 @@ background: #CBD2D9; } -/* folder_manip.tpl defs */ -#folderManip table.wrapper { +/* dialog box defs */ +.dialogbox table.wrapper { border: 1px solid #9DB5CB; } -#folderManip td.folderAction { +.dialogbox td.folderAction { background: #9DB5CB; } Modified: trunk/squirrelmail/css/bluesteel/default.css =================================================================== --- trunk/squirrelmail/css/bluesteel/default.css 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/css/bluesteel/default.css 2007-02-27 18:14:34 UTC (rev 12281) @@ -153,11 +153,11 @@ background: #dedfdf; } -/* folder_manip.tpl defs */ -#folderManip table.wrapper { +/* dialog box defs */ +.dialogbox table.wrapper { border: 1px solid #a8a8a8; } -#folderManip td.folderAction { +.dialogbox td.folderAction { background: #a8a8a8; } Modified: trunk/squirrelmail/templates/default/css/default.css =================================================================== --- trunk/squirrelmail/templates/default/css/default.css 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/templates/default/css/default.css 2007-02-27 18:14:34 UTC (rev 12281) @@ -394,17 +394,17 @@ color: navy; } -/* folder_manip.tpl defs */ -#folderManip { +/* dialog box defs */ +.dialogbox { text-align:center; } -#folderManip td { +.dialogbox td { text-align: center; padding: 2px; } -#folderManip table { +.dialogbox table { margin-left: auto; margin-right: auto; padding-top: 8px; @@ -413,7 +413,7 @@ width: 70%; } -#folderManip table.wrapper { +.dialogbox table.wrapper { border: 1px solid #dcdcdc /* __COLOR0__ */; width: 95%; margin-left: auto; @@ -421,11 +421,7 @@ padding: 0; } -#folderManip td.folderAction { - background: #dcdcdc /* __COLOR0__ */; -} - -#folderManip div { +.dialogbox div { margin-left: auto; margin-right: auto; width: 80%; Modified: trunk/squirrelmail/templates/default/folder_manip.tpl =================================================================== --- trunk/squirrelmail/templates/default/folder_manip.tpl 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/templates/default/folder_manip.tpl 2007-02-27 18:14:34 UTC (rev 12281) @@ -34,7 +34,7 @@ /* retrieve the template vars */ extract($t); ?> -<div id="folderManip"> +<div class="dialogbox"> <table cellspacing="0" class="wrapper"> <tr> <td class="header1"> @@ -50,7 +50,7 @@ </td> </tr> <tr> - <td class="folderAction"> + <td> <form method="post" action="folders.php" name="cf" id="cf"> <input type="hidden" name="smaction" value="create" /> <input type="text" name="folder_name" size="25" value="" /> @@ -87,7 +87,7 @@ </td> </tr> <tr> - <td class="folderAction"> + <td> <?php if ( !empty($rendel_folder_list) ) { ?> @@ -118,7 +118,7 @@ </td> </tr> <tr> - <td class="folderAction"> + <td> <?php if ( !empty($rendel_folder_list) ) { ?> @@ -152,7 +152,7 @@ </td> </tr> <tr> - <td class="folderAction"> + <td> <?php if (!empty($rendel_folder_list)) { ?> @@ -170,7 +170,7 @@ } ?> </td> - <td class="folderAction"> + <td> <?php if ($no_list_for_subscribe) { ?> Modified: trunk/squirrelmail/templates/default/folder_manip_dialog.tpl =================================================================== --- trunk/squirrelmail/templates/default/folder_manip_dialog.tpl 2007-02-27 17:27:26 UTC (rev 12280) +++ trunk/squirrelmail/templates/default/folder_manip_dialog.tpl 2007-02-27 18:14:34 UTC (rev 12281) @@ -29,7 +29,7 @@ /* retrieve the template vars */ extract($t); ?> -<div id="folderManip"> +<div class="dialogbox"> <form action="folders.php" method="post"> <table cellspacing="0" class="wrapper"> <?php @@ -80,4 +80,4 @@ </tr> </table> </form> -</div> \ No newline at end of file +</div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-02-27 18:57:33
|
Revision: 12283 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12283&view=rev Author: kink Date: 2007-02-27 10:57:18 -0800 (Tue, 27 Feb 2007) Log Message: ----------- also store the unparsed date, and display it when we failed to parse a Date. This allows RFC-incompatible dates to still be seen in e.g. read_body in their original form, better than nothing. For safety split any "<",">" out, something might rely on the date being completely safe to print. Modified Paths: -------------- trunk/squirrelmail/class/mime/Message.class.php trunk/squirrelmail/class/mime/Rfc822Header.class.php trunk/squirrelmail/functions/date.php trunk/squirrelmail/src/compose.php trunk/squirrelmail/src/printer_friendly_bottom.php trunk/squirrelmail/src/read_body.php Modified: trunk/squirrelmail/class/mime/Message.class.php =================================================================== --- trunk/squirrelmail/class/mime/Message.class.php 2007-02-27 18:22:00 UTC (rev 12282) +++ trunk/squirrelmail/class/mime/Message.class.php 2007-02-27 18:57:18 UTC (rev 12283) @@ -618,6 +618,7 @@ if (!$arg_a[1]) $arg_a[1] = _("(no subject)"); $hdr->date = getTimeStamp($d); /* argument 1: date */ + $hdr->date_unparsed = strtr($d,'<>',' '); /* original date */ $hdr->subject = $arg_a[1]; /* argument 2: subject */ $hdr->from = is_array($arg_a[2]) ? $arg_a[2][0] : ''; /* argument 3: from */ $hdr->sender = is_array($arg_a[3]) ? $arg_a[3][0] : ''; /* argument 4: sender */ Modified: trunk/squirrelmail/class/mime/Rfc822Header.class.php =================================================================== --- trunk/squirrelmail/class/mime/Rfc822Header.class.php 2007-02-27 18:22:00 UTC (rev 12282) +++ trunk/squirrelmail/class/mime/Rfc822Header.class.php 2007-02-27 18:57:18 UTC (rev 12283) @@ -30,6 +30,11 @@ */ var $date = -1; /** + * Date_original header + * @var mixed + */ + var $date_unparsed = ''; + /** * Subject header * @var string */ @@ -234,6 +239,7 @@ $d = strtr($value, array(' ' => ' ')); $d = explode(' ', $d); $this->date = getTimeStamp($d); + $this->date_unparsed = strtr($value,'<>',' '); break; case 'subject': $this->subject = $value; @@ -343,7 +349,7 @@ $value = $this->stripComments($value); $this->mlist('id', $value); break; - case 'x-spam-status': + case 'x-spam-status': $this->x_spam_status = $this->parseSpamStatus($value); break; default: Modified: trunk/squirrelmail/functions/date.php =================================================================== --- trunk/squirrelmail/functions/date.php 2007-02-27 18:22:00 UTC (rev 12282) +++ trunk/squirrelmail/functions/date.php 2007-02-27 18:57:18 UTC (rev 12283) @@ -305,14 +305,15 @@ * and taking localization into accout. * * @param int stamp the timestamp + * @param string fallback string to use when stamp not valid * @return string the long date string */ -function getLongDateString( $stamp ) { +function getLongDateString( $stamp, $fallback = '' ) { global $hour_format; if ($stamp == -1) { - return ''; + return $fallback; } if ( $hour_format == SMPREF_TIME_12HR ) { Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2007-02-27 18:22:00 UTC (rev 12282) +++ trunk/squirrelmail/src/compose.php 2007-02-27 18:57:18 UTC (rev 12283) @@ -285,7 +285,7 @@ $bodyTop = sq_str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH,$default_charset) . "\n". $display[_("Subject")] . $subject . "\n" . $display[_("From")] . $from . "\n" . - $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" . + $display[_("Date")] . getLongDateString( $orig_header->date, $orig_header->date_unparsed ). "\n" . $display[_("To")] . $to . "\n"; if ($orig_header->cc != array() && $orig_header->cc !='') { $cc = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false,true); @@ -928,7 +928,7 @@ } /* this corrects some wrapping/quoting problems on replies */ $rewrap_body = explode("\n", $body); - $from = (is_array($orig_header->from)) ? $orig_header->from[0] : $orig_header->from; + $from = (is_array($orig_header->from) && !empty($orig_header->from)) ? $orig_header->from[0] : $orig_header->from; $body = ''; $strip_sigs = getPref($data_dir, $username, 'strip_sigs'); foreach ($rewrap_body as $line) { Modified: trunk/squirrelmail/src/printer_friendly_bottom.php =================================================================== --- trunk/squirrelmail/src/printer_friendly_bottom.php 2007-02-27 18:22:00 UTC (rev 12282) +++ trunk/squirrelmail/src/printer_friendly_bottom.php 2007-02-27 18:57:18 UTC (rev 12283) @@ -52,7 +52,7 @@ $rfc822_header = $message->rfc822_header; /* From and Date are usually fine as they are... */ $from = $rfc822_header->getAddr_s('from'); -$date = getLongDateString($rfc822_header->date); +$date = getLongDateString($rfc822_header->date, $rfc822_header->date_unparsed); $subject = trim($rfc822_header->subject); /* we can clean these up if the list is too long... */ Modified: trunk/squirrelmail/src/read_body.php =================================================================== --- trunk/squirrelmail/src/read_body.php 2007-02-27 18:22:00 UTC (rev 12282) +++ trunk/squirrelmail/src/read_body.php 2007-02-27 18:57:18 UTC (rev 12283) @@ -174,7 +174,7 @@ } // part 1 (RFC2298) - $senton = getLongDateString( $header->date ); + $senton = getLongDateString( $header->date, $header->date_unparsed ); $to_array = $header->to; $to = ''; foreach ($to_array as $line) { @@ -372,7 +372,7 @@ $env[_("From")] = _("Unknown sender"); else $env[_("From")] = decodeHeader($from_name); - $env[_("Date")] = getLongDateString($header->date); + $env[_("Date")] = getLongDateString($header->date, $header->date_unparsed); $env[_("To")] = formatRecipientString($header->to, "to"); $env[_("Cc")] = formatRecipientString($header->cc, "cc"); $env[_("Bcc")] = formatRecipientString($header->bcc, "bcc"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-03-06 01:24:02
|
Revision: 12311 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12311&view=rev Author: kink Date: 2007-03-05 17:23:44 -0800 (Mon, 05 Mar 2007) Log Message: ----------- Fix Priority and Receipt compose options being reset after return from HTML addressbook, and allow returning from an empty address book (#1673056). Modified Paths: -------------- trunk/squirrelmail/ChangeLog trunk/squirrelmail/src/addrbook_search_html.php Modified: trunk/squirrelmail/ChangeLog =================================================================== --- trunk/squirrelmail/ChangeLog 2007-03-06 01:12:44 UTC (rev 12310) +++ trunk/squirrelmail/ChangeLog 2007-03-06 01:23:44 UTC (rev 12311) @@ -184,6 +184,8 @@ in PHP 4.4.5 (#1664155). - If a date-header cannot be parsed, display the unparsed version as a better-than-nothing alternative. + - Fix Priority and Receipt compose options being reset after return from + HTML addressbook, and allow returning from an empty address book (#1673056). Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/src/addrbook_search_html.php =================================================================== --- trunk/squirrelmail/src/addrbook_search_html.php 2007-03-06 01:12:44 UTC (rev 12310) +++ trunk/squirrelmail/src/addrbook_search_html.php 2007-03-06 01:23:44 UTC (rev 12311) @@ -40,7 +40,7 @@ */ function addr_insert_hidden() { global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox, - $identity, $session; + $request_mdn, $request_dr, $identity, $session; if (substr($body, 0, 1) == "\r") { echo addHidden('body', "\n".$body); @@ -53,6 +53,9 @@ addHidden('send_to', $send_to). addHidden('send_to_bcc', $send_to_bcc). addHidden('send_to_cc', $send_to_cc). + addHidden('mailprio', $mailprio). + addHidden('request_mdn', $request_mdn). + addHidden('request_dr', $request_dr). addHidden('identity', $identity). addHidden('mailbox', $mailbox). addHidden('from_htmladdr_search', 'true'); @@ -69,12 +72,11 @@ global $oTemplate, $oErrorHandler; - if (sizeof($res) <= 0) return; echo addForm($PHP_SELF, 'post', 'addressbook'). addHidden('html_addr_search_done', 'true'); addr_insert_hidden(); - + $oTemplate->assign('use_js', false); $oTemplate->assign('include_abook_name', $includesource); $oTemplate->assign('addresses', formatAddressList($res)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-03-06 14:57:14
|
Revision: 12315 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12315&view=rev Author: kink Date: 2007-03-06 06:57:12 -0800 (Tue, 06 Mar 2007) Log Message: ----------- do not special case a folder named 'None'. There's no reason to not use the empty string and this prevents people who want to have a "None" folder from using it properly. Modified Paths: -------------- trunk/squirrelmail/ChangeLog trunk/squirrelmail/functions/imap_mailbox.php trunk/squirrelmail/functions/page_header.php trunk/squirrelmail/help/en_US/options.hlp trunk/squirrelmail/plugins/abook_take/take.php trunk/squirrelmail/plugins/administrator/options.php trunk/squirrelmail/plugins/bug_report/bug_report.php trunk/squirrelmail/plugins/calendar/calendar.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/change_password/options.php trunk/squirrelmail/plugins/filters/options.php trunk/squirrelmail/plugins/filters/spamoptions.php trunk/squirrelmail/plugins/info/options.php trunk/squirrelmail/plugins/listcommands/options.php trunk/squirrelmail/plugins/mail_fetch/fetch.php trunk/squirrelmail/plugins/mail_fetch/options.php trunk/squirrelmail/plugins/newmail/newmail_opt.php trunk/squirrelmail/plugins/spamcop/options.php trunk/squirrelmail/plugins/squirrelspell/sqspell_functions.php trunk/squirrelmail/plugins/translate/options.php trunk/squirrelmail/src/about.php trunk/squirrelmail/src/addressbook.php trunk/squirrelmail/src/compose.php trunk/squirrelmail/src/folders.php trunk/squirrelmail/src/help.php trunk/squirrelmail/src/image.php trunk/squirrelmail/src/left_main.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/search.php trunk/squirrelmail/src/vcard.php trunk/squirrelmail/src/view_text.php trunk/squirrelmail/templates/default/page_header.tpl Modified: trunk/squirrelmail/ChangeLog =================================================================== --- trunk/squirrelmail/ChangeLog 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/ChangeLog 2007-03-06 14:57:12 UTC (rev 12315) @@ -186,6 +186,7 @@ better-than-nothing alternative. - Fix Priority and Receipt compose options being reset after return from HTML addressbook, and allow returning from an empty address book (#1673056). + - Do not special case the 'None' folder. Version 1.5.1 (branched on 2006-02-12) -------------------------------------- Modified: trunk/squirrelmail/functions/imap_mailbox.php =================================================================== --- trunk/squirrelmail/functions/imap_mailbox.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/functions/imap_mailbox.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -360,8 +360,7 @@ * @since 1.0 or older */ function sqimap_mailbox_select ($imap_stream, $mailbox) { - // FIX ME: WHAAAA DO NOT USE "None" for something that does not exist. Use false or NULL instead - if ($mailbox == 'None') { + if (empty($mailbox)) { return; } Modified: trunk/squirrelmail/functions/page_header.php =================================================================== --- trunk/squirrelmail/functions/page_header.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/functions/page_header.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -196,7 +196,7 @@ * @return void */ -function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') { +function displayPageHeader($color, $mailbox='', $sHeaderJs='', $sBodyTagJs = '') { global $reply_focus, $hide_sm_attributions, $frame_top, $provider_name, $provider_uri, $startMessage, Modified: trunk/squirrelmail/help/en_US/options.hlp =================================================================== --- trunk/squirrelmail/help/en_US/options.hlp 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/help/en_US/options.hlp 2007-03-06 14:57:12 UTC (rev 12315) @@ -268,7 +268,7 @@ messages, the INBOX will become bold and a number will appear to the right of it to say how many new messages are in it. If you set it to All Folders, this behavior will happen on all folders. If you notice that loading the folder list - is really slow, you can set this to INBOX or None and that should speed it up. + is really slow, you can set this to INBOX and that should speed it up. <br /><br /> <b>Unseen message notification type</b><br /> Modified: trunk/squirrelmail/plugins/abook_take/take.php =================================================================== --- trunk/squirrelmail/plugins/abook_take/take.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/abook_take/take.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -22,7 +22,7 @@ require(SM_PATH . 'functions/forms.php'); require(SM_PATH . 'functions/addressbook.php'); -displayPageHeader($color, 'None'); +displayPageHeader($color); /* input form data */ sqgetGlobalVar('email', $email, SQ_POST); @@ -45,4 +45,4 @@ abook_create_form(SM_PATH . 'src/addressbook.php','addaddr',_("Add to address book"),_("Add address"),$formdata); echo '</form>'; ?> -</body></html> \ No newline at end of file +</body></html> Modified: trunk/squirrelmail/plugins/administrator/options.php =================================================================== --- trunk/squirrelmail/plugins/administrator/options.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/administrator/options.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -233,7 +233,7 @@ exit; } -displayPageHeader($color, 'None'); +displayPageHeader($color); $newcfg = array( ); @@ -646,4 +646,4 @@ } ?> -</body></html> \ No newline at end of file +</body></html> Modified: trunk/squirrelmail/plugins/bug_report/bug_report.php =================================================================== --- trunk/squirrelmail/plugins/bug_report/bug_report.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/bug_report/bug_report.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -24,7 +24,7 @@ /** load plugin functions */ require_once(SM_PATH . 'plugins/bug_report/functions.php'); -displayPageHeader($color, 'None'); +displayPageHeader($color); /** is bug_report plugin disabled or called by wrong user */ if (! is_plugin_enabled('bug_report') || ! bug_report_check_user()) { @@ -131,4 +131,4 @@ </form> <br /> </body> -</html> \ No newline at end of file +</html> Modified: trunk/squirrelmail/plugins/calendar/calendar.php =================================================================== --- trunk/squirrelmail/plugins/calendar/calendar.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/calendar/calendar.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -169,7 +169,7 @@ $todayis = date( 'mdY' ); $calself=basename($PHP_SELF); -displayPageHeader($color, 'None'); +displayPageHeader($color); calendar_header(); readcalendardata(); startcalendar(); @@ -177,4 +177,4 @@ endcalendar(); ?> -</body></html> \ No newline at end of file +</body></html> Modified: trunk/squirrelmail/plugins/calendar/day.php =================================================================== --- trunk/squirrelmail/plugins/calendar/day.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/calendar/day.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -169,7 +169,7 @@ $daily_events = array(); -displayPageHeader($color, 'None'); +displayPageHeader($color); calendar_header(); readcalendardata(); day_header(); @@ -177,4 +177,4 @@ display_events(); ?> </table></td></tr></table> -</body></html> \ No newline at end of file +</body></html> Modified: trunk/squirrelmail/plugins/calendar/event_create.php =================================================================== --- trunk/squirrelmail/plugins/calendar/event_create.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/calendar/event_create.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -122,7 +122,7 @@ $calself=basename($PHP_SELF); -displayPageHeader($color, 'None'); +displayPageHeader($color); //load calendar menu calendar_header(); @@ -175,4 +175,4 @@ ?> </table></td></tr></table> -</body></html> \ No newline at end of file +</body></html> Modified: trunk/squirrelmail/plugins/calendar/event_delete.php =================================================================== --- trunk/squirrelmail/plugins/calendar/event_delete.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/calendar/event_delete.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -119,7 +119,7 @@ $calself=basename($PHP_SELF); -displayPageHeader($color, 'None'); +displayPageHeader($color); //load calendar menu calendar_header(); @@ -145,4 +145,4 @@ ?> </table></td></tr></table> -</body></html> \ No newline at end of file +</body></html> Modified: trunk/squirrelmail/plugins/calendar/event_edit.php =================================================================== --- trunk/squirrelmail/plugins/calendar/event_edit.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/calendar/event_edit.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -255,7 +255,7 @@ $calself=basename($PHP_SELF); -displayPageHeader($color, 'None'); +displayPageHeader($color); //load calendar menu calendar_header(); @@ -311,4 +311,4 @@ ?> </table></td></tr></table> -</body></html> \ No newline at end of file +</body></html> Modified: trunk/squirrelmail/plugins/change_password/options.php =================================================================== --- trunk/squirrelmail/plugins/change_password/options.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/change_password/options.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -62,7 +62,7 @@ } } -displayPageHeader($color, 'None'); +displayPageHeader($color); do_hook('change_password_init', $null); ?> Modified: trunk/squirrelmail/plugins/filters/options.php =================================================================== --- trunk/squirrelmail/plugins/filters/options.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/filters/options.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -18,7 +18,7 @@ include_once(SM_PATH . 'functions/forms.php'); include_once(SM_PATH . 'plugins/filters/filters.php'); -displayPageHeader($color, 'None'); +displayPageHeader($color); /* get globals */ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); Modified: trunk/squirrelmail/plugins/filters/spamoptions.php =================================================================== --- trunk/squirrelmail/plugins/filters/spamoptions.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/filters/spamoptions.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -25,7 +25,7 @@ sqgetGlobalVar('action', $action, SQ_GET); /* end globals */ -displayPageHeader($color, 'None'); +displayPageHeader($color); if (sqgetGlobalVar('spam_submit',$spam_submit,SQ_POST)) { $spam_filters = load_spam_filters(); Modified: trunk/squirrelmail/plugins/info/options.php =================================================================== --- trunk/squirrelmail/plugins/info/options.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/info/options.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -26,7 +26,7 @@ global $username, $color, $folder_prefix, $default_charset; $default_charset = strtoupper($default_charset); -displayPageHeader($color, 'None'); +displayPageHeader($color); $mailbox = 'INBOX'; /** Modified: trunk/squirrelmail/plugins/listcommands/options.php =================================================================== --- trunk/squirrelmail/plugins/listcommands/options.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/listcommands/options.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -70,7 +70,7 @@ -displayPageHeader($color, 'None'); +displayPageHeader($color); $oTemplate->assign('lists', $lists); $oTemplate->display('plugins/listcommands/non_rfc_lists.tpl'); Modified: trunk/squirrelmail/plugins/mail_fetch/fetch.php =================================================================== --- trunk/squirrelmail/plugins/mail_fetch/fetch.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/mail_fetch/fetch.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -119,7 +119,7 @@ } $mailfetch = Mail_Fetch_Servers(); -displayPageHeader($color, 'None'); +displayPageHeader($color); echo '<br />'; Modified: trunk/squirrelmail/plugins/mail_fetch/options.php =================================================================== --- trunk/squirrelmail/plugins/mail_fetch/options.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/mail_fetch/options.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -55,7 +55,7 @@ /* end globals */ -displayPageHeader( $color, 'None' ); +displayPageHeader( $color ); switch( $mf_action ) { case 'add': Modified: trunk/squirrelmail/plugins/newmail/newmail_opt.php =================================================================== --- trunk/squirrelmail/plugins/newmail/newmail_opt.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/newmail/newmail_opt.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -23,7 +23,7 @@ include_once(SM_PATH . 'functions/forms.php'); -displayPageHeader($color, 'None'); +displayPageHeader($color); echo html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) . "\n" . html_tag( 'tr' ) . "\n" . Modified: trunk/squirrelmail/plugins/spamcop/options.php =================================================================== --- trunk/squirrelmail/plugins/spamcop/options.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/spamcop/options.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -18,7 +18,7 @@ /* plugin functions */ include_once(SM_PATH . 'plugins/spamcop/functions.php'); -displayPageHeader($color, 'None'); +displayPageHeader($color); /** is spamcop plugin disabled */ // option changes do nothing, if read_body_header_right hook is not active. @@ -194,4 +194,4 @@ printf(_("For more information about SpamCop, it's services, spam in general, and many related topics, try reading through SpamCop's %sHelp and Feedback%s section."), '<a href="http://spamcop.net/help.shtml">', '</a>'); echo "</p>\n"; ?> -</body></html> \ No newline at end of file +</body></html> Modified: trunk/squirrelmail/plugins/squirrelspell/sqspell_functions.php =================================================================== --- trunk/squirrelmail/plugins/squirrelspell/sqspell_functions.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/squirrelspell/sqspell_functions.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -125,7 +125,7 @@ $MOD = 'options_main'; } - displayPageHeader($color, 'None'); + displayPageHeader($color); echo " <br />\n"; /** * Check if we need to link in a script. Modified: trunk/squirrelmail/plugins/translate/options.php =================================================================== --- trunk/squirrelmail/plugins/translate/options.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/plugins/translate/options.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -20,7 +20,7 @@ /** Plugin functions */ include_once(SM_PATH . 'plugins/translate/functions.php'); -displayPageHeader($color, 'None'); +displayPageHeader($color); ?> <table width="95%" align="center" border="0" cellpadding="1" cellspacing="0"><tr><td bgcolor="<?php echo $color[0]; ?>"> @@ -78,4 +78,4 @@ </td></tr> </table> </form> -</body></html> \ No newline at end of file +</body></html> Modified: trunk/squirrelmail/src/about.php =================================================================== --- trunk/squirrelmail/src/about.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/about.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -21,7 +21,7 @@ */ require('../include/init.php'); -displayPageHeader($color, 'None' ); +displayPageHeader($color); ?> <p align="center"> Modified: trunk/squirrelmail/src/addressbook.php =================================================================== --- trunk/squirrelmail/src/addressbook.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/addressbook.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -40,7 +40,7 @@ $abook_sort_order = get_abook_sort(); /* Create page header before addressbook_init in order to display error messages correctly. */ -displayPageHeader($color, 'None'); +displayPageHeader($color); /* Open addressbook with error messages on. remote backends (LDAP) are enabled because they can be used. (list_addr function) Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/compose.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -383,7 +383,7 @@ $composeMessage=$compose_messages[$session]; } -if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) { +if (empty($mailbox)) { $mailbox = 'INBOX'; } Modified: trunk/squirrelmail/src/folders.php =================================================================== --- trunk/squirrelmail/src/folders.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/folders.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -22,7 +22,7 @@ require_once(SM_PATH . 'functions/folder_manip.php'); require_once(SM_PATH . 'functions/forms.php'); -displayPageHeader($color, 'None'); +displayPageHeader($color); /* get globals we may need */ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); Modified: trunk/squirrelmail/src/help.php =================================================================== --- trunk/squirrelmail/src/help.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/help.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -16,7 +16,7 @@ */ require('../include/init.php'); -displayPageHeader($color, 'None' ); +displayPageHeader($color); $helpdir[0] = 'basic.hlp'; $helpdir[1] = 'main_folder.hlp'; Modified: trunk/squirrelmail/src/image.php =================================================================== --- trunk/squirrelmail/src/image.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/image.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -16,7 +16,7 @@ */ require('../include/init.php'); -displayPageHeader($color, 'None'); +displayPageHeader($color); /* globals */ if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) { Modified: trunk/squirrelmail/src/left_main.php =================================================================== --- trunk/squirrelmail/src/left_main.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/left_main.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -69,7 +69,7 @@ $autocreate = array($sent_folder, $trash_folder, $draft_folder); $folders_created = false; foreach( $autocreate as $folder ) { - if (($folder != '') && ($folder != 'none')) { + if ($folder != '') { /** * If $show_only_subscribed_folders is true, don't use * $mailboxes array for checking if mailbox exists. Modified: trunk/squirrelmail/src/options.php =================================================================== --- trunk/squirrelmail/src/options.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/options.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -237,7 +237,7 @@ /* Finally, display whatever page we are supposed to show now. */ /***************************************************************/ -displayPageHeader($color, 'None', (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : '')); +displayPageHeader($color, null, (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : '')); /* * The main option page has a different layout then the rest of the option Modified: trunk/squirrelmail/src/options_highlight.php =================================================================== --- trunk/squirrelmail/src/options_highlight.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/options_highlight.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -104,7 +104,7 @@ setPref($data_dir, $username, 'hililist', serialize($message_highlight_list)); } -displayPageHeader($color, 'None'); +displayPageHeader($color); /** * Display the current rule list Modified: trunk/squirrelmail/src/options_identities.php =================================================================== --- trunk/squirrelmail/src/options_identities.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/options_identities.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -61,7 +61,7 @@ exit; } -displayPageHeader($color, 'None'); +displayPageHeader($color); /* since 1.1.3 */ do_hook('options_identities_top', $null); Modified: trunk/squirrelmail/src/options_order.php =================================================================== --- trunk/squirrelmail/src/options_order.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/options_order.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -73,7 +73,7 @@ /* Finally, display whatever page we are supposed to show now. */ /***************************************************************/ -displayPageHeader($color, 'None', (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : '')); +displayPageHeader($color, null, (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : '')); /** Modified: trunk/squirrelmail/src/search.php =================================================================== --- trunk/squirrelmail/src/search.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/search.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -1312,7 +1312,7 @@ $boxes = sqimap_mailbox_list($imapConnection); /* ensure we have a valid default mailbox name */ $mailbox = asearch_nz($mailbox_array[0]); -if (($mailbox == '') || ($mailbox == 'None')) //Workaround for sm quirk IMHO (what if I really have a mailbox called None?) +if ($mailbox == '') $mailbox = $boxes[0]['unformatted']; //Usually INBOX ;) Modified: trunk/squirrelmail/src/vcard.php =================================================================== --- trunk/squirrelmail/src/vcard.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/vcard.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -41,7 +41,7 @@ $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); -displayPageHeader($color, 'None'); +displayPageHeader($color); $msg_url = 'read_body.php?mailbox='.urlencode($mailbox). '&startMessage='.urlencode($startMessage). @@ -185,4 +185,4 @@ $oTemplate->display('vcard.tpl'); $oTemplate->display('footer.tpl'); -?> \ No newline at end of file +?> Modified: trunk/squirrelmail/src/view_text.php =================================================================== --- trunk/squirrelmail/src/view_text.php 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/src/view_text.php 2007-03-06 14:57:12 UTC (rev 12315) @@ -75,7 +75,7 @@ translateText($body, $wrap_at, $charset); } -displayPageHeader($color, 'None'); +displayPageHeader($color); $oTemplate->assign('view_message_href', $msg_url); $oTemplate->assign('download_href', $dwnld_url); Modified: trunk/squirrelmail/templates/default/page_header.tpl =================================================================== --- trunk/squirrelmail/templates/default/page_header.tpl 2007-03-06 14:55:41 UTC (rev 12314) +++ trunk/squirrelmail/templates/default/page_header.tpl 2007-03-06 14:57:12 UTC (rev 12315) @@ -17,7 +17,7 @@ $current_folder_str = ''; -if ( $shortBoxName <> '' && strtolower( $shortBoxName ) <> 'none' ) { +if ( $shortBoxName != '' ) { $current_folder_str .= _("Current Folder") . ": <em>$shortBoxName </em>\n"; } else { $current_folder_str .= ' '; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jer...@us...> - 2007-03-08 12:13:17
|
Revision: 12325 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12325&view=rev Author: jervfors Date: 2007-03-08 04:13:09 -0800 (Thu, 08 Mar 2007) Log Message: ----------- Removing "www." in some links as well as the link to the deprecated feedback page. Modified Paths: -------------- trunk/squirrelmail/INSTALL trunk/squirrelmail/README trunk/squirrelmail/ReleaseNotes trunk/squirrelmail/config/conf.pl trunk/squirrelmail/contrib/RPM/squirrelmail.spec trunk/squirrelmail/contrib/conf.pl.8 trunk/squirrelmail/help/en_US/FAQ.hlp trunk/squirrelmail/plugins/bug_report/bug_report.php trunk/squirrelmail/src/about.php Modified: trunk/squirrelmail/INSTALL =================================================================== --- trunk/squirrelmail/INSTALL 2007-03-07 22:00:04 UTC (rev 12324) +++ trunk/squirrelmail/INSTALL 2007-03-08 12:13:09 UTC (rev 12325) @@ -28,9 +28,9 @@ - Run config/conf.pl from the command line. Use the D option to load predefined options for specific IMAP servers, and edit at least the Server Settings and General Options (datadir). -- Browse to http://www.example.com/yourwebmaillocation/src/configtest.php +- Browse to http://example.com/yourwebmaillocation/src/configtest.php to test your configuration for common errors. -- Browse to http://www.example.com/yourwebmaillocation/ to log in. +- Browse to http://example.com/yourwebmaillocation/ to log in. 1. CONFIGURE YOUR WEBSERVER TO WORK WITH PHP @@ -40,7 +40,7 @@ to work with PHP. You need at least PHP v4.1.0. SquirrelMail uses the standard suffix .php for all PHP files. - You can find PHP at http://www.php.net. See the documentation that + You can find PHP at http://php.net. See the documentation that comes with PHP for instructions how to set it up. The PHP IMAP extension is NOT necessary at all (but won't harm)! @@ -91,7 +91,7 @@ ---------------------------------------- SquirrelMail is constantly being improved. Therefore you should always - get the newest version around. Look at http://www.squirrelmail.org + get the newest version around. Look at http://squirrelmail.org to see what it is. If you want to be bleeding edge you might want to consider using the latest SVN version (with the latest and most fashionable bugs). @@ -191,7 +191,7 @@ Point your browser at the URL at which SquirrelMail is installed. A possible example of this is: - http://www.example.com/squirrelmail + http://example.com/squirrelmail It should be pretty straight forward to use. Some more documentation might show up one day or another. Modified: trunk/squirrelmail/README =================================================================== --- trunk/squirrelmail/README 2007-03-07 22:00:04 UTC (rev 12324) +++ trunk/squirrelmail/README 2007-03-08 12:13:09 UTC (rev 12325) @@ -1,5 +1,5 @@ SquirrelMail -http://www.squirrelmail.org +http://squirrelmail.org Introduction: ------------- @@ -29,11 +29,6 @@ have a few minutes, please send us an email to let us know! You can send it to our mailing list: squ...@li... -You can also go to the page below and fill out a small form to get listed -with the list of people already using SquirrelMail (free advertising). - - http://www.squirrelmail.org/feedback.php - Contact: -------- It is pretty easy to get in contact with the developers if you need help or @@ -43,7 +38,7 @@ squ...@li... NOTE: you need to be subscribed to this mailinglist to be able to post to it! -Please visit our web page (http://www.squirrelmail.org) and go to the section +Please visit our web page (http://squirrelmail.org) and go to the section titled "Mailing Lists". Installation: Modified: trunk/squirrelmail/ReleaseNotes =================================================================== --- trunk/squirrelmail/ReleaseNotes 2007-03-07 22:00:04 UTC (rev 12324) +++ trunk/squirrelmail/ReleaseNotes 2007-03-08 12:13:09 UTC (rev 12325) @@ -169,7 +169,7 @@ (version 1.5.1), and list your IMAP server and web server details. Bugs can be submitted at: - http://www.squirrelmail.org/bugs + http://squirrelmail.org/bugs Thanks for your cooperation with this. This helps ensure that nothing slips through the cracks. Also, please search the bug database for existing items @@ -200,7 +200,7 @@ sure that they are still present in the latest development code snapshots. To obtain thelatest development snapshot, see - http://www.squirrelmail.org/download.php#snapshot + http://squirrelmail.org/download.php#snapshot Happy SquirrelMailing! - The SquirrelMail Project Team Modified: trunk/squirrelmail/config/conf.pl =================================================================== --- trunk/squirrelmail/config/conf.pl 2007-03-07 22:00:04 UTC (rev 12324) +++ trunk/squirrelmail/config/conf.pl 2007-03-08 12:13:09 UTC (rev 12325) @@ -140,7 +140,7 @@ print " should get the 'config_default.php' that matches the version\n"; print " of SquirrelMail that you are running. You can get this from\n"; print " the SquirrelMail web page by going to the following URL:\n"; - print " http://www.squirrelmail.org.\n"; + print " http://squirrelmail.org.\n"; print "\n"; print "Continue loading with old config_default.php (a bad idea) [y/N]? "; $ctu = <STDIN>; @@ -1015,7 +1015,7 @@ print " to use the default logo, use ../images/sm_logo.png\n"; print " - To specify a logo defined outside the SquirrelMail source tree\n"; print " use the absolute URL the webserver would use to include the file\n"; - print " e.g. http://www.example.com/images/mylogo.gif or /images/mylogo.jpg\n"; + print " e.g. http://example.com/images/mylogo.gif or /images/mylogo.jpg\n"; print "\n"; print "[$WHT$org_logo$NRM]: $WHT"; $new_org_logo = <STDIN>; @@ -5388,4 +5388,3 @@ } } - Modified: trunk/squirrelmail/contrib/RPM/squirrelmail.spec =================================================================== --- trunk/squirrelmail/contrib/RPM/squirrelmail.spec 2007-03-07 22:00:04 UTC (rev 12324) +++ trunk/squirrelmail/contrib/RPM/squirrelmail.spec 2007-03-08 12:13:09 UTC (rev 12325) @@ -21,7 +21,7 @@ Version: 1.4.0 Release: %{rpm_release} License: GPL -URL: http://www.squirrelmail.org/ +URL: http://squirrelmail.org/ Vendor: squirrelmail.org Group: Applications/Internet Source: %{name}-%{version}.tar.bz2 Modified: trunk/squirrelmail/contrib/conf.pl.8 =================================================================== --- trunk/squirrelmail/contrib/conf.pl.8 2007-03-07 22:00:04 UTC (rev 12324) +++ trunk/squirrelmail/contrib/conf.pl.8 2007-03-08 12:13:09 UTC (rev 12325) @@ -26,7 +26,7 @@ Disable a plugin. Deactivates the plugin and saves SquirrelMail configuration. .SH "BUGS" If you find bugs in SquirrelMail configuration utility or this manual, you can -report them in SquirrelMail bug tracker. See \fBhttp://www.squirrelmail.org/bugs\fR +report them in SquirrelMail bug tracker. See \fBhttp://squirrelmail.org/bugs\fR .SH "AUTHOR" Tomas Kuliavas <to...@us...> .SH "COPYRIGHT" Modified: trunk/squirrelmail/help/en_US/FAQ.hlp =================================================================== --- trunk/squirrelmail/help/en_US/FAQ.hlp 2007-03-07 22:00:04 UTC (rev 12324) +++ trunk/squirrelmail/help/en_US/FAQ.hlp 2007-03-08 12:13:09 UTC (rev 12325) @@ -45,7 +45,7 @@ <description> <p> A lot of people helped out. To get a list of them, you can visit our - web site <a href="http://www.squirrelmail.org" target=_top>www.squirrelmail.org</a>. + web site <a href="http://squirrelmail.org" target=_top>squirrelmail.org</a>. </p> </description> </section> Modified: trunk/squirrelmail/plugins/bug_report/bug_report.php =================================================================== --- trunk/squirrelmail/plugins/bug_report/bug_report.php 2007-03-07 22:00:04 UTC (rev 12324) +++ trunk/squirrelmail/plugins/bug_report/bug_report.php 2007-03-08 12:13:09 UTC (rev 12325) @@ -73,7 +73,7 @@ echo '<ul>'; echo '<li>'; -printf(_("Make sure that you are running the most recent copy of %s. You are currently using version %s."), '<a href="http://www.squirrelmail.org/" target="_blank">SquirrelMail</a>', $version); +printf(_("Make sure that you are running the most recent copy of %s. You are currently using version %s."), '<a href="http://squirrelmail.org/" target="_blank">SquirrelMail</a>', $version); echo "</li>\n"; echo '<li>'; Modified: trunk/squirrelmail/src/about.php =================================================================== --- trunk/squirrelmail/src/about.php 2007-03-07 22:00:04 UTC (rev 12324) +++ trunk/squirrelmail/src/about.php 2007-03-08 12:13:09 UTC (rev 12325) @@ -55,7 +55,7 @@ echo ' '; // i18n: %s tags are used in order to remove html URL attributes from translation -echo sprintf(_("For more information about SquirrelMail and the SquirrelMail Project Team, see %sthe SquirrelMail website%s."),'<a href="http://www.squirrelmail.org/" target="_blank">','</a>'); +echo sprintf(_("For more information about SquirrelMail and the SquirrelMail Project Team, see %sthe SquirrelMail website%s."),'<a href="http://squirrelmail.org/" target="_blank">','</a>'); ?> <br /> <br /><br /> @@ -87,4 +87,3 @@ </table></p> <?php $oTemplate->display('footer.tpl'); -?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |