From: tokul Date: Sat, 15 Jul 2006 12:01:32 +0000 (+0000) Subject: removing trailing ?> from function scripts X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=6c99d1de81366bceab6c9d6cf12179eedc81f9bc removing trailing ?> from function scripts git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11396 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/ChangeLog b/ChangeLog index c6b66745..4fb9d36e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ Version 1.5.2 - CVS - Add HTML labels for form elements. - Fixed spamcop web based reporting form (#1519673) and removed service type options from spamcop plugin. + - Removed trailing ?> from function scripts. Version 1.5.1 (branched on 2006-02-12) -------------------------------------- diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php index 189de2b0..1ac5faa0 100644 --- a/class/deliver/Deliver.class.php +++ b/class/deliver/Deliver.class.php @@ -812,5 +812,3 @@ class Deliver { return $ret; } } - -?> diff --git a/class/deliver/Deliver_IMAP.class.php b/class/deliver/Deliver_IMAP.class.php index 17d2021a..2bb90dd0 100644 --- a/class/deliver/Deliver_IMAP.class.php +++ b/class/deliver/Deliver_IMAP.class.php @@ -28,5 +28,3 @@ class Deliver_IMAP extends Deliver { /* to do: finishing the imap-class so the initStream function can call the imap-class */ } - -?> \ No newline at end of file diff --git a/class/deliver/Deliver_SMTP.class.php b/class/deliver/Deliver_SMTP.class.php index 3b94f1e2..e03c7682 100644 --- a/class/deliver/Deliver_SMTP.class.php +++ b/class/deliver/Deliver_SMTP.class.php @@ -514,5 +514,3 @@ class Deliver_SMTP extends Deliver { return $ret; } } - -?> diff --git a/class/deliver/Deliver_SendMail.class.php b/class/deliver/Deliver_SendMail.class.php index de586387..7e4a8201 100644 --- a/class/deliver/Deliver_SendMail.class.php +++ b/class/deliver/Deliver_SendMail.class.php @@ -156,4 +156,3 @@ class Deliver_SendMail extends Deliver { } -?> \ No newline at end of file diff --git a/class/error.class.php b/class/error.class.php index af241e36..0f9f13c8 100644 --- a/class/error.class.php +++ b/class/error.class.php @@ -281,4 +281,3 @@ function sqm_trigger_error($sErrNo,$aExtra=array()) { } trigger_error($sErrString, $iPhpErr); } -?> \ No newline at end of file diff --git a/class/helper/VCard.class.php b/class/helper/VCard.class.php index 9274164c..757fe6d9 100644 --- a/class/helper/VCard.class.php +++ b/class/helper/VCard.class.php @@ -40,5 +40,3 @@ class VCard { return $array; } } - -?> \ No newline at end of file diff --git a/class/l10n.class.php b/class/l10n.class.php index 02cc7d05..bc93511f 100644 --- a/class/l10n.class.php +++ b/class/l10n.class.php @@ -20,4 +20,3 @@ if (! defined('SM_PATH')) define('SM_PATH','../'); /** Load all php-gettext classes */ include_once(SM_PATH . 'class/l10n/streams.class.php'); include_once(SM_PATH . 'class/l10n/gettext.class.php'); -?> \ No newline at end of file diff --git a/class/l10n/gettext.class.php b/class/l10n/gettext.class.php index 23429014..ce8d78f1 100644 --- a/class/l10n/gettext.class.php +++ b/class/l10n/gettext.class.php @@ -288,4 +288,3 @@ class gettext_reader { } } } -?> \ No newline at end of file diff --git a/class/l10n/streams.class.php b/class/l10n/streams.class.php index 5f918ea8..ca856777 100644 --- a/class/l10n/streams.class.php +++ b/class/l10n/streams.class.php @@ -125,4 +125,3 @@ class FileReader { fclose($this->_fd); } } -?> \ No newline at end of file diff --git a/class/mime.class.php b/class/mime.class.php index 9cb179f3..bba3c65e 100644 --- a/class/mime.class.php +++ b/class/mime.class.php @@ -24,5 +24,3 @@ require_once(SM_PATH . 'class/mime/SMimeMessage.class.php'); require_once(SM_PATH . 'class/mime/Disposition.class.php'); require_once(SM_PATH . 'class/mime/Language.class.php'); require_once(SM_PATH . 'class/mime/ContentType.class.php'); - -?> \ No newline at end of file diff --git a/class/mime/AddressStructure.class.php b/class/mime/AddressStructure.class.php index 2fa3af37..165607f7 100644 --- a/class/mime/AddressStructure.class.php +++ b/class/mime/AddressStructure.class.php @@ -98,5 +98,3 @@ class AddressStructure { return $this->getAddress(true, true); } } - -?> \ No newline at end of file diff --git a/class/mime/ContentType.class.php b/class/mime/ContentType.class.php index 915485d7..be876155 100644 --- a/class/mime/ContentType.class.php +++ b/class/mime/ContentType.class.php @@ -56,5 +56,3 @@ class ContentType { $this->properties = array(); } } - -?> \ No newline at end of file diff --git a/class/mime/Disposition.class.php b/class/mime/Disposition.class.php index e26e383e..2abde4f9 100644 --- a/class/mime/Disposition.class.php +++ b/class/mime/Disposition.class.php @@ -45,5 +45,3 @@ class Disposition { return ''; } } - -?> \ No newline at end of file diff --git a/class/mime/Language.class.php b/class/mime/Language.class.php index 4ced6850..ba7e8275 100644 --- a/class/mime/Language.class.php +++ b/class/mime/Language.class.php @@ -36,5 +36,3 @@ class Language { $this->properties = array(); } } - -?> \ No newline at end of file diff --git a/class/mime/Message.class.php b/class/mime/Message.class.php index 9c49cabd..1c483001 100644 --- a/class/mime/Message.class.php +++ b/class/mime/Message.class.php @@ -1071,5 +1071,3 @@ class Message { } } } - -?> diff --git a/class/mime/MessageHeader.class.php b/class/mime/MessageHeader.class.php index 2ad573f6..110bb3db 100644 --- a/class/mime/MessageHeader.class.php +++ b/class/mime/MessageHeader.class.php @@ -96,5 +96,3 @@ class MessageHeader { $this->parameters[strtolower($parameter)] = $value; } } - -?> \ No newline at end of file diff --git a/class/mime/Rfc822Header.class.php b/class/mime/Rfc822Header.class.php index ba22d256..2b5d7dda 100644 --- a/class/mime/Rfc822Header.class.php +++ b/class/mime/Rfc822Header.class.php @@ -940,5 +940,3 @@ class Rfc822Header { return $this->content_type->properties; } } - -?> diff --git a/class/mime/SMimeMessage.class.php b/class/mime/SMimeMessage.class.php index 26b68905..0a732c2c 100644 --- a/class/mime/SMimeMessage.class.php +++ b/class/mime/SMimeMessage.class.php @@ -23,5 +23,3 @@ class SMimeMessage { } - -?> \ No newline at end of file diff --git a/class/template/template.class.php b/class/template/template.class.php index a6d060be..238b8ac1 100755 --- a/class/template/template.class.php +++ b/class/template/template.class.php @@ -272,5 +272,3 @@ class Template return $paths; } } - -?> diff --git a/config/conf.pl b/config/conf.pl index 3ec71ea5..58d759e4 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -4173,8 +4173,6 @@ sub save_data { print CF " * sent and regular output to begin, which will majorly screw\n"; print CF " * things up when we try to send more headers later.\n"; print CF " */\n"; - print CF "?>"; - close CF; print "Data saved in config.php\n"; diff --git a/config/config_default.php b/config/config_default.php index a230308b..7b92d598 100644 --- a/config/config_default.php +++ b/config/config_default.php @@ -1208,4 +1208,3 @@ $config_use_color = 2; * sent and regular output to begin, which will majorly screw * things up when we try to send more headers later. */ -?> diff --git a/config/config_local.example.php b/config/config_local.example.php index e1143095..59d5e44a 100644 --- a/config/config_local.example.php +++ b/config/config_local.example.php @@ -13,5 +13,3 @@ * @package squirrelmail * @subpackage config */ - -?> \ No newline at end of file diff --git a/functions/abook_database.php b/functions/abook_database.php index 77deaac7..6fc04ac2 100644 --- a/functions/abook_database.php +++ b/functions/abook_database.php @@ -473,4 +473,3 @@ class abook_database extends addressbook_backend { } /* End of class abook_database */ // vim: et ts=4 -?> diff --git a/functions/abook_local_file.php b/functions/abook_local_file.php index fb215e27..e9986c6e 100644 --- a/functions/abook_local_file.php +++ b/functions/abook_local_file.php @@ -573,4 +573,3 @@ class abook_local_file extends addressbook_backend { } } /* End of class abook_local_file */ -?> diff --git a/functions/attachment_common.php b/functions/attachment_common.php index 0aec18e7..446842a2 100644 --- a/functions/attachment_common.php +++ b/functions/attachment_common.php @@ -262,5 +262,3 @@ function attachment_common_octet_stream(&$Args) { $Args[$a] = $b; } } - -?> \ No newline at end of file diff --git a/functions/auth.php b/functions/auth.php index 71f2fdb9..2729c749 100644 --- a/functions/auth.php +++ b/functions/auth.php @@ -272,5 +272,3 @@ function get_smtp_user(&$user, &$pass) { $pass = sqauth_read_password(); } } - -?> \ No newline at end of file diff --git a/functions/db_prefs.php b/functions/db_prefs.php index 1bc2a122..26c2ac2e 100644 --- a/functions/db_prefs.php +++ b/functions/db_prefs.php @@ -543,4 +543,3 @@ function getSig($data_dir, $username, $number) { } // vim: et ts=4 -?> \ No newline at end of file diff --git a/functions/decode/cp1250.php b/functions/decode/cp1250.php index 9bfbf198..b6653b5d 100644 --- a/functions/decode/cp1250.php +++ b/functions/decode/cp1250.php @@ -168,5 +168,3 @@ function charset_decode_cp1250 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/cp1251.php b/functions/decode/cp1251.php index 590e662f..e55b1a19 100644 --- a/functions/decode/cp1251.php +++ b/functions/decode/cp1251.php @@ -168,5 +168,3 @@ function charset_decode_cp1251 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/cp1252.php b/functions/decode/cp1252.php index 6a7d230f..b94c3771 100644 --- a/functions/decode/cp1252.php +++ b/functions/decode/cp1252.php @@ -169,5 +169,3 @@ function charset_decode_cp1252 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/cp1253.php b/functions/decode/cp1253.php index f2159653..7c55c429 100644 --- a/functions/decode/cp1253.php +++ b/functions/decode/cp1253.php @@ -168,5 +168,3 @@ function charset_decode_cp1253 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/cp1254.php b/functions/decode/cp1254.php index 8b2f4be7..bdb59201 100644 --- a/functions/decode/cp1254.php +++ b/functions/decode/cp1254.php @@ -168,5 +168,3 @@ function charset_decode_cp1254 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/cp1255.php b/functions/decode/cp1255.php index 4dadc355..be63830a 100644 --- a/functions/decode/cp1255.php +++ b/functions/decode/cp1255.php @@ -168,5 +168,3 @@ function charset_decode_cp1255 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/cp1256.php b/functions/decode/cp1256.php index 3f32de47..66a6b94c 100644 --- a/functions/decode/cp1256.php +++ b/functions/decode/cp1256.php @@ -168,5 +168,3 @@ function charset_decode_cp1256 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/cp1257.php b/functions/decode/cp1257.php index 8a560db2..1bd21443 100644 --- a/functions/decode/cp1257.php +++ b/functions/decode/cp1257.php @@ -156,5 +156,3 @@ function charset_decode_cp1257 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/cp1258.php b/functions/decode/cp1258.php index d5b82456..d6a7a5c6 100644 --- a/functions/decode/cp1258.php +++ b/functions/decode/cp1258.php @@ -168,5 +168,3 @@ function charset_decode_cp1258 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/cp855.php b/functions/decode/cp855.php index e1e82394..1a86876e 100644 --- a/functions/decode/cp855.php +++ b/functions/decode/cp855.php @@ -168,5 +168,3 @@ function charset_decode_cp855 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/cp866.php b/functions/decode/cp866.php index 4e4c0569..23d87c4a 100644 --- a/functions/decode/cp866.php +++ b/functions/decode/cp866.php @@ -169,4 +169,4 @@ function charset_decode_cp866 ($string) { $string = str_replace(array_keys($cp866), array_values($cp866), $string); return $string; -} \ No newline at end of file +} diff --git a/functions/decode/iso_8859_1.php b/functions/decode/iso_8859_1.php index 8675c99f..f75c2956 100644 --- a/functions/decode/iso_8859_1.php +++ b/functions/decode/iso_8859_1.php @@ -31,5 +31,3 @@ function charset_decode_iso_8859_1 ($string) { $string = preg_replace("/([\241-\377])/e","'&#' . ord('\\1') . ';'",$string); return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_10.php b/functions/decode/iso_8859_10.php index ae870a93..87c1e559 100644 --- a/functions/decode/iso_8859_10.php +++ b/functions/decode/iso_8859_10.php @@ -153,5 +153,3 @@ function charset_decode_iso_8859_10 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_11.php b/functions/decode/iso_8859_11.php index 6c77c450..5654b096 100644 --- a/functions/decode/iso_8859_11.php +++ b/functions/decode/iso_8859_11.php @@ -145,5 +145,3 @@ function charset_decode_iso_8859_11 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_13.php b/functions/decode/iso_8859_13.php index c1fce27c..e0f88195 100644 --- a/functions/decode/iso_8859_13.php +++ b/functions/decode/iso_8859_13.php @@ -153,5 +153,3 @@ function charset_decode_iso_8859_13 ($string) { return $string; } - -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_14.php b/functions/decode/iso_8859_14.php index c4e9d962..b0a49676 100644 --- a/functions/decode/iso_8859_14.php +++ b/functions/decode/iso_8859_14.php @@ -154,4 +154,3 @@ function charset_decode_iso_8859_14 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_15.php b/functions/decode/iso_8859_15.php index 3ae37270..49123879 100644 --- a/functions/decode/iso_8859_15.php +++ b/functions/decode/iso_8859_15.php @@ -154,4 +154,3 @@ function charset_decode_iso_8859_15 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_16.php b/functions/decode/iso_8859_16.php index bc75891e..84b236bd 100644 --- a/functions/decode/iso_8859_16.php +++ b/functions/decode/iso_8859_16.php @@ -153,4 +153,3 @@ function charset_decode_iso_8859_16 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_2.php b/functions/decode/iso_8859_2.php index d82d84d8..22727292 100644 --- a/functions/decode/iso_8859_2.php +++ b/functions/decode/iso_8859_2.php @@ -153,4 +153,3 @@ function charset_decode_iso_8859_2 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_3.php b/functions/decode/iso_8859_3.php index 0ea19d2c..9874ee9b 100644 --- a/functions/decode/iso_8859_3.php +++ b/functions/decode/iso_8859_3.php @@ -146,4 +146,3 @@ function charset_decode_iso_8859_3 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_4.php b/functions/decode/iso_8859_4.php index 8538b0d6..b0c675cb 100644 --- a/functions/decode/iso_8859_4.php +++ b/functions/decode/iso_8859_4.php @@ -153,4 +153,3 @@ function charset_decode_iso_8859_4 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_5.php b/functions/decode/iso_8859_5.php index 7272e8de..8464958b 100644 --- a/functions/decode/iso_8859_5.php +++ b/functions/decode/iso_8859_5.php @@ -153,4 +153,3 @@ function charset_decode_iso_8859_5 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_6.php b/functions/decode/iso_8859_6.php index d2c740f9..9c75de2e 100644 --- a/functions/decode/iso_8859_6.php +++ b/functions/decode/iso_8859_6.php @@ -108,4 +108,3 @@ function charset_decode_iso_8859_6 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_7.php b/functions/decode/iso_8859_7.php index d59ab988..34317936 100644 --- a/functions/decode/iso_8859_7.php +++ b/functions/decode/iso_8859_7.php @@ -147,4 +147,3 @@ function charset_decode_iso_8859_7 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_8.php b/functions/decode/iso_8859_8.php index bfc02365..5ff1b5a9 100644 --- a/functions/decode/iso_8859_8.php +++ b/functions/decode/iso_8859_8.php @@ -117,4 +117,3 @@ function charset_decode_iso_8859_8 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/iso_8859_9.php b/functions/decode/iso_8859_9.php index b6a30970..9247152d 100644 --- a/functions/decode/iso_8859_9.php +++ b/functions/decode/iso_8859_9.php @@ -153,4 +153,3 @@ function charset_decode_iso_8859_9 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/iso_ir_111.php b/functions/decode/iso_ir_111.php index 5a1984a3..f466b26b 100644 --- a/functions/decode/iso_ir_111.php +++ b/functions/decode/iso_ir_111.php @@ -157,4 +157,3 @@ function charset_decode_iso_ir_111 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/koi8_r.php b/functions/decode/koi8_r.php index 4c1da5f5..2077a0c0 100644 --- a/functions/decode/koi8_r.php +++ b/functions/decode/koi8_r.php @@ -184,4 +184,3 @@ function charset_decode_koi8_r ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/koi8_u.php b/functions/decode/koi8_u.php index 27e87a46..a5e7e889 100644 --- a/functions/decode/koi8_u.php +++ b/functions/decode/koi8_u.php @@ -188,4 +188,3 @@ function charset_decode_koi8_u ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/ns_4551_1.php b/functions/decode/ns_4551_1.php index 4ee9f6ea..8c6a889a 100644 --- a/functions/decode/ns_4551_1.php +++ b/functions/decode/ns_4551_1.php @@ -32,4 +32,3 @@ function charset_decode_ns_4551_1 ($string) { */ return strtr ($string, "[\\]{|}", "ÆØÅæøå"); } -?> \ No newline at end of file diff --git a/functions/decode/tis_620.php b/functions/decode/tis_620.php index 1f8fbfd0..0b3251dd 100644 --- a/functions/decode/tis_620.php +++ b/functions/decode/tis_620.php @@ -151,4 +151,3 @@ function charset_decode_tis_620 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/decode/us_ascii.php b/functions/decode/us_ascii.php index 1d559e6e..ebb381e5 100644 --- a/functions/decode/us_ascii.php +++ b/functions/decode/us_ascii.php @@ -34,4 +34,3 @@ function charset_decode_us_ascii ($string) { $string = preg_replace("/([\241-\377])/e","'?'",$string); return $string; } -?> \ No newline at end of file diff --git a/functions/decode/utf_8.php b/functions/decode/utf_8.php index 2eb8d41e..9c3c3068 100644 --- a/functions/decode/utf_8.php +++ b/functions/decode/utf_8.php @@ -92,4 +92,3 @@ function charset_decode_utf_8 ($string) { return $string; } -?> \ No newline at end of file diff --git a/functions/encode/cp1251.php b/functions/encode/cp1251.php index 7e04c4f4..fbda9ef7 100644 --- a/functions/encode/cp1251.php +++ b/functions/encode/cp1251.php @@ -176,4 +176,3 @@ function unicodetocp1251($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/cp1255.php b/functions/encode/cp1255.php index bfd1e54b..48d2d682 100644 --- a/functions/encode/cp1255.php +++ b/functions/encode/cp1255.php @@ -154,4 +154,3 @@ function unicodetocp1255($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/cp1256.php b/functions/encode/cp1256.php index 31129753..19acb29f 100644 --- a/functions/encode/cp1256.php +++ b/functions/encode/cp1256.php @@ -177,4 +177,3 @@ function unicodetocp1256($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/iso_8859_1.php b/functions/encode/iso_8859_1.php index 99d50b10..48271728 100644 --- a/functions/encode/iso_8859_1.php +++ b/functions/encode/iso_8859_1.php @@ -48,4 +48,3 @@ function unicodetoiso88591($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/iso_8859_15.php b/functions/encode/iso_8859_15.php index 11f61729..a2db358a 100644 --- a/functions/encode/iso_8859_15.php +++ b/functions/encode/iso_8859_15.php @@ -145,4 +145,3 @@ function unicodetoiso885915($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/iso_8859_2.php b/functions/encode/iso_8859_2.php index 3e67e437..a4f784c8 100644 --- a/functions/encode/iso_8859_2.php +++ b/functions/encode/iso_8859_2.php @@ -146,4 +146,3 @@ function unicodetoiso88592($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/iso_8859_7.php b/functions/encode/iso_8859_7.php index c8ec3603..f59cc101 100644 --- a/functions/encode/iso_8859_7.php +++ b/functions/encode/iso_8859_7.php @@ -140,4 +140,3 @@ function unicodetoiso88597($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/iso_8859_9.php b/functions/encode/iso_8859_9.php index 689a073c..6c263e12 100644 --- a/functions/encode/iso_8859_9.php +++ b/functions/encode/iso_8859_9.php @@ -146,4 +146,3 @@ function unicodetoiso88599($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/koi8_r.php b/functions/encode/koi8_r.php index 059fbce6..9293d264 100644 --- a/functions/encode/koi8_r.php +++ b/functions/encode/koi8_r.php @@ -177,4 +177,3 @@ function unicodetokoi8r($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/koi8_u.php b/functions/encode/koi8_u.php index 99f0bbbb..a70c5153 100644 --- a/functions/encode/koi8_u.php +++ b/functions/encode/koi8_u.php @@ -177,4 +177,3 @@ function unicodetokoi8u($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/tis_620.php b/functions/encode/tis_620.php index 2bc9c436..c68b4563 100644 --- a/functions/encode/tis_620.php +++ b/functions/encode/tis_620.php @@ -136,4 +136,3 @@ function unicodetotis620($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/us_ascii.php b/functions/encode/us_ascii.php index ecf7cf9a..bc399474 100644 --- a/functions/encode/us_ascii.php +++ b/functions/encode/us_ascii.php @@ -48,4 +48,3 @@ function unicodetousascii($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/encode/utf_8.php b/functions/encode/utf_8.php index 8cd069ba..dda11ba9 100644 --- a/functions/encode/utf_8.php +++ b/functions/encode/utf_8.php @@ -118,4 +118,3 @@ function unicodetoutf8($var) { } return $ret; } -?> \ No newline at end of file diff --git a/functions/file_prefs.php b/functions/file_prefs.php index 161f2ef7..6c6f511e 100644 --- a/functions/file_prefs.php +++ b/functions/file_prefs.php @@ -309,4 +309,3 @@ function getSig($data_dir, $username, $number) { } // vim: et ts=4 -?> \ No newline at end of file diff --git a/functions/folder_manip.php b/functions/folder_manip.php index 75f64d6f..b1032dc9 100644 --- a/functions/folder_manip.php +++ b/functions/folder_manip.php @@ -340,6 +340,3 @@ function folders_unsubscribe($imapConnection, $folder_names) return; } - - -?> diff --git a/functions/forms.php b/functions/forms.php index eacfaaca..361dd49d 100644 --- a/functions/forms.php +++ b/functions/forms.php @@ -299,5 +299,3 @@ function addForm($sAction, $sMethod = 'post', $sName = '', $sEnctype = '', $sCha return '
\n"; } - -?> \ No newline at end of file diff --git a/functions/gettext.php b/functions/gettext.php index f311150e..ad52d435 100644 --- a/functions/gettext.php +++ b/functions/gettext.php @@ -101,4 +101,3 @@ if (! function_exists('dgettext')) { return $l10n[$domain]->translate($str); } } -?> \ No newline at end of file diff --git a/functions/global.php b/functions/global.php index e40dffba..b04a5adb 100644 --- a/functions/global.php +++ b/functions/global.php @@ -418,5 +418,3 @@ function php_self () { return ''; } - - diff --git a/functions/html.php b/functions/html.php index 59f69a25..4dc3f1e7 100644 --- a/functions/html.php +++ b/functions/html.php @@ -157,4 +157,3 @@ function set_url_var($url, $var, $val=0, $link=true) { } return $url; } -?> \ No newline at end of file diff --git a/functions/htmlentities/iso-8859-1.php b/functions/htmlentities/iso-8859-1.php index 1dcf9c46..da98a7fb 100644 --- a/functions/htmlentities/iso-8859-1.php +++ b/functions/htmlentities/iso-8859-1.php @@ -107,4 +107,3 @@ $sq_html_ent_table = array_merge($sq_html_ent_table, "\xFE" => 'þ', "\xFF" => 'ÿ') ); -?> \ No newline at end of file diff --git a/functions/htmlentities/readme.php b/functions/htmlentities/readme.php index 0ede7cef..ada66f75 100644 --- a/functions/htmlentities/readme.php +++ b/functions/htmlentities/readme.php @@ -321,4 +321,3 @@ * @package squirrelmail * @subpackage strings */ -?> \ No newline at end of file diff --git a/functions/htmlentities/utf-8.php b/functions/htmlentities/utf-8.php index de47bd59..297cc005 100644 --- a/functions/htmlentities/utf-8.php +++ b/functions/htmlentities/utf-8.php @@ -273,4 +273,3 @@ $sq_html_ent_table = array_merge($sq_html_ent_table, "\xE2\x99\xA6" => '♦' ) ); -?> \ No newline at end of file diff --git a/functions/identity.php b/functions/identity.php index 10c377eb..9fd5b261 100644 --- a/functions/identity.php +++ b/functions/identity.php @@ -210,5 +210,3 @@ function empty_identity($ident) { return false; } } - -?> \ No newline at end of file diff --git a/functions/imap.php b/functions/imap.php index 84dfa9c9..38411499 100644 --- a/functions/imap.php +++ b/functions/imap.php @@ -16,5 +16,3 @@ /** Includes */ include_once(SM_PATH . 'functions/imap_messages.php'); include_once(SM_PATH . 'functions/imap_general.php'); - -?> \ No newline at end of file diff --git a/functions/imap_asearch.php b/functions/imap_asearch.php index 957591e6..8c0c26af 100644 --- a/functions/imap_asearch.php +++ b/functions/imap_asearch.php @@ -486,5 +486,3 @@ function sqimap_asearch($imapConnection, &$mailbox_array, &$biop_array, &$unop_a } return ($mbox_search); } - -?> diff --git a/functions/imap_general.php b/functions/imap_general.php index a4820491..7a3ef3e6 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -1306,5 +1306,3 @@ function map_yp_alias($username) { $yp = `ypmatch $username aliases`; return chop(substr($yp, strlen($username)+1)); } - -?> \ No newline at end of file diff --git a/functions/imap_messages.php b/functions/imap_messages.php index f16b5d2b..b2f8eab5 100755 --- a/functions/imap_messages.php +++ b/functions/imap_messages.php @@ -944,5 +944,3 @@ function sqimap_get_message($imap_stream, $id, $mailbox) { $msg->rfc822_header = $rfc822_header; return $msg; } - -?> diff --git a/functions/imap_utf7_local.php b/functions/imap_utf7_local.php index 83a93099..edfe834b 100644 --- a/functions/imap_utf7_local.php +++ b/functions/imap_utf7_local.php @@ -250,5 +250,3 @@ function decodeBASE64($s) { } return $d; } - -?> \ No newline at end of file diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 03c74d72..2de35bb2 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1460,5 +1460,3 @@ function attachSelectedMessages($imapConnection,$aMsgHeaders) { sqsession_register($compose_messages,'compose_messages'); return $composesession; } - -?> diff --git a/functions/mime.php b/functions/mime.php index 58f29884..1d7f0321 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -2409,5 +2409,3 @@ function SendDownloadHeaders($type0, $type1, $filename, $force, $filesize=0) { } } // end fn SendDownloadHeaders - -?> \ No newline at end of file diff --git a/functions/ngettext.php b/functions/ngettext.php index 985cf875..6fad6a6a 100644 --- a/functions/ngettext.php +++ b/functions/ngettext.php @@ -67,4 +67,3 @@ if (! function_exists('dngettext')) { return $l10n[$domain]->ngettext($single, $plural, $number); } } -?> \ No newline at end of file diff --git a/functions/options.php b/functions/options.php index 189f1f71..747d85e4 100644 --- a/functions/options.php +++ b/functions/options.php @@ -734,4 +734,3 @@ function OptionSubmit( $name ) { } // vim: et ts=4 -?> diff --git a/functions/plugin.php b/functions/plugin.php index 6e66aa60..eaf90da6 100644 --- a/functions/plugin.php +++ b/functions/plugin.php @@ -206,4 +206,3 @@ function is_plugin_enabled($plugin_name) { return false; } } -?> diff --git a/functions/prefs.php b/functions/prefs.php index 49244419..3f8f9974 100644 --- a/functions/prefs.php +++ b/functions/prefs.php @@ -126,4 +126,3 @@ function computeHashDirs($username) { /* Return our array of hash directories. */ return ($hash_dirs); } -?> \ No newline at end of file diff --git a/functions/rfc822address.php b/functions/rfc822address.php index 1225ed0b..40fd183a 100644 --- a/functions/rfc822address.php +++ b/functions/rfc822address.php @@ -406,4 +406,3 @@ function _getAddressTokens($address) { } return $aTokens; } -?> \ No newline at end of file diff --git a/functions/strings.php b/functions/strings.php index 626d022b..31813f3d 100644 --- a/functions/strings.php +++ b/functions/strings.php @@ -1290,5 +1290,3 @@ function sq_count8bit($string) { function sq_trim_value ( &$value ) { $value = trim($value); } - -?> \ No newline at end of file diff --git a/functions/tree.php b/functions/tree.php index 14c32383..a714d26a 100644 --- a/functions/tree.php +++ b/functions/tree.php @@ -194,5 +194,3 @@ function simpleWalkTreePre($index, $tree) { echo $tree[$index]['value'] . '
'; } } - -?> \ No newline at end of file diff --git a/functions/url_parser.php b/functions/url_parser.php index b9496746..32fdc392 100644 --- a/functions/url_parser.php +++ b/functions/url_parser.php @@ -277,4 +277,3 @@ function sq_strpos_8bit($haystack,$offset=0,$maxlength=false) { } return $ret; } -?> \ No newline at end of file diff --git a/images/themes/default/theme.php b/images/themes/default/theme.php index 13e5aed6..6cb2f7e6 100644 --- a/images/themes/default/theme.php +++ b/images/themes/default/theme.php @@ -9,5 +9,4 @@ * @package squirrelmail * @subpackage themes */ - $icon_themes[] = array('NAME'=>_("Default"),'PATH'=> SM_PATH.'images/'); -?> \ No newline at end of file +$icon_themes[] = array('NAME'=>_("Default"),'PATH'=> SM_PATH.'images/'); diff --git a/images/themes/none/theme.php b/images/themes/none/theme.php index e5b1addf..6aa73dab 100644 --- a/images/themes/none/theme.php +++ b/images/themes/none/theme.php @@ -9,5 +9,4 @@ * @package squirrelmail * @subpackage themes */ - $icon_themes[] = array('NAME'=>_("None"),'PATH'=> 'none'); -?> \ No newline at end of file +$icon_themes[] = array('NAME'=>_("None"),'PATH'=> 'none'); diff --git a/images/themes/template/theme.php b/images/themes/template/theme.php index b5a0dd46..424f1e19 100644 --- a/images/themes/template/theme.php +++ b/images/themes/template/theme.php @@ -9,5 +9,4 @@ * @package squirrelmail * @subpackage themes */ - $icon_themes[] = array('NAME'=>_("Template Default"),'PATH'=> 'template'); -?> \ No newline at end of file +$icon_themes[] = array('NAME'=>_("Template Default"),'PATH'=> 'template'); diff --git a/images/themes/xp/theme.php b/images/themes/xp/theme.php index e7a76edd..a3360705 100644 --- a/images/themes/xp/theme.php +++ b/images/themes/xp/theme.php @@ -9,5 +9,4 @@ * @package squirrelmail * @subpackage themes */ - $icon_themes[] = array('NAME'=>_("XP"),'PATH'=> SM_PATH . 'images/themes/xp/'); -?> \ No newline at end of file +$icon_themes[] = array('NAME'=>_("XP"),'PATH'=> SM_PATH . 'images/themes/xp/'); diff --git a/include/constants.php b/include/constants.php index 2caf3bd7..e6e20486 100644 --- a/include/constants.php +++ b/include/constants.php @@ -156,5 +156,3 @@ define('SQM_COL_BCC', 11); * @since 1.2.0 */ do_hook('loading_constants'); - -?> \ No newline at end of file diff --git a/include/errors.php b/include/errors.php index 983a594c..9a483c43 100644 --- a/include/errors.php +++ b/include/errors.php @@ -81,5 +81,3 @@ $aErrors['SQM_IMAP_BYE'] = array( ); //$aError['SQM_FS'] // Filesystem related errors - -?> \ No newline at end of file diff --git a/include/languages.php b/include/languages.php index a1e30150..ce987825 100644 --- a/include/languages.php +++ b/include/languages.php @@ -1103,4 +1103,3 @@ elseif ($gettext_flags == 0) { } } } -?> \ No newline at end of file diff --git a/include/load_prefs.php b/include/load_prefs.php index 4e740118..fc54fdd1 100644 --- a/include/load_prefs.php +++ b/include/load_prefs.php @@ -408,5 +408,3 @@ if (! isset($use_smtp_tls)) { } do_hook('loading_prefs'); - -?> diff --git a/include/options/compose.php b/include/options/compose.php index 49598df7..735041c0 100644 --- a/include/options/compose.php +++ b/include/options/compose.php @@ -185,4 +185,3 @@ function save_option_reply_prefix($option) { save_option($option); } -?> diff --git a/include/options/display.php b/include/options/display.php index 98f1d044..0a2db96f 100644 --- a/include/options/display.php +++ b/include/options/display.php @@ -505,5 +505,3 @@ function icon_theme_save($option) { setPref($data_dir, $username, 'icon_theme', 'none'); } - -?> diff --git a/include/options/folder.php b/include/options/folder.php index b17ccec0..4ac4f42b 100644 --- a/include/options/folder.php +++ b/include/options/folder.php @@ -314,5 +314,3 @@ function save_option_draft_folder($option) { save_option($option); } } - -?> \ No newline at end of file diff --git a/include/options/personal.php b/include/options/personal.php index 36a1ae63..02460995 100644 --- a/include/options/personal.php +++ b/include/options/personal.php @@ -264,5 +264,3 @@ function save_option_signature($option) { global $data_dir, $username; setSig($data_dir, $username, 'g', $option->new_value); } - -?> \ No newline at end of file diff --git a/include/timezones.php b/include/timezones.php index 247adbfc..bc549c21 100644 --- a/include/timezones.php +++ b/include/timezones.php @@ -87,4 +87,3 @@ function sq_get_tz_key($sTZ) { return false; } } -?> \ No newline at end of file diff --git a/include/timezones/check.php b/include/timezones/check.php index 2fff3a79..26ff90ab 100644 --- a/include/timezones/check.php +++ b/include/timezones/check.php @@ -215,4 +215,3 @@ if (! $error) { echo "\n"; echo "Done!\n"; -?> \ No newline at end of file diff --git a/include/timezones/standard.php b/include/timezones/standard.php index c105a30a..1f50a682 100644 --- a/include/timezones/standard.php +++ b/include/timezones/standard.php @@ -1256,4 +1256,3 @@ $aTimeZones['Mideast/Riyadh88']['LINK']='Asia/Riyadh88'; $aTimeZones['Asia/Riyadh89']['TZ']='UCT-3:07:04'; $aTimeZones['Mideast/Riyadh89']['LINK']='Asia/Riyadh89'; -?> \ No newline at end of file diff --git a/include/timezones/standard_orig.php b/include/timezones/standard_orig.php index 471f6604..23410157 100644 --- a/include/timezones/standard_orig.php +++ b/include/timezones/standard_orig.php @@ -552,4 +552,3 @@ $aTimeZones['Universal']['TZ']='Universal'; $aTimeZones['W-SU']['TZ']='W-SU'; $aTimeZones['WET']['TZ']='WET'; $aTimeZones['Zulu']['TZ']='Zulu'; -?> \ No newline at end of file diff --git a/plugins/abook_take/functions.php b/plugins/abook_take/functions.php index 46726020..fd0060cb 100644 --- a/plugins/abook_take/functions.php +++ b/plugins/abook_take/functions.php @@ -94,5 +94,3 @@ function abook_take_save() else setPref($data_dir, $username, 'abook_take_verify', ''); } - -?> \ No newline at end of file diff --git a/plugins/abook_take/setup.php b/plugins/abook_take/setup.php index af71969f..e57e63d1 100755 --- a/plugins/abook_take/setup.php +++ b/plugins/abook_take/setup.php @@ -51,5 +51,3 @@ function abook_take_options_display_save() { abook_take_save(); } - -?> \ No newline at end of file diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php index cb189380..b988bffa 100644 --- a/plugins/administrator/auth.php +++ b/plugins/administrator/auth.php @@ -63,4 +63,3 @@ function adm_check_user() { function adm_array_trim(&$value,$key) { $value=trim($value); } -?> \ No newline at end of file diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php index b0a5fb68..c7ed3684 100644 --- a/plugins/administrator/defines.php +++ b/plugins/administrator/defines.php @@ -418,4 +418,3 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), ); -?> \ No newline at end of file diff --git a/plugins/administrator/setup.php b/plugins/administrator/setup.php index 4babd5f4..20a52a7a 100644 --- a/plugins/administrator/setup.php +++ b/plugins/administrator/setup.php @@ -43,4 +43,3 @@ function squirrelmail_administrator_optpage_register_block() { ); } } -?> \ No newline at end of file diff --git a/plugins/bug_report/config_default.php b/plugins/bug_report/config_default.php index 4ced4697..3723f593 100644 --- a/plugins/bug_report/config_default.php +++ b/plugins/bug_report/config_default.php @@ -29,4 +29,3 @@ $bug_report_admin_email = ''; * @global boolean $bug_report_allow_users */ $bug_report_allow_users = false; -?> \ No newline at end of file diff --git a/plugins/bug_report/functions.php b/plugins/bug_report/functions.php index 30cc2d14..a5c3190c 100644 --- a/plugins/bug_report/functions.php +++ b/plugins/bug_report/functions.php @@ -80,5 +80,3 @@ function bug_report_check_user() { function bug_report_array_trim(&$value,$key) { $value=trim($value); } - -?> \ No newline at end of file diff --git a/plugins/bug_report/setup.php b/plugins/bug_report/setup.php index 12112a8f..d7e4dcf2 100644 --- a/plugins/bug_report/setup.php +++ b/plugins/bug_report/setup.php @@ -73,5 +73,3 @@ function bug_report_block() { $optpage_data['vals']['bug_report'] = $optionValues; } } - -?> \ No newline at end of file diff --git a/plugins/bug_report/system_specs.php b/plugins/bug_report/system_specs.php index ebb3249c..6f0c5740 100644 --- a/plugins/bug_report/system_specs.php +++ b/plugins/bug_report/system_specs.php @@ -160,5 +160,3 @@ if (isset($warning) && $warning) { } $body = htmlspecialchars($body_top . $body); - -?> \ No newline at end of file diff --git a/plugins/calendar/calendar_data.php b/plugins/calendar/calendar_data.php index bb32daa3..743035e0 100644 --- a/plugins/calendar/calendar_data.php +++ b/plugins/calendar/calendar_data.php @@ -181,5 +181,3 @@ function update_event($date, $time) { fclose ($fp); } } - -?> \ No newline at end of file diff --git a/plugins/calendar/functions.php b/plugins/calendar/functions.php index dedeb8ee..fad21357 100644 --- a/plugins/calendar/functions.php +++ b/plugins/calendar/functions.php @@ -189,4 +189,3 @@ function select_option_day($selected) { } } -?> \ No newline at end of file diff --git a/plugins/calendar/setup.php b/plugins/calendar/setup.php index ec9ec128..83aab7ad 100644 --- a/plugins/calendar/setup.php +++ b/plugins/calendar/setup.php @@ -27,5 +27,3 @@ function calendar() { displayInternalLink('plugins/calendar/calendar.php',_("Calendar"),'right'); echo "  \n"; } - -?> \ No newline at end of file diff --git a/plugins/change_password/backend/ldap.php b/plugins/change_password/backend/ldap.php index 81a181a7..fcfd30c9 100644 --- a/plugins/change_password/backend/ldap.php +++ b/plugins/change_password/backend/ldap.php @@ -785,4 +785,3 @@ function cpw_ldap_compare_pass($pass_hash,$pass_clear,&$msgs) { } return $ret; } -?> \ No newline at end of file diff --git a/plugins/change_password/backend/peardb.php b/plugins/change_password/backend/peardb.php index acec1493..c3bb0f9f 100644 --- a/plugins/change_password/backend/peardb.php +++ b/plugins/change_password/backend/peardb.php @@ -431,4 +431,3 @@ function cpw_peardb_passwd_hash($password,$crypto,&$msgs,$forced_salt='') { } return $ret; } -?> \ No newline at end of file diff --git a/plugins/change_password/backend/poppassd.php b/plugins/change_password/backend/poppassd.php index 7a0f574c..663d0c6b 100644 --- a/plugins/change_password/backend/poppassd.php +++ b/plugins/change_password/backend/poppassd.php @@ -135,5 +135,3 @@ function cpw_poppassd_go($username, $old_pw, $new_pw, $debug = 0) { return $messages; } - -?> \ No newline at end of file diff --git a/plugins/change_password/backend/vmailmgrd.php b/plugins/change_password/backend/vmailmgrd.php index 1a5fb9ff..351f7845 100644 --- a/plugins/change_password/backend/vmailmgrd.php +++ b/plugins/change_password/backend/vmailmgrd.php @@ -286,4 +286,3 @@ function cpw_i18n_vmail_response($string) { } return $ret; } -?> \ No newline at end of file diff --git a/plugins/change_password/config_default.php b/plugins/change_password/config_default.php index 1a3d1681..4b6131fd 100644 --- a/plugins/change_password/config_default.php +++ b/plugins/change_password/config_default.php @@ -22,4 +22,3 @@ $cpw_pass_max_length = 25; /** whether we require the use of SSL/https to change a password */ $cpw_require_ssl = FALSE; -?> \ No newline at end of file diff --git a/plugins/change_password/functions.php b/plugins/change_password/functions.php index 0c7adaf5..a0cd81dc 100644 --- a/plugins/change_password/functions.php +++ b/plugins/change_password/functions.php @@ -109,4 +109,3 @@ function cpw_do_change() exit; } -?> \ No newline at end of file diff --git a/plugins/change_password/setup.php b/plugins/change_password/setup.php index 10c2fed9..f96399f5 100644 --- a/plugins/change_password/setup.php +++ b/plugins/change_password/setup.php @@ -56,4 +56,3 @@ function change_password_loadinfo() { function change_password_version() { return '0.2'; } -?> \ No newline at end of file diff --git a/plugins/filters/config_default.php b/plugins/filters/config_default.php index 1d6e7933..3bf34ebc 100644 --- a/plugins/filters/config_default.php +++ b/plugins/filters/config_default.php @@ -100,4 +100,3 @@ $SpamFilters_SharedCache = true; */ $SpamFilters_CacheTTL = 7200; -?> \ No newline at end of file diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php index f27ff130..09df3f7f 100644 --- a/plugins/filters/filters.php +++ b/plugins/filters/filters.php @@ -953,5 +953,3 @@ function do_error($string) { echo $string; echo "

\n"; } - -?> \ No newline at end of file diff --git a/plugins/filters/options.php b/plugins/filters/options.php index b2d4eeaa..e5a67e31 100644 --- a/plugins/filters/options.php +++ b/plugins/filters/options.php @@ -258,4 +258,3 @@ if (count($filters)) { ) , 'center', '', 'width="80%" border="0" cellpadding="2" cellspacing="0"' ); echo ''; -?> \ No newline at end of file diff --git a/plugins/filters/setup.php b/plugins/filters/setup.php index 47ab5f5f..7821ca72 100644 --- a/plugins/filters/setup.php +++ b/plugins/filters/setup.php @@ -64,5 +64,3 @@ function update_for_folder_hook($args) { include_once(SM_PATH . 'plugins/filters/filters.php'); update_for_folder ($args); } - -?> \ No newline at end of file diff --git a/plugins/info/functions.php b/plugins/info/functions.php index 36bff635..8182a2da 100644 --- a/plugins/info/functions.php +++ b/plugins/info/functions.php @@ -59,5 +59,3 @@ function print_response($response) { } } } - -?> \ No newline at end of file diff --git a/plugins/info/setup.php b/plugins/info/setup.php index 0f26b732..017b3af1 100644 --- a/plugins/info/setup.php +++ b/plugins/info/setup.php @@ -34,5 +34,3 @@ function info_opt() { 'js' => false ); } - -?> \ No newline at end of file diff --git a/plugins/listcommands/functions.php b/plugins/listcommands/functions.php index a2170c0b..a90587f3 100644 --- a/plugins/listcommands/functions.php +++ b/plugins/listcommands/functions.php @@ -92,4 +92,3 @@ function listcommands_fieldsdescr() { 'help' => _("Help")); } -?> \ No newline at end of file diff --git a/plugins/listcommands/setup.php b/plugins/listcommands/setup.php index e7673f12..68764b44 100644 --- a/plugins/listcommands/setup.php +++ b/plugins/listcommands/setup.php @@ -31,5 +31,3 @@ function plugin_listcommands_menu() { include_once(SM_PATH . 'plugins/listcommands/functions.php'); plugin_listcommands_menu_do(); } - -?> \ No newline at end of file diff --git a/plugins/mail_fetch/class.POP3.php b/plugins/mail_fetch/class.POP3.php index 0866e945..d4f55b16 100644 --- a/plugins/mail_fetch/class.POP3.php +++ b/plugins/mail_fetch/class.POP3.php @@ -652,4 +652,3 @@ class POP3 { } // End class -?> \ No newline at end of file diff --git a/plugins/mail_fetch/config_default.php b/plugins/mail_fetch/config_default.php index 49616eea..6c6f1ab8 100644 --- a/plugins/mail_fetch/config_default.php +++ b/plugins/mail_fetch/config_default.php @@ -16,4 +16,3 @@ */ $mail_fetch_allow_unsubscribed = false; -?> \ No newline at end of file diff --git a/plugins/mail_fetch/functions.php b/plugins/mail_fetch/functions.php index bdcfd71d..80223967 100644 --- a/plugins/mail_fetch/functions.php +++ b/plugins/mail_fetch/functions.php @@ -395,4 +395,3 @@ function mail_fetch_check_noselect($imap_stream,$imap_folder) { } return false; } -?> \ No newline at end of file diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php index 616ba1d0..89ad6119 100644 --- a/plugins/mail_fetch/setup.php +++ b/plugins/mail_fetch/setup.php @@ -80,4 +80,3 @@ function mail_fetch_folderact($args) { include_once (SM_PATH . 'plugins/mail_fetch/functions.php'); mail_fetch_folderact_function($args); } -?> \ No newline at end of file diff --git a/plugins/message_details/setup.php b/plugins/message_details/setup.php index 9aac54b7..f99b1bc0 100644 --- a/plugins/message_details/setup.php +++ b/plugins/message_details/setup.php @@ -58,5 +58,3 @@ function show_message_details() { } echo $result; } - -?> \ No newline at end of file diff --git a/plugins/newmail/config_default.php b/plugins/newmail/config_default.php index 523ade7b..a52693fa 100644 --- a/plugins/newmail/config_default.php +++ b/plugins/newmail/config_default.php @@ -46,4 +46,3 @@ $newmail_mediacompat_mode=false; */ global $newmail_mmedia; $newmail_mmedia=array(); -?> \ No newline at end of file diff --git a/plugins/newmail/config_sample.php b/plugins/newmail/config_sample.php index dcb636c5..fb0e3002 100644 --- a/plugins/newmail/config_sample.php +++ b/plugins/newmail/config_sample.php @@ -33,4 +33,3 @@ $newmail_mmedia['monty_message']['types'] = array(SM_NEWMAIL_FILETYPE_SWF,SM_NEW $newmail_mmedia['monty_message']['args'] = array('width'=>0,'height'=>0); $newmail_mmedia['austin_mail']['types'] = array(SM_NEWMAIL_FILETYPE_SWF,SM_NEWMAIL_FILETYPE_MP3,SM_NEWMAIL_FILETYPE_WAV); $newmail_mmedia['austin_mail']['args'] = array('width'=>0,'height'=>0); -?> \ No newline at end of file diff --git a/plugins/newmail/functions.php b/plugins/newmail/functions.php index 274822bb..7a8535ee 100644 --- a/plugins/newmail/functions.php +++ b/plugins/newmail/functions.php @@ -722,4 +722,3 @@ function newmail_create_media_tags($newmail_media) { } return $ret_media; } -?> \ No newline at end of file diff --git a/plugins/newmail/loadfile.php b/plugins/newmail/loadfile.php index 034eb3cc..25bb8d79 100644 --- a/plugins/newmail/loadfile.php +++ b/plugins/newmail/loadfile.php @@ -80,4 +80,3 @@ if ($newmail_uploadsounds && $newmail_userfile_type!=false && file_exists($newma } // failed to open userfile } // userfile is missing or preferences don't store file type. // maybe we should send some error code -?> \ No newline at end of file diff --git a/plugins/newmail/setup.php b/plugins/newmail/setup.php index 84195ca5..248ee317 100644 --- a/plugins/newmail/setup.php +++ b/plugins/newmail/setup.php @@ -85,4 +85,3 @@ function newmail_plugin() { include_once(SM_PATH . 'plugins/newmail/functions.php'); newmail_plugin_function(); } -?> diff --git a/plugins/sent_subfolders/setup.php b/plugins/sent_subfolders/setup.php index f2c81f61..53d17d14 100644 --- a/plugins/sent_subfolders/setup.php +++ b/plugins/sent_subfolders/setup.php @@ -347,4 +347,3 @@ function sent_subfolders_special_mailbox($mb) { } return 0; } -?> \ No newline at end of file diff --git a/plugins/spamcop/functions.php b/plugins/spamcop/functions.php index 44c542ef..a36ac3ce 100644 --- a/plugins/spamcop/functions.php +++ b/plugins/spamcop/functions.php @@ -213,4 +213,3 @@ function spamcop_getMessage_RFC822_Attachment($message, $composeMessage, $passed } return $composeMessage; } -?> \ No newline at end of file diff --git a/plugins/spamcop/setup.php b/plugins/spamcop/setup.php index 0c74620e..1c8ce71f 100755 --- a/plugins/spamcop/setup.php +++ b/plugins/spamcop/setup.php @@ -64,4 +64,3 @@ function spamcop_while_sending() { include_once(SM_PATH . 'plugins/spamcop/functions.php'); spamcop_while_sending_function(); } -?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/check_me.mod b/plugins/squirrelspell/modules/check_me.mod index 1fb75b5d..0d9c510c 100644 --- a/plugins/squirrelspell/modules/check_me.mod +++ b/plugins/squirrelspell/modules/check_me.mod @@ -482,4 +482,3 @@ if ($errors){ * End: * vim: syntax=php et ts=4 */ -?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/crypto.mod b/plugins/squirrelspell/modules/crypto.mod index b9f4fa5b..4d2078e6 100644 --- a/plugins/squirrelspell/modules/crypto.mod +++ b/plugins/squirrelspell/modules/crypto.mod @@ -90,5 +90,3 @@ sqspell_makePage( _("Personal Dictionary Crypto Settings"), null, $msg); * End: * vim: syntax=php */ - -?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/crypto_badkey.mod b/plugins/squirrelspell/modules/crypto_badkey.mod index 0e0a975c..a4984f9f 100644 --- a/plugins/squirrelspell/modules/crypto_badkey.mod +++ b/plugins/squirrelspell/modules/crypto_badkey.mod @@ -139,4 +139,3 @@ if (! $old_setup && $old_key) { * End: * vim: syntax=php */ -?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/edit_dic.mod b/plugins/squirrelspell/modules/edit_dic.mod index 2104e201..8e60ff7d 100644 --- a/plugins/squirrelspell/modules/edit_dic.mod +++ b/plugins/squirrelspell/modules/edit_dic.mod @@ -89,5 +89,3 @@ sqspell_makePage(_("Edit your Personal Dictionary"), null, $msg); * End: * vim: syntax=php */ - -?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/enc_setup.mod b/plugins/squirrelspell/modules/enc_setup.mod index 10cce009..7d91fdfd 100644 --- a/plugins/squirrelspell/modules/enc_setup.mod +++ b/plugins/squirrelspell/modules/enc_setup.mod @@ -103,5 +103,3 @@ sqspell_makePage(_("Personal Dictionary Crypto Settings"), * End: * vim: syntax=php */ - -?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/forget_me.mod b/plugins/squirrelspell/modules/forget_me.mod index c4466a1a..851b80b5 100644 --- a/plugins/squirrelspell/modules/forget_me.mod +++ b/plugins/squirrelspell/modules/forget_me.mod @@ -69,4 +69,3 @@ if (! empty($words_ary)){ * End: * vim: syntax=php */ -?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/forget_me_not.mod b/plugins/squirrelspell/modules/forget_me_not.mod index 069cd10b..a75b8578 100644 --- a/plugins/squirrelspell/modules/forget_me_not.mod +++ b/plugins/squirrelspell/modules/forget_me_not.mod @@ -66,5 +66,3 @@ sqspell_makeWindow($onload, _("Personal Dictionary Updated"), null, $msg); * End: * vim: syntax=php */ - -?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/init.mod b/plugins/squirrelspell/modules/init.mod index 2a7d5688..cae38f68 100644 --- a/plugins/squirrelspell/modules/init.mod +++ b/plugins/squirrelspell/modules/init.mod @@ -63,5 +63,3 @@ sqspell_makeWindow($onload, _("SquirrelSpell Initiating"), "init.js", $msg); * End: * vim: syntax=php */ - -?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/lang_change.mod b/plugins/squirrelspell/modules/lang_change.mod index 6e0fbebe..3ad3660d 100644 --- a/plugins/squirrelspell/modules/lang_change.mod +++ b/plugins/squirrelspell/modules/lang_change.mod @@ -76,4 +76,3 @@ sqspell_makePage(_("International Dictionaries Preferences Updated"), * End: * vim: syntax=php */ -?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/lang_setup.mod b/plugins/squirrelspell/modules/lang_setup.mod index 48a3b35b..57d3d826 100644 --- a/plugins/squirrelspell/modules/lang_setup.mod +++ b/plugins/squirrelspell/modules/lang_setup.mod @@ -56,5 +56,3 @@ sqspell_makePage(_("Add International Dictionaries"), null, $msg); * End: * vim: syntax=php */ - -?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/options_main.mod b/plugins/squirrelspell/modules/options_main.mod index f2bc15b6..d3f3978a 100644 --- a/plugins/squirrelspell/modules/options_main.mod +++ b/plugins/squirrelspell/modules/options_main.mod @@ -55,4 +55,3 @@ sqspell_makePage( _("SquirrelSpell Options Menu"), null, $msg); * End: * vim: syntax=php */ -?> \ No newline at end of file diff --git a/plugins/squirrelspell/setup.php b/plugins/squirrelspell/setup.php index 083e7fa1..e987446a 100644 --- a/plugins/squirrelspell/setup.php +++ b/plugins/squirrelspell/setup.php @@ -76,5 +76,3 @@ function squirrelspell_upgrade() { function squirrelspell_version() { return '0.5'; } - -?> \ No newline at end of file diff --git a/plugins/squirrelspell/sqspell_config.php b/plugins/squirrelspell/sqspell_config.php index c4f12062..467ecf73 100644 --- a/plugins/squirrelspell/sqspell_config.php +++ b/plugins/squirrelspell/sqspell_config.php @@ -88,5 +88,3 @@ $SQSPELL_WORDS_FILE = * @deprecated It is not used since 1.5.1 (sqspell 0.5) */ $SQSPELL_EREG = 'ereg'; - -?> diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php index 9489dc66..22ec47b4 100644 --- a/plugins/squirrelspell/sqspell_functions.php +++ b/plugins/squirrelspell/sqspell_functions.php @@ -898,4 +898,3 @@ function sqspell_handle_crypt_panic($lang=false) { * @deprecated */ $SQSPELL_VERSION="v0.3.8"; -?> \ No newline at end of file diff --git a/plugins/squirrelspell/sqspell_interface.php b/plugins/squirrelspell/sqspell_interface.php index 417e8c60..94dedc55 100644 --- a/plugins/squirrelspell/sqspell_interface.php +++ b/plugins/squirrelspell/sqspell_interface.php @@ -50,4 +50,3 @@ if (file_exists(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod")) { // display sm footer (closes html tags) $oTemplate->display('footer.tpl'); } -?> \ No newline at end of file diff --git a/plugins/squirrelspell/sqspell_options.php b/plugins/squirrelspell/sqspell_options.php index 7db23a00..09e966c7 100644 --- a/plugins/squirrelspell/sqspell_options.php +++ b/plugins/squirrelspell/sqspell_options.php @@ -47,4 +47,3 @@ if (file_exists(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod")) { // display footer (closes html tags) $oTemplate->display('footer.tpl'); } -?> \ No newline at end of file diff --git a/plugins/translate/config_default.php b/plugins/translate/config_default.php index d35ad5d2..25123b3d 100644 --- a/plugins/translate/config_default.php +++ b/plugins/translate/config_default.php @@ -108,4 +108,3 @@ $disable_compose_translate=true; */ global $translate_custom_enabled; $translate_custom_enabled=false; -?> \ No newline at end of file diff --git a/plugins/translate/config_sample.php b/plugins/translate/config_sample.php index afbf23f3..8c919727 100644 --- a/plugins/translate/config_sample.php +++ b/plugins/translate/config_sample.php @@ -122,4 +122,3 @@ function translate_custom_showtrad() { function translate_custom_showoption() { translate_showoption_internal('server', 'custom', 'Al Misbar'); } -?> \ No newline at end of file diff --git a/plugins/translate/functions.php b/plugins/translate/functions.php index f1885238..cc649dcf 100644 --- a/plugins/translate/functions.php +++ b/plugins/translate/functions.php @@ -943,4 +943,3 @@ function translate_form_google($message) { translate_table_end(); } -?> \ No newline at end of file diff --git a/plugins/translate/setup.php b/plugins/translate/setup.php index 0a098ba0..c665b926 100644 --- a/plugins/translate/setup.php +++ b/plugins/translate/setup.php @@ -87,4 +87,3 @@ function translate_set_loadinfo() { include_once(SM_PATH . 'plugins/translate/functions.php'); translate_set_loadinfo_function(); } -?> \ No newline at end of file diff --git a/templates/default/error_message.tpl b/templates/default/error_message.tpl index 9a7bb582..d2e77469 100644 --- a/templates/default/error_message.tpl +++ b/templates/default/error_message.tpl @@ -87,4 +87,3 @@ if (isset($aErrors) && is_array($aErrors)) { \ No newline at end of file diff --git a/templates/default/options.tpl b/templates/default/options.tpl index 8f683f04..6f7368b5 100644 --- a/templates/default/options.tpl +++ b/templates/default/options.tpl @@ -26,6 +26,9 @@ extract($t); /** * $Log$ + * Revision 1.3 2006/07/15 12:01:19 tokul + * removing trailing ?> from function scripts + * * Revision 1.2 2006/07/13 18:49:44 tokul * reverting some templating changes. They broke plugin blocks. * moving display of option blocks to separate template @@ -35,4 +38,3 @@ extract($t); * * **/ -?> \ No newline at end of file diff --git a/templates/default/paginator.tpl b/templates/default/paginator.tpl index a0c5af24..4557594d 100644 --- a/templates/default/paginator.tpl +++ b/templates/default/paginator.tpl @@ -43,4 +43,3 @@ if ($javascript_on && $compact_paginator &&!isset($bScriptAdded)) { } // display the paginator string. echo $sPaginator; -?> \ No newline at end of file diff --git a/templates/default/stylelink.tpl b/templates/default/stylelink.tpl index d3e1f940..0e1e369a 100644 --- a/templates/default/stylelink.tpl +++ b/templates/default/stylelink.tpl @@ -54,6 +54,9 @@ echo $css_link_html; /** * $Log$ + * Revision 1.4 2006/07/15 12:01:19 tokul + * removing trailing ?> from function scripts + * * Revision 1.3 2006/07/10 15:48:51 vanmer * - added new utils_css file to contain CSS-related functions for use in templates * - altered stylelink template to use new util_css.php file for all function definitions @@ -66,4 +69,3 @@ echo $css_link_html; * * **/ -?> \ No newline at end of file diff --git a/templates/default/stylesheet.tpl b/templates/default/stylesheet.tpl index f2c420b2..343da585 100644 --- a/templates/default/stylesheet.tpl +++ b/templates/default/stylesheet.tpl @@ -245,5 +245,3 @@ a:link, a:visited, a:hover, a:active { .spacer { background: ; } - - diff --git a/templates/default/template.php b/templates/default/template.php index 41b650ab..9fec2d8d 100644 --- a/templates/default/template.php +++ b/templates/default/template.php @@ -61,4 +61,3 @@ $provided_js_files = array ( */ $additional_css_sheets = array ( ); -?> \ No newline at end of file diff --git a/templates/default/webmail.tpl b/templates/default/webmail.tpl index 2079596d..410cc24b 100644 --- a/templates/default/webmail.tpl +++ b/templates/default/webmail.tpl @@ -123,8 +123,10 @@ if($ret != '') { echo $output . ''; /** * $Log$ + * Revision 1.2 2006/07/15 12:01:19 tokul + * removing trailing ?> from function scripts + * * Revision 1.1 2006/07/09 21:55:33 vanmer * - Initial revision of a template to render the main squirrelmail HTML (current a frameset) * **/ -?> \ No newline at end of file diff --git a/templates/default_advanced/template.php b/templates/default_advanced/template.php index 0cee1c38..809fb33b 100644 --- a/templates/default_advanced/template.php +++ b/templates/default_advanced/template.php @@ -49,4 +49,3 @@ $provided_js_files = array ( $additional_css_sheets = array ( 'stylesheet_advanced.tpl' ); -?> \ No newline at end of file diff --git a/templates/util_css.php b/templates/util_css.php index 98e21a41..d2749183 100644 --- a/templates/util_css.php +++ b/templates/util_css.php @@ -85,10 +85,11 @@ function css_link($url, $name = null, $alt = true, $mtype = 'screen', $xhtml_end /** * $Log$ + * Revision 1.2 2006/07/15 12:01:19 tokul + * removing trailing ?> from function scripts + * * Revision 1.1 2006/07/10 15:48:50 vanmer * - added new utils_css file to contain CSS-related functions for use in templates * - altered stylelink template to use new util_css.php file for all function definitions * **/ - -?> \ No newline at end of file diff --git a/templates/util_global.php b/templates/util_global.php index 0bb822c3..e51091fb 100644 --- a/templates/util_global.php +++ b/templates/util_global.php @@ -75,4 +75,3 @@ function getIconPath ($icon_theme_path, $icon_name) { return NULL; } -?> \ No newline at end of file diff --git a/templates/util_left_main.php b/templates/util_left_main.php index 943cddd5..97887852 100644 --- a/templates/util_left_main.php +++ b/templates/util_left_main.php @@ -113,6 +113,3 @@ function getBoxStructure ($boxes) { return $box; } - - -?> \ No newline at end of file diff --git a/templates/util_message_list.php b/templates/util_message_list.php index 6d7c4c1a..ddd36036 100644 --- a/templates/util_message_list.php +++ b/templates/util_message_list.php @@ -198,6 +198,3 @@ function getAttachmentIcon ($attach, $icon_theme_path) { return $icon; } - - -?> \ No newline at end of file diff --git a/templates/util_paginator.php b/templates/util_paginator.php index dbc31484..b01dd0de 100644 --- a/templates/util_paginator.php +++ b/templates/util_paginator.php @@ -351,4 +351,3 @@ function get_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,$page_sel /* Return our final magical compact paginator string. */ return ($result); } -?> \ No newline at end of file diff --git a/themes/alien_glow.php b/themes/alien_glow.php index fd82c2b0..15435122 100644 --- a/themes/alien_glow.php +++ b/themes/alien_glow.php @@ -12,17 +12,17 @@ * @subpackage themes */ - $color[0] = "#19881a"; // TitleBar - $color[1] = "#800000"; // - $color[2] = "#cc0000"; // Warning/Error Messages - $color[3] = "#000000"; // Left Bar Background - $color[4] = "#000000"; // Normal Background - $color[5] = "#0a6c11"; // Table Headers - $color[6] = "#4cc748"; // Text on left bar - #$color[7] = "#706c44"; // Links - $color[7] = "#ffffff"; // Normal text - $color[8] = "#61ff5c"; // Links - $color[9] = "#157316"; // Darker version of #0 - $color[10] = "#105611"; // Darker version of #9 - $color[11] = "#ffffff"; // Special Folders color -?> \ No newline at end of file +global $color; +$color[0] = "#19881a"; // TitleBar +$color[1] = "#800000"; // +$color[2] = "#cc0000"; // Warning/Error Messages +$color[3] = "#000000"; // Left Bar Background +$color[4] = "#000000"; // Normal Background +$color[5] = "#0a6c11"; // Table Headers +$color[6] = "#4cc748"; // Text on left bar +#$color[7] = "#706c44"; // Links +$color[7] = "#ffffff"; // Normal text +$color[8] = "#61ff5c"; // Links +$color[9] = "#157316"; // Darker version of #0 +$color[10] = "#105611"; // Darker version of #9 +$color[11] = "#ffffff"; // Special Folders color diff --git a/themes/autumn.php b/themes/autumn.php index b22d6917..707b3f0d 100644 --- a/themes/autumn.php +++ b/themes/autumn.php @@ -29,4 +29,3 @@ $color[12] = '#ebebeb'; // Alternate color for message list (alters between #4 $color[13] = '#800000'; // Color for single-quoted text ('> text') $color[14] = '#ff0000'; // Color for text with more than one quote ('>> text') $color[15] = '#ffffff'; // Non-selectable folders in the left frame (defaults to #6) -?> \ No newline at end of file diff --git a/themes/autumn2.php b/themes/autumn2.php index bad43540..059b450a 100644 --- a/themes/autumn2.php +++ b/themes/autumn2.php @@ -29,4 +29,3 @@ $color[12] = '#c9cba4'; // Alternate color for message list (alters between #4 $color[13] = '#800000'; // Color for single-quoted text ('> text') $color[14] = '#ff0000'; // Color for text with more than one quote ('>> text') $color[15] = '#ffffff'; // Non-selectable folders in the left frame (defaults to #6) -?> diff --git a/themes/black_bean_burrito_theme.php b/themes/black_bean_burrito_theme.php index b35bf895..edff8679 100644 --- a/themes/black_bean_burrito_theme.php +++ b/themes/black_bean_burrito_theme.php @@ -30,4 +30,3 @@ $color[12] = '#202020'; // (dark gray) Alternate color $color[13] = '#ff7733'; // (orange-ish) Single-quoted text $color[14] = '#ff3377'; // (pink-ish) 2 or more quotes $color[15] = '#414141'; // (darker gray) unselectable folders -?> \ No newline at end of file diff --git a/themes/blue_grey_theme.php b/themes/blue_grey_theme.php index 7993c090..8e58325e 100644 --- a/themes/blue_grey_theme.php +++ b/themes/blue_grey_theme.php @@ -28,5 +28,3 @@ $color[10] = '#496e8b'; // (dark gray) Darker version of #9 $color[11] = '#a7c5f3'; // (light blue) Special Folders color $color[12] = '#7092b4'; $color[15] = '#d0d0d0'; // (light gray) Unselectable folders - -?> \ No newline at end of file diff --git a/themes/blue_on_blue.php b/themes/blue_on_blue.php index 471d6649..d43c826e 100644 --- a/themes/blue_on_blue.php +++ b/themes/blue_on_blue.php @@ -11,6 +11,7 @@ * @subpackage themes */ +global $color; $color[0] = '#4c4b83'; // TitleBar $color[1] = '#ffffff'; // Not Currently Used $color[2] = '#ffffff'; // Warning/Error Messages @@ -27,5 +28,3 @@ $color[12] = '#1d1d26'; // Alternate List Item Color (alternates with #4) $color[13] = '#8a8aaf'; // Single-Quoted text $color[14] = '#8a8aaf'; // Two or more quotes $color[15] = '#ffffff'; // Unselectable Folders - -?> \ No newline at end of file diff --git a/themes/bluesnews_theme.php b/themes/bluesnews_theme.php index 22719fa7..19174020 100644 --- a/themes/bluesnews_theme.php +++ b/themes/bluesnews_theme.php @@ -30,5 +30,3 @@ $color[10] = '#000080'; // (bright blue) Darker version of #9 $color[11] = '#3333ff'; // (dull blue) Special Folders color $color[12] = '#808080'; // Alternate rows $color[15] = '#c0c060'; // (dull yellow) Unselectable folders - -?> \ No newline at end of file diff --git a/themes/bluesome.php b/themes/bluesome.php index 24549e02..2cc473b9 100644 --- a/themes/bluesome.php +++ b/themes/bluesome.php @@ -33,4 +33,3 @@ $color[12] = '#9DB5CB'; $color[13] = '#800000'; $color[14] = '#FF0000'; $color[15] = '#CCCCCC'; -?> \ No newline at end of file diff --git a/themes/bluesteel_theme.php b/themes/bluesteel_theme.php index 1d30caba..33aa3e6f 100644 --- a/themes/bluesteel_theme.php +++ b/themes/bluesteel_theme.php @@ -24,4 +24,3 @@ $color[9] = '#ababab'; // (mid-gray) Lighter version of #0 $color[10] = '#666666'; // (dark gray) Darker version of #0 $color[11] = '#770000'; // (dark red) Special Folders color $color[15] = '#ababab'; // (mid-gray) Unselectable folders -?> \ No newline at end of file diff --git a/themes/christmas.php b/themes/christmas.php index 6c920b83..f2a6a147 100644 --- a/themes/christmas.php +++ b/themes/christmas.php @@ -29,5 +29,3 @@ $color[10] = '#88aa88'; // Dimmed out folder color $color[11] = '#ee0000'; // Special folders / Unseen messages color $color[12] = '#ddffdd'; // Alternate table row color $color[15] = '#aaffaa'; // Unselectable folders - -?> \ No newline at end of file diff --git a/themes/classic_blue.php b/themes/classic_blue.php index b4a6fc35..b2a0ba77 100644 --- a/themes/classic_blue.php +++ b/themes/classic_blue.php @@ -29,4 +29,3 @@ $color[12] = '#eef4fe'; // Alternate color for message list (alters between #4 $color[13] = '#333333'; // Color for single-quoted text ('> text') $color[14] = '#666666'; // Color for text with more than one quote ('>> text') $color[15] = '#ffffff'; // Non-selectable folders in the left frame (defaults to #6) -?> \ No newline at end of file diff --git a/themes/classic_blue2.php b/themes/classic_blue2.php index 61c84123..8b1b1f55 100644 --- a/themes/classic_blue2.php +++ b/themes/classic_blue2.php @@ -29,4 +29,3 @@ $color[12] = '#dae9f3'; // Alternate color for message list (alters between #4 $color[13] = '#333333'; // Color for single-quoted text ('> text') $color[14] = '#666666'; // Color for text with more than one quote ('>> text') $color[15] = '#ffffff'; // Non-selectable folders in the left frame (defaults to #6) -?> \ No newline at end of file diff --git a/themes/dark_green.php b/themes/dark_green.php index 543eaf3a..1467e299 100644 --- a/themes/dark_green.php +++ b/themes/dark_green.php @@ -12,20 +12,19 @@ * @subpackage themes */ - global $color; - $color[0] = "#0a2801"; - $color[1] = "#f88888"; - $color[2] = "#ff7171"; - $color[3] = "#0a2801"; - $color[4] = "#000000"; - $color[5] = "#0e3503"; - $color[6] = "#d0d0d0"; - $color[7] = "#cfcfa0"; - $color[8] = "#d0d0d0"; - $color[9] = "#0e3503"; - $color[10] = "#0a2801"; - $color[11] = "#aaaa44"; - $color[12] = "#0a2801"; - $color[13] = "#ff7733"; - $color[14] = "#ff3377"; -?> \ No newline at end of file +global $color; +$color[0] = "#0a2801"; +$color[1] = "#f88888"; +$color[2] = "#ff7171"; +$color[3] = "#0a2801"; +$color[4] = "#000000"; +$color[5] = "#0e3503"; +$color[6] = "#d0d0d0"; +$color[7] = "#cfcfa0"; +$color[8] = "#d0d0d0"; +$color[9] = "#0e3503"; +$color[10] = "#0a2801"; +$color[11] = "#aaaa44"; +$color[12] = "#0a2801"; +$color[13] = "#ff7733"; +$color[14] = "#ff3377"; diff --git a/themes/dark_grey_theme.php b/themes/dark_grey_theme.php index dec25fdc..950d927e 100644 --- a/themes/dark_grey_theme.php +++ b/themes/dark_grey_theme.php @@ -27,5 +27,3 @@ $color[9] = '#929292'; // (mid-gray) Darker version of #0 $color[10] = '#505050'; // (dark gray) Darker version of #9 $color[11] = '#770010'; // (dark red) Special Folders color $color[15] = '#440000'; // (darker red) Unselectable folders - -?> \ No newline at end of file diff --git a/themes/darkness.php b/themes/darkness.php index cfc8fa47..a48a66cb 100755 --- a/themes/darkness.php +++ b/themes/darkness.php @@ -75,91 +75,68 @@ global $squirrelmail_plugin_hooks; $squirrelmail_plugin_hooks['generic_header']['theme_darkness'] = 'Darkness_HeaderPlugin'; - /** seed the random number generator **/ - sq_mt_randomize(); - - $color[3] = '#000000'; - $color[4] = '#000000'; - $used = array(0); - $targetDistance = $BackgroundTargetDistance; - $Left = array(0, 5, 9, 10, 12); - while (count($Left) > 0) { - // Some background colors - $r = mt_rand(24,64); - $unique = true; - foreach ($used as $col) { - if (abs($r - $col) < $targetDistance) +/** seed the random number generator **/ +sq_mt_randomize(); + +$color[3] = '#000000'; +$color[4] = '#000000'; +$used = array(0); +$targetDistance = $BackgroundTargetDistance; +$Left = array(0, 5, 9, 10, 12); +while (count($Left) > 0) { + // Some background colors + $r = mt_rand(24,64); + $unique = true; + foreach ($used as $col) { + if (abs($r - $col) < $targetDistance) $unique = false; - } - if ($unique) { - $i = array_shift($Left); - $color[$i] = sprintf('#%02X%02X%02X',$r,$r, $r); - $used[] = $r; - $targetDistance = $BackgroundTargetDistance; - } else { - $targetDistance -= $BackgroundAdjust; - } - } - - // Set the error color to some shade of red - $r = mt_rand(196, 255); - $g = mt_rand(144, ($r * .8)); - $color[2] = sprintf('#%02X%02X%02X', $r, $g, $g); - $used = array(array($r, $g, $g)); - - // Set normal text colors - $cmin = 196; - $cmax = 255; - foreach (array(6, 8) as $i) { - /** generate random color **/ - $r = mt_rand($cmin,$cmax); - $g = mt_rand($cmin,$cmax); - $b = mt_rand($cmin,$cmax); - $color[$i] = sprintf('#%02X%02X%02X',$r,$g,$b); - $used[] = array($r, $g, $b); - } - - $Left = array(1, 7, 11, 13, 14, 15); - $targetDistance = $TextTargetDistance; - while (count($Left) > 0) { - // Text colors -- Try to keep the colors distinct - $cmin = 196; - $cmax = 255; - - /** generate random color **/ - $r = mt_rand($cmin,$cmax); - $g = mt_rand($cmin,$cmax); - $b = mt_rand($cmin,$cmax); - - if (IsUnique($targetDistance, $r, $g, $b, $used)) { - $i = array_shift($Left); - $color[$i] = sprintf('#%02X%02X%02X',$r,$g,$b); - $used[] = array($r, $g, $b); - $targetDistance = $TextTargetDistance; - } else { - $targetDistance *= $TextAdjust; - } - } - - -/** Reference from doc/themes.txt - -b 0: Title Bar at the top of the page header -f 1: -f 2: Error messages, usually red -b 3: Left folder list background color -b 4: Normal background color -b 5: Header of the message index [From, Date, Subject] -f 6: Normal text on the left folder list -f 7: Links in the right frame, Folders with subfolders in left frame -f 8: Normal text [usually black] -b 9: Darker version of #0 -b 10: Darker version of #9 -f 11: Special folders color [Inbox, Trash, Sent] -b 12: Alternate color for message list [alters between 4 and this one] -f 13: Color for single-quoted text ('> text') when reading (default: #800000) -f 14: Color for text with more than one quote (default: #FF0000) + } + if ($unique) { + $i = array_shift($Left); + $color[$i] = sprintf('#%02X%02X%02X',$r,$r, $r); + $used[] = $r; + $targetDistance = $BackgroundTargetDistance; + } else { + $targetDistance -= $BackgroundAdjust; + } +} -**/ +// Set the error color to some shade of red +$r = mt_rand(196, 255); +$g = mt_rand(144, ($r * .8)); +$color[2] = sprintf('#%02X%02X%02X', $r, $g, $g); +$used = array(array($r, $g, $g)); + +// Set normal text colors +$cmin = 196; +$cmax = 255; +foreach (array(6, 8) as $i) { + /** generate random color **/ + $r = mt_rand($cmin,$cmax); + $g = mt_rand($cmin,$cmax); + $b = mt_rand($cmin,$cmax); + $color[$i] = sprintf('#%02X%02X%02X',$r,$g,$b); + $used[] = array($r, $g, $b); +} -?> \ No newline at end of file +$Left = array(1, 7, 11, 13, 14, 15); +$targetDistance = $TextTargetDistance; +while (count($Left) > 0) { + // Text colors -- Try to keep the colors distinct + $cmin = 196; + $cmax = 255; + + /** generate random color **/ + $r = mt_rand($cmin,$cmax); + $g = mt_rand($cmin,$cmax); + $b = mt_rand($cmin,$cmax); + + if (IsUnique($targetDistance, $r, $g, $b, $used)) { + $i = array_shift($Left); + $color[$i] = sprintf('#%02X%02X%02X',$r,$g,$b); + $used[] = array($r, $g, $b); + $targetDistance = $TextTargetDistance; + } else { + $targetDistance *= $TextAdjust; + } +} diff --git a/themes/deepocean2_theme.php b/themes/deepocean2_theme.php index 73be195b..128d8030 100644 --- a/themes/deepocean2_theme.php +++ b/themes/deepocean2_theme.php @@ -29,4 +29,3 @@ $color[10] = '#496e8b'; // (dark gray) Darker version of #9 $color[11] = '#a7c5f3'; // (dark red) Special Folders color $color[12] = '#7092b4'; $color[15] = '#83a1da'; // (another blue) Unselectable folders color -?> \ No newline at end of file diff --git a/themes/deepocean_theme.php b/themes/deepocean_theme.php index bfc88f59..6109682b 100644 --- a/themes/deepocean_theme.php +++ b/themes/deepocean_theme.php @@ -29,5 +29,3 @@ $color[10] = '#496e8b'; // (dark gray) Darker version of #9 $color[11] = '#a7c5f3'; // (dark red) Special Folders color $color[12] = '#7092b4'; $color[15] = '#83a1da'; // (another blue) Unselectable folders color - -?> \ No newline at end of file diff --git a/themes/default_theme.php b/themes/default_theme.php index c7c647ee..da0202bb 100644 --- a/themes/default_theme.php +++ b/themes/default_theme.php @@ -23,22 +23,21 @@ * @subpackage themes **/ - global $color; - $color[0] = '#dcdcdc'; // (light gray) TitleBar - $color[1] = '#800000'; // (red) - $color[2] = '#cc0000'; // (light red) Warning/Error Messages - $color[3] = '#a0b8c8'; // (green-blue) Left Bar Background - $color[4] = '#ffffff'; // (white) Normal Background - $color[5] = '#ffffcc'; // (light yellow) Table Headers - $color[6] = '#000000'; // (black) Text on left bar - $color[7] = '#0000cc'; // (blue) Links - $color[8] = '#000000'; // (black) Normal text - $color[9] = '#ababab'; // (mid-gray) Darker version of #0 - $color[10] = '#666666'; // (dark gray) Darker version of #9 - $color[11] = '#770000'; // (dark red) Special Folders color - $color[12] = '#ededed'; // (light gray) Alternate color for message list - $color[13] = '#800000'; // (dark red) Color for quoted text -- > 1 quote - $color[14] = '#ff0000'; // (red) Color for quoted text -- >> 2 or more - $color[15] = '#002266'; // (dark blue) Unselectable folders - $color[16] = '#ff9933'; // (orange) Highlight color -?> \ No newline at end of file +global $color; +$color[0] = '#dcdcdc'; // (light gray) TitleBar +$color[1] = '#800000'; // (red) +$color[2] = '#cc0000'; // (light red) Warning/Error Messages +$color[3] = '#a0b8c8'; // (green-blue) Left Bar Background +$color[4] = '#ffffff'; // (white) Normal Background +$color[5] = '#ffffcc'; // (light yellow) Table Headers +$color[6] = '#000000'; // (black) Text on left bar +$color[7] = '#0000cc'; // (blue) Links +$color[8] = '#000000'; // (black) Normal text +$color[9] = '#ababab'; // (mid-gray) Darker version of #0 +$color[10] = '#666666'; // (dark gray) Darker version of #9 +$color[11] = '#770000'; // (dark red) Special Folders color +$color[12] = '#ededed'; // (light gray) Alternate color for message list +$color[13] = '#800000'; // (dark red) Color for quoted text -- > 1 quote +$color[14] = '#ff0000'; // (red) Color for quoted text -- >> 2 or more +$color[15] = '#002266'; // (dark blue) Unselectable folders +$color[16] = '#ff9933'; // (orange) Highlight color diff --git a/themes/dompie_theme.php b/themes/dompie_theme.php index 3a2f64f2..f252a92f 100644 --- a/themes/dompie_theme.php +++ b/themes/dompie_theme.php @@ -29,5 +29,3 @@ $color[10] = '#c0c0c0'; // (light grey) Darker version of #9 $color[11] = '#a7c5f3'; // (light blue) Special Folders color $color[12] = '#c0c0c0'; // $color[15] = '#788dd0'; // (darkish blue) Unselectable folders - -?> \ No newline at end of file diff --git a/themes/forest_theme.php b/themes/forest_theme.php index be5c3813..f9e95d44 100644 --- a/themes/forest_theme.php +++ b/themes/forest_theme.php @@ -29,4 +29,3 @@ $color[10] = '#5e7f67'; // (dark purp) Darker version of #9 $color[11] = '#4a9b62'; // (dark red) Special Folders color $color[12] = '#d2f3da'; $color[15] = '#648b70'; // (another green) Unselectable folders -?> \ No newline at end of file diff --git a/themes/greenhouse_effect.php b/themes/greenhouse_effect.php index 31034796..c9a76989 100755 --- a/themes/greenhouse_effect.php +++ b/themes/greenhouse_effect.php @@ -48,28 +48,3 @@ for ($i = 0; $i <= 15; $i++) { /** set array element as hex string with hashmark (for HTML output) **/ $color[$i] = sprintf('#%02X%02X%02X',$r,$g,$b); } - - - -/** - * Reference from http://www.squirrelmail.org/wiki/CreatingThemes - * $color[0] = '#xxxxxx'; // Title bar at the top of the page header - * $color[1] = '#xxxxxx'; // Not currently used - * $color[2] = '#xxxxxx'; // Error messages (usually red) - * $color[3] = '#xxxxxx'; // Left folder list background color - * $color[4] = '#xxxxxx'; // Normal background color - * $color[5] = '#xxxxxx'; // Header of the message indexi - * // (From, Date,Subject) - * $color[6] = '#xxxxxx'; // Normal text on the left folder list - * $color[7] = '#xxxxxx'; // Links in the right frame - * $color[8] = '#xxxxxx'; // Normal text (usually black) - * $color[9] = '#xxxxxx'; // Darker version of #0 - * $color[10] = '#xxxxxx'; // Darker version of #9 - * $color[11] = '#xxxxxx'; // Special folders color (INBOX, Trash, Sent) - * $color[12] = '#xxxxxx'; // Alternate color for message list - * // Alters between #4 and this one - * $color[13] = '#xxxxxx'; // Color for quoted text -- > 1 quote - * $color[14] = '#xxxxxx'; // Color for quoted text -- >> 2 or more - **/ - -?> \ No newline at end of file diff --git a/themes/high_contrast_theme.php b/themes/high_contrast_theme.php index 08a1ffeb..72e13cdd 100644 --- a/themes/high_contrast_theme.php +++ b/themes/high_contrast_theme.php @@ -27,5 +27,3 @@ $color[9] = '#c0c0c0'; // (mid-gray) Darker version of #0 $color[10] = '#808080'; // (dark gray) Darker version of #9 $color[11] = '#ffffff'; // (white) Special Folders color $color[15] = '#d0d070'; // (gold) Unselectable folders - -?> \ No newline at end of file diff --git a/themes/ice_theme.php b/themes/ice_theme.php index 219a867f..1c191ffa 100644 --- a/themes/ice_theme.php +++ b/themes/ice_theme.php @@ -27,5 +27,3 @@ $color[9] = '#d0eaff'; // Darker version of #0 $color[10] = '#f0faff'; // Darker version of #9 $color[11] = '#770000'; // Special Folders color $color[15] = '#006600'; // Unselectable folders - -?> \ No newline at end of file diff --git a/themes/in_the_pink.php b/themes/in_the_pink.php index 3a9fd6cc..b2def3ec 100755 --- a/themes/in_the_pink.php +++ b/themes/in_the_pink.php @@ -44,26 +44,3 @@ for ($i = 0; $i <= 15; $i++) { /* set array element as hex string with hashmark (for HTML output) */ $color[$i] = sprintf('#%02X%02X%02X',$r,$g,$b); } - - -/* Reference from http://www.squirrelmail.org/wiki/CreatingThemes - -$color[0] = '#xxxxxx'; // Title bar at the top of the page header -$color[1] = '#xxxxxx'; // Not currently used -$color[2] = '#xxxxxx'; // Error messages (usually red) -$color[3] = '#xxxxxx'; // Left folder list background color -$color[4] = '#xxxxxx'; // Normal background color -$color[5] = '#xxxxxx'; // Header of the message index // (From, Date,Subject) -$color[6] = '#xxxxxx'; // Normal text on the left folder list -$color[7] = '#xxxxxx'; // Links in the right frame -$color[8] = '#xxxxxx'; // Normal text (usually black) -$color[9] = '#xxxxxx'; // Darker version of #0 -$color[10] = '#xxxxxx'; // Darker version of #9 -$color[11] = '#xxxxxx'; // Special folders color (INBOX, Trash, Sent) -$color[12] = '#xxxxxx'; // Alternate color for message list // Alters between #4 and this one -$color[13] = '#xxxxxx'; // Color for quoted text -- > 1 quote -$color[14] = '#xxxxxx'; // Color for quoted text -- >> 2 or more - -*/ - -?> \ No newline at end of file diff --git a/themes/kind_of_blue.php b/themes/kind_of_blue.php index dd3cd11d..7c4b91f3 100755 --- a/themes/kind_of_blue.php +++ b/themes/kind_of_blue.php @@ -48,26 +48,3 @@ for ($i = 0; $i <= 15; $i++) { /* set array element as hex string with hashmark (for HTML output) */ $color[$i] = sprintf('#%02X%02X%02X',$r,$g,$b); } - - -/* Reference from http://www.squirrelmail.org/wiki/CreatingThemes - -$color[0] = '#xxxxxx'; // Title bar at the top of the page header -$color[1] = '#xxxxxx'; // Not currently used -$color[2] = '#xxxxxx'; // Error messages (usually red) -$color[3] = '#xxxxxx'; // Left folder list background color -$color[4] = '#xxxxxx'; // Normal background color -$color[5] = '#xxxxxx'; // Header of the message index // (From, Date,Subject) -$color[6] = '#xxxxxx'; // Normal text on the left folder list -$color[7] = '#xxxxxx'; // Links in the right frame -$color[8] = '#xxxxxx'; // Normal text (usually black) -$color[9] = '#xxxxxx'; // Darker version of #0 -$color[10] = '#xxxxxx'; // Darker version of #9 -$color[11] = '#xxxxxx'; // Special folders color (INBOX, Trash, Sent) -$color[12] = '#xxxxxx'; // Alternate color for message list // Alters between #4 and this one -$color[13] = '#xxxxxx'; // Color for quoted text -- > 1 quote -$color[14] = '#xxxxxx'; // Color for quoted text -- >> 2 or more - -*/ - -?> \ No newline at end of file diff --git a/themes/maize_theme.php b/themes/maize_theme.php index 1aa0560d..fe7f30a0 100644 --- a/themes/maize_theme.php +++ b/themes/maize_theme.php @@ -34,5 +34,3 @@ $color[9] = '#909090'; // (darker gray) Darker version of #0 $color[10] = '#606060'; // (darkest gray) Darker version of #9 $color[11] = '#600000'; // (lighter red) Special Folders color $color[15] = '#602020'; // (some brown) Unselectable folders - -?> \ No newline at end of file diff --git a/themes/methodical_theme.php b/themes/methodical_theme.php index c71379e3..0d4e8740 100644 --- a/themes/methodical_theme.php +++ b/themes/methodical_theme.php @@ -31,4 +31,3 @@ $color[10] = '#999999'; // (light grey) Darker version of #9 $color[11] = '#a7c5f3'; // (light blue) Special Folders color $color[12] = '#9f9f9f'; // $color[13] = '#dfdfdf'; // (lighter grey) Unselectable folders -?> \ No newline at end of file diff --git a/themes/midnight.php b/themes/midnight.php index 909f158f..5961c202 100644 --- a/themes/midnight.php +++ b/themes/midnight.php @@ -30,4 +30,3 @@ $color[11] = '#7070ff'; // Special folders / Unseen messages color $color[12] = '#3300cc'; // Alternate table row color $color[13] = '#3333cc'; $color[15] = '#33ff66'; // Unselectable folders -?> \ No newline at end of file diff --git a/themes/minimal_bw.php b/themes/minimal_bw.php index 69cb5a8d..b7bf3e6e 100644 --- a/themes/minimal_bw.php +++ b/themes/minimal_bw.php @@ -16,21 +16,20 @@ * @subpackage themes */ - global $color; - $color[0] = '#ffffff'; // (white) TitleBar - $color[1] = '#000000'; // (black) (unused) - $color[2] = '#000000'; // (black) Warning/Error Messages - $color[3] = '#ffffff'; // (white) Left Bar Background - $color[4] = '#ffffff'; // (white) Normal Background - $color[5] = '#ffffff'; // (white) Table Headers - $color[6] = '#000000'; // (black) Text on left bar - $color[7] = '#000000'; // (black) Links - $color[8] = '#000000'; // (black) Normal text - $color[9] = '#ffffff'; // (white) Darker version of #0 - $color[10] = '#ffffff'; // (white) Darker version of #9 - $color[11] = '#000000'; // (black) Special Folders color - $color[12] = '#ffffff'; // (white) Alternate color for message list - $color[13] = '#000000'; // (black) Color for quoted text -- > 1 quote - $color[14] = '#000000'; // (black) Color for quoted text -- >> 2 or more - $color[15] = '#000000'; // (black) Unselectable folders -?> \ No newline at end of file +global $color; +$color[0] = '#ffffff'; // (white) TitleBar +$color[1] = '#000000'; // (black) (unused) +$color[2] = '#000000'; // (black) Warning/Error Messages +$color[3] = '#ffffff'; // (white) Left Bar Background +$color[4] = '#ffffff'; // (white) Normal Background +$color[5] = '#ffffff'; // (white) Table Headers +$color[6] = '#000000'; // (black) Text on left bar +$color[7] = '#000000'; // (black) Links +$color[8] = '#000000'; // (black) Normal text +$color[9] = '#ffffff'; // (white) Darker version of #0 +$color[10] = '#ffffff'; // (white) Darker version of #9 +$color[11] = '#000000'; // (black) Special Folders color +$color[12] = '#ffffff'; // (white) Alternate color for message list +$color[13] = '#000000'; // (black) Color for quoted text -- > 1 quote +$color[14] = '#000000'; // (black) Color for quoted text -- >> 2 or more +$color[15] = '#000000'; // (black) Unselectable folders diff --git a/themes/monostochastic.php b/themes/monostochastic.php index 82d58b54..51a37ba4 100755 --- a/themes/monostochastic.php +++ b/themes/monostochastic.php @@ -59,27 +59,3 @@ for ($i = 0; $i <= 15; $i++) { $color[$i] = sprintf('#%02X%02X%02X',$rt,$gt,$bt); } } - -/* Reference from http://www.squirrelmail.org/wiki/CreatingThemes - -$color[0] = '#xxxxxx'; // Title bar at the top of the page header -$color[1] = '#xxxxxx'; // Not currently used -$color[2] = '#xxxxxx'; // Error messages (usually red) -$color[3] = '#xxxxxx'; // Left folder list background color -$color[4] = '#xxxxxx'; // Normal background color -$color[5] = '#xxxxxx'; // Header of the message index - // (From, Date,Subject) -$color[6] = '#xxxxxx'; // Normal text on the left folder list -$color[7] = '#xxxxxx'; // Links in the right frame -$color[8] = '#xxxxxx'; // Normal text (usually black) -$color[9] = '#xxxxxx'; // Darker version of #0 -$color[10] = '#xxxxxx'; // Darker version of #9 -$color[11] = '#xxxxxx'; // Special folders color (INBOX, Trash, Sent) -$color[12] = '#xxxxxx'; // Alternate color for message list - // Alters between #4 and this one -$color[13] = '#xxxxxx'; // Color for quoted text -- > 1 quote -$color[14] = '#xxxxxx'; // Color for quoted text -- >> 2 or more - -*/ - -?> \ No newline at end of file diff --git a/themes/netstyle_theme.php b/themes/netstyle_theme.php index ddc96429..8696bc94 100644 --- a/themes/netstyle_theme.php +++ b/themes/netstyle_theme.php @@ -30,4 +30,3 @@ $color[12] = '#FFFFCC'; // (lightest yellow) Alternate color for message list $color[13] = '#0000F0'; // (blue) Color for quoted text -- > 1 quote $color[14] = '#00C060'; // (green) Color for quoted text -- >> 2 or more $color[15] = '#002266'; // (dark blue) Unselectable folders -?> \ No newline at end of file diff --git a/themes/penguin.php b/themes/penguin.php index 31592fed..0ae8ebbc 100644 --- a/themes/penguin.php +++ b/themes/penguin.php @@ -15,6 +15,7 @@ * @subpackage themes */ +global $color; $color[0] = '#ffcc00'; // b 0: Title Bar at the top of the page header $color[1] = '#333333'; // f 1: $color[2] = '#ff0000'; // f 2: Error messages, usually red @@ -31,5 +32,3 @@ $color[12] = '#eeeeee'; // b 12: Alternate color for message list [alters betwe $color[13] = '#800000'; // f 13: Color for single-quoted text ('> text') when reading (default: #800000) $color[14] = '#ff0000'; // f 14: Color for text with more than one quote (default: #ff0000) $color[15] = '#ffdd11'; // f 15: Non-selectable folders in the left frame (defaults to $color[6]) - -?> \ No newline at end of file diff --git a/themes/plain_blue_theme.php b/themes/plain_blue_theme.php index 9718fdcc..f0caa8b4 100644 --- a/themes/plain_blue_theme.php +++ b/themes/plain_blue_theme.php @@ -27,5 +27,3 @@ $color[10] = '#376589'; // Darker version of #9 $color[11] = '#770000'; // Special Folders color $color[12] = '#ededed'; // Alternating rows color $color[15] = '#001166'; // Unselectable folders - -?> \ No newline at end of file diff --git a/themes/powder_blue.php b/themes/powder_blue.php index 21ec18e0..77171fb4 100644 --- a/themes/powder_blue.php +++ b/themes/powder_blue.php @@ -29,4 +29,3 @@ $color[12] = '#f2f3ff'; // Alternate color for message list (alters between #4 $color[13] = '#333333'; // Color for single-quoted text ('> text') $color[14] = '#666666'; // Color for text with more than one quote ('>> text') $color[15] = '#f5f9ff'; // Non-selectable folders in the left frame (defaults to #6) -?> \ No newline at end of file diff --git a/themes/purple_theme.php b/themes/purple_theme.php index 8920e635..3dfa2b17 100644 --- a/themes/purple_theme.php +++ b/themes/purple_theme.php @@ -27,5 +27,3 @@ $color[9] = '#877c9f'; // (mid purp) Darker version of #0 $color[10] = '#726987'; // (dark purp) Darker version of #9 $color[11] = '#770000'; // (dark red) Special Folders color $color[12] = '#e0d9f2'; - -?> \ No newline at end of file diff --git a/themes/random.php b/themes/random.php index c93d8d8c..ba094253 100755 --- a/themes/random.php +++ b/themes/random.php @@ -51,5 +51,3 @@ if (!sqsession_is_registered('random_theme_good_theme')) { } @include_once (SM_PATH . $random_theme_good_theme); - -?> \ No newline at end of file diff --git a/themes/redmond.php b/themes/redmond.php index 8a4433e3..52ffed16 100644 --- a/themes/redmond.php +++ b/themes/redmond.php @@ -14,21 +14,20 @@ * @subpackage themes */ - global $color; - $color[0] = '#ece9d8'; - $color[1] = '#800000'; - $color[2] = '#cc0000'; - $color[3] = '#aba899'; - $color[4] = '#ffffff'; - $color[5] = '#ece9d8'; - $color[6] = '#ffffff'; - $color[7] = '#0000cc'; - $color[8] = '#000000'; - $color[9] = '#aba899'; - $color[10] = '#666666'; - $color[11] = '#ffffcc'; - $color[12] = '#ffffcc'; - $color[13] = '#800000'; - $color[14] = '#ff0000'; - $color[15] = '#002266'; -?> \ No newline at end of file +global $color; +$color[0] = '#ece9d8'; +$color[1] = '#800000'; +$color[2] = '#cc0000'; +$color[3] = '#aba899'; +$color[4] = '#ffffff'; +$color[5] = '#ece9d8'; +$color[6] = '#ffffff'; +$color[7] = '#0000cc'; +$color[8] = '#000000'; +$color[9] = '#aba899'; +$color[10] = '#666666'; +$color[11] = '#ffffcc'; +$color[12] = '#ffffcc'; +$color[13] = '#800000'; +$color[14] = '#ff0000'; +$color[15] = '#002266'; diff --git a/themes/sandstorm_theme.php b/themes/sandstorm_theme.php index b3255be9..08a54aa6 100644 --- a/themes/sandstorm_theme.php +++ b/themes/sandstorm_theme.php @@ -27,5 +27,3 @@ $color[9] = '#bfa779'; // (mid tan) Darker version of #0 $color[10] = '#7f6729'; // (dark tan) Darker version of #9 $color[11] = '#770000'; // (dark red) Special Folders color $color[15] = '#7f6729'; // (dark tan) Unselectable folders - -?> \ No newline at end of file diff --git a/themes/seaspray_theme.php b/themes/seaspray_theme.php index ea0b38ad..0895eb85 100644 --- a/themes/seaspray_theme.php +++ b/themes/seaspray_theme.php @@ -26,5 +26,3 @@ $color[9] = '#78a0a0'; $color[10] = '#386060'; $color[11] = '#ffffb0'; $color[15] = '#b0ffff'; - -?> \ No newline at end of file diff --git a/themes/servery_theme.php b/themes/servery_theme.php index 653c51b0..55cb00f7 100644 --- a/themes/servery_theme.php +++ b/themes/servery_theme.php @@ -26,4 +26,3 @@ $color[9] = '#c7b98b'; // (mid-gray) Darker version of #0 $color[10] = '#f1eee3'; // (dark gray) Darker version of #9 $color[11] = '#770000'; // (dark red) Special Folders color $color[15] = '#c7b98b'; // (mid-gray) Unselectable folders -?> \ No newline at end of file diff --git a/themes/shades_of_grey.php b/themes/shades_of_grey.php index b86f6216..a7ce6f7b 100755 --- a/themes/shades_of_grey.php +++ b/themes/shades_of_grey.php @@ -47,26 +47,3 @@ for ($i = 0; $i <= 15; $i++) { /* set array element as hex string with hashmark (for HTML output) */ $color[$i] = sprintf('#%02X%02X%02X',$r,$g,$b); } - - -/* Reference from http://www.squirrelmail.org/wiki/CreatingThemes - -$color[0] = '#xxxxxx'; // Title bar at the top of the page header -$color[1] = '#xxxxxx'; // Not currently used -$color[2] = '#xxxxxx'; // Error messages (usually red) -$color[3] = '#xxxxxx'; // Left folder list background color -$color[4] = '#xxxxxx'; // Normal background color -$color[5] = '#xxxxxx'; // Header of the message index // (From, Date,Subject) -$color[6] = '#xxxxxx'; // Normal text on the left folder list -$color[7] = '#xxxxxx'; // Links in the right frame -$color[8] = '#xxxxxx'; // Normal text (usually black) -$color[9] = '#xxxxxx'; // Darker version of #0 -$color[10] = '#xxxxxx'; // Darker version of #9 -$color[11] = '#xxxxxx'; // Special folders color (INBOX, Trash, Sent) -$color[12] = '#xxxxxx'; // Alternate color for message list // Alters between #4 and this one -$color[13] = '#xxxxxx'; // Color for quoted text -- > 1 quote -$color[14] = '#xxxxxx'; // Color for quoted text -- >> 2 or more - -*/ - -?> \ No newline at end of file diff --git a/themes/silver_steel_theme.php b/themes/silver_steel_theme.php index 4aeeeb1c..f4601401 100644 --- a/themes/silver_steel_theme.php +++ b/themes/silver_steel_theme.php @@ -29,5 +29,3 @@ $color[12] = '#d0d4de'; // odd message background $color[13] = '#ffffff'; // $color[14] = '#ffffff'; // $color[15] = '#d0d0d0'; // Unselectable folders - -?> \ No newline at end of file diff --git a/themes/simple_green2.php b/themes/simple_green2.php index d13dc492..f6a83116 100644 --- a/themes/simple_green2.php +++ b/themes/simple_green2.php @@ -33,4 +33,3 @@ $color[12] = '#EDEDED'; // (light gray) Alternate color for message list $color[13] = '#6666CC'; // (dull blue) Color for quoted text -- > 1 quote $color[14] = '#333399'; // (dark blue) Color for quoted text -- >> 2 or more $color[15] = '#669966'; // (grey-green) Unselectable folders -?> \ No newline at end of file diff --git a/themes/simple_green_theme.php b/themes/simple_green_theme.php index 86e97d35..a4dbeaea 100644 --- a/themes/simple_green_theme.php +++ b/themes/simple_green_theme.php @@ -29,5 +29,3 @@ $color[12] = "#EDEDED"; // (light gray) Alternate List Item Color (alternates wi $color[13] = "#800000"; // (dark red) > Quoted Message Text $color[14] = "#FF0000"; // (rec) >> Multi-Quoted Message Text (2 >'s or more) $color[15] = "#002266"; // (dark blue NOTE: not tested) L. Frame: unselectable folders - -?> \ No newline at end of file diff --git a/themes/simple_purple.php b/themes/simple_purple.php index 2666e1be..ad7b5274 100644 --- a/themes/simple_purple.php +++ b/themes/simple_purple.php @@ -33,4 +33,3 @@ $color[12] = '#EDEDED'; // (light gray) Alternate color for message list $color[13] = '#6666CC'; // (dull blue) Color for quoted text -- > 1 quote $color[14] = '#333399'; // (dark blue) Color for quoted text -- >> 2 or more $color[15] = '#9966CC'; // (grey-purple) Unselectable folders -?> \ No newline at end of file diff --git a/themes/slashdot_theme.php b/themes/slashdot_theme.php index ea461314..22534ddc 100644 --- a/themes/slashdot_theme.php +++ b/themes/slashdot_theme.php @@ -29,5 +29,3 @@ $color[10] = '#666666'; // (dark gray) Darker version of #9 $color[11] = '#770000'; // (dark red) Special Folders color $color[12] = '#eaeaea'; $color[15] = '#ababab'; // (mid-gray) Unselectable folders - -?> \ No newline at end of file diff --git a/themes/spice_of_life.php b/themes/spice_of_life.php index 57d3d884..4ac72925 100755 --- a/themes/spice_of_life.php +++ b/themes/spice_of_life.php @@ -52,26 +52,3 @@ for ($i = 0; $i <= 15; $i++) { /** set array element as hex string with hashmark (for HTML output) **/ $color[$i] = sprintf('#%02X%02X%02X',$r,$g,$b); } - - -/* Reference from http://www.squirrelmail.org/wiki/CreatingThemes - -$color[0] = '#xxxxxx'; // Title bar at the top of the page header -$color[1] = '#xxxxxx'; // Not currently used -$color[2] = '#xxxxxx'; // Error messages (usually red) -$color[3] = '#xxxxxx'; // Left folder list background color -$color[4] = '#xxxxxx'; // Normal background color -$color[5] = '#xxxxxx'; // Header of the message index // (From, Date,Subject) -$color[6] = '#xxxxxx'; // Normal text on the left folder list -$color[7] = '#xxxxxx'; // Links in the right frame -$color[8] = '#xxxxxx'; // Normal text (usually black) -$color[9] = '#xxxxxx'; // Darker version of #0 -$color[10] = '#xxxxxx'; // Darker version of #9 -$color[11] = '#xxxxxx'; // Special folders color (INBOX, Trash, Sent) -$color[12] = '#xxxxxx'; // Alternate color for message list // Alters between #4 and this one -$color[13] = '#xxxxxx'; // Color for quoted text -- > 1 quote -$color[14] = '#xxxxxx'; // Color for quoted text -- >> 2 or more - -*/ - -?> \ No newline at end of file diff --git a/themes/spice_of_life_dark.php b/themes/spice_of_life_dark.php index eb17f92e..dbc65bad 100755 --- a/themes/spice_of_life_dark.php +++ b/themes/spice_of_life_dark.php @@ -52,26 +52,3 @@ for ($i = 0; $i <= 15; $i++) { /** set array element as hex string with hashmark (for HTML output) **/ $color[$i] = sprintf('#%02X%02X%02X',$r,$g,$b); } - - -/* Reference from http://www.squirrelmail.org/wiki/CreatingThemes - -$color[0] = '#xxxxxx'; // Title bar at the top of the page header -$color[1] = '#xxxxxx'; // Not currently used -$color[2] = '#xxxxxx'; // Error messages (usually red) -$color[3] = '#xxxxxx'; // Left folder list background color -$color[4] = '#xxxxxx'; // Normal background color -$color[5] = '#xxxxxx'; // Header of the message index // (From, Date,Subject) -$color[6] = '#xxxxxx'; // Normal text on the left folder list -$color[7] = '#xxxxxx'; // Links in the right frame -$color[8] = '#xxxxxx'; // Normal text (usually black) -$color[9] = '#xxxxxx'; // Darker version of #0 -$color[10] = '#xxxxxx'; // Darker version of #9 -$color[11] = '#xxxxxx'; // Special folders color (INBOX, Trash, Sent) -$color[12] = '#xxxxxx'; // Alternate color for message list // Alters between #4 and this one -$color[13] = '#xxxxxx'; // Color for quoted text -- > 1 quote -$color[14] = '#xxxxxx'; // Color for quoted text -- >> 2 or more - -*/ - -?> \ No newline at end of file diff --git a/themes/spice_of_life_lite.php b/themes/spice_of_life_lite.php index 84aaa4f6..941527b7 100755 --- a/themes/spice_of_life_lite.php +++ b/themes/spice_of_life_lite.php @@ -52,26 +52,3 @@ for ($i = 0; $i <= 15; $i++) { /** set array element as hex string with hashmark (for HTML output) **/ $color[$i] = sprintf('#%02X%02X%02X',$r,$g,$b); } - - -/* Reference from http://www.squirrelmail.org/wiki/CreatingThemes - -$color[0] = '#xxxxxx'; // Title bar at the top of the page header -$color[1] = '#xxxxxx'; // Not currently used -$color[2] = '#xxxxxx'; // Error messages (usually red) -$color[3] = '#xxxxxx'; // Left folder list background color -$color[4] = '#xxxxxx'; // Normal background color -$color[5] = '#xxxxxx'; // Header of the message index // (From, Date,Subject) -$color[6] = '#xxxxxx'; // Normal text on the left folder list -$color[7] = '#xxxxxx'; // Links in the right frame -$color[8] = '#xxxxxx'; // Normal text (usually black) -$color[9] = '#xxxxxx'; // Darker version of #0 -$color[10] = '#xxxxxx'; // Darker version of #9 -$color[11] = '#xxxxxx'; // Special folders color (INBOX, Trash, Sent) -$color[12] = '#xxxxxx'; // Alternate color for message list // Alters between #4 and this one -$color[13] = '#xxxxxx'; // Color for quoted text -- > 1 quote -$color[14] = '#xxxxxx'; // Color for quoted text -- >> 2 or more - -*/ - -?> \ No newline at end of file diff --git a/themes/techno_blue.php b/themes/techno_blue.php index db95972d..5aa456a9 100644 --- a/themes/techno_blue.php +++ b/themes/techno_blue.php @@ -29,4 +29,3 @@ $color[12] = '#eaeff5'; // Alternate color for message list (alters between #4 $color[13] = '#4d657d'; // Color for single-quoted text ('> text') $color[14] = '#4d657d'; // Color for text with more than one quote ('>> text') $color[15] = '#f6faff'; // Non-selectable folders in the left frame (defaults to #6) -?> \ No newline at end of file diff --git a/themes/turquoise.php b/themes/turquoise.php index 1c3ac89e..d2081170 100644 --- a/themes/turquoise.php +++ b/themes/turquoise.php @@ -29,4 +29,3 @@ $color[12] = '#dfdfdf'; // Alternate color for message list (alters between #4 $color[13] = '#333333'; // Color for single-quoted text ('> text') $color[14] = '#666666'; // Color for text with more than one quote ('>> text') $color[15] = '#ffffff'; // Non-selectable folders in the left frame (defaults to #6) -?> \ No newline at end of file diff --git a/themes/wood_theme.php b/themes/wood_theme.php index 3a0d49b1..ab752cf2 100644 --- a/themes/wood_theme.php +++ b/themes/wood_theme.php @@ -29,5 +29,3 @@ $color[12] = '#e4dab0'; // odd message background $color[13] = '#ffffff'; // $color[14] = '#ffffff'; // $color[15] = '#D0D0D0'; // Unselectable folders - -?> \ No newline at end of file