hastymail-cvs Mailing List for Hastymail
Brought to you by:
sailfrog,
slushpupie
You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(133) |
Dec
(199) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(83) |
Feb
(165) |
Mar
(221) |
Apr
(47) |
May
(29) |
Jun
(69) |
Jul
(212) |
Aug
(284) |
Sep
(84) |
Oct
(113) |
Nov
(148) |
Dec
(155) |
2004 |
Jan
(97) |
Feb
(77) |
Mar
(138) |
Apr
(48) |
May
(102) |
Jun
(101) |
Jul
(158) |
Aug
(136) |
Sep
(66) |
Oct
(34) |
Nov
(25) |
Dec
(28) |
2005 |
Jan
(39) |
Feb
(20) |
Mar
(134) |
Apr
(130) |
May
(66) |
Jun
(59) |
Jul
(18) |
Aug
(49) |
Sep
(7) |
Oct
(2) |
Nov
(10) |
Dec
(60) |
2006 |
Jan
(35) |
Feb
(17) |
Mar
(176) |
Apr
(44) |
May
(52) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(2) |
Dec
|
2007 |
Jan
(9) |
Feb
(2) |
Mar
(11) |
Apr
|
May
|
Jun
|
Jul
(18) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
(151) |
Feb
(75) |
Mar
(60) |
Apr
(89) |
May
(119) |
Jun
(19) |
Jul
(18) |
Aug
(21) |
Sep
(14) |
Oct
(18) |
Nov
(32) |
Dec
(66) |
2009 |
Jan
(61) |
Feb
(17) |
Mar
(62) |
Apr
(60) |
May
(26) |
Jun
(42) |
Jul
(33) |
Aug
(41) |
Sep
(11) |
Oct
(88) |
Nov
(113) |
Dec
(55) |
2010 |
Jan
(31) |
Feb
(35) |
Mar
(49) |
Apr
(76) |
May
(63) |
Jun
(31) |
Jul
(56) |
Aug
(18) |
Sep
(16) |
Oct
(7) |
Nov
(40) |
Dec
(23) |
2011 |
Jan
(37) |
Feb
(31) |
Mar
(15) |
Apr
(28) |
May
(16) |
Jun
(35) |
Jul
(39) |
Aug
(30) |
Sep
(26) |
Oct
(3) |
Nov
(3) |
Dec
(16) |
2012 |
Jan
(17) |
Feb
(6) |
Mar
(9) |
Apr
(4) |
May
(6) |
Jun
(2) |
Jul
(6) |
Aug
(7) |
Sep
|
Oct
(9) |
Nov
(39) |
Dec
(9) |
2013 |
Jan
(6) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
(3) |
Nov
|
Dec
(1) |
From: <sai...@us...> - 2013-12-31 21:36:51
|
Revision: 2155 http://sourceforge.net/p/hastymail/code/2155 Author: sailfrog Date: 2013-12-31 21:36:47 +0000 (Tue, 31 Dec 2013) Log Message: ----------- Add a configuration option to strip domains from login names Modified Paths: -------------- trunk/hastymail2/hastymail2.conf.example trunk/hastymail2/lib/utility_classes.php Modified: trunk/hastymail2/hastymail2.conf.example =================================================================== --- trunk/hastymail2/hastymail2.conf.example 2013-10-22 16:03:09 UTC (rev 2154) +++ trunk/hastymail2/hastymail2.conf.example 2013-12-31 21:36:47 UTC (rev 2155) @@ -398,6 +398,13 @@ site_blacklist_ips = + # site_strip_login_domain + # ----------------------- + # If mail users should login without a domain but add one anyway this + # will strip the domain portion from their login username + +site_strip_login_domain = false + # site_append_login_domain # ------------------------ # If your IMAP server requires users to login with their full email Modified: trunk/hastymail2/lib/utility_classes.php =================================================================== --- trunk/hastymail2/lib/utility_classes.php 2013-10-22 16:03:09 UTC (rev 2154) +++ trunk/hastymail2/lib/utility_classes.php 2013-12-31 21:36:47 UTC (rev 2155) @@ -949,6 +949,9 @@ $username = trim($username); $pass = trim($pass); } + if (isset($conf['site_strip_login_domain']) && $conf['site_strip_login_domain']) { + $username = preg_replace("/@.+$/", '', $username); + } if ($this->do_auth($username, $pass, $conf['imap_proxyauth_user'])) { $this->start_session(); $this->logged_in = true; @@ -992,6 +995,9 @@ $username = trim($username); $pass = trim($pass); } + if (isset($conf['site_strip_login_domain']) && $conf['site_strip_login_domain']) { + $username = preg_replace("/@.+$/", '', $username); + } if ($this->do_auth($username, $pass, false)) { $this->start_session(); $this->logged_in = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-10-22 16:03:12
|
Revision: 2154 http://sourceforge.net/p/hastymail/code/2154 Author: sailfrog Date: 2013-10-22 16:03:09 +0000 (Tue, 22 Oct 2013) Log Message: ----------- Remove debug Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2013-10-22 15:45:39 UTC (rev 2153) +++ trunk/hastymail2/lib/imap_class.php 2013-10-22 16:03:09 UTC (rev 2154) @@ -2046,7 +2046,6 @@ if ($mailbox && isset($this->msg_header_page_cache[$mailbox.'-'.$command])) { return $this->msg_header_page_cache[$mailbox.'-'.$command]; } - error_log($mailbox.'-'.$command); $this->send_command($command); $result = $this->get_response(false, true); $status = $this->check_response($result, true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-10-22 15:45:42
|
Revision: 2153 http://sourceforge.net/p/hastymail/code/2153 Author: sailfrog Date: 2013-10-22 15:45:39 +0000 (Tue, 22 Oct 2013) Log Message: ----------- Reduce IMAP calls per page load with some simple caching. If an exact command has been issued already for select/search/fetch headers then we return the previous result. This reduces unneeded back and forth to the IMAP server for these cases. This is really useful for plugins because from the plugin context you don't have access to the prior IMAP result set. Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php trunk/hastymail2/lib/url_action_classes/message.php trunk/hastymail2/lib/utility_classes.php trunk/hastymail2/plugins/message_digest/work.php trunk/hastymail2/plugins/message_tags/work.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2013-10-21 21:14:29 UTC (rev 2152) +++ trunk/hastymail2/lib/imap_class.php 2013-10-22 15:45:39 UTC (rev 2153) @@ -746,6 +746,9 @@ var $state; var $read_only; var $search_sort_flag; + var $unseen_search_page_cache; + var $msg_header_page_cache; + var $selected_mailbox; /* set defaults */ @@ -783,6 +786,8 @@ $this->use_folder_cache = 0; $this->use_uid_cache = 0; $this->use_header_cache = 0; + $this->unseen_search_page_cache = array(); + $this->msg_header_page_cache = array(); } /* establish a connection to the server. */ function connect() { @@ -1299,6 +1304,9 @@ in the folders array created by get_folders() in the session */ function select_mailbox($mailbox, $sort_by, $unseen=false, $quick=false, $filter='ALL') { $box = $this->utf7_encode(str_replace('"', '\"', $mailbox)); + if (!$unseen && $quick && $this->selected_mailbox == $box) { + return true; + } if (!$this->clean($box, 'mailbox')) { return false; } @@ -1408,11 +1416,17 @@ } $this->state = 'selected'; } + if ($status) { + $this->selected_mailbox = $box; + } return $status; } function get_mailbox_unseen($folder) { global $user; $command = "UID SEARCH (UNSEEN) ALL\r\n"; + if (isset($this->unseen_search_page_cache[$folder.'-'.$command])) { + return $this->unseen_search_page_cache[$folder.'-'.$command]; + } $this->send_command($command); $res = $this->get_response(false, true); $status = $this->check_response($res, true); @@ -1443,6 +1457,7 @@ } $_SESSION['folders'][$folder]['status']['unseen'] = $unseen; } + $this->unseen_search_page_cache[$folder.'-'.$command] = array($unseen, $uids); return array($unseen, $uids); } /* get the headers for a mailbox page display. Saved in the session @@ -2015,7 +2030,7 @@ return $struct; } /* get the headers for the selected message */ - function get_message_headers($uid, $message_part) { + function get_message_headers($uid, $message_part, $mailbox=false) { if (!$this->clean($uid, 'uid')) { return array(); } @@ -2028,6 +2043,10 @@ } $command = "UID FETCH $uid (FLAGS BODY[$message_part.HEADER])\r\n"; } + if ($mailbox && isset($this->msg_header_page_cache[$mailbox.'-'.$command])) { + return $this->msg_header_page_cache[$mailbox.'-'.$command]; + } + error_log($mailbox.'-'.$command); $this->send_command($command); $result = $this->get_response(false, true); $status = $this->check_response($result, true); @@ -2085,6 +2104,9 @@ $headers[] = array('Flags', join(' ', $flags)); } } + if ($mailbox) { + $this->msg_header_page_cache[$mailbox.'-'.$command] = $headers; + } return $headers; } function get_message_part_start($uid, $message_part) { Modified: trunk/hastymail2/lib/url_action_classes/message.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/message.php 2013-10-21 21:14:29 UTC (rev 2152) +++ trunk/hastymail2/lib/url_action_classes/message.php 2013-10-22 15:45:39 UTC (rev 2153) @@ -164,7 +164,7 @@ } $sort_by = 'ARRIVAL'; if (!isset($get['show_image']) && !isset($get['download']) || isset($get['framed_part'])) { - $user->page_data['full_message_headers'] = $imap->get_message_headers($id, false); + $user->page_data['full_message_headers'] = $imap->get_message_headers($id, false, $mailbox); } if ($override_missing_mime_header) { $struct = $this->override_missing_mime_header($struct, $user->page_data['full_message_headers']); Modified: trunk/hastymail2/lib/utility_classes.php =================================================================== --- trunk/hastymail2/lib/utility_classes.php 2013-10-21 21:14:29 UTC (rev 2152) +++ trunk/hastymail2/lib/utility_classes.php 2013-10-22 15:45:39 UTC (rev 2153) @@ -1789,7 +1789,7 @@ } return $caps; } - function imap_select_mailbox($mailbox, $sort_by='ARRIVAL', $unseen=false, $quick=false, $filter='ALL') { + function imap_select_mailbox($mailbox, $sort_by='ARRIVAL', $unseen=false, $quick=true, $filter='ALL') { global $imap; return $imap->select_mailbox($mailbox, $sort_by, $unseen, $quick, $filter); } @@ -1809,11 +1809,11 @@ global $imap; return $imap->get_mailbox_page($mailbox, $uids, false); } - function imap_get_message_headers($uid, $part) { + function imap_get_message_headers($uid, $part, $mailbox=false) { global $imap; $uid = (int) $uid; if ($uid) { - return $imap->get_message_headers($uid, $part); + return $imap->get_message_headers($uid, $part, $mailbox); } else { return array(); Modified: trunk/hastymail2/plugins/message_digest/work.php =================================================================== --- trunk/hastymail2/plugins/message_digest/work.php 2013-10-21 21:14:29 UTC (rev 2152) +++ trunk/hastymail2/plugins/message_digest/work.php 2013-10-22 15:45:39 UTC (rev 2153) @@ -42,7 +42,7 @@ } $res = $tools->imap_select_mailbox($tools->get_mailbox()); $uid = $tools->get_current_message_uid(); - $headers = $tools->imap_get_message_headers($uid, 0); + $headers = $tools->imap_get_message_headers($uid, 0, $tools->get_mailbox()); foreach ($headers as $vals) { if (strtolower($vals[0]) == 'content-type' && (stristr($vals[1], 'multipart/mixed') || stristr($vals[1], 'multipart/digest'))) { $struct = $tools->imap_get_message_structure($uid); Modified: trunk/hastymail2/plugins/message_tags/work.php =================================================================== --- trunk/hastymail2/plugins/message_tags/work.php 2013-10-21 21:14:29 UTC (rev 2152) +++ trunk/hastymail2/plugins/message_tags/work.php 2013-10-22 15:45:39 UTC (rev 2153) @@ -363,7 +363,7 @@ $msg_id_map = array(); if ($this->tools->imap_select_mailbox($mailbox, 'ARRIVAL', false, true)) { foreach ($uids as $uid) { - $vals = $this->tools->imap_get_message_headers($uid, 0); + $vals = $this->tools->imap_get_message_headers($uid, 0, $mailbox); foreach ($vals as $headers) { if (strtolower($headers[0]) == 'message-id') { $msg_id_map[$uid] = array($headers[1], $tags[$uid]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-10-21 21:14:32
|
Revision: 2152 http://sourceforge.net/p/hastymail/code/2152 Author: sailfrog Date: 2013-10-21 21:14:29 +0000 (Mon, 21 Oct 2013) Log Message: ----------- Fix for IMAP literals at the end of a LIST response line Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2013-08-15 16:46:56 UTC (rev 2151) +++ trunk/hastymail2/lib/imap_class.php 2013-10-21 21:14:29 UTC (rev 2152) @@ -48,6 +48,7 @@ $chunk = ''; /* if we hit a newline exit the loop */ if ($line{$i} == "\r" || $line{$i} == "\n") { + $line_cont = false; break; } /* skip spaces */ @@ -73,7 +74,9 @@ } $lit_result = $this->read_literal($literal_size, $max, $current_size, $line_length); $chunk = $lit_result[0]; - $line_cont = true; + if (!isset($lit_result[1]) || $lit_result[1] != "\r\n") { + $line_cont = true; + } $i = $len; } /* all other atoms */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-08-15 16:47:00
|
Revision: 2151 http://sourceforge.net/p/hastymail/code/2151 Author: sailfrog Date: 2013-08-15 16:46:56 +0000 (Thu, 15 Aug 2013) Log Message: ----------- Fix reply all formatting for double quoted address labels Modified Paths: -------------- trunk/hastymail2/lib/misc_functions.php Modified: trunk/hastymail2/lib/misc_functions.php =================================================================== --- trunk/hastymail2/lib/misc_functions.php 2013-07-15 18:52:48 UTC (rev 2150) +++ trunk/hastymail2/lib/misc_functions.php 2013-08-15 16:46:56 UTC (rev 2151) @@ -64,7 +64,7 @@ $res = array(); $replacements = array(); if (strstr($str, ',') || strstr($str, ';')) { - if (preg_match_all("/[\"']{1}[^\"']+[\"']{1}/", $str, $matches)) { + if (preg_match_all("/[\"']{1,2}[^\"']+[\"']{1,2}/", $str, $matches)) { foreach ($matches[0] as $i => $v) { $str = str_replace($v, $page_id.'_'.$i, $str); $replacements[$page_id.'_'.$i] = $v; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-07-15 18:52:51
|
Revision: 2150 http://sourceforge.net/p/hastymail/code/2150 Author: sailfrog Date: 2013-07-15 18:52:48 +0000 (Mon, 15 Jul 2013) Log Message: ----------- allow text/vcard mime type in contacts vcard upload Modified Paths: -------------- trunk/hastymail2/lib/post_action_classes/contacts.php Modified: trunk/hastymail2/lib/post_action_classes/contacts.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/contacts.php 2013-02-05 21:30:25 UTC (rev 2149) +++ trunk/hastymail2/lib/post_action_classes/contacts.php 2013-07-15 18:52:48 UTC (rev 2150) @@ -160,7 +160,7 @@ if (!empty($ufiles)) { if (!$ufiles['error']) { $type = strtolower($ufiles['type']); - if (strtolower(trim($type)) == 'text/x-vcard' || strtolower(trim($type)) == 'text/directory' || strtolower(trim($type)) == 'application/octet-stream') { + if (strtolower(trim($type)) == 'text/x-vcard' || strtolower(trim($type)) == 'text/vcard' || strtolower(trim($type)) == 'text/directory' || strtolower(trim($type)) == 'application/octet-stream') { $src = $ufiles['tmp_name']; $size = $ufiles['size']; if ($ufiles['size']) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-02-05 21:30:31
|
Revision: 2149 http://hastymail.svn.sourceforge.net/hastymail/?rev=2149&view=rev Author: sailfrog Date: 2013-02-05 21:30:25 +0000 (Tue, 05 Feb 2013) Log Message: ----------- doc updates Modified Paths: -------------- trunk/hastymail2/CHANGES trunk/hastymail2/UPGRADING Modified: trunk/hastymail2/CHANGES =================================================================== --- trunk/hastymail2/CHANGES 2013-02-05 21:23:47 UTC (rev 2148) +++ trunk/hastymail2/CHANGES 2013-02-05 21:30:25 UTC (rev 2149) @@ -1,6 +1,8 @@ SVN 1.2 ------------------------------------- +- Added PHP PDO support for database communication, along with sqlite and + firebird support in addition to mysql and postgresql. Thanks to Ben Hanna - Fixed a possible attachment corruption bug in the base64 encoding routine - Added lots of comments to the IMAP class (needs more still) - Updated Copyright notice date range in code and in the interface for 2013 Modified: trunk/hastymail2/UPGRADING =================================================================== --- trunk/hastymail2/UPGRADING 2013-02-05 21:23:47 UTC (rev 2148) +++ trunk/hastymail2/UPGRADING 2013-02-05 21:30:25 UTC (rev 2149) @@ -1,3 +1,10 @@ +FROM 1.1 to 1.2-SVN +------------------- +- Changed the name of the config file option 'db_pear_type' to 'db_adapter' + since it now supports a PDO option. The old db_pear_type will still work + if it is present and db_adapter is not + + FROM 1.1 RC2 to 1.1 ------------------- - Changed the behavior of the 'http_prifix' setting in the hastymail2.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-02-05 21:23:54
|
Revision: 2148 http://hastymail.svn.sourceforge.net/hastymail/?rev=2148&view=rev Author: sailfrog Date: 2013-02-05 21:23:47 +0000 (Tue, 05 Feb 2013) Log Message: ----------- - fix strict warnings in new PDO code - add support for old db_pear_type for sites who have not upgraded there config file - change the placeholder for the calendar event insert from 'null' to 'default'. null does not work in postresql. I need to check with Ben to make sure this works with firebird/sqlite Modified Paths: -------------- trunk/hastymail2/db/db.php trunk/hastymail2/lib/utility_classes.php trunk/hastymail2/plugins/calendar/cal_include.php Modified: trunk/hastymail2/db/db.php =================================================================== --- trunk/hastymail2/db/db.php 2013-02-03 08:41:54 UTC (rev 2147) +++ trunk/hastymail2/db/db.php 2013-02-05 21:23:47 UTC (rev 2148) @@ -162,18 +162,18 @@ $result_set = array(); if ($force) { $src = 'write handle'; - $res =& $this->db_write->query($sql); + $res = $this->db_write->query($sql); } else { $src = 'read handle'; - $res =& $this->db_read->query($sql); + $res = $this->db_read->query($sql); } $this->sql_list[] = $src.': '.$sql; if (!$res) { - $this->debug[] = $src.': sql id: '.(count($this->sql_list) - 1).' : '.str_replace('**', "\n **", $res->userinfo); + $this->debug[] = $src.': sql id: '.(count($this->sql_list) - 1).' : select failed: '.$sql; } else { - while ($row =& $res->fetch($this->fetch_mode)) { + while ($row = $res->fetch($this->fetch_mode)) { $result_set[] = $row; } if ($explain) { @@ -196,7 +196,7 @@ $src = 'write handle'; $this->sql_list[] = $src.': '.$sql; if (!$res) { - $this->debug[] = $src.': '.(count($this->sql_list) - 1).' : '.str_replace('**', "\n **", $res->userinfo); + $this->debug[] = $src.': '.(count($this->sql_list) - 1).' : write failed: '.$sql; } else { } Modified: trunk/hastymail2/lib/utility_classes.php =================================================================== --- trunk/hastymail2/lib/utility_classes.php 2013-02-03 08:41:54 UTC (rev 2147) +++ trunk/hastymail2/lib/utility_classes.php 2013-02-05 21:23:47 UTC (rev 2148) @@ -1423,6 +1423,9 @@ global $include_path; global $conf; global $fd; + if (isset($conf['db_pear_type']) && !isset($conf['db_adapter'])) { + $conf['db_adapter'] = $conf['db_pear_type']; + } if (isset($conf['db_type']) && isset($conf['db_adapter']) && isset($conf['db_username']) && isset($conf['db_password']) && isset($conf['db_hostname']) && isset($conf['db_database'])) { $db_lib = 'db'; Modified: trunk/hastymail2/plugins/calendar/cal_include.php =================================================================== --- trunk/hastymail2/plugins/calendar/cal_include.php 2013-02-03 08:41:54 UTC (rev 2147) +++ trunk/hastymail2/plugins/calendar/cal_include.php 2013-02-05 21:23:47 UTC (rev 2148) @@ -343,7 +343,7 @@ else { $duration = 0; } - $sql = 'insert into calendar values(null, '. + $sql = 'insert into calendar values(default, '. $tools->db_quote($tools->username).', '. $tools->db_quote($date_str).', '. floatval($duration).', '. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ben...@us...> - 2013-02-03 08:42:02
|
Revision: 2147 http://hastymail.svn.sourceforge.net/hastymail/?rev=2147&view=rev Author: benthepoet Date: 2013-02-03 08:41:54 +0000 (Sun, 03 Feb 2013) Log Message: ----------- Added: Renamed the old db.php to db_pear.php for legacy support. The new db.php uses PDO. Added: Generic is_error functions for the db libraries and a limit function. Added: SQL scripts for both SQLite and Firebird. Updated: Modified pear_type config option to now be db_adapter in the example config file. Updated: utility_classes.php now loads the appropriate db file based on which adapter is selected. Updated: Added date formatting for calendar plugin, this was necessary for cross db compatibility (doesn't break the old db code). Fixed: Found a bug with the 'This Week' link in calendar plugin. On any calendar page that isn't month-level or lower this was getting the wrong week because the first_week_day variable defaulted to false and never got set in these cases. Set the default to be the current date. Modified Paths: -------------- trunk/hastymail2/db/db.php trunk/hastymail2/hastymail2.conf.example trunk/hastymail2/lib/utility_classes.php trunk/hastymail2/plugins/calendar/cal_include.php trunk/hastymail2/plugins/calendar/page.php Added Paths: ----------- trunk/hastymail2/db/contacts.firebird.sql trunk/hastymail2/db/contacts.sqlite.sql trunk/hastymail2/db/db_pear.php trunk/hastymail2/db/user_setting.firebird.sql trunk/hastymail2/db/user_setting.sqlite.sql trunk/hastymail2/plugins/calendar/calendar.firebird.sql trunk/hastymail2/plugins/calendar/calendar.sqlite.sql trunk/hastymail2/plugins/logger/log.firebird.sql trunk/hastymail2/plugins/logger/log.sqlite.sql trunk/hastymail2/plugins/login_alias/login_alias_table.firebird.sql trunk/hastymail2/plugins/login_alias/login_alias_table.sqlite.sql Added: trunk/hastymail2/db/contacts.firebird.sql =================================================================== --- trunk/hastymail2/db/contacts.firebird.sql (rev 0) +++ trunk/hastymail2/db/contacts.firebird.sql 2013-02-03 08:41:54 UTC (rev 2147) @@ -0,0 +1,27 @@ +CREATE TABLE CONTACTS +( + ID integer PRIMARY KEY NOT NULL, + USERNAME varchar(250), + CONTACTS blob sub_type 1 +); + +CREATE GENERATOR GEN_CONTACTS_ID; + +SET TERM ^ ; +CREATE TRIGGER CONTACTS_BI FOR CONTACTS ACTIVE +BEFORE INSERT POSITION 0 +as +declare variable tmp decimal(18,0); +begin + if (new.id is null) then + new.id = gen_id(gen_contacts_id, 1); + else + begin + tmp = gen_id(gen_contacts_id, 0); + if (tmp < new.id) then + tmp = gen_id(gen_contacts_id, new.id-tmp); + end +end^ +SET TERM ; ^ + + Added: trunk/hastymail2/db/contacts.sqlite.sql =================================================================== --- trunk/hastymail2/db/contacts.sqlite.sql (rev 0) +++ trunk/hastymail2/db/contacts.sqlite.sql 2013-02-03 08:41:54 UTC (rev 2147) @@ -0,0 +1,5 @@ +CREATE TABLE contacts ( + id integer primary key autoincrement not null, + username varchar(250), + contacts text +); Modified: trunk/hastymail2/db/db.php =================================================================== --- trunk/hastymail2/db/db.php 2013-01-17 14:55:02 UTC (rev 2146) +++ trunk/hastymail2/db/db.php 2013-02-03 08:41:54 UTC (rev 2147) @@ -30,19 +30,21 @@ function add_read_server($user, $pass, $host, $db) { $this->read_servers[] = array($user, $pass, $host, $db); } + function build_dsn($host, $db) { + if ($this->db_type == 'sqlite') { + $dsn = $this->db_type.':'.$db; + } + else { + $dsn = $this->db_type.':dbname='.$db.';host='.$host; + } + return $dsn; + } function connect() { global $user; global $db_include_path; - if ($this->pear_type == 'MDB2') { - require_once($db_include_path.'MDB2.php'); - $this->mode = 'MDB2'; - $this->fetch_mode = MDB2_FETCHMODE_ASSOC; - } - else { - require_once($db_include_path.'DB.php'); - $this->mode = 'DB'; - $this->fetch_mode = DB_FETCHMODE_ASSOC; - } + + $this->fetch_mode = PDO::FETCH_ASSOC; + if ($this->db_split) { $this->debug[] = 'configuration: db_split is set to true, both read and write servers required'; } @@ -69,24 +71,26 @@ shuffle($this->read_servers); } foreach ($this->read_servers as $v) { - $dsn = $this->db_type.'://'.$v[0].':'.$v[1].'@'.$v[2].'/'.$v[3]; - if ($this->pear_type == 'MDB2') { - $db_read =& MDB2::Connect($dsn, array('persistent' => $this->persistent)); + $dsn = $this->build_dsn($v[2], $v[3]); + + try { + $db_read = new PDO($dsn, $v[0], $v[1]); + $db_read->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); + } catch (PDOException $e) { + $db_read = $e; } - else { - $db_read = DB::Connect($dsn, $this->persistent); - } + $this->db_read = $db_read; - if (PEAR::isError($this->db_read) || !($this->db_read)) { - $this->debug[] = 'connecting: UNABLE TO CONNECT to read DB: '.$v[2].' ('.$this->db_type.') as '.$v[0].' using PEAR '.$this->pear_type; + if ($this->is_error($this->db_read)) { + $this->debug[] = 'connecting: UNABLE TO CONNECT to read DB: '.$v[2].' ('.$this->db_type.') as '.$v[0].' using PDO'; } else { - $this->debug[] = 'connecting: Connected to read DB: '.$v[2].' ('.$this->db_type.') as '.$v[0].' using PEAR '.$this->pear_type; + $this->debug[] = 'connecting: Connected to read DB: '.$v[2].' ('.$this->db_type.') as '.$v[0].' using PDO'; $this->current_read = $v; break; } } - if (!$this->db_read || PEAR::isError($this->db_read)) { + if ($this->is_error($this->db_read)) { $this->debug[] = 'connecting: Could not connect to any configured read servers'; } else { @@ -99,23 +103,25 @@ shuffle($this->write_servers); } foreach ($this->write_servers as $v) { - $dsn = $this->db_type.'://'.$v[0].':'.$v[1].'@'.$v[2].'/'.$v[3]; - if ($this->pear_type == 'MDB2') { - $this->db_write =& MDB2::Connect($dsn, true); + $dsn = $this->build_dsn($v[2], $v[3]); + + try { + $this->db_write = new PDO($dsn, $v[0], $v[1]); + $this->db_write->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); + } catch (PDOException $e) { + $this->db_write = $e; } - else { - $this->db_write =& DB::Connect($dsn, true); - } - if (PEAR::isError($this->db_write) || !($this->db_write)) { + + if ($this->is_error($this->db_write)) { $this->debug[] = 'connecting: Unable to connect to write DB: '.$v[2].' as '.$v[0]; } else { - $this->debug[] = 'connecting: Connected to write DB: '.$v[2].' ('.$this->db_type.') as '.$v[0].' using PEAR '.$this->pear_type; + $this->debug[] = 'connecting: Connected to write DB: '.$v[2].' ('.$this->db_type.') as '.$v[0].' using PDO'; $this->current_write = $v; break; } } - if (!$this->db_write || PEAR::isError($this->db_write)) { + if ($this->is_error($this->db_write)) { $this->debug[] = 'connecting: Could not connect to any configured write servers'; } } @@ -131,9 +137,9 @@ $user->notices[] = 'Could not establish a connection to the database'; } function disconnect() { - if ($this->db_split && is_object($this->db_write) && !PEAR::isError($this->db_read) && $this->db_write != $this->db_read) { + if ($this->db_split && is_object($this->db_write) && !($this->is_error($this->db_write)) && $this->db_write != $this->db_read) { $this->debug[] = 'disconnecting: disconnecting from write handle'; - $this->db_write->disconnect(); + $this->db_write = null; } if ($this->db_split) { $this->debug[] = 'disconnecting: disconnecting from read handle'; @@ -141,8 +147,8 @@ else { $this->debug[] = 'disconnecting: disconnecting from read/write handle'; } - if (is_object($this->db_read) && !PEAR::isError($this->db_read)) { - $this->db_read->disconnect(); + if (is_object($this->db_read) && !($this->is_error($this->db_read))) { + $this->db_read = null; } $this->debug[] = 'disconnecting: all db connections terminated'; } @@ -163,11 +169,11 @@ $res =& $this->db_read->query($sql); } $this->sql_list[] = $src.': '.$sql; - if (PEAR::isError($res)) { + if (!$res) { $this->debug[] = $src.': sql id: '.(count($this->sql_list) - 1).' : '.str_replace('**', "\n **", $res->userinfo); } else { - while ($row =& $res->fetchRow($this->fetch_mode)) { + while ($row =& $res->fetch($this->fetch_mode)) { $result_set[] = $row; } if ($explain) { @@ -182,28 +188,17 @@ return 0; } $result = 0; - if ($this->pear_type == 'MDB2') { - $sth = $this->db_write->prepare($sql); - if (method_exists($sth, 'execute')) { - $res = $sth->execute(); - $result = $res; - } - else { - $res = $sth; - } + $sth = $this->db_write->prepare($sql); + $res = $sth->execute(); + if ($res) { + $result = $sth->rowCount(); } - else { - $res =& $this->db_write->query($sql); - } $src = 'write handle'; $this->sql_list[] = $src.': '.$sql; - if (PEAR::isError($res)) { + if (!$res) { $this->debug[] = $src.': '.(count($this->sql_list) - 1).' : '.str_replace('**', "\n **", $res->userinfo); } else { - if ($this->pear_type == 'DB') { - $result = $this->db_write->affectedRows(); - } } return $result; } @@ -217,18 +212,16 @@ return $this->write($sql, $ses); } function single($sql, $force=false, $explain=false, $ses=false) { - if ($this->pear_type == 'MDB2') { - $cmd = 'queryOne'; - } - else { - $cmd = 'getOne'; - } if ($force) { - $res = $this->db_write->$cmd($sql); + $sth = $this->db_write->prepare($sql); + $sth->execute(); + $res = $sth->fetchColumn(); $src = 'write handle'; } else { - $res = $this->db_read->$cmd($sql); + $sth = $this->db_read->prepare($sql); + $sth->execute(); + $res = $sth->fetchColumn(); $src = 'read handle'; } $this->sql_list[] = $src.': '.$sql; @@ -249,6 +242,18 @@ return $res; } } + function limit($sql, $count=1) { + if ($this->db_type == 'firebird') { + $ptn = '/^(SELECT)(.*)$/i'; + preg_match($ptn, $sql, $matches); + array_splice($matches, 2, 0, 'FIRST '.$count); + $limit_sql = implode(' ', array_slice($matches, 1)); + } + else { + $limit_sql = $sql.' LIMIT '.$count; + } + return $limit_sql; + } function last_insert($force=true) { if ($this->read_only) { return 0; @@ -272,7 +277,7 @@ $res =& $this->db_write->query($sql); } $this->sql_list[] = $src.': '.$sql; - if (PEAR::isError($res)) { + if (!$res) { $this->debug[] = $src.': sql id: '.(count($this->sql_list) - 1).' : '.str_replace('**', "\n **", $res->userinfo); return false; } @@ -291,7 +296,7 @@ $res =& $this->db_write->query($sql); } $this->sql_list[] = $src.': '.$sql; - if (PEAR::isError($res)) { + if (!$res) { $this->debug[] = $src.': sql id: '.(count($this->sql_list) - 1).' : '.str_replace('**', "\n **", $res->userinfo); return false; } @@ -333,6 +338,9 @@ die; } } + function is_error($db_error) { + return $db_error instanceof PDOException; + } } /* myql db wrapper requires fw_sql_commands and fw_db_connections */ @@ -350,16 +358,15 @@ var $current_read; var $current_write; var $session_server; - var $mode; var $db_type; - var $pear_type; + var $adapter; var $fetch_mode; var $persistent; function db_wrap() { $this->db_type = 'mysql'; $this->fetch_mode = false; - $this->pear_type = 'DB'; + $this->adapter = 'PDO'; $this->current_read = array(); $this->current_write = array(); $this->db_split = false; Added: trunk/hastymail2/db/db_pear.php =================================================================== --- trunk/hastymail2/db/db_pear.php (rev 0) +++ trunk/hastymail2/db/db_pear.php 2013-02-03 08:41:54 UTC (rev 2147) @@ -0,0 +1,386 @@ +<?php + +/* db.php: Database wrapper + Copyright (C) 2002-2013 Hastymail Development group + + This file is part of Hastymail. + + Hastymail is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + Hastymail is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Hastymail; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +* $Id:$ +*/ +$db_include_path = ''; +/* connect/disconnect and setup sql servers for */ +class fw_db_connections { + function add_write_server($user, $pass, $host, $db) { + $this->write_servers[] = array($user, $pass, $host, $db); + } + function add_read_server($user, $pass, $host, $db) { + $this->read_servers[] = array($user, $pass, $host, $db); + } + function connect() { + global $user; + global $db_include_path; + if ($this->adapter == 'MDB2') { + require_once($db_include_path.'MDB2.php'); + $this->mode = 'MDB2'; + $this->fetch_mode = MDB2_FETCHMODE_ASSOC; + } + else { + require_once($db_include_path.'DB.php'); + $this->mode = 'DB'; + $this->fetch_mode = DB_FETCHMODE_ASSOC; + } + if ($this->db_split) { + $this->debug[] = 'configuration: db_split is set to true, both read and write servers required'; + } + else { + $this->debug[] = 'configuration: db_split is set to false, only one server for read/write required'; + } + if ($this->random_connect_read) { + $this->debug[] = 'configuration: Read server order being randomized'; + } + else { + $this->debug[] = 'configuration: Maintaining read server order'; + } + if ($this->random_connect_write) { + $this->debug[] = 'configuration: Write server order being randomized'; + } + else { + $this->debug[] = 'configuration: Maintaining write server order'; + } + if (empty($this->read_servers)) { + $this->debug[] = 'connecting: No sql read servers defined'; + } + else { + if ($this->random_connect_read) { + shuffle($this->read_servers); + } + foreach ($this->read_servers as $v) { + $dsn = $this->db_type.'://'.$v[0].':'.$v[1].'@'.$v[2].'/'.$v[3]; + if ($this->adapter == 'MDB2') { + $db_read =& MDB2::Connect($dsn, array('persistent' => $this->persistent)); + } + else { + $db_read = DB::Connect($dsn, $this->persistent); + } + $this->db_read = $db_read; + if ($this->is_error($this->db_read) || !($this->db_read)) { + $this->debug[] = 'connecting: UNABLE TO CONNECT to read DB: '.$v[2].' ('.$this->db_type.') as '.$v[0].' using PEAR '.$this->adapter; + } + else { + $this->debug[] = 'connecting: Connected to read DB: '.$v[2].' ('.$this->db_type.') as '.$v[0].' using PEAR '.$this->adapter; + $this->current_read = $v; + break; + } + } + if (!$this->db_read || $this->is_error($this->db_read)) { + $this->debug[] = 'connecting: Could not connect to any configured read servers'; + } + else { + if ($this->db_split) { + if (empty($this->write_servers)) { + $this->debug[] = 'connecting: No sql write servers defined'; + } + else { + if ($this->random_connect_write) { + shuffle($this->write_servers); + } + foreach ($this->write_servers as $v) { + $dsn = $this->db_type.'://'.$v[0].':'.$v[1].'@'.$v[2].'/'.$v[3]; + if ($this->adapter == 'MDB2') { + $this->db_write =& MDB2::Connect($dsn, true); + } + else { + $this->db_write =& DB::Connect($dsn, true); + } + if ($this->is_error($this->db_write) || !($this->db_write)) { + $this->debug[] = 'connecting: Unable to connect to write DB: '.$v[2].' as '.$v[0]; + } + else { + $this->debug[] = 'connecting: Connected to write DB: '.$v[2].' ('.$this->db_type.') as '.$v[0].' using PEAR '.$this->adapter; + $this->current_write = $v; + break; + } + } + if (!$this->db_write || $this->is_error($this->db_write)) { + $this->debug[] = 'connecting: Could not connect to any configured write servers'; + } + } + } + else { + $this->db_write = $this->db_read; + $this->debug[] = 'connection: db_split is set to false, using current read server as read/write'; + $this->debug[] = 'connecting: Successfully connnected to required sql servers'; + return true; + } + } + } + $user->notices[] = 'Could not establish a connection to the database'; + } + function disconnect() { + if ($this->db_split && is_object($this->db_write) && !$this->is_error($this->db_read) && $this->db_write != $this->db_read) { + $this->debug[] = 'disconnecting: disconnecting from write handle'; + $this->db_write->disconnect(); + } + if ($this->db_split) { + $this->debug[] = 'disconnecting: disconnecting from read handle'; + } + else { + $this->debug[] = 'disconnecting: disconnecting from read/write handle'; + } + if (is_object($this->db_read) && !$this->is_error($this->db_read)) { + $this->db_read->disconnect(); + } + $this->debug[] = 'disconnecting: all db connections terminated'; + } +} + +/* sql command wrappers */ +class fw_sql_commands extends fw_db_connections { + function fw_sql_commands() { + } + function select($sql, $force=false, $explain=false, $ses=false) { + $result_set = array(); + if ($force) { + $src = 'write handle'; + $res =& $this->db_write->query($sql); + } + else { + $src = 'read handle'; + $res =& $this->db_read->query($sql); + } + $this->sql_list[] = $src.': '.$sql; + if ($this->is_error($res)) { + $this->debug[] = $src.': sql id: '.(count($this->sql_list) - 1).' : '.str_replace('**', "\n **", $res->userinfo); + } + else { + while ($row =& $res->fetchRow($this->fetch_mode)) { + $result_set[] = $row; + } + if ($explain) { + $res = $this->select('explain '.$sql); + $this->debug[] = array('EXPLAIN output for sql id '.(count($this->sql_list) - 1) => $res); + } + } + return $result_set; + } + function write($sql, $ses=false) { + if ($this->read_only) { + return 0; + } + $result = 0; + if ($this->adapter == 'MDB2') { + $sth = $this->db_write->prepare($sql); + if (method_exists($sth, 'execute')) { + $res = $sth->execute(); + $result = $res; + } + else { + $res = $sth; + } + } + else { + $res =& $this->db_write->query($sql); + } + $src = 'write handle'; + $this->sql_list[] = $src.': '.$sql; + if ($this->is_error($res)) { + $this->debug[] = $src.': '.(count($this->sql_list) - 1).' : '.str_replace('**', "\n **", $res->userinfo); + } + else { + if ($this->adapter == 'DB') { + $result = $this->db_write->affectedRows(); + } + } + return $result; + } + function delete($sql, $ses=false) { + return $this->write($sql, $ses); + } + function update($sql, $ses=false) { + return $this->write($sql, $ses); + } + function insert($sql, $ses=false) { + return $this->write($sql, $ses); + } + function single($sql, $force=false, $explain=false, $ses=false) { + if ($this->adapter == 'MDB2') { + $cmd = 'queryOne'; + } + else { + $cmd = 'getOne'; + } + if ($force) { + $res = $this->db_write->$cmd($sql); + $src = 'write handle'; + } + else { + $res = $this->db_read->$cmd($sql); + $src = 'read handle'; + } + $this->sql_list[] = $src.': '.$sql; + if (is_object($res)) { + if (isset($res->userinfo)) { + $this->debug[] = $src.': '.(count($this->sql_list) - 1).' : '.str_replace('**', "\n **", $res->userinfo); + } + else { + $this->debug[] = $src.': '.(count($this->sql_list) - 1).' : Unkown Error'; + } + return false; + } + else { + if ($explain) { + $exp = $this->select('explain '.$sql); + $this->debug[] = array('EXPLAIN output for sql id '.(count($this->sql_list) - 1) => $exp); + } + return $res; + } + } + function limit($sql, $count=1) { + $limit_sql = $sql.' LIMIT '.$count; + return $limit_sql; + } + function last_insert($force=true) { + if ($this->read_only) { + return 0; + } + $sql = 'select last_insert_id()'; + return $this->single($sql, $force); + } + function calc_rows($force=false) { + $sql = 'select FOUND_ROWS()'; + return $this->single($sql, $force); + } + function lock_table($table, $lock_type, $read=false) { + $sql = 'lock table '.$table.' '.$lock_type; + $result_set = array(); + if (!$read) { + $src = 'write handle'; + $res =& $this->db_write->query($sql); + } + else { + $src = 'read handle'; + $res =& $this->db_write->query($sql); + } + $this->sql_list[] = $src.': '.$sql; + if ($this->is_error($res)) { + $this->debug[] = $src.': sql id: '.(count($this->sql_list) - 1).' : '.str_replace('**', "\n **", $res->userinfo); + return false; + } + else { + return true; + } + } + function unlock_table($read=false) { + $sql = 'unlock tables'; + if (!$read) { + $src = 'write handle'; + $res =& $this->db_write->query($sql); + } + else { + $src = 'read handle'; + $res =& $this->db_write->query($sql); + } + $this->sql_list[] = $src.': '.$sql; + if ($this->is_error($res)) { + $this->debug[] = $src.': sql id: '.(count($this->sql_list) - 1).' : '.str_replace('**', "\n **", $res->userinfo); + return false; + } + else { + return true; + } + } + function get_tables() { + $sql = 'show tables'; + $res = $this->select($sql); + $clean = array(); + foreach ($res as $vals) { + $indexes = array_keys($vals); + foreach ($indexes as $v) { + $clean[] = $vals[$v]; + } + } + return $clean; + } + function qt($string, $wc=false) { + if (!$string && !is_int($string)) { + return "''"; + } + else { + if ($wc) { + $string = '%'.$string.'%'; + } + return $this->db_read->quote($string); + } + } + function puke($continue=false) { + if (!$continue) { + $this->disconnect(); + } + $data = '<div class="debug"><h4>SQL DEBUG<br /></h4><pre>'.print_r($this->sql_list, true)."\n". + print_r($this->debug, true)."\n</pre></div>"; + return $data; + if (!$continue) { + die; + } + } + function is_error($db_res) { + return PEAR::isError($db_res); + } +} + +/* myql db wrapper requires fw_sql_commands and fw_db_connections */ +class db_wrap extends fw_sql_commands { + var $db_write; + var $db_read; + var $debug; + var $sql_list; + var $db_split; + var $read_servers; + var $write_servers; + var $random_connect_read; + var $random_connect_write; + var $read_only; + var $current_read; + var $current_write; + var $session_server; + var $mode; + var $db_type; + var $adapter; + var $fetch_mode; + var $persistent; + + function db_wrap() { + $this->db_type = 'mysql'; + $this->fetch_mode = false; + $this->adapter = 'DB'; + $this->current_read = array(); + $this->current_write = array(); + $this->db_split = false; + $this->session_server = array(); + $this->read_servers = array(); + $this->write_servers = array(); + $this->debug = array('db_wrap DEBUG MESSAGES'); + $this->sql_list = array('SQL STATEMENTS IN ORDER'); + $this->random_connect_read = false; + $this->random_connect_write = false; + $this->read_only = false; + $this->persistent = false; + } +} + + +?> Added: trunk/hastymail2/db/user_setting.firebird.sql =================================================================== --- trunk/hastymail2/db/user_setting.firebird.sql (rev 0) +++ trunk/hastymail2/db/user_setting.firebird.sql 2013-02-03 08:41:54 UTC (rev 2147) @@ -0,0 +1,27 @@ +CREATE TABLE USER_SETTING +( + ID integer PRIMARY KEY NOT NULL, + USERNAME varchar(250), + SETTINGS blob sub_type 1 +); + +CREATE GENERATOR GEN_USER_SETTING_ID; + +SET TERM ^ ; +CREATE TRIGGER USER_SETTING_BI FOR USER_SETTING ACTIVE +BEFORE INSERT POSITION 0 +as +declare variable tmp decimal(18,0); +begin + if (new.id is null) then + new.id = gen_id(gen_user_setting_id, 1); + else + begin + tmp = gen_id(gen_user_setting_id, 0); + if (tmp < new.id) then + tmp = gen_id(gen_user_setting_id, new.id-tmp); + end +end^ +SET TERM ; ^ + + Added: trunk/hastymail2/db/user_setting.sqlite.sql =================================================================== --- trunk/hastymail2/db/user_setting.sqlite.sql (rev 0) +++ trunk/hastymail2/db/user_setting.sqlite.sql 2013-02-03 08:41:54 UTC (rev 2147) @@ -0,0 +1,5 @@ +CREATE TABLE user_setting ( + id integer primary key autoincrement not null, + username varchar(250), + settings text +); Modified: trunk/hastymail2/hastymail2.conf.example =================================================================== --- trunk/hastymail2/hastymail2.conf.example 2013-01-17 14:55:02 UTC (rev 2146) +++ trunk/hastymail2/hastymail2.conf.example 2013-02-03 08:41:54 UTC (rev 2147) @@ -324,17 +324,17 @@ db_database = hastymail - # db_pear_type + # db_adapter # ------------ - # This can be set to DB to use the older pear DB support or MDB2 to use - # the newer pear DB library. + # This can be set to PDO to use PHP Data Objects, DB to use the older pear + # DB support, MDB2 to use the newer pear DB library. -db_pear_type = DB +db_adapter = DB # db_type # ------- - # This can be set to mysql for Mysql db support or pgsql for Postgres - # support + # With PDO this can be set to mysql, pgsql, sqlite, or firebird + # With DB or MDB2 this can be set to mysql or pgsql db_type = mysql Modified: trunk/hastymail2/lib/utility_classes.php =================================================================== --- trunk/hastymail2/lib/utility_classes.php 2013-01-17 14:55:02 UTC (rev 2146) +++ trunk/hastymail2/lib/utility_classes.php 2013-02-03 08:41:54 UTC (rev 2147) @@ -1423,12 +1423,16 @@ global $include_path; global $conf; global $fd; - require_once($include_path.'db'.$fd.'db.php'); - if (isset($conf['db_type']) && isset($conf['db_pear_type']) && isset($conf['db_username']) && + if (isset($conf['db_type']) && isset($conf['db_adapter']) && isset($conf['db_username']) && isset($conf['db_password']) && isset($conf['db_hostname']) && isset($conf['db_database'])) { + $db_lib = 'db'; + if ($conf['db_adapter'] != 'PDO') { + $db_lib = 'db_pear'; + } + require_once($include_path.'db'.$fd.$db_lib.'.php'); $dbase = hm_new('db_wrap'); $dbase->db_type = $conf['db_type']; - $dbase->pear_type = $conf['db_pear_type']; + $dbase->adapter = $conf['db_adapter']; if (isset($conf['db_persistent'])) { $dbase->persistent = $conf['db_persistent']; } @@ -1982,7 +1986,7 @@ /* db functions */ function get_db() { global $dbase; - if (!is_object($dbase) || PEAR::isError($dbase->db_read)) { + if (!is_object($dbase) || $dbase->is_error($dbase->db_read)) { $res = false; } else { @@ -2009,6 +2013,12 @@ return $dbase->select($sql); } } + function db_limit($sql) { + global $dbase; + if ($this->db) { + return $dbase->limit($sql); + } + } function db_quote($sql) { global $dbase; if ($this->db) { Modified: trunk/hastymail2/plugins/calendar/cal_include.php =================================================================== --- trunk/hastymail2/plugins/calendar/cal_include.php 2013-01-17 14:55:02 UTC (rev 2146) +++ trunk/hastymail2/plugins/calendar/cal_include.php 2013-02-03 08:41:54 UTC (rev 2147) @@ -180,24 +180,28 @@ if ($tools->get_db()) { $date_sql = ''; $repeat_sql = ''; + $base = strtotime(($year?$year:1).'-'.($month?$month:1).'-'.($day?$day:1)); + $next_year = strtotime('next year', $base); + $next_month = strtotime('next month', $base); + $next_day = strtotime('next day', $base); switch ($dsp_page) { case 'all': - $date_sql = "(datetime > '0001-01-01 00:00:00')"; + $date_sql = "(datetime > '".date('Y-m-d 00:00:00', $base)."')"; break; case 'calendar_year': - $date_sql = "(datetime > '".intval($year)."-01-01 00:00:00' and datetime < '".(intval($year) + 1)."-01-01 00:00:00')"; + $date_sql = "(datetime > '".date('Y-01-01 00:00:00', $base)."' and datetime < '".date('Y-01-01 00:00:00', $next_year)."')"; break; case 'calendar_week': case 'calendar_month': if ($month == 12) { - $date_sql = "(datetime > '".intval($year)."-".intval($month)."-01 00:00:00' and datetime < '".(intval($year) + 1)."-01-01 00:00:00')"; + $date_sql = "(datetime > '".date('Y-m-01 00:00:00', $base)."' and datetime < '".date('Y-01-01 00:00:00', $next_year)."')"; } else { - $date_sql = "(datetime > '".intval($year)."-".intval($month)."-01 00:00:00' and datetime < '".intval($year)."-".(intval($month) + 1)."-01 00:00:00')"; + $date_sql = "(datetime > '".date('Y-m-01 00:00:00', $base)."' and datetime < '".date('Y-m-01 00:00:00', $next_month)."')"; } break; case 'calendar_day': - $date_sql = "(datetime > '".intval($year)."-".intval($month)."-".intval($day)." 00:00:00' and datetime < '".intval($year)."-".intval($month)."-".intval($day)." 24:00:00')"; + $date_sql = "(datetime > '".date('Y-m-d 00:00:00', $base)."' and datetime < '".date('Y-m-d 00:00:00', $next_day)."')"; break; } if ($date_sql) { @@ -206,10 +210,11 @@ $res = $tools->db_query($sql); foreach ($res as $vals) { if (strpos($vals['datetime'], ' ')) { - $date = substr($vals['datetime'], 0, strpos($vals['datetime'], ' ')); - $time = substr($vals['datetime'], (strpos($vals['datetime'], ' ') + 1)); - $hour_time = substr($time, 0, 2); - $min_time = substr($time, 3, 2); + $timestamp = strtotime($vals['datetime']); + $date = date('Y-m-d', $timestamp); + $time = date('H:i:s', $timestamp); + $hour_time = date('H', $timestamp); + $min_time = date('i', $timestamp); $vals['repeat'] = $vals['repeat_val']; $events[$date][$hour_time][$min_time][] = $vals; } @@ -326,7 +331,7 @@ function add_cal_event($atts, $tools) { $id = 0; if ($tools->get_db()) { - $date_str = intval($atts['year']).'-'.intval($atts['month']).'-'.intval($atts['day']).' '.intval($atts['event_time']).':'.intval($atts['event_time2']).':00'; + $date_str = date('Y-m-d H:i:s', strtotime($atts['year'].'-'.$atts['month'].'-'.$atts['day'].' '.$atts['event_time'].':'.$atts['event_time2'].':00')); if ($atts['duration']) { if ($atts['duration2']) { $duration = intval($atts['duration']) + ($atts['duration2']/60); @@ -338,7 +343,7 @@ else { $duration = 0; } - $sql = 'insert into calendar values(default, '. + $sql = 'insert into calendar values(null, '. $tools->db_quote($tools->username).', '. $tools->db_quote($date_str).', '. floatval($duration).', '. @@ -347,7 +352,7 @@ intval($atts['repeat']).')'; $res = $tools->db_insert($sql); if ($res) { - $sql = 'select id from calendar order by id DESC limit 1'; + $sql = $tools->db_limit('select id from calendar order by id DESC'); $id = $tools->db_query_one($sql); } } @@ -410,7 +415,7 @@ function update_event($tools, $atts) { $res = false; if ($tools->get_db()) { - $date_str = intval($atts['year']).'-'.intval($atts['month']).'-'.intval($atts['day']).' '.intval($atts['event_time']).':'.intval($atts['event_time2']).':00'; + $date_str = date('Y-m-d H:i:s', strtotime($atts['year'].'-'.$atts['month'].'-'.$atts['day'].' '.$atts['event_time'].':'.$atts['event_time2'].':00')); if ($atts['duration']) { if ($atts['duration2']) { $duration = intval($atts['duration']) + ($atts['duration2']/60); Added: trunk/hastymail2/plugins/calendar/calendar.firebird.sql =================================================================== --- trunk/hastymail2/plugins/calendar/calendar.firebird.sql (rev 0) +++ trunk/hastymail2/plugins/calendar/calendar.firebird.sql 2013-02-03 08:41:54 UTC (rev 2147) @@ -0,0 +1,31 @@ +CREATE TABLE CALENDAR +( + ID integer PRIMARY KEY NOT NULL, + USERNAME varchar(250), + DATETIME timestamp, + DURATION double precision, + TITLE varchar(250), + DESCRIPTION blob sub_type 1, + REPEAT_VAL integer +); + +CREATE GENERATOR GEN_CALENDAR_ID; + +SET TERM ^ ; +CREATE TRIGGER CALENDAR_BI FOR CALENDAR ACTIVE +BEFORE INSERT POSITION 0 +as +declare variable tmp decimal(18,0); +begin + if (new.id is null) then + new.id = gen_id(gen_calendar_id, 1); + else + begin + tmp = gen_id(gen_calendar_id, 0); + if (tmp < new.id) then + tmp = gen_id(gen_calendar_id, new.id-tmp); + end +end^ +SET TERM ; ^ + + Added: trunk/hastymail2/plugins/calendar/calendar.sqlite.sql =================================================================== --- trunk/hastymail2/plugins/calendar/calendar.sqlite.sql (rev 0) +++ trunk/hastymail2/plugins/calendar/calendar.sqlite.sql 2013-02-03 08:41:54 UTC (rev 2147) @@ -0,0 +1,9 @@ +CREATE TABLE calendar ( + id integer primary key autoincrement not null, + username varchar(250), + `datetime` datetime, + duration float, + title varchar(250), + description text, + repeat_val integer +); Modified: trunk/hastymail2/plugins/calendar/page.php =================================================================== --- trunk/hastymail2/plugins/calendar/page.php 2013-01-17 14:55:02 UTC (rev 2146) +++ trunk/hastymail2/plugins/calendar/page.php 2013-02-03 08:41:54 UTC (rev 2147) @@ -55,7 +55,7 @@ $duration2 = ''; $event_time = ''; $event_time2 = ''; - $first_week_day = false; + $first_week_day = date('w', mktime(0, 0, 0, date('m'), 1, date('Y')));; $all_events = array(); $edit_id = 0; $dsp_page = 'calendar_month'; Added: trunk/hastymail2/plugins/logger/log.firebird.sql =================================================================== --- trunk/hastymail2/plugins/logger/log.firebird.sql (rev 0) +++ trunk/hastymail2/plugins/logger/log.firebird.sql 2013-02-03 08:41:54 UTC (rev 2147) @@ -0,0 +1,32 @@ +CREATE TABLE event_log ( + id integer primary key not null, + ts timestamp NOT NULL, + username varchar(250) default NULL, + server_name varchar(250) default NULL, + server_port varchar(250) default NULL, + remote_address varchar(250) default NULL, + remote_port varchar(250) default NULL, + query_string varchar(250) default NULL, + php_self varchar(250) default NULL, + referer varchar(250) default NULL, + user_agent varchar(250) default NULL +); + +CREATE GENERATOR GEN_EVENT_LOG_ID; + +SET TERM ^ ; +CREATE TRIGGER EVENT_LOG_BI FOR EVENT_LOG ACTIVE +BEFORE INSERT POSITION 0 +as +declare variable tmp decimal(18,0); +begin + if (new.id is null) then + new.id = gen_id(gen_event_log_id, 1); + else + begin + tmp = gen_id(gen_event_log_id, 0); + if (tmp < new.id) then + tmp = gen_id(gen_event_log_id, new.id-tmp); + end +end^ +SET TERM ; ^ \ No newline at end of file Added: trunk/hastymail2/plugins/logger/log.sqlite.sql =================================================================== --- trunk/hastymail2/plugins/logger/log.sqlite.sql (rev 0) +++ trunk/hastymail2/plugins/logger/log.sqlite.sql 2013-02-03 08:41:54 UTC (rev 2147) @@ -0,0 +1,13 @@ +CREATE TABLE event_log ( + id integer primary key autoincrement not null, + ts date NOT NULL, + username varchar(250) default NULL, + server_name varchar(250) default NULL, + server_port varchar(250) default NULL, + remote_address varchar(250) default NULL, + remote_port varchar(250) default NULL, + query_string varchar(250) default NULL, + php_self varchar(250) default NULL, + referer varchar(250) default NULL, + user_agent varchar(250) default NULL +); Added: trunk/hastymail2/plugins/login_alias/login_alias_table.firebird.sql =================================================================== --- trunk/hastymail2/plugins/login_alias/login_alias_table.firebird.sql (rev 0) +++ trunk/hastymail2/plugins/login_alias/login_alias_table.firebird.sql 2013-02-03 08:41:54 UTC (rev 2147) @@ -0,0 +1,4 @@ +CREATE TABLE login_alias ( + login_name varchar(250) PRIMARY KEY, + imap_name varchar(250) +); \ No newline at end of file Added: trunk/hastymail2/plugins/login_alias/login_alias_table.sqlite.sql =================================================================== --- trunk/hastymail2/plugins/login_alias/login_alias_table.sqlite.sql (rev 0) +++ trunk/hastymail2/plugins/login_alias/login_alias_table.sqlite.sql 2013-02-03 08:41:54 UTC (rev 2147) @@ -0,0 +1,4 @@ +CREATE TABLE login_alias ( + login_name varchar(250) PRIMARY KEY, + imap_name varchar(250) +); \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-01-17 14:55:10
|
Revision: 2146 http://hastymail.svn.sourceforge.net/hastymail/?rev=2146&view=rev Author: sailfrog Date: 2013-01-17 14:55:02 +0000 (Thu, 17 Jan 2013) Log Message: ----------- fix the build for the C++ utils module with current stable PHP (5.4.10) Modified Paths: -------------- trunk/hastymail2/utils_module/hm_utils.cpp Modified: trunk/hastymail2/utils_module/hm_utils.cpp =================================================================== --- trunk/hastymail2/utils_module/hm_utils.cpp 2013-01-16 14:28:17 UTC (rev 2145) +++ trunk/hastymail2/utils_module/hm_utils.cpp 2013-01-17 14:55:02 UTC (rev 2146) @@ -29,7 +29,7 @@ #if HAVE_HM_UTILS -function_entry hm_utils_functions[] = { +static zend_function_entry hm_utils_functions[] = { PHP_FE(hm_html_strlen , hm_html_strlen_arg_info) PHP_FE(hm_html_trim , hm_html_trim_arg_info) PHP_FE(hm_html_entities , hm_html_entities_arg_info) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-01-16 14:28:23
|
Revision: 2145 http://hastymail.svn.sourceforge.net/hastymail/?rev=2145&view=rev Author: sailfrog Date: 2013-01-16 14:28:17 +0000 (Wed, 16 Jan 2013) Log Message: ----------- fix call to removed method Modified Paths: -------------- trunk/hastymail2/lib/url_action_classes/contacts.php Modified: trunk/hastymail2/lib/url_action_classes/contacts.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/contacts.php 2013-01-10 20:29:17 UTC (rev 2144) +++ trunk/hastymail2/lib/url_action_classes/contacts.php 2013-01-16 14:28:17 UTC (rev 2145) @@ -389,7 +389,7 @@ } $data = '<a name="contactform"></a>'; if (strstr($this->user->page_anchor, 'contactform')) { - $data .= '<div class="notices">'.$this->print_notices().'</div>'; + $data .= '<div class="notices">'.join('<br />', $this->notices).'</div>'; } $data .= '<h4>'.$label.'</h4><div id="contact_form">'.$form.' <div class="edit_buttons">'.$button.'</div><h5>'.$this->user->str[16].'</h5><table cellpadding="0" cellspacing="0"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-01-10 20:29:25
|
Revision: 2144 http://hastymail.svn.sourceforge.net/hastymail/?rev=2144&view=rev Author: sailfrog Date: 2013-01-10 20:29:17 +0000 (Thu, 10 Jan 2013) Log Message: ----------- parse line rewrite to improve performance and code clarity Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2013-01-09 16:08:36 UTC (rev 2143) +++ trunk/hastymail2/lib/imap_class.php 2013-01-10 20:29:17 UTC (rev 2144) @@ -30,10 +30,9 @@ function imap_base() { $this->max_read = false; } + /* break up a "line" response from imap. If we find - a literal we read ahead on the stream and include it. - * TODO: instead of looping on the string itself it might be - * faster to loop on the string position */ + a literal we read ahead on the stream and include it.*/ function parse_line($line, $current_size, $max, $line_length) { /* make it a bit easier to find "atoms" */ $line = str_replace(')(', ') (', $line); @@ -41,95 +40,64 @@ $parts = array(); /* flag to control if the line continues */ $line_cont = false; - /*chip away at the line string left to right until it is empty */ - while ($line) { - /* the leftmost char determines what behavior we take */ - $chunk = false; - switch ($line{0}) { - /* any newline char means we are done */ - case "\r": - case "\n": - $line = false; - break; - /* skip spaces and start over from the top */ - case ' ': - $line = substr($line, 1); - break; - /* save these "atoms" and start over from the top */ - case '*': - case '[': - case ']': - case '(': - case ')': - $chunk = $line{0}; - $line = substr($line, 1); - break; - /* quoted string saved without the quotes */ - case '"': - if (preg_match("/^(\"[^\"\\\]*(?:\\\.[^\"\\\]*)*\")/", $line, $matches)) { - $chunk = substr($matches[1], 1, -1); + /* line size */ + $len = strlen($line); + /* walk through the line */ + for ($i=0;$i<$len;$i++) { + /* this will hold one "atom" from the parsed line */ + $chunk = ''; + /* if we hit a newline exit the loop */ + if ($line{$i} == "\r" || $line{$i} == "\n") { + break; + } + /* skip spaces */ + if ($line{$i} == ' ') { + continue; + } + /* capture special chars as "atoms" */ + elseif ($line{$i} == '*' || $line{$i} == '[' || $line{$i} == ']' || $line{$i} == '(' || $line{$i} == ')') { + $chunk = $line{$i}; + } + /* regex match a quoted string */ + elseif ($line{$i} == '"') { + if (preg_match("/^(\"[^\"\\\]*(?:\\\.[^\"\\\]*)*\")/", substr($line, $i), $matches)) { + $chunk = substr($matches[1], 1, -1); + } + $i += strlen($chunk) + 1; + } + /* IMAP literal */ + elseif ($line{$i} == '{') { + $end = strpos($line, '}'); + if ($end !== false) { + $literal_size = substr($line, ($i + 1), ($end - $i - 1)); + } + $lit_result = $this->read_literal($literal_size, $max, $current_size, $line_length); + $chunk = $lit_result[0]; + $line_cont = true; + $i = $len; + } + /* all other atoms */ + else { + $marker = -1; + /* don't include these three trailing chars in the atom */ + foreach (array(' ', ')', ']') as $v) { + $tmp_marker = strpos($line, $v, $i); + if ($tmp_marker !== false && ($marker == -1 || $tmp_marker < $marker)) { + $marker = $tmp_marker; } - $line = substr($line, strlen($chunk) + 2); - break; - /* IMAP literal market found. Read ahead on the wire and fetch the literal content */ - case '{': - $end = strpos($line, '}'); - if ($end !== false) { - $literal_size = substr($line, 1, ($end - 1)); - } - $lit_result = $this->read_literal($literal_size, $max, $current_size, $line_length); - $chunk = $lit_result[0]; - if ($lit_result[1]) { - $line = str_replace(')', ' )', $lit_result[1]); - } - else { - $line_cont = true; - $line = false; - } - break; - /* some other atom not defined above. collect this chunk and adjust the line length */ - default: - /* TODO: refactor this to be more like the C++ version and remove duplicate logic */ - if (strpos($line, ' ') !== false) { - $marker = strpos($line, ' '); - $marker_adjust = $marker; - $chunk = substr($line, 0, $marker); - $char_check = substr($chunk, -1); - $temp_chunk = $chunk; - while ($temp_chunk && ($char_check == ')' || $char_check == ']')) { - $marker_adjust--; - $temp_chunk = substr($temp_chunk, 0, -1); - $char_check = substr($temp_chunk, -1); - } - if ($marker_adjust != $marker) { - $marker = $marker_adjust; - } - $chunk = substr($line, 0, $marker); - $line = substr($line, strlen($chunk)); - } - else { - $chunk = trim($line); - $line = false; - $marker = strlen($chunk); - $marker_adjust = $marker; - $temp_chunk = trim($chunk); - $char_check = substr($temp_chunk, -1); - while ($temp_chunk && ($char_check == ')' || $char_check == ']')) { - $marker_adjust--; - $temp_chunk = substr($temp_chunk, 0, -1); - $char_check = substr($temp_chunk, -1); - } - if ($marker_adjust != $marker) { - $marker = $marker_adjust; - $line = $chunk; - $chunk = substr($line, 0, $marker); - $line = substr($line, strlen($chunk)); - } - } - break; + } + /* slice out the chunk */ + if ($marker !== false && $marker !== -1) { + $chunk = substr($line, $i, ($marker - $i)); + $i += strlen($chunk) - 1; + } + else { + $chunk = rtrim(substr($line, $i)); + $i += strlen($chunk); + } } - /* each time through the while loop if $chunk is set we save it */ - if (is_string($chunk)) { + /* if we found a worthwhile chunk add it to the results set */ + if ($chunk) { $parts[] = $chunk; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-01-09 16:08:44
|
Revision: 2143 http://hastymail.svn.sourceforge.net/hastymail/?rev=2143&view=rev Author: sailfrog Date: 2013-01-09 16:08:36 +0000 (Wed, 09 Jan 2013) Log Message: ----------- warning fix Modified Paths: -------------- trunk/hastymail2/lib/misc_functions.php Modified: trunk/hastymail2/lib/misc_functions.php =================================================================== --- trunk/hastymail2/lib/misc_functions.php 2013-01-09 16:00:16 UTC (rev 2142) +++ trunk/hastymail2/lib/misc_functions.php 2013-01-09 16:08:36 UTC (rev 2143) @@ -1120,7 +1120,7 @@ $plugin_list = array(); $plugins_enabled = false; - if ($force_plugin_reloading || $force || ($user->just_logged_in && is_array($active_plugins))) { + if ($force_plugin_reloading || $force || ($user->just_logged_in && is_array($active_plugins)) || !isset($_SESSION['plugins'])) { foreach ($active_plugins as $v) { if (is_dir('plugins'.$fd.$v.$fd)) { $file = 'plugins'.$fd.$v.$fd.'config.php'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-01-09 16:00:22
|
Revision: 2142 http://hastymail.svn.sourceforge.net/hastymail/?rev=2142&view=rev Author: sailfrog Date: 2013-01-09 16:00:16 +0000 (Wed, 09 Jan 2013) Log Message: ----------- doc and version updates Modified Paths: -------------- trunk/hastymail2/CHANGES trunk/hastymail2/index.php Modified: trunk/hastymail2/CHANGES =================================================================== --- trunk/hastymail2/CHANGES 2013-01-08 14:33:27 UTC (rev 2141) +++ trunk/hastymail2/CHANGES 2013-01-09 16:00:16 UTC (rev 2142) @@ -1,3 +1,55 @@ +SVN 1.2 +------------------------------------- + +- Fixed a possible attachment corruption bug in the base64 encoding routine +- Added lots of comments to the IMAP class (needs more still) +- Updated Copyright notice date range in code and in the interface for 2013 +- Added experimental NTLM SMTP authentication support +- When hiding a folder on the folders page automatically hide all subfolders +- Refactored the IMAP class get_folders() routine to be faster +- Fixed a bug in message part searching that could result in no viewable part + or the wrong part being displayed +- Fixed a typo in tinyMCE that broke the HTML spell checker feature on the + compose page +- Use the httponly cookie flag for sites with PHP >= 5.2 +- Added an access keys plugin that binds keys to navigation events +- Improved connection dropped handling in the IMAP class +- Improved image pattern matching when substituting place holder images in + HTML message +- Update Japanese interface translation and example configuration file thanks + to Takao Abe +- Fixed content type header on dynamic image thumbnail previews +- Improved the unique id generator to produce more secure ids +- Added a second cookie with a unique id to make session hijacking harder +- Added HTTP request fingerprint support to make sessin hijacking + harder +- Added an option to bind ip addresses to sessions (disabled by default) +- Added an option to deny logged in content to a list of ips +- Added an option to throttle outbound messages from authenticated users +- Fixed a bug converting text to HTML that caused newlines to be dropped + on the compose page +- Fixed some non-ASCII formatting issues in the textarea/tinyMCE editor + on the compose page +- Updated Spanish interface translation thanks to Jesus Marin +- Remove "self" references in site.js +- Add support to the contact import script for Squirremail formatted contact + files +- Added a new plugin that provides jQuery support thanks to Li-Yi Shie +- Added a new plugin that provides client side language translation support + for plugins thanks to Li-Yi Shie +- Added a new plugin that converts TNEF files to a zip file thanks to + Li-Yi Shie +- Added new plugin that adds an "unsafe mode" switch when viewing HTML + messages thanks to Li-Yi Shie +- Fixed a bug decoding entities in message subjects on the thread view page +- Fixed a type mismatch in the C++ module +- Fixed a bug handling uuencoded attachments with a space in the filename +- Fixed a bug restoring the message body after SMTP send +- Fixed a bug quoting typo in place holder images +- Fixed a typo in decode_mail_field function name +- Fixed a typo in the unread link url + + STABLE 1.1 -------------------------------------- Modified: trunk/hastymail2/index.php =================================================================== --- trunk/hastymail2/index.php 2013-01-08 14:33:27 UTC (rev 2141) +++ trunk/hastymail2/index.php 2013-01-09 16:00:16 UTC (rev 2142) @@ -65,7 +65,7 @@ $page_id = build_internal_id(); /* Define the current version. */ -$hastymail_version = 'Hastymail2 1.1'; +$hastymail_version = 'Hastymail2 1.2 SVN'; /* Data structures used by different parts of the program This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2013-01-08 14:33:33
|
Revision: 2141 http://hastymail.svn.sourceforge.net/hastymail/?rev=2141&view=rev Author: sailfrog Date: 2013-01-08 14:33:27 +0000 (Tue, 08 Jan 2013) Log Message: ----------- fix a possible attachment corrupting bug in the base64 encoding routine. Requires an input file with long lines to possibly trigger the bug. Modified Paths: -------------- trunk/hastymail2/lib/url_action_classes/compose.php Modified: trunk/hastymail2/lib/url_action_classes/compose.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/compose.php 2012-12-28 21:56:51 UTC (rev 2140) +++ trunk/hastymail2/lib/url_action_classes/compose.php 2013-01-08 14:33:27 UTC (rev 2141) @@ -488,7 +488,7 @@ $size = 0; $left_over = ''; while (!feof($input_file)) { - $clear = fgets($input_file, 1024); + $clear = fgets($input_file, 1025); if ($left_over) { $clear = $left_over.$clear; } @@ -500,10 +500,6 @@ $left_over = ''; $data = substr($data, 76); } - elseif (strlen($data) < 76) { - $left_over = base64_decode($data); - $data = ''; - } else { $left_over = base64_decode($data); $data = ''; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2012-12-28 21:57:01
|
Revision: 2140 http://hastymail.svn.sourceforge.net/hastymail/?rev=2140&view=rev Author: sailfrog Date: 2012-12-28 21:56:51 +0000 (Fri, 28 Dec 2012) Log Message: ----------- more comments *gasp* Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2012-12-28 21:17:47 UTC (rev 2139) +++ trunk/hastymail2/lib/imap_class.php 2012-12-28 21:56:51 UTC (rev 2140) @@ -32,21 +32,30 @@ } /* break up a "line" response from imap. If we find a literal we read ahead on the stream and include it. - */ + * TODO: instead of looping on the string itself it might be + * faster to loop on the string position */ function parse_line($line, $current_size, $max, $line_length) { + /* make it a bit easier to find "atoms" */ $line = str_replace(')(', ') (', $line); + /* will hold the line parts */ $parts = array(); + /* flag to control if the line continues */ $line_cont = false; + /*chip away at the line string left to right until it is empty */ while ($line) { + /* the leftmost char determines what behavior we take */ $chunk = false; switch ($line{0}) { + /* any newline char means we are done */ case "\r": case "\n": $line = false; break; + /* skip spaces and start over from the top */ case ' ': $line = substr($line, 1); break; + /* save these "atoms" and start over from the top */ case '*': case '[': case ']': @@ -55,12 +64,14 @@ $chunk = $line{0}; $line = substr($line, 1); break; + /* quoted string saved without the quotes */ case '"': if (preg_match("/^(\"[^\"\\\]*(?:\\\.[^\"\\\]*)*\")/", $line, $matches)) { $chunk = substr($matches[1], 1, -1); } $line = substr($line, strlen($chunk) + 2); break; + /* IMAP literal market found. Read ahead on the wire and fetch the literal content */ case '{': $end = strpos($line, '}'); if ($end !== false) { @@ -76,7 +87,9 @@ $line = false; } break; + /* some other atom not defined above. collect this chunk and adjust the line length */ default: + /* TODO: refactor this to be more like the C++ version and remove duplicate logic */ if (strpos($line, ' ') !== false) { $marker = strpos($line, ' '); $marker_adjust = $marker; @@ -115,13 +128,14 @@ } break; } + /* each time through the while loop if $chunk is set we save it */ if (is_string($chunk)) { $parts[] = $chunk; } } return array($line_cont, $parts); } - /* Read literal found during parse_line(). + /* Read IMAP literal found during parse_line(). */ function read_literal($size, $max, $current, $line_length) { $left_over = false; @@ -151,15 +165,15 @@ } return array($literal_data, $left_over); } - /* loop through "lines" returned from imap and parse - them with parse_line() and read_literal. it can return - the lines in a raw format, or parsed into atoms. It also - supports a maximum number of lines to return, in case we - did something stupid like list a loaded unix homedir - in UW + /* loop through "lines" returned from imap and parse them with parse_line() and read_literal. + * it can return the lines in a raw format, or parsed into atoms. It also supports a maximum + * number of lines to return, in case we did something stupid like list a loaded unix homedir */ function get_response($max=false, $chunked=false, $line_length=8192, $sort=false) { + + /* flag to determine if the C++ version of parse_line is available */ global $hm_utils_mod; + /* defaults and results containers */ $result = array(); $current_size = 0; $chunked_result = array(); @@ -167,17 +181,26 @@ $line_cont = false; $c = -1; $n = -1; + /* start of do -> while loop to read from the IMAP server */ do { $n++; + /* if we loose connection to the server while reading terminate */ if (!is_resource($this->handle) || feof($this->handle)) { break; } + /* read in a line up to 8192 bytes */ $result[$n] = $this->fgets($line_length); + + /* keep track of how much we have read and break out if we max out. This can + * happen on large messages. We need this check to ensure we don't exhaust available + * memory */ $current_size += strlen($result[$n]); if ($max && $current_size > $max) { $this->max_read = true; break; } + /* if the line is longer than 8192 bytes keep appending more reads until we find + * an end of line char. Keep checking the max read length as we go */ while(substr($result[$n], -2) != "\r\n" && substr($result[$n], -1) != "\n") { if (!is_resource($this->handle) || feof($this->handle)) { break; @@ -192,6 +215,7 @@ break 2; } } + /* check line continuation marker and grab previous index and parsed chunks */ if ($line_cont) { $last_line_cont = true; $pres = $n - 1; @@ -199,10 +223,14 @@ $pchunk = $c; } } + /* If we are using quick parsing of the IMAP SORT response we know the results are simply space + * delimited UIDs so quickly explode(). Otherwise we have to follow the spec and look for quoted + * strings and literals in the parse_line() routine. */ if ($sort) { $line_cont = false; $chunks = explode(' ', trim($result[$n])); } + /* properly parse the line with either the C++ or PHP version */ else { if ($hm_utils_mod) { list($line_cont, $chunks) = hm_parse_imap_line($result[$n], $current_size, $max, $this->handle); @@ -211,6 +239,7 @@ list($line_cont, $chunks) = $this->parse_line($result[$n], $current_size, $max, $line_length); } } + /* merge lines that should have been recieved as one and add to results */ if ($chunks && !$last_line_cont) { $c++; } @@ -222,16 +251,22 @@ } $last_line_cont = false; } + /* add line and parsed bits to result set */ else { $result[$n] = join(' ', $chunks); if ($chunked) { $chunked_result[$c] = $chunks; } } + /* check for untagged error condition. This represents a server problem but there is no reason + * we can't attempt to recover with the partial response we received up until this point */ if (substr(strtoupper($result[$n]), 0, 6) == '* BYE ') { break; } + /* end outer loop when we receive the tagged response line */ } while (substr($result[$n], 0, strlen('A'.$this->command_count)) != 'A'.$this->command_count); + + /* return either raw or parsed result */ $this->responses[] = $result; if ($chunked) { $result = $chunked_result; @@ -246,7 +281,11 @@ } /* put a prefix on a command and send it to the server */ function send_command($command, $piped=false) { + + /* we don't actively connect to the IMAP server unless we have to */ $this->on_demand_connect(); + + /* pipelined commands are sent in bunches. Improves performance */ if ($piped) { $final_command = ''; foreach ($command as $v) { @@ -254,18 +293,22 @@ } $command = $final_command; } + /* single command */ else { $command = 'A'.$this->command_number().' '.$command; } + /* send the command out to the server */ if (is_resource($this->handle)) { fputs($this->handle, $command); } + /* save the command and time for the IMAP debug output option */ $this->commands[trim($command)] = microtime(); } /* determine if an imap response returned an "OK", returns - true or false */ + * true or false */ function check_response($data, $chunked=false) { $result = false; + /* find the last bit of the parsed response and look for the OK atom */ if ($chunked) { if (!empty($data)) { $vals = $data[(count($data) - 1)]; @@ -277,6 +320,7 @@ } } } + /* pattern match the last line of a raw response */ else { $line = array_pop($data); $this->short_responses[$line] = microtime(); @@ -288,34 +332,43 @@ } /* check the cache size and reduce stored data if its bloated */ function bust_cache($mailbox) { - $data = array(); + + /* max and min values to restrict the cache to. Proportional to + * kilobytes but has no real meaning in the real world */ $max = 20000; $min = 9000; $total = 0; + /* if the selected mailbox is frozen don't mess with the cache */ if (isset($_SESSION['frozen_folders'][$mailbox])) { return; } + /* find out whats in the cache now */ + $data = array(); foreach ($_SESSION['mailbox_activity'] as $i => $vals) { if ($i != $mailbox && $i != 'INBOX') { $total += $vals[1]; $data[$i] = $vals[0]; } } + /* if we have more in the cache than we want, get a more accurate size estimate */ if ($total > $max) { - $kb = 0; + $bytes = 0; if (isset($_SESSION['uid_cache'])) { - $kb += strlen(serialize($_SESSION['uid_cache'])); + $bytes += strlen(serialize($_SESSION['uid_cache'])); } if (isset($_SESSION['header_cache'])) { - $kb += strlen(serialize($_SESSION['header_cache'])); + $bytes += strlen(serialize($_SESSION['header_cache'])); } - $approx = number_format(($kb/1024)); + $approx = number_format(($bytes/1024)); + /* loop through cached folders largest to smallest purging them from the cache */ if ($approx > 400) { asort($data); foreach ($data as $name => $val) { + /* skip "frozen" folders */ if (isset($_SESSION['frozen_folders'][$name]) || $name == $mailbox) { continue; } + /* delete UIDs and headers from a folders cache then check the size again */ if (isset($_SESSION['uid_cache'][$name])) { unset($_SESSION['uid_cache'][$name]); if (isset($_SESSION['header_cache'][$name])) { @@ -323,6 +376,7 @@ } $total -= $_SESSION['mailbox_activity'][$name][1]; unset($_SESSION['mailbox_activity'][$name]); + /* purged enough, exit now */ if ($total < $max && $total > $min) { break; } @@ -331,6 +385,7 @@ } } } + /* convert UTF-7 encoded forlder names to UTF-8 */ function utf7_decode($string) { global $user; global $conf; @@ -341,6 +396,7 @@ } return $string; } + /* convert UTF-8 encoded forlder names to UTF-7 */ function utf7_encode($string) { global $user; global $conf; @@ -355,6 +411,9 @@ /* parsing routines for the imap bodstructure response */ class imap_bodystruct extends imap_base { + + /* IMAP message part numbers are like one half integer and one half string :) This + * routine "increments" them correctly */ function update_part_num($part) { if (!strstr($part, '.')) { $part++; @@ -366,6 +425,8 @@ } return $part; } + /* A single message part structure. This is a MIME type in the message that does NOT contain + * any other attachments or additonal MIME types */ function parse_single_part($array) { $vals = $array[0]; array_shift($vals); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2012-12-28 21:17:59
|
Revision: 2139 http://hastymail.svn.sourceforge.net/hastymail/?rev=2139&view=rev Author: sailfrog Date: 2012-12-28 21:17:47 +0000 (Fri, 28 Dec 2012) Log Message: ----------- fix copyright year in the plugins dir Modified Paths: -------------- trunk/hastymail2/plugins/accesskey/config.php trunk/hastymail2/plugins/accesskey/work.php trunk/hastymail2/plugins/auto_address/ajax.php trunk/hastymail2/plugins/auto_address/config.php trunk/hastymail2/plugins/auto_address/display.php trunk/hastymail2/plugins/auto_address/work.php trunk/hastymail2/plugins/calendar/cal_include.php trunk/hastymail2/plugins/calendar/config.php trunk/hastymail2/plugins/calendar/display.php trunk/hastymail2/plugins/calendar/page.php trunk/hastymail2/plugins/calendar/work.php trunk/hastymail2/plugins/compose_warning/config.php trunk/hastymail2/plugins/compose_warning/display.php trunk/hastymail2/plugins/compose_warning/work.php trunk/hastymail2/plugins/context/config.php trunk/hastymail2/plugins/context/display.php trunk/hastymail2/plugins/context/page.php trunk/hastymail2/plugins/context/settings.php trunk/hastymail2/plugins/context/work.php trunk/hastymail2/plugins/custom_headers/config.php trunk/hastymail2/plugins/custom_headers/display.php trunk/hastymail2/plugins/custom_headers/work.php trunk/hastymail2/plugins/custom_reply_to/config.php trunk/hastymail2/plugins/custom_reply_to/display.php trunk/hastymail2/plugins/custom_reply_to/work.php trunk/hastymail2/plugins/filters/config.php trunk/hastymail2/plugins/filters/display.php trunk/hastymail2/plugins/filters/page.php trunk/hastymail2/plugins/filters/work.php trunk/hastymail2/plugins/hello_world/config.php trunk/hastymail2/plugins/hello_world/display.php trunk/hastymail2/plugins/hello_world/page.php trunk/hastymail2/plugins/hello_world/work.php trunk/hastymail2/plugins/html_mail/ajax.php trunk/hastymail2/plugins/html_mail/config.php trunk/hastymail2/plugins/html_mail/display.php trunk/hastymail2/plugins/html_mail/page.php trunk/hastymail2/plugins/html_mail/tiny_mce/plugins/spellchecker/changelog.txt trunk/hastymail2/plugins/html_mail/tiny_mce/tiny_mce_gzip.php trunk/hastymail2/plugins/html_mail/work.php trunk/hastymail2/plugins/html_safe/config.php trunk/hastymail2/plugins/html_safe/display.php trunk/hastymail2/plugins/html_safe/work.php trunk/hastymail2/plugins/imap_domain_map/config.php trunk/hastymail2/plugins/imap_domain_map/settings.php trunk/hastymail2/plugins/imap_domain_map/work.php trunk/hastymail2/plugins/jquery/config.php trunk/hastymail2/plugins/jquery/display.php trunk/hastymail2/plugins/js_help/ajax.php trunk/hastymail2/plugins/js_help/config.php trunk/hastymail2/plugins/js_help/display.php trunk/hastymail2/plugins/js_help/work.php trunk/hastymail2/plugins/js_lang/config.php trunk/hastymail2/plugins/js_lang/display.php trunk/hastymail2/plugins/js_notice/config.php trunk/hastymail2/plugins/js_notice/display.php trunk/hastymail2/plugins/js_notice/work.php trunk/hastymail2/plugins/js_sign/ajax.php trunk/hastymail2/plugins/js_sign/config.php trunk/hastymail2/plugins/js_sign/display.php trunk/hastymail2/plugins/js_sign/work.php trunk/hastymail2/plugins/ldap_addressbook/config.php trunk/hastymail2/plugins/ldap_addressbook/settings.php trunk/hastymail2/plugins/ldap_addressbook/work.php trunk/hastymail2/plugins/logger/config.php trunk/hastymail2/plugins/logger/settings.php trunk/hastymail2/plugins/logger/work.php trunk/hastymail2/plugins/login_alias/config.php trunk/hastymail2/plugins/login_alias/settings.php trunk/hastymail2/plugins/login_alias/work.php trunk/hastymail2/plugins/message_digest/config.php trunk/hastymail2/plugins/message_digest/display.php trunk/hastymail2/plugins/message_digest/work.php trunk/hastymail2/plugins/message_tags/ajax.php trunk/hastymail2/plugins/message_tags/config.php trunk/hastymail2/plugins/message_tags/display.php trunk/hastymail2/plugins/message_tags/page.php trunk/hastymail2/plugins/message_tags/work.php trunk/hastymail2/plugins/move_sent/config.php trunk/hastymail2/plugins/move_sent/display.php trunk/hastymail2/plugins/move_sent/work.php trunk/hastymail2/plugins/news/config.php trunk/hastymail2/plugins/news/display.php trunk/hastymail2/plugins/news/page.php trunk/hastymail2/plugins/news/work.php trunk/hastymail2/plugins/notices/config.php trunk/hastymail2/plugins/notices/display.php trunk/hastymail2/plugins/notices/work.php trunk/hastymail2/plugins/pop_fetch/ajax.php trunk/hastymail2/plugins/pop_fetch/config.php trunk/hastymail2/plugins/pop_fetch/display.php trunk/hastymail2/plugins/pop_fetch/page.php trunk/hastymail2/plugins/pop_fetch/pop3_class.php trunk/hastymail2/plugins/pop_fetch/settings.php trunk/hastymail2/plugins/pop_fetch/work.php trunk/hastymail2/plugins/quota/config.php trunk/hastymail2/plugins/quota/display.php trunk/hastymail2/plugins/quota/work.php trunk/hastymail2/plugins/saved_search/config.php trunk/hastymail2/plugins/saved_search/display.php trunk/hastymail2/plugins/saved_search/work.php trunk/hastymail2/plugins/select_range/config.php trunk/hastymail2/plugins/select_range/work.php trunk/hastymail2/plugins/spam_folder/config.php trunk/hastymail2/plugins/spam_folder/display.php trunk/hastymail2/plugins/spam_folder/work.php trunk/hastymail2/plugins/tnef/config.php trunk/hastymail2/plugins/tnef/display.php trunk/hastymail2/plugins/tnef/work.php trunk/hastymail2/plugins/username/config.php trunk/hastymail2/plugins/username/display.php trunk/hastymail2/plugins/uuencode/config.php trunk/hastymail2/plugins/uuencode/display.php trunk/hastymail2/plugins/uuencode/include.php trunk/hastymail2/plugins/uuencode/work.php Modified: trunk/hastymail2/plugins/accesskey/config.php =================================================================== --- trunk/hastymail2/plugins/accesskey/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/accesskey/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/accesskey/work.php =================================================================== --- trunk/hastymail2/plugins/accesskey/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/accesskey/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/auto_address/ajax.php =================================================================== --- trunk/hastymail2/plugins/auto_address/ajax.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/auto_address/ajax.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* ajax.php: Plugin file responsible for handling ajax callbacks - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/auto_address/config.php =================================================================== --- trunk/hastymail2/plugins/auto_address/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/auto_address/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/auto_address/display.php =================================================================== --- trunk/hastymail2/plugins/auto_address/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/auto_address/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/auto_address/work.php =================================================================== --- trunk/hastymail2/plugins/auto_address/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/auto_address/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/calendar/cal_include.php =================================================================== --- trunk/hastymail2/plugins/calendar/cal_include.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/calendar/cal_include.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* cal_include.php: Helper functions for the calendar plugin - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/calendar/config.php =================================================================== --- trunk/hastymail2/plugins/calendar/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/calendar/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/calendar/display.php =================================================================== --- trunk/hastymail2/plugins/calendar/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/calendar/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/calendar/page.php =================================================================== --- trunk/hastymail2/plugins/calendar/page.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/calendar/page.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* page.php: Plugin file responsible for handling plugin specific pages - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/calendar/work.php =================================================================== --- trunk/hastymail2/plugins/calendar/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/calendar/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/compose_warning/config.php =================================================================== --- trunk/hastymail2/plugins/compose_warning/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/compose_warning/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/compose_warning/display.php =================================================================== --- trunk/hastymail2/plugins/compose_warning/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/compose_warning/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/compose_warning/work.php =================================================================== --- trunk/hastymail2/plugins/compose_warning/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/compose_warning/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/context/config.php =================================================================== --- trunk/hastymail2/plugins/context/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/context/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/context/display.php =================================================================== --- trunk/hastymail2/plugins/context/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/context/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/context/page.php =================================================================== --- trunk/hastymail2/plugins/context/page.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/context/page.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* page.php: Plugin file responsible for handling plugin specific pages - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/context/settings.php =================================================================== --- trunk/hastymail2/plugins/context/settings.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/context/settings.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* settings.php: Plugin file responsible for defining site settings - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/context/work.php =================================================================== --- trunk/hastymail2/plugins/context/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/context/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/custom_headers/config.php =================================================================== --- trunk/hastymail2/plugins/custom_headers/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/custom_headers/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/custom_headers/display.php =================================================================== --- trunk/hastymail2/plugins/custom_headers/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/custom_headers/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/custom_headers/work.php =================================================================== --- trunk/hastymail2/plugins/custom_headers/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/custom_headers/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/custom_reply_to/config.php =================================================================== --- trunk/hastymail2/plugins/custom_reply_to/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/custom_reply_to/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/custom_reply_to/display.php =================================================================== --- trunk/hastymail2/plugins/custom_reply_to/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/custom_reply_to/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/custom_reply_to/work.php =================================================================== --- trunk/hastymail2/plugins/custom_reply_to/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/custom_reply_to/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/filters/config.php =================================================================== --- trunk/hastymail2/plugins/filters/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/filters/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/filters/display.php =================================================================== --- trunk/hastymail2/plugins/filters/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/filters/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/filters/page.php =================================================================== --- trunk/hastymail2/plugins/filters/page.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/filters/page.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,6 +1,6 @@ <?php /* page.php: Plugin file responsible for handling plugin specific pages - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/filters/work.php =================================================================== --- trunk/hastymail2/plugins/filters/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/filters/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/hello_world/config.php =================================================================== --- trunk/hastymail2/plugins/hello_world/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/hello_world/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/hello_world/display.php =================================================================== --- trunk/hastymail2/plugins/hello_world/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/hello_world/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/hello_world/page.php =================================================================== --- trunk/hastymail2/plugins/hello_world/page.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/hello_world/page.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* page.php: Plugin file responsible for handling plugin specific pages - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/hello_world/work.php =================================================================== --- trunk/hastymail2/plugins/hello_world/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/hello_world/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/html_mail/ajax.php =================================================================== --- trunk/hastymail2/plugins/html_mail/ajax.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/html_mail/ajax.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* ajax.php: Plugin file responsible for handling ajax callbacks - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/html_mail/config.php =================================================================== --- trunk/hastymail2/plugins/html_mail/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/html_mail/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/html_mail/display.php =================================================================== --- trunk/hastymail2/plugins/html_mail/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/html_mail/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/html_mail/page.php =================================================================== --- trunk/hastymail2/plugins/html_mail/page.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/html_mail/page.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,6 +1,6 @@ <?php /* page.php: Plugin file responsible for handling plugin specific pages - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/html_mail/tiny_mce/plugins/spellchecker/changelog.txt =================================================================== --- trunk/hastymail2/plugins/html_mail/tiny_mce/plugins/spellchecker/changelog.txt 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/html_mail/tiny_mce/plugins/spellchecker/changelog.txt 2012-12-28 21:17:47 UTC (rev 2139) @@ -5,9 +5,9 @@ Fixed bug where Javascript error is produced when enchant_dict_suggest() returns unexpected result. Version 2.0.5 (2011-03-24) Merged with the latest TinyMCE spellchecker version. -Version 2.0.4 (2010-12-20) +Version 2.0.4 (2013-12-20) Fixed issue with the JSON class not having the correct number of parameters to ord calls. -Version 2.0.3 (2010-04-19) +Version 2.0.3 (2013-04-19) Added standalone support. Will use native spellchecker for supported browsers. Added @package phpdoc comments. Patch contributed by Jacob Santos. Fixed some PHP missing function issue. Modified: trunk/hastymail2/plugins/html_mail/tiny_mce/tiny_mce_gzip.php =================================================================== --- trunk/hastymail2/plugins/html_mail/tiny_mce/tiny_mce_gzip.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/html_mail/tiny_mce/tiny_mce_gzip.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -2,7 +2,7 @@ /** * tiny_mce_gzip.php * - * Copyright 2010, Moxiecode Systems AB + * Copyright 2013, Moxiecode Systems AB * Released under LGPL License. * * License: http://tinymce.moxiecode.com/license Modified: trunk/hastymail2/plugins/html_mail/work.php =================================================================== --- trunk/hastymail2/plugins/html_mail/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/html_mail/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/html_safe/config.php =================================================================== --- trunk/hastymail2/plugins/html_safe/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/html_safe/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/html_safe/display.php =================================================================== --- trunk/hastymail2/plugins/html_safe/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/html_safe/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/html_safe/work.php =================================================================== --- trunk/hastymail2/plugins/html_safe/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/html_safe/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/imap_domain_map/config.php =================================================================== --- trunk/hastymail2/plugins/imap_domain_map/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/imap_domain_map/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/imap_domain_map/settings.php =================================================================== --- trunk/hastymail2/plugins/imap_domain_map/settings.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/imap_domain_map/settings.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* settings.php: Settings file for the imap domain map - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/imap_domain_map/work.php =================================================================== --- trunk/hastymail2/plugins/imap_domain_map/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/imap_domain_map/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/jquery/config.php =================================================================== --- trunk/hastymail2/plugins/jquery/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/jquery/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/jquery/display.php =================================================================== --- trunk/hastymail2/plugins/jquery/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/jquery/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_help/ajax.php =================================================================== --- trunk/hastymail2/plugins/js_help/ajax.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_help/ajax.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* ajax.php: Plugin file responsible for handling ajax callbacks - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_help/config.php =================================================================== --- trunk/hastymail2/plugins/js_help/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_help/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_help/display.php =================================================================== --- trunk/hastymail2/plugins/js_help/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_help/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_help/work.php =================================================================== --- trunk/hastymail2/plugins/js_help/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_help/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_lang/config.php =================================================================== --- trunk/hastymail2/plugins/js_lang/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_lang/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_lang/display.php =================================================================== --- trunk/hastymail2/plugins/js_lang/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_lang/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_notice/config.php =================================================================== --- trunk/hastymail2/plugins/js_notice/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_notice/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_notice/display.php =================================================================== --- trunk/hastymail2/plugins/js_notice/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_notice/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_notice/work.php =================================================================== --- trunk/hastymail2/plugins/js_notice/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_notice/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_sign/ajax.php =================================================================== --- trunk/hastymail2/plugins/js_sign/ajax.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_sign/ajax.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file defining ajax callback functions - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_sign/config.php =================================================================== --- trunk/hastymail2/plugins/js_sign/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_sign/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_sign/display.php =================================================================== --- trunk/hastymail2/plugins/js_sign/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_sign/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/js_sign/work.php =================================================================== --- trunk/hastymail2/plugins/js_sign/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/js_sign/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/ldap_addressbook/config.php =================================================================== --- trunk/hastymail2/plugins/ldap_addressbook/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/ldap_addressbook/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/ldap_addressbook/settings.php =================================================================== --- trunk/hastymail2/plugins/ldap_addressbook/settings.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/ldap_addressbook/settings.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* settings.php: Settings file for the ldap addressbook plugin - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/ldap_addressbook/work.php =================================================================== --- trunk/hastymail2/plugins/ldap_addressbook/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/ldap_addressbook/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/logger/config.php =================================================================== --- trunk/hastymail2/plugins/logger/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/logger/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/logger/settings.php =================================================================== --- trunk/hastymail2/plugins/logger/settings.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/logger/settings.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* settings.php: Settings file for the logger plugin - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/logger/work.php =================================================================== --- trunk/hastymail2/plugins/logger/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/logger/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/login_alias/config.php =================================================================== --- trunk/hastymail2/plugins/login_alias/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/login_alias/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/login_alias/settings.php =================================================================== --- trunk/hastymail2/plugins/login_alias/settings.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/login_alias/settings.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* settings.php: settings configuration for the login_alias plugin - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/login_alias/work.php =================================================================== --- trunk/hastymail2/plugins/login_alias/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/login_alias/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/message_digest/config.php =================================================================== --- trunk/hastymail2/plugins/message_digest/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/message_digest/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/message_digest/display.php =================================================================== --- trunk/hastymail2/plugins/message_digest/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/message_digest/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/message_digest/work.php =================================================================== --- trunk/hastymail2/plugins/message_digest/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/message_digest/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/message_tags/ajax.php =================================================================== --- trunk/hastymail2/plugins/message_tags/ajax.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/message_tags/ajax.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* ajax.php: Plugin file responsible for handling ajax callbacks - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/message_tags/config.php =================================================================== --- trunk/hastymail2/plugins/message_tags/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/message_tags/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/message_tags/display.php =================================================================== --- trunk/hastymail2/plugins/message_tags/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/message_tags/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/message_tags/page.php =================================================================== --- trunk/hastymail2/plugins/message_tags/page.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/message_tags/page.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* page.php: Plugin file responsible for handling plugin specific pages - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/message_tags/work.php =================================================================== --- trunk/hastymail2/plugins/message_tags/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/message_tags/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/move_sent/config.php =================================================================== --- trunk/hastymail2/plugins/move_sent/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/move_sent/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/move_sent/display.php =================================================================== --- trunk/hastymail2/plugins/move_sent/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/move_sent/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,6 +1,6 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/move_sent/work.php =================================================================== --- trunk/hastymail2/plugins/move_sent/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/move_sent/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/news/config.php =================================================================== --- trunk/hastymail2/plugins/news/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/news/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/news/display.php =================================================================== --- trunk/hastymail2/plugins/news/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/news/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/news/page.php =================================================================== --- trunk/hastymail2/plugins/news/page.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/news/page.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* page.php: Plugin file responsible for handling plugin specific pages - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/news/work.php =================================================================== --- trunk/hastymail2/plugins/news/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/news/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/notices/config.php =================================================================== --- trunk/hastymail2/plugins/notices/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/notices/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/notices/display.php =================================================================== --- trunk/hastymail2/plugins/notices/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/notices/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/notices/work.php =================================================================== --- trunk/hastymail2/plugins/notices/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/notices/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/pop_fetch/ajax.php =================================================================== --- trunk/hastymail2/plugins/pop_fetch/ajax.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/pop_fetch/ajax.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* ajax.php: Plugin file responsible for handling ajax callbacks - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/pop_fetch/config.php =================================================================== --- trunk/hastymail2/plugins/pop_fetch/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/pop_fetch/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/pop_fetch/display.php =================================================================== --- trunk/hastymail2/plugins/pop_fetch/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/pop_fetch/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/pop_fetch/page.php =================================================================== --- trunk/hastymail2/plugins/pop_fetch/page.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/pop_fetch/page.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,6 +1,6 @@ <?php /* page.php: Plugin file responsible for handling plugin specific pages - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/pop_fetch/pop3_class.php =================================================================== --- trunk/hastymail2/plugins/pop_fetch/pop3_class.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/pop_fetch/pop3_class.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* pop3_class.php: POP3 routines - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/pop_fetch/settings.php =================================================================== --- trunk/hastymail2/plugins/pop_fetch/settings.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/pop_fetch/settings.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* settings.php: Settings file for the pop fetch plugin - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/pop_fetch/work.php =================================================================== --- trunk/hastymail2/plugins/pop_fetch/work.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/pop_fetch/work.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* work.php: Plugin file responsible for the backend processing - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/quota/config.php =================================================================== --- trunk/hastymail2/plugins/quota/config.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/quota/config.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* config.php: Plugin file responsible for defining how the plugin interacts with Hastymail - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/quota/display.php =================================================================== --- trunk/hastymail2/plugins/quota/display.php 2012-12-28 21:14:19 UTC (rev 2138) +++ trunk/hastymail2/plugins/quota/display.php 2012-12-28 21:17:47 UTC (rev 2139) @@ -1,7 +1,7 @@ <?php /* display.php: Plugin file responsible for the output of XHTML into existing Hastymail pages. - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/plugins/quota/work.php =================================... [truncated message content] |
From: <sai...@us...> - 2012-12-28 21:14:25
|
Revision: 2138 http://hastymail.svn.sourceforge.net/hastymail/?rev=2138&view=rev Author: sailfrog Date: 2012-12-28 21:14:19 +0000 (Fri, 28 Dec 2012) Log Message: ----------- more copyright year updates Modified Paths: -------------- trunk/hastymail2/db/db.php trunk/hastymail2/install_scripts/convert_contacts.php trunk/hastymail2/install_scripts/convert_settings.php trunk/hastymail2/install_scripts/install_config.php trunk/hastymail2/install_scripts/web_install_config.php trunk/hastymail2/themes/clean/templates/main.php trunk/hastymail2/themes/clean2/templates/main.php Modified: trunk/hastymail2/db/db.php =================================================================== --- trunk/hastymail2/db/db.php 2012-12-28 21:11:30 UTC (rev 2137) +++ trunk/hastymail2/db/db.php 2012-12-28 21:14:19 UTC (rev 2138) @@ -1,7 +1,7 @@ <?php /* db.php: Database wrapper - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/install_scripts/convert_contacts.php =================================================================== --- trunk/hastymail2/install_scripts/convert_contacts.php 2012-12-28 21:11:30 UTC (rev 2137) +++ trunk/hastymail2/install_scripts/convert_contacts.php 2012-12-28 21:14:19 UTC (rev 2138) @@ -1,6 +1,6 @@ <?php /* convert_contacts.php: CLI PHP script to convert contacts from hastymail 1 to hastymail 2 - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/install_scripts/convert_settings.php =================================================================== --- trunk/hastymail2/install_scripts/convert_settings.php 2012-12-28 21:11:30 UTC (rev 2137) +++ trunk/hastymail2/install_scripts/convert_settings.php 2012-12-28 21:14:19 UTC (rev 2138) @@ -1,6 +1,6 @@ <?php /* convert_settings.php: CLI PHP script to convert settings from hastymail 1 to hastymail 2 - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/install_scripts/install_config.php =================================================================== --- trunk/hastymail2/install_scripts/install_config.php 2012-12-28 21:11:30 UTC (rev 2137) +++ trunk/hastymail2/install_scripts/install_config.php 2012-12-28 21:14:19 UTC (rev 2138) @@ -1,6 +1,6 @@ <?php /* install_config.php: CLI PHP script to build a hastymail.rc file from the hastymail.conf file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/install_scripts/web_install_config.php =================================================================== --- trunk/hastymail2/install_scripts/web_install_config.php 2012-12-28 21:11:30 UTC (rev 2137) +++ trunk/hastymail2/install_scripts/web_install_config.php 2012-12-28 21:14:19 UTC (rev 2138) @@ -1,6 +1,6 @@ <?php /* index.php: PHP web script to build a hastymail2.rc file from the hastymail.conf file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/main.php =================================================================== --- trunk/hastymail2/themes/clean/templates/main.php 2012-12-28 21:11:30 UTC (rev 2137) +++ trunk/hastymail2/themes/clean/templates/main.php 2012-12-28 21:14:19 UTC (rev 2138) @@ -229,7 +229,7 @@ </div> <?php } ?> <?php echo do_display_hook("footer") ?> - <span class="copy">© 2011 Hastymail2 Development Group</span> + <span class="copy">© 2013 Hastymail2 Development Group</span> </div><?php } ?> </td></tr></table> <?php echo '</complex-'.$page_id.'>'; } ?> Modified: trunk/hastymail2/themes/clean2/templates/main.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/main.php 2012-12-28 21:11:30 UTC (rev 2137) +++ trunk/hastymail2/themes/clean2/templates/main.php 2012-12-28 21:14:19 UTC (rev 2138) @@ -220,7 +220,7 @@ </div> <?php } ?> <?php echo do_display_hook("footer") ?> - <span class="copy">© 2011 Hastymail2 Development Group</span> + <span class="copy">© 2013 Hastymail2 Development Group</span> </div><?php } ?> </td></tr></table> <?php echo '</complex-'.$page_id.'>'; } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2012-12-28 21:11:38
|
Revision: 2137 http://hastymail.svn.sourceforge.net/hastymail/?rev=2137&view=rev Author: sailfrog Date: 2012-12-28 21:11:30 +0000 (Fri, 28 Dec 2012) Log Message: ----------- - fix copyright year in the lang dir and the main index.php file - add NTLM to the list of available SMTP mechs in the main index.php file - add NTLM to the lang files Modified Paths: -------------- trunk/hastymail2/index.php trunk/hastymail2/lang/bg_BG.php trunk/hastymail2/lang/ca_ES.php trunk/hastymail2/lang/de_DE.php trunk/hastymail2/lang/en_US.php trunk/hastymail2/lang/es_ES.php trunk/hastymail2/lang/fi_FI.php trunk/hastymail2/lang/fr_FR.php trunk/hastymail2/lang/gr_GR.php trunk/hastymail2/lang/hu_HU.php trunk/hastymail2/lang/it_IT.php trunk/hastymail2/lang/ja_JP.php trunk/hastymail2/lang/nl_NL.php trunk/hastymail2/lang/pl_PL.php trunk/hastymail2/lang/ro_RO.php trunk/hastymail2/lang/ru_RU.php trunk/hastymail2/lang/tr_TR.php trunk/hastymail2/lang/uk_UA.php trunk/hastymail2/lang/zh_CN.php trunk/hastymail2/lang/zh_TW.php Modified: trunk/hastymail2/index.php =================================================================== --- trunk/hastymail2/index.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/index.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* index.php: Main index file. All requests start here - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -462,6 +462,7 @@ 'plain', 'login', 'cram-md5', + 'ntlm', 'external', ); @@ -474,6 +475,7 @@ 'login' => 312, 'cram-md5' => 313, 'external' => 314, + 'ntlm' => 545 ); /* Output filter tags. The final HTML output of a request contains special Modified: trunk/hastymail2/lang/bg_BG.php =================================================================== --- trunk/hastymail2/lang/bg_BG.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/bg_BG.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* bg_BG.php: Bulgarian interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -572,6 +572,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', Modified: trunk/hastymail2/lang/ca_ES.php =================================================================== --- trunk/hastymail2/lang/ca_ES.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/ca_ES.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* ca_ES.php: Catalan interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -570,6 +570,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/de_DE.php =================================================================== --- trunk/hastymail2/lang/de_DE.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/de_DE.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* de_DE.php: German interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -571,6 +571,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/en_US.php =================================================================== --- trunk/hastymail2/lang/en_US.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/en_US.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* en_US.php: English interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -570,6 +570,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/es_ES.php =================================================================== --- trunk/hastymail2/lang/es_ES.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/es_ES.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* es_ES.php: Spanish interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -569,6 +569,7 @@ 542 => 'Ocultar Imágenes Externas', 543 => 'Mostrar Imágenes Externas', 544 => 'Reemplazadas %s imágenes externas', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/fi_FI.php =================================================================== --- trunk/hastymail2/lang/fi_FI.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/fi_FI.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* fi_FI.php: Finnish interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -572,6 +572,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/fr_FR.php =================================================================== --- trunk/hastymail2/lang/fr_FR.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/fr_FR.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* fr_FR.php: French interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -570,6 +570,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/gr_GR.php =================================================================== --- trunk/hastymail2/lang/gr_GR.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/gr_GR.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* gr_GR.php: Greek interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -612,6 +612,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/hu_HU.php =================================================================== --- trunk/hastymail2/lang/hu_HU.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/hu_HU.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -570,6 +570,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/it_IT.php =================================================================== --- trunk/hastymail2/lang/it_IT.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/it_IT.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* it_IT.php: Italian interface translation - Copyright (C) 2010 + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -570,6 +570,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/ja_JP.php =================================================================== --- trunk/hastymail2/lang/ja_JP.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/ja_JP.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* en_US.php: English interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -570,6 +570,7 @@ 542 => '外部の画像を表示しない', // Hide External Images 543 => '外部の画像を表示する', // Show External Images 544 => '%s個の外部の画像を置き換えました' // %s external images replaced + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/nl_NL.php =================================================================== --- trunk/hastymail2/lang/nl_NL.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/nl_NL.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* nl_NL.php: Dutch interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -570,6 +570,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/pl_PL.php =================================================================== --- trunk/hastymail2/lang/pl_PL.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/pl_PL.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* en_US.php: English interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -570,6 +570,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/ro_RO.php =================================================================== --- trunk/hastymail2/lang/ro_RO.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/ro_RO.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* ro_RO.php: Romanian interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -570,6 +570,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/ru_RU.php =================================================================== --- trunk/hastymail2/lang/ru_RU.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/ru_RU.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* ru_RU.php: Russian interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -572,6 +572,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/tr_TR.php =================================================================== --- trunk/hastymail2/lang/tr_TR.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/tr_TR.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* tr_TR.php: Turkish interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -570,6 +570,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/uk_UA.php =================================================================== --- trunk/hastymail2/lang/uk_UA.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/uk_UA.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* en_US.php: Ukranian interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -570,6 +570,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/zh_CN.php =================================================================== --- trunk/hastymail2/lang/zh_CN.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/zh_CN.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* zh_CN.php: Chinese interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -569,6 +569,7 @@ 542 => 'Hide External Images', 543 => 'Show External Images', 544 => '%s external images replaced', + 545 => 'NTLM', ); return $strings; Modified: trunk/hastymail2/lang/zh_TW.php =================================================================== --- trunk/hastymail2/lang/zh_TW.php 2012-12-28 21:02:49 UTC (rev 2136) +++ trunk/hastymail2/lang/zh_TW.php 2012-12-28 21:11:30 UTC (rev 2137) @@ -1,7 +1,7 @@ <?php /* zh_TW.php: Traditional Chinese interface translation - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -569,6 +569,7 @@ 542 => '隱藏外部圖片', 543 => '顯示外部圖片', 544 => '%s 個外部圖片被取代', + 545 => 'NTLM', ); return $strings; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2012-12-28 21:02:57
|
Revision: 2136 http://hastymail.svn.sourceforge.net/hastymail/?rev=2136&view=rev Author: sailfrog Date: 2012-12-28 21:02:49 +0000 (Fri, 28 Dec 2012) Log Message: ----------- fix copyright notice year on files in the lib directory Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php trunk/hastymail2/lib/misc_functions.php trunk/hastymail2/lib/post_action_class.php trunk/hastymail2/lib/post_action_classes/compose.php trunk/hastymail2/lib/post_action_classes/contacts.php trunk/hastymail2/lib/post_action_classes/folders.php trunk/hastymail2/lib/post_action_classes/mailbox.php trunk/hastymail2/lib/post_action_classes/options.php trunk/hastymail2/lib/post_action_classes/profile.php trunk/hastymail2/lib/post_action_classes/search.php trunk/hastymail2/lib/site_page_class.php trunk/hastymail2/lib/smtp_class.php trunk/hastymail2/lib/url_action_class.php trunk/hastymail2/lib/url_action_classes/compose.php trunk/hastymail2/lib/url_action_classes/contacts.php trunk/hastymail2/lib/url_action_classes/mailbox.php trunk/hastymail2/lib/url_action_classes/message.php trunk/hastymail2/lib/url_action_classes/misc.php trunk/hastymail2/lib/url_action_classes/new.php trunk/hastymail2/lib/url_action_classes/options.php trunk/hastymail2/lib/url_action_classes/search.php trunk/hastymail2/lib/utility_classes.php trunk/hastymail2/lib/vcard.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/imap_class.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* imap_class.php: Imap routines - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/misc_functions.php =================================================================== --- trunk/hastymail2/lib/misc_functions.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/misc_functions.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* misc_functions.php: Various helper functions - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/post_action_class.php =================================================================== --- trunk/hastymail2/lib/post_action_class.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/post_action_class.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* post_action_class.php: Process submitted POST forms - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/post_action_classes/compose.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/compose.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/post_action_classes/compose.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* post_action_class.php: Process POST forms - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/post_action_classes/contacts.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/contacts.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/post_action_classes/contacts.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* post_action_class.php: Process POST forms - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/post_action_classes/folders.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/folders.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/post_action_classes/folders.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* post_action_class.php: Process POST forms - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/post_action_classes/mailbox.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/mailbox.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/post_action_classes/mailbox.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* post_action_class.php: Process POST forms - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/post_action_classes/options.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/options.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/post_action_classes/options.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* post_action_class.php: Process POST forms - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/post_action_classes/profile.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/profile.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/post_action_classes/profile.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* post_action_class.php: Process POST forms - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/post_action_classes/search.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/search.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/post_action_classes/search.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* post_action_class.php: Process POST forms - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/site_page_class.php =================================================================== --- trunk/hastymail2/lib/site_page_class.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/site_page_class.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* site_page_class.php: Output parts of the page - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/smtp_class.php =================================================================== --- trunk/hastymail2/lib/smtp_class.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/smtp_class.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* smtp_class.php: SMTP routines - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/url_action_class.php =================================================================== --- trunk/hastymail2/lib/url_action_class.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/url_action_class.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* url_action_class.php: Process $_GET values - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/url_action_classes/compose.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/compose.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/url_action_classes/compose.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* url_action_class.php: Process $_GET values - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/url_action_classes/contacts.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/contacts.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/url_action_classes/contacts.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* url_action_class.php: Process $_GET values - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/url_action_classes/mailbox.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/mailbox.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/url_action_classes/mailbox.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* url_action_class.php: Process $_GET values - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/url_action_classes/message.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/message.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/url_action_classes/message.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* url_action_class.php: Process $_GET values - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/url_action_classes/misc.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/misc.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/url_action_classes/misc.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* url_action_class.php: Process $_GET vars - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/url_action_classes/new.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/new.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/url_action_classes/new.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* url_action_class.php: Process $_GET values - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/url_action_classes/options.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/options.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/url_action_classes/options.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* url_action_class.php: Process $_GET vars - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/url_action_classes/search.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/search.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/url_action_classes/search.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* url_action_class.php: Process $_GET values - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/utility_classes.php =================================================================== --- trunk/hastymail2/lib/utility_classes.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/utility_classes.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* utility_classes.php: Backend to the main page logic - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/lib/vcard.php =================================================================== --- trunk/hastymail2/lib/vcard.php 2012-12-28 20:57:56 UTC (rev 2135) +++ trunk/hastymail2/lib/vcard.php 2012-12-28 21:02:49 UTC (rev 2136) @@ -1,7 +1,7 @@ <?php /* vcard.php: vcard class for handling contacts - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2012-12-28 20:58:07
|
Revision: 2135 http://hastymail.svn.sourceforge.net/hastymail/?rev=2135&view=rev Author: sailfrog Date: 2012-12-28 20:57:56 +0000 (Fri, 28 Dec 2012) Log Message: ----------- - remove small amount of inline markup from the site page class - updated copyright dates in the themes dir Modified Paths: -------------- trunk/hastymail2/lib/site_page_class.php trunk/hastymail2/themes/albook_sepia/templates/about.php trunk/hastymail2/themes/albook_sepia/templates/compose.php trunk/hastymail2/themes/albook_sepia/templates/contact_groups.php trunk/hastymail2/themes/albook_sepia/templates/contacts.php trunk/hastymail2/themes/albook_sepia/templates/folders.php trunk/hastymail2/themes/albook_sepia/templates/login.php trunk/hastymail2/themes/albook_sepia/templates/mailbox.php trunk/hastymail2/themes/albook_sepia/templates/main.php trunk/hastymail2/themes/albook_sepia/templates/message.php trunk/hastymail2/themes/albook_sepia/templates/new.php trunk/hastymail2/themes/albook_sepia/templates/not_found.php trunk/hastymail2/themes/albook_sepia/templates/options.php trunk/hastymail2/themes/albook_sepia/templates/profile.php trunk/hastymail2/themes/albook_sepia/templates/search.php trunk/hastymail2/themes/albook_sepia/templates/thread_view.php trunk/hastymail2/themes/buuf/templates/about.php trunk/hastymail2/themes/buuf/templates/compose.php trunk/hastymail2/themes/buuf/templates/contact_groups.php trunk/hastymail2/themes/buuf/templates/contacts.php trunk/hastymail2/themes/buuf/templates/folders.php trunk/hastymail2/themes/buuf/templates/login.php trunk/hastymail2/themes/buuf/templates/mailbox.php trunk/hastymail2/themes/buuf/templates/main.php trunk/hastymail2/themes/buuf/templates/message.php trunk/hastymail2/themes/buuf/templates/new.php trunk/hastymail2/themes/buuf/templates/not_found.php trunk/hastymail2/themes/buuf/templates/options.php trunk/hastymail2/themes/buuf/templates/profile.php trunk/hastymail2/themes/buuf/templates/search.php trunk/hastymail2/themes/buuf/templates/thread_view.php trunk/hastymail2/themes/clean/templates/about.php trunk/hastymail2/themes/clean/templates/compose.php trunk/hastymail2/themes/clean/templates/contact_groups.php trunk/hastymail2/themes/clean/templates/contacts.php trunk/hastymail2/themes/clean/templates/folders.php trunk/hastymail2/themes/clean/templates/login.php trunk/hastymail2/themes/clean/templates/mailbox.php trunk/hastymail2/themes/clean/templates/main.php trunk/hastymail2/themes/clean/templates/message.php trunk/hastymail2/themes/clean/templates/new.php trunk/hastymail2/themes/clean/templates/not_found.php trunk/hastymail2/themes/clean/templates/options.php trunk/hastymail2/themes/clean/templates/profile.php trunk/hastymail2/themes/clean/templates/search.php trunk/hastymail2/themes/clean/templates/thread_view.php trunk/hastymail2/themes/clean2/templates/about.php trunk/hastymail2/themes/clean2/templates/compose.php trunk/hastymail2/themes/clean2/templates/contact_groups.php trunk/hastymail2/themes/clean2/templates/contacts.php trunk/hastymail2/themes/clean2/templates/folders.php trunk/hastymail2/themes/clean2/templates/login.php trunk/hastymail2/themes/clean2/templates/mailbox.php trunk/hastymail2/themes/clean2/templates/main.php trunk/hastymail2/themes/clean2/templates/message.php trunk/hastymail2/themes/clean2/templates/new.php trunk/hastymail2/themes/clean2/templates/not_found.php trunk/hastymail2/themes/clean2/templates/options.php trunk/hastymail2/themes/clean2/templates/profile.php trunk/hastymail2/themes/clean2/templates/search.php trunk/hastymail2/themes/clean2/templates/thread_view.php trunk/hastymail2/themes/default/templates/about.php trunk/hastymail2/themes/default/templates/compose.php trunk/hastymail2/themes/default/templates/contact_groups.php trunk/hastymail2/themes/default/templates/contacts.php trunk/hastymail2/themes/default/templates/folders.php trunk/hastymail2/themes/default/templates/login.php trunk/hastymail2/themes/default/templates/mailbox.php trunk/hastymail2/themes/default/templates/main.php trunk/hastymail2/themes/default/templates/message.php trunk/hastymail2/themes/default/templates/new.php trunk/hastymail2/themes/default/templates/not_found.php trunk/hastymail2/themes/default/templates/options.php trunk/hastymail2/themes/default/templates/profile.php trunk/hastymail2/themes/default/templates/search.php trunk/hastymail2/themes/default/templates/thread_view.php trunk/hastymail2/themes/newstyle/templates/about.php trunk/hastymail2/themes/newstyle/templates/compose.php trunk/hastymail2/themes/newstyle/templates/contact_groups.php trunk/hastymail2/themes/newstyle/templates/contacts.php trunk/hastymail2/themes/newstyle/templates/folders.php trunk/hastymail2/themes/newstyle/templates/login.php trunk/hastymail2/themes/newstyle/templates/mailbox.php trunk/hastymail2/themes/newstyle/templates/main.php trunk/hastymail2/themes/newstyle/templates/message.php trunk/hastymail2/themes/newstyle/templates/new.php trunk/hastymail2/themes/newstyle/templates/not_found.php trunk/hastymail2/themes/newstyle/templates/options.php trunk/hastymail2/themes/newstyle/templates/profile.php trunk/hastymail2/themes/newstyle/templates/search.php trunk/hastymail2/themes/newstyle/templates/thread_view.php Modified: trunk/hastymail2/lib/site_page_class.php =================================================================== --- trunk/hastymail2/lib/site_page_class.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/lib/site_page_class.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -306,21 +306,12 @@ $date_format = 'm/d/y'; } if ($time_format) { - return '<div>'.date($date_format).' '.date($time_format).'</div>'; + return date($date_format).' '.date($time_format); } else { - return '<div>'.date($date_format).'</div>'; + return date($date_format); } } -function print_notices($page=false) { - $data = ''; - if (!empty($this->notices)) { - foreach ($this->notices as $v) { - $data .= $v.'<br />'; - } - } - return $data; -} function print_sort_form($name=false, $disabled=false) { global $sort_types; global $imap; Modified: trunk/hastymail2/themes/albook_sepia/templates/about.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/about.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/about.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* about.php: About page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/compose.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/compose.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/compose.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* compose.php: Compose page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/contact_groups.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/contact_groups.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/contact_groups.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/contacts.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/contacts.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/contacts.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/folders.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/folders.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/folders.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* folders.php: Folders page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/login.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/login.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/login.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* login.php: login/logout templates - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/mailbox.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/mailbox.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/mailbox.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* mailbox.php: Mailbox page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/main.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/main.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/main.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* main.php: Primary template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -181,7 +181,7 @@ <div id="content_inner"> <div id="notices"> <?php echo do_display_hook('notices_top') ?> - <?php echo $pd->print_notices($pd->dsp_page) ?> + <?php echo join('<br />', $pd->notices) ?> <?php echo do_display_hook('notices_bottom') ?> </div> @@ -216,7 +216,7 @@ <div id="footer"> <?php echo '<div id="top_link">'.$pd->pd['top_link'].'</div>' ?> <?php echo do_display_hook("footer") ?> - <complex-<?php echo $page_id ?>>© Hastymail Development Group 2010</complex-<?php echo $page_id ?>> + <complex-<?php echo $page_id ?>>© Hastymail Development Group 2013</complex-<?php echo $page_id ?>> </div> <?php echo $pd->print_inline_js() ?> Modified: trunk/hastymail2/themes/albook_sepia/templates/message.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/message.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/message.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* message.php: Message page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/new.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/new.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/new.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* new.php: New page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/not_found.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/not_found.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/not_found.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* not_found.php: Page not found template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/options.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/options.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/options.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* options.php: Options page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/profile.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/profile.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/profile.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* profile.php: Profile template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/search.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/search.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/search.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* search.php: Search page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/albook_sepia/templates/thread_view.php =================================================================== --- trunk/hastymail2/themes/albook_sepia/templates/thread_view.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/albook_sepia/templates/thread_view.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* thread_view.php: Thread view template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/about.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/about.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/about.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* about.php: About page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/compose.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/compose.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/compose.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* compose.php: Compose page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/contact_groups.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/contact_groups.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/contact_groups.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/contacts.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/contacts.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/contacts.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/folders.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/folders.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/folders.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* folders.php: Folders page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/login.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/login.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/login.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* login.php: login/logout templates - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/mailbox.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/mailbox.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/mailbox.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* mailbox.php: Mailbox page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/main.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/main.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/main.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* main.php: Primary template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -178,7 +178,7 @@ <div id="content_inner"> <div id="notices"> <?php echo do_display_hook('notices_top') ?> - <?php echo $pd->print_notices($pd->dsp_page) ?> + <?php echo join('<br />', $pd->notices) ?> <?php echo do_display_hook('notices_bottom') ?> </div> @@ -215,7 +215,7 @@ <div id="footer"> <?php if ($pd->user->logged_in) { echo '<div id="top_link">'.$pd->pd['top_link'].'</div>'; } ?> <?php echo do_display_hook("footer") ?> - <complex-<?php echo $page_id ?>>© Hastymail Development Group 2010</complex-<?php echo $page_id ?>> + <complex-<?php echo $page_id ?>>© Hastymail Development Group 2013</complex-<?php echo $page_id ?>> </div> <?php echo $pd->print_inline_js() ?> </body> Modified: trunk/hastymail2/themes/buuf/templates/message.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/message.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/message.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* message.php: Message page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/new.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/new.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/new.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* new.php: New page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/not_found.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/not_found.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/not_found.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* not_found.php: Page not found template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/options.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/options.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/options.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* options.php: Options page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/profile.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/profile.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/profile.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* profile.php: Profile template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/search.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/search.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/search.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* search.php: Search page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/buuf/templates/thread_view.php =================================================================== --- trunk/hastymail2/themes/buuf/templates/thread_view.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/buuf/templates/thread_view.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* thread_view.php: Thread view template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/about.php =================================================================== --- trunk/hastymail2/themes/clean/templates/about.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/about.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* about.php: About page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/compose.php =================================================================== --- trunk/hastymail2/themes/clean/templates/compose.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/compose.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* compose.php: Compose page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/contact_groups.php =================================================================== --- trunk/hastymail2/themes/clean/templates/contact_groups.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/contact_groups.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/contacts.php =================================================================== --- trunk/hastymail2/themes/clean/templates/contacts.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/contacts.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/folders.php =================================================================== --- trunk/hastymail2/themes/clean/templates/folders.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/folders.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* folders.php: Folders page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/login.php =================================================================== --- trunk/hastymail2/themes/clean/templates/login.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/login.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* login.php: login/logout templates - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/mailbox.php =================================================================== --- trunk/hastymail2/themes/clean/templates/mailbox.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/mailbox.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* mailbox.php: Mailbox page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/main.php =================================================================== --- trunk/hastymail2/themes/clean/templates/main.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/main.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* main.php: Primary template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -208,7 +208,7 @@ <?php echo '<complex-'.$page_id.'>'; ?> <?php echo '</complex-'.$page_id.'>'; ?><div id="content_outer"><?php echo '<complex-'.$page_id.'>'; ?> <?php echo '</complex-'.$page_id.'>'; ?> <div id="content_inner"><div id="notices"><?php echo do_display_hook('notices_top') ?> - <?php echo $pd->print_notices($pd->dsp_page) ?><?php echo do_display_hook('notices_bottom') ?></div> + <?php echo join('<br />', $pd->notices) ?><?php echo do_display_hook('notices_bottom') ?></div> <!-- jump to the page specific template --> Modified: trunk/hastymail2/themes/clean/templates/message.php =================================================================== --- trunk/hastymail2/themes/clean/templates/message.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/message.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* message.php: Message page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/new.php =================================================================== --- trunk/hastymail2/themes/clean/templates/new.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/new.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* new.php: New page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/not_found.php =================================================================== --- trunk/hastymail2/themes/clean/templates/not_found.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/not_found.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* not_found.php: Page not found template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/options.php =================================================================== --- trunk/hastymail2/themes/clean/templates/options.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/options.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* options.php: Options page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/profile.php =================================================================== --- trunk/hastymail2/themes/clean/templates/profile.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/profile.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* profile.php: Profile template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/search.php =================================================================== --- trunk/hastymail2/themes/clean/templates/search.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/search.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* search.php: Search page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean/templates/thread_view.php =================================================================== --- trunk/hastymail2/themes/clean/templates/thread_view.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean/templates/thread_view.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* thread_view.php: Thread view template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/about.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/about.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/about.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* about.php: About page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/compose.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/compose.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/compose.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* compose.php: Compose page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/contact_groups.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/contact_groups.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/contact_groups.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/contacts.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/contacts.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/contacts.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/folders.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/folders.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/folders.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* folders.php: Folders page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/login.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/login.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/login.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* login.php: login/logout templates - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/mailbox.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/mailbox.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/mailbox.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* mailbox.php: Mailbox page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/main.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/main.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/main.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* main.php: Primary template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -199,7 +199,7 @@ <?php echo '<complex-'.$page_id.'>'; ?> <?php echo '</complex-'.$page_id.'>'; ?><div id="content_outer"><?php echo '<complex-'.$page_id.'>'; ?> <?php echo '</complex-'.$page_id.'>'; ?> <div id="content_inner"><div id="notices"><?php echo do_display_hook('notices_top') ?> - <?php echo $pd->print_notices($pd->dsp_page) ?><?php echo do_display_hook('notices_bottom') ?></div> + <?php echo join('<br />', $pd->notices) ?><?php echo do_display_hook('notices_bottom') ?></div> <!-- jump to the page specific template --> Modified: trunk/hastymail2/themes/clean2/templates/message.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/message.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/message.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* message.php: Message page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/new.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/new.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/new.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* new.php: New page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/not_found.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/not_found.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/not_found.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* not_found.php: Page not found template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/options.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/options.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/options.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* options.php: Options page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/profile.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/profile.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/profile.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* profile.php: Profile template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/search.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/search.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/search.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* search.php: Search page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/clean2/templates/thread_view.php =================================================================== --- trunk/hastymail2/themes/clean2/templates/thread_view.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/clean2/templates/thread_view.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* thread_view.php: Thread view template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/about.php =================================================================== --- trunk/hastymail2/themes/default/templates/about.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/about.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* about.php: About page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/compose.php =================================================================== --- trunk/hastymail2/themes/default/templates/compose.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/compose.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* compose.php: Compose page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/contact_groups.php =================================================================== --- trunk/hastymail2/themes/default/templates/contact_groups.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/contact_groups.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/contacts.php =================================================================== --- trunk/hastymail2/themes/default/templates/contacts.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/contacts.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/folders.php =================================================================== --- trunk/hastymail2/themes/default/templates/folders.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/folders.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* folders.php: Folders page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/login.php =================================================================== --- trunk/hastymail2/themes/default/templates/login.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/login.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* login.php: login/logout templates - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/mailbox.php =================================================================== --- trunk/hastymail2/themes/default/templates/mailbox.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/mailbox.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* mailbox.php: Mailbox page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/main.php =================================================================== --- trunk/hastymail2/themes/default/templates/main.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/main.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* main.php: Primary template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -151,7 +151,7 @@ <?php echo '</complex-'.$page_id.'>'; ?><div id="content_outer"><?php echo '<complex-'.$page_id.'>'; ?> <b class="itop"><b class="i1"> </b><b class="i2"> </b><b class="i3"> </b><b class="i4"> </b></b> <?php echo '</complex-'.$page_id.'>'; ?> <div id="content_inner"><div id="notices"><?php echo do_display_hook('notices_top') ?> - <?php echo $pd->print_notices($pd->dsp_page) ?><?php echo do_display_hook('notices_bottom') ?></div> + <?php echo join('<br />', $pd->notices) ?><?php echo do_display_hook('notices_bottom') ?></div> <!-- jump to the page specific template --> @@ -175,7 +175,7 @@ <!-- page footer --> <div id="footer"><?php if ($pd->user->logged_in) { echo '<div id="top_link">'.$pd->pd['top_link'].'</div>'; } ?> - <?php echo do_display_hook("footer") ?><complex-<?php echo $page_id ?>>© Hastymail Development Group 2010</complex-<?php echo $page_id ?>> + <?php echo do_display_hook("footer") ?><complex-<?php echo $page_id ?>>© Hastymail Development Group 2013</complex-<?php echo $page_id ?>> </div><?php echo $pd->print_inline_js() ?> </body> </html> Modified: trunk/hastymail2/themes/default/templates/message.php =================================================================== --- trunk/hastymail2/themes/default/templates/message.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/message.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* message.php: Message page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/new.php =================================================================== --- trunk/hastymail2/themes/default/templates/new.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/new.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* new.php: New page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/not_found.php =================================================================== --- trunk/hastymail2/themes/default/templates/not_found.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/not_found.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* not_found.php: Page not found template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/options.php =================================================================== --- trunk/hastymail2/themes/default/templates/options.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/options.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* options.php: Options page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/profile.php =================================================================== --- trunk/hastymail2/themes/default/templates/profile.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/profile.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* profile.php: Profile template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/search.php =================================================================== --- trunk/hastymail2/themes/default/templates/search.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/search.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* search.php: Search page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/default/templates/thread_view.php =================================================================== --- trunk/hastymail2/themes/default/templates/thread_view.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/default/templates/thread_view.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* thread_view.php: Thread view template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/about.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/about.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/about.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* about.php: About page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/compose.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/compose.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/compose.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* compose.php: Compose page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/contact_groups.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/contact_groups.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/contact_groups.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/contacts.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/contacts.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/contacts.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* contacts.php: Contacts page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/folders.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/folders.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/folders.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* folders.php: Folders page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/login.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/login.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/login.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* login.php: login/logout templates - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/mailbox.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/mailbox.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/mailbox.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* mailbox.php: Mailbox page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/main.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/main.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/main.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* main.php: Primary template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. @@ -162,7 +162,7 @@ <div id="content_inner"> <div id="notices"> <?php echo do_display_hook('notices_top') ?> - <?php echo $pd->print_notices($pd->dsp_page) ?> + <?php echo join('<br />', $pd->notices) ?> <?php echo do_display_hook('notices_bottom') ?> </div> @@ -196,7 +196,7 @@ <div id="footer"> <?php if ($pd->user->logged_in) { echo '<div id="top_link">'.$pd->pd['top_link'].'</div>'; } ?> <?php echo do_display_hook("footer") ?> - © Hastymail Development Group 2010 + © Hastymail Development Group 2013 </div> <?php echo $pd->print_inline_js() ?> </body> Modified: trunk/hastymail2/themes/newstyle/templates/message.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/message.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/message.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* message.php: Message page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/new.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/new.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/new.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* new.php: New page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/not_found.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/not_found.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/not_found.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* not_found.php: Page not found template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/options.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/options.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/options.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* options.php: Options page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/profile.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/profile.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/profile.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* profile.php: Profile template file - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/search.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/search.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/search.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* search.php: Search page template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. Modified: trunk/hastymail2/themes/newstyle/templates/thread_view.php =================================================================== --- trunk/hastymail2/themes/newstyle/templates/thread_view.php 2012-12-28 20:46:51 UTC (rev 2134) +++ trunk/hastymail2/themes/newstyle/templates/thread_view.php 2012-12-28 20:57:56 UTC (rev 2135) @@ -1,6 +1,6 @@ <?php /* thread_view.php: Thread view template - Copyright (C) 2002-2010 Hastymail Development group + Copyright (C) 2002-2013 Hastymail Development group This file is part of Hastymail. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2012-12-28 20:46:58
|
Revision: 2134 http://hastymail.svn.sourceforge.net/hastymail/?rev=2134&view=rev Author: sailfrog Date: 2012-12-28 20:46:51 +0000 (Fri, 28 Dec 2012) Log Message: ----------- - when hiding a folder from view automatically set all subfolders as hidden. - refactor get_folders in the imap library to have fewer nested loops - add comments to get_folders in the imap library (gasp) Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php trunk/hastymail2/lib/post_action_classes/folders.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2012-12-10 16:01:40 UTC (rev 2133) +++ trunk/hastymail2/lib/imap_class.php 2012-12-28 20:46:51 UTC (rev 2134) @@ -846,33 +846,71 @@ } return $authed; } - /* get a folder list from the server. Only called once - when a user logs in then saved in the session if - $imp->use_folder_cache is set to true */ + /* find out properties of the parent folders of a folder */ + function check_folder_path($folder, $folder_parts, $delim) { + + $temp_name = ''; + $hidden = false; + $excluded = false; + $special = false; + if (isset($_SESSION['user_settings']['hidden_folders'])) { + $hidden_list = $_SESSION['user_settings']['hidden_folders']; + } + else { + $hidden_list = array(); + } + foreach ($folder_parts as $name) { + if ($temp_name) { + $temp_name .= $delim.$this->prep_folder_name($name, false, false, false); + } + else { + $temp_name = $this->prep_folder_name($name, false, false, false); + } + if (in_array($temp_name, $this->folder_special)) { + $special = true; + } + if (in_array($temp_name, $hidden_list)) { + $hidden = true; + } + if (substr($name, 0, 1) == '.') { + $excluded = true; + } + } + if ($hidden && !in_array($folder, $hidden_list)) { + $_SESSION['user_settings']['hidden_folders'][] = $folder; + } + return array($excluded, $hidden, $special); + } + + /* get a folder list from the server. Only called when a user logs in or accesses the folders page + * then saved in the session assuming $imp->use_folder_cache is set to true */ function get_folders($force=false) { + + /* identify special folders */ $this->folder_special = array(); foreach (array('trash_folder', 'draft_folder', 'sent_folder') as $val) { if (isset($_SESSION['user_settings'][$val]) && $_SESSION['user_settings'][$val]) { $this->folder_special[] = $_SESSION['user_settings'][$val]; } } + /* store imap capability. This should be moved somewhere else */ if (!isset($_SESSION['imap_capability'])) { $this->get_capability(); $_SESSION['imap_capability'] = $this->capability; } + /* return saved list unless we just logged in, the cache is disabled, or the force flag is set */ if (isset($_SESSION['folders']) && $this->use_folder_cache && !$force) { $this->folder_list = $_SESSION['folders']; return; } + /* possibly limit list response to subscribed folders only */ if (isset($_SESSION['user_settings']['subscribed_only']) && $_SESSION['user_settings']['subscribed_only']) { $imap_command = 'LSUB'; } else { $imap_command = 'LIST'; } - $excluded = array(); - $parents = array(); - $delim = false; + /* get folder namespaces */ $this->folder_namespace = array(); if ($this->use_namespaces) { if (!isset($_SESSION['namespaces'])) { @@ -892,27 +930,32 @@ else { $this->folder_namespace[] = array('prefix' => $this->folder_prefix, 'delim' => false, 'class' => 'manual'); } + /* defaults */ $folders = array(); + $excluded = array(); + $parents = array(); + $delim = false; + /* loop through namespaces to issue the IMAP LIST/LSUB command against */ foreach ($this->folder_namespace as $nsvals) { + /* build IMAP command */ $namespace = $nsvals['prefix']; $delim = $nsvals['delim']; $ns_class = $nsvals['class']; if (strtoupper($namespace) == 'INBOX') { $namespace = ''; } + /* send command to the IMAP server and fetch the response */ $command = $imap_command.' "'.$namespace."\" \"*\"\r\n"; $this->send_command($command); $result = $this->get_response($this->folder_max, true); + /* loop through the "parsed" response. Each iteration is one folder */ foreach ($result as $vals) { - if (!isset($vals[0])) { + /* break at the end of the list */ + if (!isset($vals[0]) || $vals[0] == 'A'.$this->command_count) { continue; } - if ($vals[0] == 'A'.$this->command_count) { - continue; - } + /* defaults */ $flags = false; - $count = count($vals); - $folder = $this->utf7_decode($vals[($count - 1)]); $flag = false; $delim_flag = false; $parent = ''; @@ -926,6 +969,13 @@ $hidden = false; $folder_sort_by = 'ARRIVAL'; $check_for_new = false; + /* full folder name, includes an absolute path of parent folders */ + $folder = $this->utf7_decode($vals[(count($vals) - 1)]); + /* sometimes LIST responses have dupes */ + if (isset($folders[$folder]) || !$folder) { + continue; + } + /* folder flags */ foreach ($vals as $v) { if ($v == '(') { $flag = true; @@ -944,6 +994,7 @@ } } } + /* folder delimiter assignment(s) */ if ($this->folder_delimiter_override) { $delim = $this->folder_delimiter_override; } @@ -951,50 +1002,42 @@ $this->delimiter = $delim; $_SESSION['imap_delimiter'] = $this->delimiter; } + /* get each folder name part of the complete hierarchy */ + $folder_parts = array(); if ($delim && strstr($folder, $delim)) { $temp_parts = explode($delim, $folder); - $folder_parts = array(); foreach ($temp_parts as $g) { if (trim($g)) { $folder_parts[] = $g; } } } + else { + $folder_parts[] = $folder; + } + /* get the basename part of the folder name. For a folder named "inbox.sent.march" + * with a delimiter of "." the basename would be "march" */ if (isset($folder_parts[(count($folder_parts) - 1)])) { $base_name = $folder_parts[(count($folder_parts) - 1)]; } else { $base_name = $folder; } - if ($this->folder_exclude_hidden) { - if (substr($base_name, 0, 1) == '.') { - if (!in_array($base_name, $excluded)) { - $excluded[] = $base_name; - } - continue; - } - else { - $excl = false; - foreach ($folder_parts as $v) { - if (substr($v, 0, 1) == '.') { - $excl = true; - if (!in_array($v, $excluded)) { - $excluded[] = $v; - } - break; - } - } - if ($excl) { - continue; - } - } + /* get folder path properties */ + list($excluded, $hidden, $special) = $this->check_folder_path($folder, $folder_parts, $delim); + /* if configured to exclude UNIX "hidden" folder (ones beginning with a dot) + * filter them from the list now */ + if ($this->folder_exclude_hidden && $excluded) { + continue; } + /* determine the parent folder basename if it exists */ if (isset($folder_parts[(count($folder_parts) - 2)])) { $parent = join($delim, array_slice($folder_parts, 0, -1)); if ($parent.$delim == $namespace) { $parent = ''; } } + /* build properties from the flags string */ if (stristr($flags, 'marked')) { $marked = true; } @@ -1007,53 +1050,30 @@ if ($folder != 'INBOX' && $folder != $namespace && stristr($flags, 'noselect')) { $no_select = true; } - if (isset($_SESSION['user_settings']['hidden_folders']) && in_array($folder, $_SESSION['user_settings']['hidden_folders'])) { - $hidden = true; - } + /* check for a custom per folder sort option */ if (isset($_SESSION['user_settings']['sort_by'][$folder])) { $folder_sort_by = $_SESSION['user_settings']['sort_by'][$folder]; } + /* determine if this folder should be checked for new messages */ if (isset($_SESSION['user_settings']['folder_check']) && in_array($folder, $_SESSION['user_settings']['folder_check'])) { $check_for_new = true; } - $temp_name = ''; - if (!empty($folder_parts)) { - $temp_name = ''; - foreach ($folder_parts as $name) { - if ($temp_name) { - $temp_name = $delim.$this->prep_folder_name($name, false, false, false); - } - else { - $temp_name = $this->prep_folder_name($name, false, false, false); - } - if (in_array($temp_name, $this->folder_special)) { - $special = true; - break; - } - } - if (!$special && in_array($folder, $this->folder_special)) { - $special = true; - } - } - else { - if (in_array($folder, $this->folder_special)) { - $special = true; - } - } - if (!isset($folders[$folder]) && $folder) { - $folders[$folder] = array('parent' => $parent, 'delim' => $delim, 'name' => $folder, - 'name_parts' => $folder_parts, 'basename' => $base_name, - 'realname' => $folder, 'namespace' => $namespace, 'marked' => $marked, - 'noselect' => $no_select, 'can_have_kids' => $can_have_kids, - 'has_kids' => $has_kids, 'special' => $special, 'hidden' => $hidden, - 'check_for_new' => $check_for_new, 'sort_by' => $folder_sort_by, - 'ns_class' => $ns_class); - } + /* store the results in the big folder list struct */ + $folders[$folder] = array('parent' => $parent, 'delim' => $delim, 'name' => $folder, + 'name_parts' => $folder_parts, 'basename' => $base_name, + 'realname' => $folder, 'namespace' => $namespace, 'marked' => $marked, + 'noselect' => $no_select, 'can_have_kids' => $can_have_kids, + 'has_kids' => $has_kids, 'special' => $special, 'hidden' => $hidden, + 'check_for_new' => $check_for_new, 'sort_by' => $folder_sort_by, + 'ns_class' => $ns_class); + /* store a parent list used below */ if ($parent && !in_array($parent, $parents)) { $parents[$parent][] = $folders[$folder]; } } } + /* attempt to fix broken hierarchy issues. If a parent folder was not found fabricate + * it in the folder list */ $place_holders = array(); foreach ($parents as $val => $parent_list) { foreach ($parent_list as $parent) { @@ -1080,25 +1100,28 @@ } $place_holders[] = $fname; $folders[$fname] = array('parent' => $fparent, 'delim' => $delim, 'name' => $freal, - 'name_parts' => $name_parts, 'basename' => $freal, - 'realname' => $fname, 'namespace' => $namespace, 'marked' => false, - 'noselect' => true, 'can_have_kids' => true, - 'has_kids' => true, 'special' => false, 'hidden' => false, - 'check_for_new' => false, 'sort_by' => false, 'ns_class' => $ns_class); + 'name_parts' => $name_parts, 'basename' => $freal, 'realname' => $fname, + 'namespace' => $namespace, 'marked' => false, 'noselect' => true, + 'can_have_kids' => true, 'has_kids' => true, 'special' => false, 'hidden' => false, + 'check_for_new' => false, 'sort_by' => false, 'ns_class' => $ns_class); } } } } } } + /* reset some stuff in the session */ $_SESSION['folder_place_holders'] = $place_holders; - uksort($folders, 'folder_sort'); if (isset($_SESSION['folder_state'])) { unset($_SESSION['folder_state']); } + /* sort the main list first */ + uksort($folders, 'folder_sort'); + /* lists used to hold different classes of folders */ $new_folders = array(); $special_folders = array(); $index_vals = array(); + /* split folders into index_vals, special_folders, and the rest */ foreach ($folders as $index => $vals) { if (strtoupper($index) == 'INBOX' || $index == $namespace) { $index_vals['INBOX'] = $vals; @@ -1114,6 +1137,7 @@ $new_folders[$index] = $vals; } } + /* pull out the parent folders of special folders */ foreach ($special_folders as $i => $vals) { if (!empty($vals['name_parts'])) { $special_parent = ''; @@ -1132,18 +1156,23 @@ } } } + /* sort special folders */ uksort($special_folders, 'folder_sort'); + /* array to hold the final merged folder list */ $folders = array(); + /* merge the index vals, special folders, and regular folders in order */ foreach (array('index_vals', 'special_folders', 'new_folders') as $folder_type) { foreach ($$folder_type as $i => $v) { $folders[$i] = $v; } } + /* ALL account need an inbox. If we did not find one manually add it to the results */ if (!isset($folders['INBOX'])) { $folders = array_merge(array('INBOX' => array( 'name' => 'INBOX', 'basename' => 'INBOX', 'realname' => 'INBOX', 'noselect' => false, 'parent' => false, 'hidden' => false, 'has_kids' => false, 'special' => false)), $folders); } + /* save the final list */ $_SESSION['folders'] = $folders; $this->folder_list = $folders; } Modified: trunk/hastymail2/lib/post_action_classes/folders.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/folders.php 2012-12-10 16:01:40 UTC (rev 2133) +++ trunk/hastymail2/lib/post_action_classes/folders.php 2012-12-28 20:46:51 UTC (rev 2134) @@ -73,9 +73,9 @@ $_SESSION['user_settings']['folder_check'] = $new_mail; $_SESSION['user_settings']['hidden_folders'] = $hidden; $_SESSION['user_settings']['sort_by'] = $sort_by; - $user->page_data['settings'] = $_SESSION['user_settings']; $this->write_settings(); $imap->get_folders(true); + $user->page_data['settings'] = $_SESSION['user_settings']; foreach ($_SESSION['folders'] as $vals) { if (isset($_SESSION['header_cache'][$vals['name']])) { $_SESSION['header_cache_refresh'][$vals['name']] = 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2012-12-10 16:01:50
|
Revision: 2133 http://hastymail.svn.sourceforge.net/hastymail/?rev=2133&view=rev Author: sailfrog Date: 2012-12-10 16:01:40 +0000 (Mon, 10 Dec 2012) Log Message: ----------- fix NTLM type one message to use minimal fields and be correctly generated Modified Paths: -------------- trunk/hastymail2/lib/smtp_class.php Modified: trunk/hastymail2/lib/smtp_class.php =================================================================== --- trunk/hastymail2/lib/smtp_class.php 2012-12-10 15:09:15 UTC (rev 2132) +++ trunk/hastymail2/lib/smtp_class.php 2012-12-10 16:01:40 UTC (rev 2133) @@ -373,7 +373,7 @@ } break; case 'ntlm': - $command = 'AUTH NTLM TlRMTVNTUAABAAAABzIAAAYABgArAAAACwALACAAAABXT1JLU1RBVElPTkRPTUFJTg=='; + $command = 'AUTH NTLM '.$this->build_ntlm_type_one(); $this->send_command($command); $response = $this->get_response(); if (empty($response) || !isset($response[0][1][0]) || $this->compare_response($response,'334') != 0) { @@ -449,6 +449,13 @@ $res['names'] = $names; return $res; } + /* build initial NTLM message string */ + function build_ntlm_type_one() { + $pre = 'NTLMSSP'.chr(0); + $type = pack('V', 1); + $flags = pack('V', 0x00000201); + return base64_encode($pre.$type.$flags); + } /* build NTLM challenge response string */ function build_ntlm_type_three($msg_data, $username, $password) { $username = iconv('UTF-8', 'UTF-16LE', $username); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2012-12-10 15:09:26
|
Revision: 2132 http://hastymail.svn.sourceforge.net/hastymail/?rev=2132&view=rev Author: sailfrog Date: 2012-12-10 15:09:15 +0000 (Mon, 10 Dec 2012) Log Message: ----------- preliminary SMTP NTLM authentication support. Modified Paths: -------------- trunk/hastymail2/lib/smtp_class.php Modified: trunk/hastymail2/lib/smtp_class.php =================================================================== --- trunk/hastymail2/lib/smtp_class.php 2012-11-30 18:32:19 UTC (rev 2131) +++ trunk/hastymail2/lib/smtp_class.php 2012-12-10 15:09:15 UTC (rev 2132) @@ -372,12 +372,25 @@ $this->send_command($command); } break; + case 'ntlm': + $command = 'AUTH NTLM TlRMTVNTUAABAAAABzIAAAYABgArAAAACwALACAAAABXT1JLU1RBVElPTkRPTUFJTg=='; + $this->send_command($command); + $response = $this->get_response(); + if (empty($response) || !isset($response[0][1][0]) || $this->compare_response($response,'334') != 0) { + $result = 'FATAL: SMTP server does not support AUTH NTLM'; + } + else { + $ntlm_res = $this->parse_ntlm_type_two($response[0][1][0]); + $command = $this->build_ntlm_type_three($ntlm_res, $username, $password); + $this->send_command($command); + } + break; case 'login': $command = 'AUTH LOGIN'; $this->send_command($command); $response = $this->get_response(); if (empty($response) || $this->compare_response($response,'334') != 0) { - $result = 'FATAL: SMTP server does ont support AUTH LOGIN'; + $result = 'FATAL: SMTP server does not support AUTH LOGIN'; } else { $command = base64_encode($username); @@ -414,7 +427,116 @@ } return $result; } + /* parse NTLM challenge string */ + function parse_ntlm_type_two($bin_str) { + $res = array(); + $res['vals'] = unpack('a8prefix/Vtype/vname_len/vname_space/Vname_offset/Vflags/A8challenge/A8context/vtarget_len/vtarget_space/Vtarget_offset', base64_decode($bin_str)); + $res['name'] = unpack('A'.$res['vals']['name_len'].'name', substr(base64_decode($bin_str), $res['vals']['name_offset'], $res['vals']['name_len'])); + $target = substr(base64_decode($bin_str), $res['vals']['target_offset'], $res['vals']['target_len']); + $flds = array(2 => 'domain', 1 => 'server', 4 => 'dns_domain', 3 => 'dns_server'); + $names = array('domain' => '', 'server' => '', 'dns_domain' => '', 'dns_server' => ''); + while ($target) { + $atts = unpack('vfld/vlen', $target); + if ($atts['fld'] == 0) { + break; + } + $fld = unpack('A'.$atts['len'], substr($target, 4)); + if (isset($flds[$atts['fld']])) { + $names[$flds[$atts['fld']]] = $fld; + } + $target = substr($target, (4 + $atts['len'])); + } + $res['names'] = $names; + return $res; + } + /* build NTLM challenge response string */ + function build_ntlm_type_three($msg_data, $username, $password) { + $username = iconv('UTF-8', 'UTF-16LE', $username); + $target = $msg_data['name']['name']; + $host = iconv('UTF-8', 'UTF-16LE', php_uname('n')); + $pre = 'NTLMSSP'.chr(0); + $type = pack('V', 3); + $lm_response = $this->build_lm_response($msg_data, $username, $password); + $ntlm_response = $this->build_ntlm_response($msg_data, $username, $password); + $flags = pack('V', 0x00000201); + $offset = strlen($pre.$type)+52; + $target_sec = $this->ntlm_security_buffer(strlen($target), $offset); + $offset += strlen($target); + $user_sec = $this->ntlm_security_buffer(strlen($username), $offset); + $offset += strlen($username); + $host_sec = $this->ntlm_security_buffer(strlen($host), $offset); + $offset += strlen($host); + $lm_sec = $this->ntlm_security_buffer(strlen($lm_response), $offset); + $offset += strlen($lm_response); + $ntlm_sec = $this->ntlm_security_buffer(strlen($ntlm_response), $offset); + $offset += strlen($ntlm_response); + $sess_sec = $this->ntlm_security_buffer(0, $offset); + return base64_encode($pre.$type.$lm_sec.$ntlm_sec.$target_sec.$user_sec.$host_sec.$sess_sec.$flags.$target.$username.$host.$lm_response.$ntlm_response); + } + /* build an NTLM "security buffer" for the type 3 response string */ + function ntlm_security_buffer($len, $offset) { + return pack('vvV', $len, $len, $offset); + } + /* build the NTLM lm hash then ecnrypt the challenge string with it */ + function build_lm_response($msg_data, $username, $password){ + $pass = strtoupper($password); + while (strlen($pass) < 14) { + $pass .= chr(0); + } + if (strlen($pass) > 14) { + return str_repeat(chr(0), 16); + } + $p1 = substr($pass, 0, 7); + $p2 = substr($pass, 7); + $lm_hash = $this->des_encrypt($p1).$this->des_encrypt($p2); + while (strlen($lm_hash) < 21) { + $lm_hash .= chr(0); + } + return $this->apply_ntlm_hash($msg_data['vals']['challenge'], $lm_hash); + } + /* build the NTLM ntlm hash then ecnrypt the challenge string with it */ + function build_ntlm_response($msg_data, $username, $password){ + $password = iconv('UTF-8', 'UTF-16LE', $password); + $ntlm_hash = hash('md4', $password, true); + while (strlen($ntlm_hash) < 21) { + $ntlm_hash .= chr(0); + } + return $this->apply_ntlm_hash($msg_data['vals']['challenge'], $ntlm_hash); + } + /* encrypt the challenge string with the lm/ntlm hash */ + function apply_ntlm_hash($challenge, $hash) { + $p1 = substr($hash, 0, 7); + $p2 = substr($hash, 7, 7); + $p3 = substr($hash, 14, 7); + return $this->des_encrypt($p1, $challenge). + $this->des_encrypt($p2, $challenge). + $this->des_encrypt($p3, $challenge); + } + /* NTLM compatible DES encryption */ + function des_encrypt($string, $challenge='KGS!@#$%') { + $key = array(); + $tmp = array(); + $len = strlen($string); + for ($i=0; $i<7; ++$i) + $tmp[] = $i < $len ? ord($string[$i]) : 0; + $key[] = $tmp[0] & 254; + $key[] = ($tmp[0] << 7) | ($tmp[1] >> 1); + $key[] = ($tmp[1] << 6) | ($tmp[2] >> 2); + $key[] = ($tmp[2] << 5) | ($tmp[3] >> 3); + $key[] = ($tmp[3] << 4) | ($tmp[4] >> 4); + $key[] = ($tmp[4] << 3) | ($tmp[5] >> 5); + $key[] = ($tmp[5] << 2) | ($tmp[6] >> 6); + $key[] = $tmp[6] << 1; + $is = mcrypt_get_iv_size(MCRYPT_DES, MCRYPT_MODE_ECB); + $iv = mcrypt_create_iv($is, MCRYPT_RAND); + $key0 = ""; + foreach ($key as $k) + $key0 .= chr($k); + $crypt = mcrypt_encrypt(MCRYPT_DES, $key0, $challenge, MCRYPT_MODE_ECB, $iv); + return $crypt; + } + /* Send a message */ function send_message($from, $recipients, $message) { global $conf; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2012-11-30 18:32:26
|
Revision: 2131 http://hastymail.svn.sourceforge.net/hastymail/?rev=2131&view=rev Author: sailfrog Date: 2012-11-30 18:32:19 +0000 (Fri, 30 Nov 2012) Log Message: ----------- better fix for message part searching Modified Paths: -------------- trunk/hastymail2/lib/url_action_class.php Modified: trunk/hastymail2/lib/url_action_class.php =================================================================== --- trunk/hastymail2/lib/url_action_class.php 2012-11-30 15:15:06 UTC (rev 2130) +++ trunk/hastymail2/lib/url_action_class.php 2012-11-30 18:32:19 UTC (rev 2131) @@ -626,7 +626,7 @@ } $subs = array(); foreach ($struct as $id => $vals) { - if ($part && $id === $part) { + if ($part && (string) $id === $part) { $vals['imap_id'] = $id; $res = $vals; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |