Thread: [Hastymail-cvs] SF.net SVN: hastymail:[584] trunk/hastymail2/lib
Brought to you by:
sailfrog,
slushpupie
From: <sai...@us...> - 2008-10-29 03:53:05
|
Revision: 584 http://hastymail.svn.sourceforge.net/hastymail/?rev=584&view=rev Author: sailfrog Date: 2008-10-29 03:52:55 +0000 (Wed, 29 Oct 2008) Log Message: ----------- warning fixes thanks to James Turner Modified Paths: -------------- trunk/hastymail2/lib/misc_functions.php trunk/hastymail2/lib/smtp_class.php Modified: trunk/hastymail2/lib/misc_functions.php =================================================================== --- trunk/hastymail2/lib/misc_functions.php 2008-10-27 04:51:02 UTC (rev 583) +++ trunk/hastymail2/lib/misc_functions.php 2008-10-29 03:52:55 UTC (rev 584) @@ -136,7 +136,7 @@ /* HTTP headers, XML declaration, doc type */ function set_page_headers() { global $pd; - if (strpos($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml') !== false) { + if (isset($_SERVER['HTTP_ACCEPT']) && strpos($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml') !== false) { $declaration = '<?xml version="1.0" encoding="UTF-8"?>'. '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'. '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">'; Modified: trunk/hastymail2/lib/smtp_class.php =================================================================== --- trunk/hastymail2/lib/smtp_class.php 2008-10-27 04:51:02 UTC (rev 583) +++ trunk/hastymail2/lib/smtp_class.php 2008-10-29 03:52:55 UTC (rev 584) @@ -170,7 +170,7 @@ $this->supports_auth = $auth_mecs; break; case 'size': // advisary maximum message size - if(is_numeric($line[1][1])) { + if(isset($line[1][1]) && is_numeric($line[1][1])) { $this->max_message_size = $line[1][1]; } break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2008-11-14 04:35:44
|
Revision: 592 http://hastymail.svn.sourceforge.net/hastymail/?rev=592&view=rev Author: sailfrog Date: 2008-11-14 04:35:42 +0000 (Fri, 14 Nov 2008) Log Message: ----------- The latest removal of some htmlentities and htmlspecialchars calls fixed some problems with non-ascii characters, but caused w3c validation problems. Now pages are passing as valid xhtml transitional. Modified Paths: -------------- trunk/hastymail2/lib/site_page_class.php trunk/hastymail2/lib/utility_classes.php Modified: trunk/hastymail2/lib/site_page_class.php =================================================================== --- trunk/hastymail2/lib/site_page_class.php 2008-11-14 03:06:18 UTC (rev 591) +++ trunk/hastymail2/lib/site_page_class.php 2008-11-14 04:35:42 UTC (rev 592) @@ -95,7 +95,7 @@ $data .= 'var do_new_page_refresh = 0;'; } if ($this->pd['settings']['dropdown_ajax']) { - $data .= 'var do_folder_dropdown = \''.$this->pd['mailbox'].'\';'; + $data .= 'var do_folder_dropdown = \''.$this->user->user_action->hm_htmlentities($this->pd['mailbox']).'\';'; } else { $data .= 'var do_folder_dropdown = 0;'; @@ -223,7 +223,7 @@ if (!isset($this->pd['settings']['mailbox_freeze']) || !$this->pd['settings']['mailbox_freeze']) { return; } - $data = '<complex-'.$page_id.'><form method="post" action=""><input type="hidden" name="mailbox" value="'.urlencode($this->pd['mailbox']).'" /> + $data = '<complex-'.$page_id.'><form method="post" action=""><input type="hidden" name="mailbox" value="'.$this->user->htmlsafe($this->pd['mailbox']).'" />  '; if (isset($this->pd['frozen_folders'][$this->pd['mailbox']])) { $data .= '<input type="submit" name="unfreeze_mailbox" value="'.$this->user->str[30].'" />'; @@ -646,8 +646,7 @@ $data .= '<form method="post" action="">'; $data .= '<input type="hidden" name="uid" value="'.$this->pd['message_uid'].'" />'; $data .= '<input type="hidden" name="prev_uid" value="'.$this->pd['previous_uid'].'" />'; - $data .= '<input type="hidden" name="mailbox" value="'.$this->pd['mailbox'].'" />'; - $data .= '<input type="hidden" name="mailbox" value="'.$this->pd['mailbox'].'" />'; + $data .= '<input type="hidden" name="mailbox" value="'.$this->user->htmlsafe($this->pd['mailbox']).'" />'; $data .= '<input type="hidden" name="next_uid" value="'.$this->pd['next_uid'].'" />'; $data .= '<input type="hidden" name="sort_by" value="'.$this->pd['sort_by'].'" />'; $data .= '<input type="hidden" name="filter_by" value="'.$this->pd['filter_by'].'" />'; Modified: trunk/hastymail2/lib/utility_classes.php =================================================================== --- trunk/hastymail2/lib/utility_classes.php 2008-11-14 03:06:18 UTC (rev 591) +++ trunk/hastymail2/lib/utility_classes.php 2008-11-14 04:35:42 UTC (rev 592) @@ -262,9 +262,14 @@ } return $this->utf8_to_html(filter_html($string, $tags)); } + function hm_htmlentities($string) { + $chars = array('<', '>', '& ', '"', "'" ); + $ents = array('<', '>', '& ', '"', '''); + return str_replace($chars, $ents, $string); + } function html_safe($string) { //return $this->utf8_to_html(str_replace(array('<', '>'), array('<', '>'), htmlentities($string, ENT_QUOTES, 'UTF-8'))); - return $this->utf8_to_html(str_replace(array('<', '>'), array('<', '>'), $string)); + return $this->utf8_to_html($this->hm_htmlentities($string)); } function is_utf($string) { return preg_match('%(?: @@ -1152,16 +1157,16 @@ if ($decode) { //$string = htmlentities($this->decode_fld($string, $charset), false, 'UTF-8'); $string = $this->decode_fld($string, $charset); - $string = $this->user_action->utf8_to_html(str_replace(array('<', '>'), array('<', '>'), ($string))); + $string = $this->user_action->utf8_to_html($this->user_action->hm_htmlentities($string)); } elseif ($charset && $charset != 'us-ascii') { list ($entities, $string) = $this->user_action->utf8_convert($string, $charset, $interface_str); if ($entities) { - $string = $this->user_action->utf8_to_html(str_replace(array('<', '>'), array('<', '>'), $string)); + $string = $this->user_action->utf8_to_html($this->user_action->hm_htmlentities($string)); } else { //$string = $this->user_action->utf8_to_html(str_replace(array('<', '>'), array('<', '>'), (htmlspecialchars($string, false, 'UTF-8')))); - $string = $this->user_action->utf8_to_html(str_replace(array('<', '>'), array('<', '>'), ($string))); + $string = $this->user_action->utf8_to_html($this->user_action->hm_htmlentities($string)); } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2008-11-24 02:29:04
|
Revision: 605 http://hastymail.svn.sourceforge.net/hastymail/?rev=605&view=rev Author: sailfrog Date: 2008-11-24 02:28:55 +0000 (Mon, 24 Nov 2008) Log Message: ----------- added an "expunge INBOX on logout" option Modified Paths: -------------- trunk/hastymail2/lib/post_action_class.php trunk/hastymail2/lib/site_page_class.php trunk/hastymail2/lib/url_action_class.php trunk/hastymail2/lib/utility_classes.php Modified: trunk/hastymail2/lib/post_action_class.php =================================================================== --- trunk/hastymail2/lib/post_action_class.php 2008-11-24 01:44:59 UTC (rev 604) +++ trunk/hastymail2/lib/post_action_class.php 2008-11-24 02:28:55 UTC (rev 605) @@ -70,6 +70,7 @@ 'mailbox_date_format' => array('string', 0, 'Mailbox time format'), 'mailbox_date_format_2' => array('string', 0, 'Mailbox time format'), 'auto_switch_simple_mode'=> array('true', 0, 'Auto switch display mode'), + 'expunge_on_exit' => array('true', 0, 'Expunge INBOX on exit'), 'start_page' => array('string', 0, 'First page after login'), ), 'unfreeze_mailbox' => array( @@ -1293,10 +1294,7 @@ $this->errors[] = $user->str[355]; $this->form_redirect = true; if (isset($post['reply_box']) && isset($post['reply_uid']) && $post['reply_uid']) { - $status = $imap->select_mailbox($post['reply_box'], false, false, true); - if ($status) { - $this->perform_imap_action('ANSWERED', $post['reply_box'], array($post['reply_uid']), false, false); - } + $this->perform_imap_action('ANSWERED', $post['reply_box'], array($post['reply_uid']), false, false); } } if (!isset($post['compose_skip_sent']) || !$post['compose_skip_sent']) { @@ -2277,6 +2275,12 @@ else { $settings['auto_switch_simple_mode'] = 0; } + if (isset($post['expunge_on_exit']) && $post['expunge_on_exit']) { + $settings['expunge_on_exit'] = 1; + } + else { + $settings['expunge_on_exit'] = 0; + } if (isset($post['time_format']) && isset($time_formats[$post['time_format']])) { $settings['time_format'] = $post['time_format']; } Modified: trunk/hastymail2/lib/site_page_class.php =================================================================== --- trunk/hastymail2/lib/site_page_class.php 2008-11-24 01:44:59 UTC (rev 604) +++ trunk/hastymail2/lib/site_page_class.php 2008-11-24 02:28:55 UTC (rev 605) @@ -936,6 +936,9 @@ $data .= '<tr><td class="opt_leftcol">'.$this->user->str[206].'</td><td><input name="auto_switch_simple_mode" type="checkbox" '; if (isset($vals['auto_switch_simple_mode']) && $vals['auto_switch_simple_mode']) { $data .= 'checked="checked" '; } $data .= 'value="1" /></td></tr>'; + $data .= '<tr><td class="opt_leftcol">Expunge INBOX on logout</td><td><input name="expunge_on_exit" type="checkbox" '; + if (isset($vals['expunge_on_exit']) && $vals['expunge_on_exit']) { $data .= 'checked="checked" '; } + $data .= 'value="1" /></td></tr>'; $data .= '<tr><td class="opt_leftcol"><a href="?page=profile">'.$this->user->str[207].'</a></td></tr>'; $data .= do_display_hook('general_options_table'); $data .= '<tr><td colspan="4" class="opt_leftcol"><br />'. Modified: trunk/hastymail2/lib/url_action_class.php =================================================================== --- trunk/hastymail2/lib/url_action_class.php 2008-11-24 01:44:59 UTC (rev 604) +++ trunk/hastymail2/lib/url_action_class.php 2008-11-24 02:28:55 UTC (rev 605) @@ -287,6 +287,15 @@ $hm_tags['simple'] = false; } } +function logout_actions() { + global $user; + $this->set_user_config(); + if (isset($_SESSION['user_settings']['expunge_on_exit']) && + $_SESSION['user_settings']['expunge_on_exit']) { + $this->perform_imap_action('EXPUNGE', 'INBOX', array(), false, false, false, true); + } + $user->user_session->close_session(); +} /* url action functions */ function url_action_thread_view($get) { global $imap; @@ -2174,7 +2183,7 @@ } return $res; } -function perform_imap_action($action, $mailbox, $uids, $trash_folder, $destination, $uid_string=false) { +function perform_imap_action($action, $mailbox, $uids, $trash_folder, $destination, $uid_string=false, $force=false) { global $imap; global $user; if ($uid_string) { @@ -2203,7 +2212,7 @@ } } } - if ($bail) { + if ($bail && !$force) { return; } if ($status) { @@ -2321,7 +2330,7 @@ break; case 'EXPUNGE': $status = $imap->message_action($uids, 'EXPUNGE', false, $uid_string); - if ($status) { + if ($status && !$force) { if (isset($_SESSION['user_settings']['selective_expunge']) && $_SESSION['user_settings']['selective_expunge']) { $this->errors[] = $user->str[410].': '.count($uids).' ('.$user->htmlsafe($mailbox).')'; } @@ -2329,7 +2338,7 @@ $this->errors[] = $user->str[410].' ('.$user->htmlsafe($mailbox).')'; } } - else { + elseif (!$force) { $this->errors[] = $user->str[404]; } Modified: trunk/hastymail2/lib/utility_classes.php =================================================================== --- trunk/hastymail2/lib/utility_classes.php 2008-11-24 01:44:59 UTC (rev 604) +++ trunk/hastymail2/lib/utility_classes.php 2008-11-24 02:28:55 UTC (rev 605) @@ -803,10 +803,19 @@ global $imap; ini_set('arg_separator.output', '&'); if ($this->logout) { + if ($user->use_cookies) { + ini_set('session.use_cookies', 1); + ini_set('session.use_trans_sid', 0); + session_name($this->cookie_name); + } + else { + ini_set('session.use_trans_sid', 1); + ini_set('session.use_cookies', 0); + ob_start(); + } + session_start(); + $user->user_action->logout_actions(); $this->logged_in = false; - ini_set('session.use_cookies', 0); - ini_set('session.use_trans_sid', 0); - session_start(); if ($user->use_cookies) { setcookie($this->cookie_name, '', time()-42000, '/'); } @@ -848,7 +857,6 @@ } } } - //$imap_connect = $this->imap_continue(); $this->recrypt_pass(); $this->logged_in = true; $this->just_logged_in = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2008-12-01 00:44:52
|
Revision: 620 http://hastymail.svn.sourceforge.net/hastymail/?rev=620&view=rev Author: sailfrog Date: 2008-12-01 00:44:50 +0000 (Mon, 01 Dec 2008) Log Message: ----------- fix bug with setting the folder update interval Modified Paths: -------------- trunk/hastymail2/lib/post_action_class.php trunk/hastymail2/lib/site_page_class.php Modified: trunk/hastymail2/lib/post_action_class.php =================================================================== --- trunk/hastymail2/lib/post_action_class.php 2008-12-01 00:15:37 UTC (rev 619) +++ trunk/hastymail2/lib/post_action_class.php 2008-12-01 00:44:50 UTC (rev 620) @@ -31,7 +31,7 @@ 'show_folder_list' => array('true', 0, 'Show Folder List'), 'folder_style' => array('int', 1, 'Folder Style'), 'folder_detail' => array('int', 1, 'Folder Detail'), - 'folder_update_interval' => array('int', 0, 'Folder Update Interval'), + 'ajax_update_interval' => array('int', 0, 'Folder Update Interval'), 'lang' => array('string', 1, 'Language'), 'theme' => array('string', 1, 'Theme'), 'font_size' => array('int', 1, 'Font Size'), @@ -2327,8 +2327,8 @@ $settings['trash_folder'] = $post['trash_folder']; } $settings['dropdown_ajax'] = 0; - if (isset($post['folder_update_interval'])) { - $int = (int) $post['folder_update_interval']; + if (isset($post['ajax_update_interval'])) { + $int = (int) $post['ajax_update_interval']; if ($int >= 60 && $int <= 1200) { $settings['dropdown_ajax'] = 1; $settings['ajax_update_interval'] = $int; Modified: trunk/hastymail2/lib/site_page_class.php =================================================================== --- trunk/hastymail2/lib/site_page_class.php 2008-12-01 00:15:37 UTC (rev 619) +++ trunk/hastymail2/lib/site_page_class.php 2008-12-01 00:44:50 UTC (rev 620) @@ -1045,7 +1045,7 @@ if ($vals['folder_detail'] == 2) { $data .= 'selected="selected" '; } $data .= '>'.$this->user->str[304].'</option></select></td></tr>'; if ($this->user->ajax_enabled) { - $data .= '<tr><td class="opt_leftcol">'.$this->user->str[213].' <span class="js1">*</span></td><td><select name="folder_update_interval"><option value="0">'.$this->user->str[242].'</option>'; + $data .= '<tr><td class="opt_leftcol">'.$this->user->str[213].' <span class="js1">*</span></td><td><select name="ajax_update_interval"><option value="0">'.$this->user->str[242].'</option>'; foreach ($update_intervals as $i => $v) { $data .= '<option '; if ($vals['ajax_update_interval'] == $i) { $data .= 'selected="selected" '; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2008-12-15 00:08:14
|
Revision: 644 http://hastymail.svn.sourceforge.net/hastymail/?rev=644&view=rev Author: sailfrog Date: 2008-12-15 00:08:09 +0000 (Mon, 15 Dec 2008) Log Message: ----------- disable folder page settings for place holder folders Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php trunk/hastymail2/lib/site_page_class.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2008-12-14 23:55:46 UTC (rev 643) +++ trunk/hastymail2/lib/imap_class.php 2008-12-15 00:08:09 UTC (rev 644) @@ -894,6 +894,7 @@ } } } + $place_holders = array(); foreach ($parents as $val => $parent) { $found = false; foreach ($folders as $vals) { @@ -914,6 +915,7 @@ $fparent = false; $freal = $fname; } + $place_holders[] = $freal; $folders[$fname] = array('parent' => $fparent, 'delim' => $delim, 'name' => $freal, 'name_parts' => $parent['name_parts'], 'basename' => $fname, 'realname' => $freal, 'namespace' => $namespace, 'marked' => false, @@ -923,6 +925,7 @@ } } } + $_SESSION['folder_place_holders'] = $place_holders; uksort($folders, 'folder_sort'); if (isset($_SESSION['folder_state'])) { unset($_SESSION['folder_state']); Modified: trunk/hastymail2/lib/site_page_class.php =================================================================== --- trunk/hastymail2/lib/site_page_class.php 2008-12-14 23:55:46 UTC (rev 643) +++ trunk/hastymail2/lib/site_page_class.php 2008-12-15 00:08:09 UTC (rev 644) @@ -157,7 +157,7 @@ } return $data; } -function print_sort_form($name=false) { +function print_sort_form($name=false, $disabled=false) { global $sort_types; global $client_sort_types; global $page_id; @@ -171,11 +171,16 @@ $types = $client_sort_types; } if ($name !== false) { - $data .= '<select name="sort_by['.$name.']">'; + $data .= '<select '; + if ($disabled) { + $data .= 'disabled="disabled" '; + } + $data .= 'name="sort_by['.$name.']">'; } else { $data .= '<input type="hidden" name="page" value="mailbox" /><input type="hidden" name="mailbox" value="'. - $this->user->htmlsafe($this->pd['mailbox']).'" />'.$this->user->str[39].' <select name="sort_by" '; + $this->user->htmlsafe($this->pd['mailbox']).'" />'.$this->user->str[39].' <select '; + $data .= 'name="sort_by" '; if (isset($this->pd['frozen_folders'][$this->pd['mailbox']])) { $data .= 'class="disabled_sort" disabled="disabled" '; } $data .= 'onchange="display_notice(this, \'Resorting Mailbox...\');">'; } @@ -1940,6 +1945,12 @@ $n = 1; foreach ($this->pd['folders'] as $vals) { $this->pd['sort_by'] = ''; + if (isset($_SESSION['folder_place_holders']) && in_array($vals['realname'], $_SESSION['folder_place_holders'])) { + $disabled = 'disabled="disabled" '; + } + else { + $disabled = ''; + } $data.= '<tr><td '; $class= ''; if (isset($this->pd['settings']['hidden_folders']) && in_array($vals['realname'], $this->pd['settings']['hidden_folders'])) { @@ -1947,12 +1958,12 @@ $data .= $class; } $data .= '>'.$this->user->htmlsafe($vals['realname'], false, false, true).'</td> - <td '.$class.'><input type="checkbox" '; + <td '.$class.'><input '.$disabled.' type="checkbox" '; if (isset($this->pd['settings']['hidden_folders']) && in_array($vals['realname'], $this->pd['settings']['hidden_folders'])) { $data .= 'checked="checked" '; } $data .= 'name="hidden[]" id="hidden_'.$n.'" value="'.$this->user->htmlsafe($vals['realname'], false, false, true).'" /></td> - <td '.$class.'><input type="checkbox" '; + <td '.$class.'><input '.$disabled.' type="checkbox" '; if (isset($this->pd['settings']['folder_check']) && in_array($vals['realname'], $this->pd['settings']['folder_check'])) { $data .= 'checked="checked" '; } @@ -1964,7 +1975,7 @@ } $data .= 'name="check_for_new[]" id="check_for_new_'.$n.'" value="'.$this->user->htmlsafe($vals['realname'], false, false, true).'" /></td> <td '.$class.'><input type="hidden" name="mailbox_index['.$i.']" value="'.$this->user->htmlsafe($vals['realname'], false, false, true). - '" />'.$this->print_sort_form($i).'</td> + '" />'.$this->print_sort_form($i, $disabled).'</td> </tr>'; $i++; $n++; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2008-12-16 16:41:10
|
Revision: 649 http://hastymail.svn.sourceforge.net/hastymail/?rev=649&view=rev Author: sailfrog Date: 2008-12-16 16:40:58 +0000 (Tue, 16 Dec 2008) Log Message: ----------- small fix to the sort order of folders on the new mail page when added from the dialog on that page Modified Paths: -------------- trunk/hastymail2/lib/misc_functions.php trunk/hastymail2/lib/post_action_class.php Modified: trunk/hastymail2/lib/misc_functions.php =================================================================== --- trunk/hastymail2/lib/misc_functions.php 2008-12-15 05:34:36 UTC (rev 648) +++ trunk/hastymail2/lib/misc_functions.php 2008-12-16 16:40:58 UTC (rev 649) @@ -363,6 +363,17 @@ $data .= '</div>'; echo $data; } +function new_folder_sort($a, $b) { + if (strtoupper($a) == 'INBOX') { + return -1; + } + elseif (strtoupper($b) == 'INBOX') { + return 1; + } + else { + return strnatcasecmp($a, $b); + } +} function folder_sort($a, $b) { return strnatcasecmp($a, $b); } Modified: trunk/hastymail2/lib/post_action_class.php =================================================================== --- trunk/hastymail2/lib/post_action_class.php 2008-12-15 05:34:36 UTC (rev 648) +++ trunk/hastymail2/lib/post_action_class.php 2008-12-16 16:40:58 UTC (rev 649) @@ -1393,8 +1393,10 @@ if ($user->logged_in && isset($_SESSION['folders'][$post['new_page_folder']])) { $folder = $post['new_page_folder']; if (isset($_SESSION['user_settings']['folder_check']) && !in_array($folder, $_SESSION['user_settings']['folder_check'])) { - $_SESSION['user_settings']['folder_check'][] = $folder; - natsort($_SESSION['user_settings']['folder_check']); + $folders = $_SESSION['user_settings']['folder_check']; + $folders[] = $folder; + usort($folders, 'new_folder_sort'); + $_SESSION['user_settings']['folder_check'] = $folders; $this->write_settings(); $this->form_redirect = true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2008-12-18 23:22:02
|
Revision: 656 http://hastymail.svn.sourceforge.net/hastymail/?rev=656&view=rev Author: sailfrog Date: 2008-12-18 22:18:37 +0000 (Thu, 18 Dec 2008) Log Message: ----------- changes to allow plugins to have a simple translation system Modified Paths: -------------- trunk/hastymail2/lib/ajax_functions.php trunk/hastymail2/lib/misc_functions.php trunk/hastymail2/lib/utility_classes.php Modified: trunk/hastymail2/lib/ajax_functions.php =================================================================== --- trunk/hastymail2/lib/ajax_functions.php 2008-12-18 20:45:16 UTC (rev 655) +++ trunk/hastymail2/lib/ajax_functions.php 2008-12-18 22:18:37 UTC (rev 656) @@ -159,6 +159,7 @@ if (is_readable('plugins'.$f.$vals['plugin'].$f.'ajax.php')) { require_once('plugins'.$f.$vals['plugin'].$f.'ajax.php'); $ajax_functions[] = 'ajax_'.$vals['plugin'].'_'.$vals['name']; + $args[] = new plugin_tools($caller); break; } } Modified: trunk/hastymail2/lib/misc_functions.php =================================================================== --- trunk/hastymail2/lib/misc_functions.php 2008-12-18 20:45:16 UTC (rev 655) +++ trunk/hastymail2/lib/misc_functions.php 2008-12-18 22:18:37 UTC (rev 656) @@ -746,6 +746,7 @@ require_check($file); require_once($file); $name = $v.'_hooks'; + $langs = $v.'_langs'; if (isset($$name)) { foreach ($$name as $type => $vals) { if ($type == 'page_hook' && $vals) { @@ -768,6 +769,9 @@ } } } + if (isset($$langs)) { + $_SESSION['plugin_strings'][$v] = $$langs; + } } } } Modified: trunk/hastymail2/lib/utility_classes.php =================================================================== --- trunk/hastymail2/lib/utility_classes.php 2008-12-18 20:45:16 UTC (rev 655) +++ trunk/hastymail2/lib/utility_classes.php 2008-12-18 22:18:37 UTC (rev 656) @@ -1332,7 +1332,35 @@ $this->data_store = array(); $this->plugin = $plugin; $this->db = false; + $this->get_strings(); } + /* get plugin strings */ + function get_strings() { + global $user; + if (isset($_SESSION['plugin_strings'][$this->plugin])) { + $strings = $_SESSION['plugin_strings'][$this->plugin]; + if (isset($_SESSION['user_settings']['lang'])) { + $lang = $_SESSION['user_settings']['lang']; + } + elseif (isset($user->default_lang)) { + $lang = $user->default_lang; + } + else { + $lang = false; + } + if (isset($strings[$lang])) { + $this->str = $strings[$lang]; + } + else { + if (count($strings) > 0) { + $this->str = array_shift($strings); + } + } + } + else { + $this->str = array(); + } + } /* imap functions */ function imap_get_folders($force_update=false) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2009-03-04 23:20:54
|
Revision: 774 http://hastymail.svn.sourceforge.net/hastymail/?rev=774&view=rev Author: sailfrog Date: 2009-03-04 23:20:32 +0000 (Wed, 04 Mar 2009) Log Message: ----------- fix a small bug with the show folder list link. small imap method update Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php trunk/hastymail2/lib/post_action_classes/options.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2009-03-03 18:10:06 UTC (rev 773) +++ trunk/hastymail2/lib/imap_class.php 2009-03-04 23:20:32 UTC (rev 774) @@ -1712,7 +1712,12 @@ return $headers; } function get_message_part_start($uid, $message_part) { - $command = "UID FETCH $uid BODY[$message_part]\r\n"; + if ($message_part == 0) { + $command = "UID FETCH $uid BODY[]\r\n"; + } + else { + $command = "UID FETCH $uid BODY[$message_part]\r\n"; + } $this->send_command($command); $result = fgets($this->handle, 1024); $size = false; Modified: trunk/hastymail2/lib/post_action_classes/options.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/options.php 2009-03-03 18:10:06 UTC (rev 773) +++ trunk/hastymail2/lib/post_action_classes/options.php 2009-03-04 23:20:32 UTC (rev 774) @@ -273,6 +273,9 @@ $settings['show_folder_list'] = 1; } else { + if (isset($_SESSION['hide_folder_list'])) { + unset($_SESSION['hide_folder_list']); + } $settings['show_folder_list'] = 0; } if (isset($post['auto_switch_simple_mode']) && $post['auto_switch_simple_mode']) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2009-03-04 23:39:44
|
Revision: 775 http://hastymail.svn.sourceforge.net/hastymail/?rev=775&view=rev Author: sailfrog Date: 2009-03-04 23:39:34 +0000 (Wed, 04 Mar 2009) Log Message: ----------- redcue some duplicate code handling attachment headers Modified Paths: -------------- trunk/hastymail2/lib/post_action_classes/compose.php trunk/hastymail2/lib/smtp_class.php Modified: trunk/hastymail2/lib/post_action_classes/compose.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/compose.php 2009-03-04 23:20:32 UTC (rev 774) +++ trunk/hastymail2/lib/post_action_classes/compose.php 2009-03-04 23:39:34 UTC (rev 775) @@ -414,8 +414,7 @@ $imap->append_feed($email); if (isset($_SESSION['attachments']) && !empty($_SESSION['attachments'])) { foreach ($_SESSION['attachments'] as $i => $v) { - $headers = '--'.$message->boundry."\r\nContent-Type: ".$v['type'].'; name="'.$v['realname']."\"\r\nContent-Disposition: attachment; filename=\"". - $v['realname']."\"\r\nContent-Transfer-Encoding: base64\r\n"; + $headers = $message->build_part_header($v['realname'], $v['type'], 'base64'); if (substr($path, -1) != $delim) { $filename = $path.$delim.$i; } @@ -727,9 +726,7 @@ $imap->append_feed($email); if (isset($_SESSION['attachments']) && !empty($_SESSION['attachments'])) { foreach ($_SESSION['attachments'] as $i => $v) { - $headers = '--'.$message->boundry."\r\nContent-Type: ".$v['type'].'; name="'.$v['realname']. - "\"\r\nContent-Disposition: attachment; filename=\"". - $v['realname']."\"\r\nContent-Transfer-Encoding: base64\r\n"; + $headers = $message->build_part_header($v['realname'], $v['type'], 'base64'); if (substr($path, -1) != $delim) { $filename = $path.$delim.$i; } Modified: trunk/hastymail2/lib/smtp_class.php =================================================================== --- trunk/hastymail2/lib/smtp_class.php 2009-03-04 23:20:32 UTC (rev 774) +++ trunk/hastymail2/lib/smtp_class.php 2009-03-04 23:39:34 UTC (rev 775) @@ -397,8 +397,7 @@ $path = $conf['attachments_path']; $delim = $conf['filesystem_delim']; foreach ($_SESSION['attachments'] as $i => $v) { - $headers = '--'.$message->boundry."\r\nContent-Type: ".$v['type'].'; name="'.$v['realname']."\"\r\nContent-Disposition: attachment; filename=\"". - $v['realname']."\"\r\nContent-Transfer-Encoding: base64\r\n"; + $headers = $message->build_part_header($v['realname'], $v['type'], 'base64'); if (substr($path, -1) != $delim) { $filename = $path.$delim.$i; } @@ -790,11 +789,15 @@ } return $this->header_str."\r\n".$body; } + function build_part_header($filename, $type, $encoding) { + return '--'.$this->boundry."\r\nContent-Type: ".$type.'; name="'.$filename."\"\r\n". + "Content-Disposition: attachment; filename=\"".$filename."\"\r\n". + "Content-Transfer-Encoding: base64\r\n"; + } function get_imap_message_size($size) { if (isset($_SESSION['attachments']) && !empty($_SESSION['attachments'])) { foreach ($_SESSION['attachments'] as $i => $v) { - $headers = '--'.$this->boundry."\r\nContent-Type: ".$v['type'].'; name="'.$v['realname']."\"\r\nContent-Disposition: attachment; filename=\"". - $v['realname']."\"\r\nContent-Transfer-Encoding: base64\r\n"; + $headers = $this->build_part_header($v['realname'], $v['type'], 'base64'); $size += strlen($headers) + 2; $size += $v['size']; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2009-03-08 18:40:29
|
Revision: 791 http://hastymail.svn.sourceforge.net/hastymail/?rev=791&view=rev Author: sailfrog Date: 2009-03-08 18:40:19 +0000 (Sun, 08 Mar 2009) Log Message: ----------- move contact detail function that needs to be availble from the message page Modified Paths: -------------- trunk/hastymail2/lib/site_page_class.php trunk/hastymail2/lib/url_action_classes/contacts.php Modified: trunk/hastymail2/lib/site_page_class.php =================================================================== --- trunk/hastymail2/lib/site_page_class.php 2009-03-08 18:33:30 UTC (rev 790) +++ trunk/hastymail2/lib/site_page_class.php 2009-03-08 18:40:19 UTC (rev 791) @@ -765,6 +765,37 @@ } return $data; } +function print_contact_detail($message_view=false) { + $data = ''; + if (!$message_view) { + $data .= '<h4>Contact Details</h4>'; + } + if (isset($this->pd['card_detail']) && !empty($this->pd['card_detail'])) { + $data .= '<table id="card_details" cellpadding="0" cellspacing="0">'; + foreach ($this->pd['card_detail'] as $vals) { + if (!trim($vals['value'])) { + continue; + } + $data .= '<tr><th>'.$this->user->htmlsafe(ucfirst(strtolower($vals['name']))); + if ($vals['group'] == 'N') { + $data .= ' Name'; + } + if (isset($vals['properties'][0])) { + $data .= ' '.$vals['properties'][0]; + } + $data .= '</th><td>'.$this->user->htmlsafe($vals['value']).'</td></tr>'; + } + if (!$message_view) { + $data .= '<tr><td></td><td><a href="?page=contacts&mailbox='.urlencode($this->pd['mailbox']).'&edit_card='.$this->pd['card_id'].'#contactform">Edit</a> + / <a href="?page=contacts&mailbox='.urlencode($this->pd['mailbox']).'&download_card='.$this->pd['card_id'].'">Export</a></td></tr>'; + } + else { + $data .= '<tr><td></td><td><a href="?page=contacts&mailbox='.urlencode($this->pd['mailbox']).'&import_card_attachment=1#contact_form">'.$this->user->str[146].'</a></td></tr>'; + } + $data .= '</table>'; + } + return $data; } +} ?> Modified: trunk/hastymail2/lib/url_action_classes/contacts.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/contacts.php 2009-03-08 18:33:30 UTC (rev 790) +++ trunk/hastymail2/lib/url_action_classes/contacts.php 2009-03-08 18:40:19 UTC (rev 791) @@ -384,36 +384,5 @@ 'value="'.$org_title.'" /></td></tr>'.do_display_hook('add_contact_org_table').'</table><div class="edit_buttons">'.$button.'</div></form></div>'; return $data; } -function print_contact_detail($message_view=false) { - $data = ''; - if (!$message_view) { - $data .= '<h4>Contact Details</h4>'; - } - if (isset($this->pd['card_detail']) && !empty($this->pd['card_detail'])) { - $data .= '<table id="card_details" cellpadding="0" cellspacing="0">'; - foreach ($this->pd['card_detail'] as $vals) { - if (!trim($vals['value'])) { - continue; - } - $data .= '<tr><th>'.$this->user->htmlsafe(ucfirst(strtolower($vals['name']))); - if ($vals['group'] == 'N') { - $data .= ' Name'; - } - if (isset($vals['properties'][0])) { - $data .= ' '.$vals['properties'][0]; - } - $data .= '</th><td>'.$this->user->htmlsafe($vals['value']).'</td></tr>'; - } - if (!$message_view) { - $data .= '<tr><td></td><td><a href="?page=contacts&mailbox='.urlencode($this->pd['mailbox']).'&edit_card='.$this->pd['card_id'].'#contactform">Edit</a> - / <a href="?page=contacts&mailbox='.urlencode($this->pd['mailbox']).'&download_card='.$this->pd['card_id'].'">Export</a></td></tr>'; - } - else { - $data .= '<tr><td></td><td><a href="?page=contacts&mailbox='.urlencode($this->pd['mailbox']).'&import_card_attachment=1#contact_form">'.$this->user->str[146].'</a></td></tr>'; - } - $data .= '</table>'; - } - return $data; } -} ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2009-03-29 04:45:17
|
Revision: 819 http://hastymail.svn.sourceforge.net/hastymail/?rev=819&view=rev Author: sailfrog Date: 2009-03-29 04:44:51 +0000 (Sun, 29 Mar 2009) Log Message: ----------- add charset support to vcard display name when importing. allow vcard upload even if the mime type is not correctly determined Modified Paths: -------------- trunk/hastymail2/lib/post_action_classes/contacts.php trunk/hastymail2/lib/vcard.php Modified: trunk/hastymail2/lib/post_action_classes/contacts.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/contacts.php 2009-03-29 04:40:50 UTC (rev 818) +++ trunk/hastymail2/lib/post_action_classes/contacts.php 2009-03-29 04:44:51 UTC (rev 819) @@ -116,7 +116,7 @@ if (!empty($ufiles)) { if (!$ufiles['error']) { $type = strtolower($ufiles['type']); - if (strtolower(trim($type)) == 'text/x-vcard' || strtolower(trim($type)) == 'text/directory') { + if (strtolower(trim($type)) == 'text/x-vcard' || strtolower(trim($type)) == 'text/directory' || strtolower(trim($type)) == 'application/octet-stream') { $src = $ufiles['tmp_name']; $size = $ufiles['size']; if ($ufiles['size']) { Modified: trunk/hastymail2/lib/vcard.php =================================================================== --- trunk/hastymail2/lib/vcard.php 2009-03-29 04:40:50 UTC (rev 818) +++ trunk/hastymail2/lib/vcard.php 2009-03-29 04:44:51 UTC (rev 819) @@ -329,8 +329,13 @@ break; case 'FN': array_shift($parts); + $prop = array(); + if (substr($v, 2, 1) == ';') { + $prop[] = str_replace('CHARSET=', '', strtoupper($parts[0])); + array_shift($parts); + } if (isset($parts[0])) { - $this->card[] = array('group' => '', 'name' => 'FN', 'value' => $parts[0], 'properties' => array()); + $this->card[] = array('group' => '', 'name' => 'FN', 'value' => $parts[0], 'properties' => $prop); } break; case 'ADR': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2009-03-29 06:13:06
|
Revision: 820 http://hastymail.svn.sourceforge.net/hastymail/?rev=820&view=rev Author: sailfrog Date: 2009-03-29 06:12:57 +0000 (Sun, 29 Mar 2009) Log Message: ----------- It is not uncommon to have folders returned from an IMAP LIST command that refer to parent folders that are not in the LIST result. This improves the way we "fill in" these missing folders with placeholders (I hope) Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php trunk/hastymail2/lib/site_page_class.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2009-03-29 04:44:51 UTC (rev 819) +++ trunk/hastymail2/lib/imap_class.php 2009-03-29 06:12:57 UTC (rev 820) @@ -946,28 +946,32 @@ } if (!$found) { if (count($parent['name_parts']) > 1) { - $sub = array_pop($parent['name_parts']); - $fname = array_pop($parent['name_parts']); - if (count($parent['name_parts']) > 0) { - $fparent = join($delim, $parent['name_parts']); - $freal = $fparent.$delim.$fname; - } - else { - $fparent = false; - $freal = $fname; - } - $place_holders[] = $freal; - $folders[$fname] = array('parent' => $fparent, 'delim' => $delim, 'name' => $freal, - 'name_parts' => $parent['name_parts'], 'basename' => $fname, - 'realname' => $freal, 'namespace' => $namespace, 'marked' => false, + foreach ($parent['name_parts'] as $i => $v) { + $fname = join($delim, array_slice($parent['name_parts'], 0, ($i + 1))); + $name_parts = array_slice($parent['name_parts'], 0, ($i + 1)); + if (!isset($folders[$fname])) { + $freal = $v; + if ($i > 0) { + $fparent = join($delim, array_slice($parent['name_parts'], 0, $i)); + } + else { + $fparent = false; + } + $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); + } + } } } } $_SESSION['folder_place_holders'] = $place_holders; uksort($folders, 'folder_sort'); + if (isset($_SESSION['folder_state'])) { unset($_SESSION['folder_state']); } Modified: trunk/hastymail2/lib/site_page_class.php =================================================================== --- trunk/hastymail2/lib/site_page_class.php 2009-03-29 04:44:51 UTC (rev 819) +++ trunk/hastymail2/lib/site_page_class.php 2009-03-29 06:12:57 UTC (rev 820) @@ -98,7 +98,7 @@ else { $data .= 'var do_folder_dropdown = 0;'; } - if ($this->pd['settings']['show_folder_list'] && $this->pd['settings']['folder_list_ajax']) { + if ($this->pd['settings']['show_folder_list'] && isset($this->pd['settings']['folder_list_ajax']) && $this->pd['settings']['folder_list_ajax']) { $data .= 'var do_folder_list = 1;'; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2009-04-01 02:19:20
|
Revision: 825 http://hastymail.svn.sourceforge.net/hastymail/?rev=825&view=rev Author: sailfrog Date: 2009-04-01 02:18:51 +0000 (Wed, 01 Apr 2009) Log Message: ----------- more folder list handling updates Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php trunk/hastymail2/lib/site_page_class.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2009-03-29 20:13:17 UTC (rev 824) +++ trunk/hastymail2/lib/imap_class.php 2009-04-01 02:18:51 UTC (rev 825) @@ -880,7 +880,7 @@ } } if (isset($folder_parts[(count($folder_parts) - 2)]) && strtoupper($folder_parts[(count($folder_parts) - 2)]) != 'INBOX') { - $parent = $folder_parts[(count($folder_parts) - 2)]; + $parent = join($delim, array_slice($folder_parts, 0, -1)); } if (stristr($flags, 'marked')) { $marked = true; @@ -938,7 +938,7 @@ foreach ($parents as $val => $parent) { $found = false; foreach ($folders as $i => $vals) { - if ($vals['basename'] == $val) { + if ($vals['name'] == $parent['name'].$val) { $folders[$i]['has_kids'] = 1; $found = true; break; @@ -971,7 +971,6 @@ } $_SESSION['folder_place_holders'] = $place_holders; uksort($folders, 'folder_sort'); - if (isset($_SESSION['folder_state'])) { unset($_SESSION['folder_state']); } Modified: trunk/hastymail2/lib/site_page_class.php =================================================================== --- trunk/hastymail2/lib/site_page_class.php 2009-03-29 20:13:17 UTC (rev 824) +++ trunk/hastymail2/lib/site_page_class.php 2009-04-01 02:18:51 UTC (rev 825) @@ -356,13 +356,13 @@ if (!isset($atts['basename'])) { continue; } - if ($atts['name'] == $vals['name'].$vals['delim'].$atts['basename']) { - $subfolders[$atts['name']] = $atts; + if ($vals['realname'] == $atts['parent']) { + $subfolders[$atts['realname']] = $atts; } } if (!empty($subfolders)) { $i++; - $data .= $this->print_folder_option_list($subfolders, $vals['basename'], $i, $selected, $clean, $no_current, $selectable_type, $exclude_list); + $data .= $this->print_folder_option_list($subfolders, $vals['realname'], $i, $selected, $clean, $no_current, $selectable_type, $exclude_list); $i--; $subfolders = array(); } @@ -509,8 +509,8 @@ if (!isset($atts['basename'])) { continue; } - if ($atts['name'] == $vals['name'].$vals['delim'].$atts['basename']) { - $subfolders[$atts['name']] = $atts; + if ($vals['realname'] == $atts['parent']) { + $subfolders[$atts['realname']] = $atts; } } if (!empty($subfolders)) { @@ -525,7 +525,7 @@ } $data .= '" id="folder_div_'.$hash.'">'; } - $data .= $this->print_folder_list($subfolders, $vals['basename'], $i, $inbox); + $data .= $this->print_folder_list($subfolders, $vals['realname'], $i, $inbox); if ($this->pd['settings']['folder_style'] == 1) { $data .= '</div>'; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2009-04-15 02:52:03
|
Revision: 861 http://hastymail.svn.sourceforge.net/hastymail/?rev=861&view=rev Author: sailfrog Date: 2009-04-15 02:51:15 +0000 (Wed, 15 Apr 2009) Log Message: ----------- add support to the mailbox and new page listings to have onclick events to link to the messages (instead of just the subject field). This is an option for theme templates Modified Paths: -------------- trunk/hastymail2/lib/site_page_class.php trunk/hastymail2/lib/url_action_classes/new.php Modified: trunk/hastymail2/lib/site_page_class.php =================================================================== --- trunk/hastymail2/lib/site_page_class.php 2009-04-14 13:40:23 UTC (rev 860) +++ trunk/hastymail2/lib/site_page_class.php 2009-04-15 02:51:15 UTC (rev 861) @@ -652,7 +652,7 @@ } return $data; } -function print_mailbox_list($cols=array('checkbox_cell', 'indicators_cell', 'subject_cell', 'from_cell', 'date_cell', 'size_cell')) { +function print_mailbox_list($cols=array('checkbox_cell', 'indicators_cell', 'subject_cell', 'from_cell', 'date_cell', 'size_cell'), $onclick=false) { $n = 1; global $page_id; $data = ''; @@ -677,6 +677,16 @@ } $list_count = count($this->pd['header_list']); foreach ($this->pd['header_list'] as $vals) { + $message_url = '?page=message&uid='.$vals['uid'].'&mailbox_page='. + $this->pd['mailbox_page'].'&sort_by='.$this->pd['sort_by']. + '&filter_by='.$this->pd['filter_by'].'&mailbox='. + urlencode($this->pd['mailbox']); + if ($onclick) { + $js = 'onclick="document.location.href=\''.$message_url.'\';" onmouseover="this.style.cursor=\'pointer\'"'; + } + else { + $js = ''; + } if (isset($this->pd['settings']['sent_folder']) && $this->pd['mailbox'] == $this->pd['settings']['sent_folder']) { $from = clean_from($vals['to']); @@ -735,6 +745,7 @@ $subj_post .= '</span>'; $subj_pre .= '<span class="deleted_message">'; } + $indicators_cell = ''; $subject_cell = ''; $from_cell = ''; @@ -742,7 +753,7 @@ $size_cell = ''; $checkbox_cell = ''; $data .= '<tr>'; - $indicators_cell = '<td class="'.$xtra_class.$class_prefix.'indicators"><complex-'.$page_id.'>'; + $indicators_cell = '<td '.$js.' class="'.$xtra_class.$class_prefix.'indicators"><complex-'.$page_id.'>'; $indicators_cell .= $indicators.'</complex-'.$page_id.'></td>'; $checkbox_cell = '<td class="'.$xtra_class.$class_prefix.'checkbox">'; if (isset($this->pd['last_message_read'][$this->pd['mailbox']]) && @@ -756,18 +767,17 @@ if ($this->pd['toggle_all']) { $data .= 'checked="checked" '; } $checkbox_cell .= 'id="message_'.$n.'" name="uids[]" value="'.$vals['uid'].'" /><input type="hidden" name="mailboxes['.$vals['uid'].']" value="'. $this->user->htmlsafe($this->pd['mailbox'], false, false, true).'" /></td>'; - $subject_cell = '<td class="'.$xtra_class.$class_prefix.'subject">'.$subj_pre.'<a href="?page=message&uid='. - $vals['uid'].'&mailbox_page='.$this->pd['mailbox_page'].'&sort_by='.$this->pd['sort_by']. - '&filter_by='.$this->pd['filter_by'].'&mailbox='.urlencode($this->pd['mailbox']).'">'. + $subject_cell = '<td '.$js.' class="'.$xtra_class.$class_prefix.'subject">'.$subj_pre.'<a href="'.$message_url.'">'. $this->user->htmlsafe($vals['subject'], $vals['charset'], true).'</a>'.$subj_post.'</td>'; - $from_cell = '<td class="'.$xtra_class.$class_prefix.'from">'.$this->user->htmlsafe($from, $vals['charset'], true).'</td>'; - $date_cell = '<td class="'.$xtra_class.$class_prefix.'date" >'.print_time2($vals['date'], $date_format, $date_format_2); - $size_cell = '</td><td class="'.$xtra_class.$class_prefix.'size">'.format_size($vals['size']/1024).'</td></tr>'; + $from_cell = '<td '.$js.' class="'.$xtra_class.$class_prefix.'from">'.$this->user->htmlsafe($from, $vals['charset'], true).'</td>'; + $date_cell = '<td '.$js.' class="'.$xtra_class.$class_prefix.'date" >'.print_time2($vals['date'], $date_format, $date_format_2).'</td>'; + $size_cell = '</td><td '.$js.' class="'.$xtra_class.$class_prefix.'size">'.format_size($vals['size']/1024).'</td>'; foreach ($cols as $v) { if (isset($$v)) { $data .= $$v; } } + $data .= '</tr>'; $n++; } return $data; Modified: trunk/hastymail2/lib/url_action_classes/new.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/new.php 2009-04-14 13:40:23 UTC (rev 860) +++ trunk/hastymail2/lib/url_action_classes/new.php 2009-04-15 02:51:15 UTC (rev 861) @@ -82,7 +82,7 @@ } class site_page_new extends site_page { -function print_new_content($cols=array('checkbox_cell', 'indicators_cell', 'subject_cell', 'from_cell', 'date_cell', 'size_cell')) { +function print_new_content($cols=array('checkbox_cell', 'indicators_cell', 'subject_cell', 'from_cell', 'date_cell', 'size_cell'), $onclick=false) { $n = 1; global $page_id; $labels = array('subject_cell' => $this->user->str[13], @@ -148,6 +148,13 @@ $data .= '</td></tr>'; if (!empty($array['headers'])) { foreach ($array['headers'] as $vals) { + $message_url = '?page=message'.$sid.'&uid='.$vals['uid'].'&sort_by='.$this->pd['sort_by'].'&mailbox='.urlencode($i); + if ($onclick) { + $js = 'onclick="document.location.href=\''.$message_url.'\';" onmouseover="this.style.cursor=\'pointer\'"'; + } + else { + $js = ''; + } $from = clean_from($vals['from']); $class_prefix= 'mbx_unseen_'; if (!trim($vals['subject'])) { @@ -176,24 +183,24 @@ $size_cell = ''; $checkbox_cell = ''; $data .= '<tr>'; - $indicators_cell = '<td class="'.$class_prefix.'indicators"><complex-'.$page_id.'>'; + $indicators_cell = '<td '.$js.' class="'.$class_prefix.'indicators"><complex-'.$page_id.'>'; $indicators_cell .= $indicators.'</complex-'.$page_id.'></td>'; $checkbox_cell = '<td class="'.$class_prefix.'checkbox"><input type="checkbox" '; if ($this->pd['toggle_all']) { $data .= 'checked="checked" '; } $checkbox_cell .= 'id="message_'.$n.'" name="uids[]" value="'.$vals['uid'].'" onchange="save_checked_state('.$n.'); return false;" /><input type="hidden" id="mailboxes-'. $vals['uid'].'" name="mailboxes['.$vals['uid'].']" value="'. $this->user->htmlsafe($i, false, false, true).'" /></td>'; - $subject_cell = '<td class="'.$class_prefix.'subject">'.$subj_pre.'<a href="?page=message'. - $sid.'&uid='.$vals['uid'].'&sort_by='.$this->pd['sort_by'].'&mailbox='.urlencode($i).'">'.$this->user->htmlsafe($vals['subject'], + $subject_cell = '<td '.$js.' class="'.$class_prefix.'subject">'.$subj_pre.'<a href="'.$message_url.'">'.$this->user->htmlsafe($vals['subject'], $vals['charset'], true).'</a>'.$subj_post.'</td>'; - $from_cell = '<td class="'.$class_prefix.'from" >'.$this->user->htmlsafe($from, $vals['charset'], true).'</td>'; - $date_cell = '<td class="'.$class_prefix.'date">'.print_time2($vals['date'], $date_format, $date_format_2).'</td>'; - $size_cell = '<td class="'.$class_prefix.'size">'.format_size($vals['size']/1024).'</td></tr>'; + $from_cell = '<td '.$js.' class="'.$class_prefix.'from" >'.$this->user->htmlsafe($from, $vals['charset'], true).'</td>'; + $date_cell = '<td '.$js.' class="'.$class_prefix.'date">'.print_time2($vals['date'], $date_format, $date_format_2).'</td>'; + $size_cell = '<td '.$js.' class="'.$class_prefix.'size">'.format_size($vals['size']/1024).'</td>'; foreach ($cols as $v) { if (isset($$v)) { $data .= $$v; } } + $data .= '</tr>'; $n++; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2009-09-02 13:38:58
|
Revision: 1027 http://hastymail.svn.sourceforge.net/hastymail/?rev=1027&view=rev Author: sailfrog Date: 2009-09-02 13:38:52 +0000 (Wed, 02 Sep 2009) Log Message: ----------- improve error handling for the smtp class Modified Paths: -------------- trunk/hastymail2/lib/post_action_classes/compose.php trunk/hastymail2/lib/smtp_class.php Modified: trunk/hastymail2/lib/post_action_classes/compose.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/compose.php 2009-08-31 14:55:26 UTC (rev 1026) +++ trunk/hastymail2/lib/post_action_classes/compose.php 2009-09-02 13:38:52 UTC (rev 1027) @@ -714,6 +714,10 @@ do_work_hook('message_send', array($message->body)); $res = $smtp->send_message($message->from_address, $recipients, $message); if ($res) { + if ($smtp->smtp_err) { + $res .= '<br />'.$smtp->smtp_err; + } + $this->form_vals = $post; $this->errors[] = $res; } else { @@ -724,7 +728,7 @@ $this->perform_imap_action('ANSWERED', $post['reply_box'], array($post['reply_uid']), false, false); } } - if (!isset($post['compose_skip_sent']) || !$post['compose_skip_sent']) { + if (!$res && !isset($post['compose_skip_sent']) || (isset($post['compose_skip_sent']) && !$post['compose_skip_sent'])) { if (isset($_SESSION['user_settings']['sent_folder']) && isset($_SESSION['folders'][$_SESSION['user_settings']['sent_folder']])) { $email = $message->output_imap_message(); @@ -760,7 +764,7 @@ } } } - if (isset($_SESSION['user_settings']['draft_folder']) && isset($post['message_id']) && $post['message_id'] && + if (!$res && isset($_SESSION['user_settings']['draft_folder']) && isset($post['message_id']) && $post['message_id'] && isset($_SESSION['user_settings']['delete_draft']) && $_SESSION['user_settings']['delete_draft'] && $_SESSION['user_settings']['draft_folder']) { $trash_folder = false; @@ -780,7 +784,7 @@ $this->errors[] = $res; $this->form_vals = $post; } - if (isset($_SESSION['attachments']) && !empty($_SESSION['attachments'])) { + if (!$res && isset($_SESSION['attachments']) && !empty($_SESSION['attachments'])) { foreach ($_SESSION['attachments'] as $i => $v) { if (substr($path, -1) != $fd) { $filename = $path.$fd.$i; Modified: trunk/hastymail2/lib/smtp_class.php =================================================================== --- trunk/hastymail2/lib/smtp_class.php 2009-08-31 14:55:26 UTC (rev 1026) +++ trunk/hastymail2/lib/smtp_class.php 2009-09-02 13:38:52 UTC (rev 1027) @@ -32,6 +32,7 @@ var $debug; var $hostname; var $command_count; + var $smtp_err; var $banner; var $capability; var $connected; @@ -70,6 +71,7 @@ else { $this->tls = false; } + $this->smtp_err = ''; $this->supports_tls = false; $this->auth = false; $this->supports_auth = array(); @@ -158,7 +160,13 @@ else { $code = false; } - return strcmp($check,$code); + $return_val = strcmp($check,$code); + if ($return_val) { + if (isset($chunked_response[0][1])) { + $this->smtp_err = join(' ', $chunked_response[0][1]); + } + } + return $return_val; } /* determine what capabilities the server has. @@ -187,7 +195,7 @@ /* establish a connection to the server. */ function connect() { global $user; - $result = 'An unknown error occured'; + $result = 'An error occured connecting to the SMTP server'; if ($this->tls) { $this->server = 'tls://'.$this->server; } @@ -341,7 +349,7 @@ exit; } if (!$result) { - $result = 'An unknown error occured'; + $result = 'An error occured authenticating to the SMTP server'; $res = $this->get_response(); if ($this->compare_response($res, '235') == 0) { $this->state = 'authed'; @@ -365,8 +373,7 @@ $this->send_command($command); $res = $this->get_response(); $bail = false; - $err = false; - $result = 'An unkown error occured'; + $result = 'An error occured sending the message'; if(is_array($recipients)) { foreach($recipients as $rcpt) { $command = 'RCPT TO:<'.$rcpt.'>'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2010-07-07 02:55:24
|
Revision: 1596 http://hastymail.svn.sourceforge.net/hastymail/?rev=1596&view=rev Author: sailfrog Date: 2010-07-07 02:55:18 +0000 (Wed, 07 Jul 2010) Log Message: ----------- correctly sort folders on the new mail page by each folders default sort method Modified Paths: -------------- trunk/hastymail2/lib/misc_functions.php trunk/hastymail2/lib/url_action_classes/new.php Modified: trunk/hastymail2/lib/misc_functions.php =================================================================== --- trunk/hastymail2/lib/misc_functions.php 2010-07-07 00:54:11 UTC (rev 1595) +++ trunk/hastymail2/lib/misc_functions.php 2010-07-07 02:55:18 UTC (rev 1596) @@ -1467,4 +1467,27 @@ } return $res . substr($str, $i); } + /* sort functions */ + function sort_date($a, $b, $rev=1) { + if (strtotime(trim($a['date']))*$rev < strtotime(trim($b['date']))*$rev) { + return true; + } + else { + return false; + } + } + function sort_date_r($a, $b) { + return sort_date($a, $b, -1); + } + function sort_idate($a, $b, $rev=1) { + if (strtotime(trim($a['date']))*$rev < strtotime(trim($b['date']))*$rev) { + return true; + } + else { + return false; + } + } + function sort_idate_r($a, $b) { + return sort_idate($a, $b, -1); + } ?> Modified: trunk/hastymail2/lib/url_action_classes/new.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/new.php 2010-07-07 00:54:11 UTC (rev 1595) +++ trunk/hastymail2/lib/url_action_classes/new.php 2010-07-07 02:55:18 UTC (rev 1596) @@ -23,6 +23,44 @@ */ class fw_user_action_page extends fw_user_action { +function sort_messages($data, $mailbox) { + $res = array(); + if (isset($_SESSION['user_settings']['sort_by'][$mailbox])) { + $sort = $_SESSION['user_settings']['sort_by'][$mailbox]; + } + else { + $sort = 'ARRIVAL'; + } + switch ($sort) { + case 'FROM': + case 'SUBJECT': + case 'CC': + case 'TO': + case 'SIZE': + case 'R_FROM': + case 'R_SUBJECT': + case 'R_CC': + case 'R_TO': + case 'R_SIZE': + natcasesort($data); + break; + + case 'DATE': + usort($data, 'sort_date'); + break; + case 'R_DATE': + usort($data, 'sort_date_r'); + break; + case 'R_ARRIVAL': + usort($data, 'sort_idate_r'); + break; + case 'ARRIVAL': + default: + usort($data, 'sort_idate'); + break; + } + return $data; +} function url_action_new($get) { global $user; global $imap; @@ -55,7 +93,7 @@ $uids = $new_uids; } $total = count($uids); - $new_page_data[$v] = array('total' => $total, 'headers' => array_reverse($imap->get_mailbox_page($v, $uids, false))); + $new_page_data[$v] = array('total' => $total, 'headers' => $this->sort_messages($imap->get_mailbox_page($v, $uids, false), $v)); } $unread_folder_count++; $grand_total += $total; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2010-08-13 01:54:51
|
Revision: 1652 http://hastymail.svn.sourceforge.net/hastymail/?rev=1652&view=rev Author: sailfrog Date: 2010-08-13 01:54:45 +0000 (Fri, 13 Aug 2010) Log Message: ----------- contacts handling improvements Modified Paths: -------------- trunk/hastymail2/lib/url_action_classes/contacts.php trunk/hastymail2/lib/vcard.php Modified: trunk/hastymail2/lib/url_action_classes/contacts.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/contacts.php 2010-08-12 23:58:51 UTC (rev 1651) +++ trunk/hastymail2/lib/url_action_classes/contacts.php 2010-08-13 01:54:45 UTC (rev 1652) @@ -222,11 +222,13 @@ $data = ''; if (!empty($this->pd['contact_list'])) { $data .= '<tr><th></th><th></th><th>'.$this->user->str[143].'</th><th>'.$this->user->str[16].'</th><th>'.$this->user->str[144].'</th><th>'.$this->user->str[145].'</th></tr>'; + $label = 1; foreach ($this->pd['contact_list'] as $id => $vals) { - $data .= '<tr><td width="1">'.$id.'</td><td class="contact_table_links"><a href="?page=contacts&mailbox='.urlencode($this->pd['mailbox']).'&card_detail='. + $data .= '<tr><td width="1">'.$label.'</td><td class="contact_table_links"><a href="?page=contacts&mailbox='.urlencode($this->pd['mailbox']).'&card_detail='. $id.'&contacts_page='.$this->pd['contacts_page'].'">'.$this->user->str[153].'</a> / <a href="?page=contacts&mailbox='.urlencode($this->pd['mailbox']).'&edit_card='.$id.'&contacts_page='.$this->pd['contacts_page'].'&token='.$page_id.'&contacts_page='.$this->pd['contacts_page'].'#contactform">'.$this->user->str[154].'</a> / <a href="?page=contacts&mailbox='.urlencode($this->pd['mailbox']).'&contacts_page='.$this->pd['contacts_page'].'&download_card='.$id.'">'.$this->user->str[155].'</a></td><td>'; $name = ''; + $label++; foreach ($vals as $atts) { if (isset($atts['name']) && $atts['name'] == 'FN') { $name = $atts['value']; Modified: trunk/hastymail2/lib/vcard.php =================================================================== --- trunk/hastymail2/lib/vcard.php 2010-08-12 23:58:51 UTC (rev 1651) +++ trunk/hastymail2/lib/vcard.php 2010-08-13 01:54:45 UTC (rev 1652) @@ -286,11 +286,11 @@ } if ($this->search_terms) { $filter_vals = array(); - foreach ($this->card_list as $vals) { + foreach ($this->card_list as $i => $vals) { foreach($vals as $flds) { if (($flds['name'] == 'EMAIL' && stristr($flds['value'], $this->search_terms)) || ($flds['name'] = 'FN' && stristr($flds['value'], $this->search_terms)) ) { - $filter_vals[] = $vals; + $filter_vals[$i] = $vals; break; } } @@ -298,9 +298,7 @@ $this->card_list = $filter_vals; } if ($this->sort_fld) { - usort($this->card_list, array($this, 'full_sort_cards')); - array_unshift($this->card_list, 'nothing'); - unset($this->card_list[0]); + uasort($this->card_list, array($this, 'full_sort_cards')); } $this->card_total = count($this->card_list); if ($page) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2010-11-15 20:38:08
|
Revision: 1703 http://hastymail.svn.sourceforge.net/hastymail/?rev=1703&view=rev Author: sailfrog Date: 2010-11-15 20:38:01 +0000 (Mon, 15 Nov 2010) Log Message: ----------- misc small message view fixes Modified Paths: -------------- trunk/hastymail2/lib/url_action_class.php trunk/hastymail2/lib/url_action_classes/message.php Modified: trunk/hastymail2/lib/url_action_class.php =================================================================== --- trunk/hastymail2/lib/url_action_class.php 2010-11-15 19:51:57 UTC (rev 1702) +++ trunk/hastymail2/lib/url_action_class.php 2010-11-15 20:38:01 UTC (rev 1703) @@ -606,6 +606,7 @@ if (!is_array($struct) || empty($struct)) { return array($res, $viewable); } + $subs = array(); foreach ($struct as $id => $vals) { if ($part && $id == $part) { $vals['imap_id'] = $id; @@ -626,12 +627,20 @@ if (!$part && isset($vals['type']) && isset($message_part_types[$vals['type'].'/'.$vals['subtype']])) { $viewable[] = $id; } - if (empty($res) && isset($vals['subs'])) { - list($res, $viewable) = $this->find_message_part($vals['subs'], $part, $type, $subtype, $viewable); + if (isset($vals['subs'])) { + $subs[] = $vals['subs']; } if (!empty($res)) { break; } + } + if (empty($res) && !empty($subs)) { + foreach ($subs as $v) { + list($res, $viewable) = $this->find_message_part($v, $part, $type, $subtype, $viewable); + if (!empty($res)) { + break; + } + } } return array($res, $viewable); } Modified: trunk/hastymail2/lib/url_action_classes/message.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/message.php 2010-11-15 19:51:57 UTC (rev 1702) +++ trunk/hastymail2/lib/url_action_classes/message.php 2010-11-15 20:38:01 UTC (rev 1703) @@ -401,7 +401,7 @@ break; } } - if ($parent_id != 1) { + if ($parent_id && $parent_id != 1) { $user->page_data['message_part_headers'] = $this->prep_headers($imap->get_message_headers($id, $parent_id)); } } @@ -1381,12 +1381,6 @@ $data = '<simple-'.$page_id.'><tr><td><br /></td></tr></simple-'.$page_id.'>'.do_display_hook('message_part_headers_top').'<complex-'.$page_id.'>'; $rows = ''; foreach ($this->pd['message_part_headers'] as $i => $vals) { - if (isset($this->pd['message_headers'][$i])) { - if ($vals[0] == $this->pd['message_headers'][$i][0] && - $vals[1] == $this->pd['message_headers'][$i][1]) { - continue; - } - } $name = $this->user->htmlsafe($vals[0], $this->pd['charset'], true); $val = $this->user->htmlsafe($vals[1], $this->pd['charset'], true); if ($this->pd['full_part_header'] == $i) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2011-01-11 21:49:30
|
Revision: 1757 http://hastymail.svn.sourceforge.net/hastymail/?rev=1757&view=rev Author: sailfrog Date: 2011-01-11 21:49:23 +0000 (Tue, 11 Jan 2011) Log Message: ----------- fix a bug that causes the To: field to show up on the unread mail page when the folder being displayed is the sent folder Modified Paths: -------------- trunk/hastymail2/lib/site_page_class.php trunk/hastymail2/lib/url_action_classes/new.php Modified: trunk/hastymail2/lib/site_page_class.php =================================================================== --- trunk/hastymail2/lib/site_page_class.php 2011-01-11 21:37:09 UTC (rev 1756) +++ trunk/hastymail2/lib/site_page_class.php 2011-01-11 21:49:23 UTC (rev 1757) @@ -931,7 +931,7 @@ } return $data; } -function print_mailbox_list_rows($cols, $rows, $onclick, $mailbox, $n=1) { +function print_mailbox_list_rows($cols, $rows, $onclick, $mailbox, $n=1, $ignore_sent=false) { global $page_id; $data = ''; $search_res = array(); @@ -1016,7 +1016,7 @@ $new_window = 'onclick="open_window(\''.$message_url.'&new_window=1&parent_refresh=1\', 1024, 900, '.$vals['uid'].'); return false;"'; } } - if (isset($this->pd['settings']['sent_folder']) && + if (!$ignore_sent && isset($this->pd['settings']['sent_folder']) && $mailbox == $this->pd['settings']['sent_folder']) { $from = clean_from($vals['to']); $full_from = $vals['to']; Modified: trunk/hastymail2/lib/url_action_classes/new.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/new.php 2011-01-11 21:37:09 UTC (rev 1756) +++ trunk/hastymail2/lib/url_action_classes/new.php 2011-01-11 21:49:23 UTC (rev 1757) @@ -157,7 +157,7 @@ } $data .= '</td></tr></complex-'.$page_id.'>'; if (!empty($array['headers'])) { - $data .= $this->print_mailbox_list_rows($msg_list_flds, $array['headers'], $onclick, $i, $n); + $data .= $this->print_mailbox_list_rows($msg_list_flds, $array['headers'], $onclick, $i, $n, true); $n += count($array['headers']); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2011-01-21 20:41:06
|
Revision: 1773 http://hastymail.svn.sourceforge.net/hastymail/?rev=1773&view=rev Author: sailfrog Date: 2011-01-21 20:41:00 +0000 (Fri, 21 Jan 2011) Log Message: ----------- another address parsing fix Modified Paths: -------------- trunk/hastymail2/lib/misc_functions.php trunk/hastymail2/lib/url_action_classes/compose.php Modified: trunk/hastymail2/lib/misc_functions.php =================================================================== --- trunk/hastymail2/lib/misc_functions.php 2011-01-21 19:03:35 UTC (rev 1772) +++ trunk/hastymail2/lib/misc_functions.php 2011-01-21 20:41:00 UTC (rev 1773) @@ -58,9 +58,11 @@ } } -function parse_address_fld($str) { +function parse_address_fld($str, $charset=false) { global $page_id; + global $user; $res = array(); + $str = $user->decode_fld($str, $charset); $replacements = array(); if (strstr($str, ',') || strstr($str, ';')) { if (preg_match_all("/[\"']{1}[^\"']+[\"']{1}/", $str, $matches)) { Modified: trunk/hastymail2/lib/url_action_classes/compose.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/compose.php 2011-01-21 19:03:35 UTC (rev 1772) +++ trunk/hastymail2/lib/url_action_classes/compose.php 2011-01-21 20:41:00 UTC (rev 1773) @@ -319,7 +319,7 @@ } foreach (array('to', 'cc', 'from') as $fld) { if (isset($all_headers[$fld])) { - foreach (parse_address_fld($all_headers[$fld]) as $vals) { + foreach (parse_address_fld($all_headers[$fld], $message_data['charset']) as $vals) { if (in_array($vals['address'], $existing)) { continue; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2012-02-07 20:39:26
|
Revision: 2045 http://hastymail.svn.sourceforge.net/hastymail/?rev=2045&view=rev Author: sailfrog Date: 2012-02-07 20:39:20 +0000 (Tue, 07 Feb 2012) Log Message: ----------- changes to support debuggin problems with the IMAP append size calculation. Modified Paths: -------------- trunk/hastymail2/lib/imap_class.php trunk/hastymail2/lib/misc_functions.php Modified: trunk/hastymail2/lib/imap_class.php =================================================================== --- trunk/hastymail2/lib/imap_class.php 2012-02-07 14:08:33 UTC (rev 2044) +++ trunk/hastymail2/lib/imap_class.php 2012-02-07 20:39:20 UTC (rev 2045) @@ -2280,10 +2280,13 @@ function append_feed($string, $as_is=false) { if ($as_is) { fwrite($this->handle, $string); + $res = strlen($string); } else { fwrite($this->handle, $string."\r\n"); + $res = strlen($string) + 2; } + return $res; } function append_start($mailbox, $size, $seen=true) { if (!$this->clean($mailbox, 'mailbox') || !$this->clean($size, 'uid')) { Modified: trunk/hastymail2/lib/misc_functions.php =================================================================== --- trunk/hastymail2/lib/misc_functions.php 2012-02-07 14:08:33 UTC (rev 2044) +++ trunk/hastymail2/lib/misc_functions.php 2012-02-07 20:39:20 UTC (rev 2045) @@ -1571,8 +1571,9 @@ $status = false; $email = $message->output_imap_message(); $size = $message->get_imap_message_size(strlen($email)); + $wsize = 0; if ($imap->append_start($mailbox, $size)) { - $imap->append_feed($email); + $wsize += $imap->append_feed($email); if (isset($_SESSION['attachments'][$session]) && !empty($_SESSION['attachments'][$session])) { foreach ($_SESSION['attachments'][$session] as $i => $v) { $headers = $message->build_part_header($v['realname'], $v['type'], $v['encoding']); @@ -1583,23 +1584,26 @@ $filename = $path.$i; } if (is_readable($filename)) { - $imap->append_feed($headers); + $wsize += $imap->append_feed($headers); $input_file = fopen($filename, 'r'); if (is_resource($input_file)) { while (!feof($input_file)) { $string = fgets($input_file, 1024); if ($string) { - $imap->append_feed(rtrim($string, "\r\n")); + $wsize += $imap->append_feed(rtrim($string, "\r\n")); } } fclose($input_file); } } - $imap->append_feed("--".$message->boundry."--"); + $wsize += $imap->append_feed("--".$message->boundry."--"); } } $status = $imap->append_end(); } + if ($wsize != $size) { + error_log('IMAP APPEND size incorrect. Written: '.$wsize.', Calculated: '.$size.', Offset: '.($size - $wsize)); + } return $status; } /* sort functions */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2012-04-02 15:56:10
|
Revision: 2059 http://hastymail.svn.sourceforge.net/hastymail/?rev=2059&view=rev Author: sailfrog Date: 2012-04-02 15:56:00 +0000 (Mon, 02 Apr 2012) Log Message: ----------- move smtp auth configuration check to the smtp class constructor (will make re-using the smtp class easier) Modified Paths: -------------- trunk/hastymail2/lib/post_action_classes/compose.php trunk/hastymail2/lib/smtp_class.php Modified: trunk/hastymail2/lib/post_action_classes/compose.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/compose.php 2012-04-02 15:54:49 UTC (rev 2058) +++ trunk/hastymail2/lib/post_action_classes/compose.php 2012-04-02 15:56:00 UTC (rev 2059) @@ -668,36 +668,7 @@ if (isset($post['compose_mdn']) && $post['compose_mdn']) { $message->set_header('disposition_Notification_To', $message->from_address); } - $smtp_auth = false; - $smtp_user = false; - $smtp_pass = false; - if (isset($conf['smtp_authentication_type'])) { - switch (strtolower($conf['smtp_authentication_type'])) { - case 'plain': - case 'login': - case 'cram-md5': - $pass_bits = $user->string_decrypt($_SESSION['user_data']['pass']); - if (is_array($pass_bits) && isset($pass_bits[1])) { - $smtp_pass = $pass_bits[1]; - $smtp_auth = $conf['smtp_authentication_type']; - $smtp_user = $_SESSION['user_data']['username']; - } - break; - case 'user': - if (isset($_SESSION['user_settings']['smtp_auth']) && $_SESSION['user_settings']['smtp_auth'] != 'none') { - $smtp_auth = $_SESSION['user_settings']['smtp_auth']; - $smtp_pass = $_SESSION['user_settings']['smtp_pass']; - $smtp_user = $_SESSION['user_settings']['smtp_user']; - } - break; - } - } $smtp = hm_new('smtp'); - if ($smtp_auth) { - $smtp->auth = $smtp_auth; - $smtp->password = $smtp_pass; - $smtp->username = $smtp_user; - } $res = $smtp->connect(); if (!$res) { do_work_hook('message_send', array($message->body)); Modified: trunk/hastymail2/lib/smtp_class.php =================================================================== --- trunk/hastymail2/lib/smtp_class.php 2012-04-02 15:54:49 UTC (rev 2058) +++ trunk/hastymail2/lib/smtp_class.php 2012-04-02 15:56:00 UTC (rev 2059) @@ -47,6 +47,7 @@ /* set defaults */ function smtp() { global $conf; + global $user; $this->hostname = $conf['host_name']; /* SMTP servers (exchange at least) don't like port numbers in the EHLO hostname */ if (preg_match("/:\d+$/", $this->hostname)) { @@ -94,6 +95,27 @@ $this->username = false; $this->password = false; $this->max_message_size = 0; //in bytes; 0 = no limit + if (isset($conf['smtp_authentication_type'])) { + switch (strtolower($conf['smtp_authentication_type'])) { + case 'plain': + case 'login': + case 'cram-md5': + $pass_bits = $user->string_decrypt($_SESSION['user_data']['pass']); + if (is_array($pass_bits) && isset($pass_bits[1])) { + $this->password = $pass_bits[1]; + $this->smtp_auth = $conf['smtp_authentication_type']; + $this->username = $_SESSION['user_data']['username']; + } + break; + case 'user': + if (isset($_SESSION['user_settings']['smtp_auth']) && $_SESSION['user_settings']['smtp_auth'] != 'none') { + $this->smtp_auth = $_SESSION['user_settings']['smtp_auth']; + $this->password = $_SESSION['user_settings']['smtp_pass']; + $this->username = $_SESSION['user_settings']['smtp_user']; + } + break; + } + } } /* send command to the server. Append "\r\n" to the end. */ 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...> - 2009-04-20 04:29:32
|
Revision: 868 http://hastymail.svn.sourceforge.net/hastymail/?rev=868&view=rev Author: sailfrog Date: 2009-04-20 04:29:05 +0000 (Mon, 20 Apr 2009) Log Message: ----------- changed the default behavior of the search dialog on the mailbox page to default to searching the entire folder (instead of the current page), and to redirect to the search page if the folder (or all folders) is searched. Modified Paths: -------------- trunk/hastymail2/lib/post_action_classes/mailbox.php trunk/hastymail2/lib/url_action_classes/mailbox.php trunk/hastymail2/lib/utility_classes.php Modified: trunk/hastymail2/lib/post_action_classes/mailbox.php =================================================================== --- trunk/hastymail2/lib/post_action_classes/mailbox.php 2009-04-20 03:54:22 UTC (rev 867) +++ trunk/hastymail2/lib/post_action_classes/mailbox.php 2009-04-20 04:29:05 UTC (rev 868) @@ -146,8 +146,9 @@ $res[$mailbox] = $result; } } - if (!empty($res) && $location_id == 3 && (!is_array($uids) || empty($uids))) { - $user->dsp_page = 'search'; + if (!empty($res) && ($location_id == 2 || $location_id == 3) && (!is_array($uids) || empty($uids))) { + $user->redirect_page = 'search'; + $this->form_redirect = true; } elseif (empty($res)) { $this->errors[] = $user->str[373]; Modified: trunk/hastymail2/lib/url_action_classes/mailbox.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/mailbox.php 2009-04-20 03:54:22 UTC (rev 867) +++ trunk/hastymail2/lib/url_action_classes/mailbox.php 2009-04-20 04:29:05 UTC (rev 868) @@ -257,7 +257,7 @@ global $page_id; $flds = array(1 => $this->user->str[112], 2 => $this->user->str[107], 3 => $this->user->str[108], 4 => $this->user->str[109], 5 => $this->user->str[110], 6 => $this->user->str[112]); - $locations = array(1 => $this->user->str[297], 2 => $this->user->str[298], 3 => $this->user->str[299]); + $locations = array(2 => $this->user->str[298], 1 => $this->user->str[297], 3 => $this->user->str[299]); $data = '<complex-'.$page_id.'>'.$this->user->str[9].' <select id="search_fld" name="search_fld">'; foreach ($flds as $i => $v) { $data .= '<option '; Modified: trunk/hastymail2/lib/utility_classes.php =================================================================== --- trunk/hastymail2/lib/utility_classes.php 2009-04-20 03:54:22 UTC (rev 867) +++ trunk/hastymail2/lib/utility_classes.php 2009-04-20 04:29:05 UTC (rev 868) @@ -666,14 +666,17 @@ $url = $conf['http_prefix'].'://'.$conf['host_name'].$conf['url_base'].'?page='.$_SESSION['user_settings']['start_page']; } } - if (isset($user->page_data['prev_next_action_url']) && $user->page_data['prev_next_action_url']) { + elseif (isset($user->page_data['prev_next_action_url']) && $user->page_data['prev_next_action_url']) { $url = $conf['http_prefix'].'://'.$conf['host_name'].$conf['url_base'].$user->page_data['prev_next_action_url']; } - if (isset($user->page_data['sent']) && $user->page_data['sent'] == 1) { + elseif (isset($user->page_data['sent']) && $user->page_data['sent'] == 1) { if (isset($_SESSION['last_page'])) { $url = $conf['http_prefix'].'://'.$conf['host_name'].str_replace('&', '&', $_SESSION['last_page']); } } + elseif (isset($user->redirect_page) && $user->redirect_page) { + $url = $conf['http_prefix'].'://'.$conf['host_name'].$conf['url_base'].'?page='.$user->redirect_page; + } if ($imap->connected) { $imap->disconnect(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sai...@us...> - 2009-04-27 03:09:14
|
Revision: 878 http://hastymail.svn.sourceforge.net/hastymail/?rev=878&view=rev Author: sailfrog Date: 2009-04-27 03:09:08 +0000 (Mon, 27 Apr 2009) Log Message: ----------- testing a change with text wrapping. Modified Paths: -------------- trunk/hastymail2/lib/misc_functions.php trunk/hastymail2/lib/url_action_classes/options.php Modified: trunk/hastymail2/lib/misc_functions.php =================================================================== --- trunk/hastymail2/lib/misc_functions.php 2009-04-27 02:46:46 UTC (rev 877) +++ trunk/hastymail2/lib/misc_functions.php 2009-04-27 03:09:08 UTC (rev 878) @@ -513,24 +513,25 @@ $main_index = 0; $string = str_replace("\r\n", "\n", $string); $string = str_replace("\r", "\n", $string); + $string = $user->htmlsafe($string, $charset); $lines = split("\n", $string); + $pattern = '/([^ ]{'.$max.'})/'; foreach ($lines as $line) { - if (hm_strlen($line) > $max) { - $pattern = '/([^ ]{'.$max.'})/'; + /*if (hm_strlen($line) > $max) { if (!isset($_SESSION['user_settings']['browser_wrap']) || !$_SESSION['user_settings']['browser_wrap']) { $line = preg_replace_callback($pattern, 'prep_text_regex_callback', $line); } - } + }*/ if ($hl_reply) { if (preg_match("/^(\>|\|)/", trim($line))) { - $new_lines[$main_index] = '<b class="reply">'.$user->htmlsafe($line, $charset).'</b>'; + $new_lines[$main_index] = '<b class="reply">'.$line.'</b>'; } else { - $new_lines[$main_index] = $user->htmlsafe($line, $charset); + $new_lines[$main_index] = $line; } } else { - $new_lines[$main_index] = $user->htmlsafe($line, $charset); + $new_lines[$main_index] = $line; } $main_index++; } Modified: trunk/hastymail2/lib/url_action_classes/options.php =================================================================== --- trunk/hastymail2/lib/url_action_classes/options.php 2009-04-27 02:46:46 UTC (rev 877) +++ trunk/hastymail2/lib/url_action_classes/options.php 2009-04-27 03:09:08 UTC (rev 878) @@ -247,9 +247,9 @@ $data .= '>'.ucfirst($v).'</option>'; } $data .= '</select></td></tr>'; - $data .= '<tr><td class="opt_leftcol">'.$this->user->str[437].'</td><td><input name="browser_wrap" type="checkbox" '; + /*$data .= '<tr><td class="opt_leftcol">'.$this->user->str[437].'</td><td><input name="browser_wrap" type="checkbox" '; if (isset($vals['browser_wrap']) && $vals['browser_wrap']) { $data .= 'checked="checked" '; } - $data .= 'value="1" /></td></tr>'; + $data .= 'value="1" /></td></tr>';*/ $data .= do_display_hook('message_options_table'); $data .= '<tr><td colspan="4" class="opt_leftcol"><br /><input type="submit" name="update_settings" value="'.$this->user->str[193].'" /><br /><br /></td></tr>'; return $data; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |