[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email addressbook.php inc/class.boattach_file.i...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] email addressbook.php inc/class.boattach_file.i... |
|
Date: |
Mon, 18 Dec 2006 11:02:13 +0000 |
CVSROOT: /sources/phpgroupware
Module name: email
Changes by: Sigurd Nes <sigurdne> 06/12/18 11:02:13
Modified files:
. : addressbook.php
inc : class.boattach_file.inc.php
class.bocompose.inc.php class.bosend.inc.php
class.mail_smtp.inc.php class.uicompose.inc.php
templates/base : addressbook.tpl
Log message:
minor fixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/addressbook.php?cvsroot=phpgroupware&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.boattach_file.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bocompose.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bosend.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_smtp.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uicompose.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/email/templates/base/addressbook.tpl?cvsroot=phpgroupware&r1=1.3&r2=1.4
Patches:
Index: addressbook.php
===================================================================
RCS file: /sources/phpgroupware/email/addressbook.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- addressbook.php 17 Dec 2005 13:24:25 -0000 1.43
+++ addressbook.php 18 Dec 2006 11:02:13 -0000 1.44
@@ -6,7 +6,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: addressbook.php,v 1.43 2005/12/17 13:24:25 skwashd Exp $
+ * @version $Id: addressbook.php,v 1.44 2006/12/18 11:02:13 sigurdne Exp
$
*/
$GLOBALS['phpgw_info']['flags'] = array(
@@ -25,8 +25,9 @@
'addressbook_list_t' => 'addressbook.tpl',
'addressbook_list' => 'addressbook.tpl'
));
-
$GLOBALS['phpgw']->template->set_block('addressbook_list_t','addressbook_list','list');
+
$GLOBALS['phpgw']->template->set_block('addressbook_list_t','addressbook_list','list');
+ $GLOBALS['phpgw']->template->set_block('addressbook_list_t',
'theme_stylesheet');
$d = CreateObject('phpgwapi.contacts');
//We do it this way so the cats class gets the right rights, alright? -
skwashd Dec-2005
@@ -36,12 +37,36 @@
$include_personal = True;
- $charset = $GLOBALS['phpgw']->translation->translate('charset');
+ $charset = 'UTF8';
$GLOBALS['phpgw']->template->set_var('charset',$charset);
-
$GLOBALS['phpgw']->template->set_var('title',$GLOBALS['phpgw_info']['site_title']);
-
$GLOBALS['phpgw']->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
+
$GLOBALS['phpgw']->template->set_var('title',(isset($GLOBALS['phpgw_info']['site_title'])?$GLOBALS['phpgw_info']['site_title']:''));
+//
$GLOBALS['phpgw']->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
$GLOBALS['phpgw']->template->set_var('lang_addressbook_action',lang('Address
book'));
-
$GLOBALS['phpgw']->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
+//
$GLOBALS['phpgw']->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
+
+
+ $template_set =
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'];
+
+ if(file_exists(PHPGW_SERVER_ROOT .
'/phpgwapi/templates/{$template_set}/css/' . $template_set . '.css'))
+ {
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/{$template_set}/css/{$template_set}.css";
+ }
+ if(file_exists(PHPGW_SERVER_ROOT .
"/phpgwapi/templates/{$template_set}/css/styles.css"))
+ {
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/{$template_set}/css/styles.css";
+ }
+
+ if(isset($theme_styles) && is_array($theme_styles))
+ {
+ foreach ( $theme_styles as $style )
+ {
+ $GLOBALS['phpgw']->template->set_var('theme_style',
$style);
+ $GLOBALS['phpgw']->template->parse('theme_stylesheets',
'theme_stylesheet', true);
+ }
+ }
+
+
+
$GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
$GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php'));
@@ -57,7 +82,7 @@
if(!$cat_id)
{
- $cat_id = $prefs['default_category'];
+ $cat_id =
(isset($prefs['default_category'])?$prefs['default_category']:'');
}
switch ($filter)
@@ -121,8 +146,8 @@
}
//------------------------------------------- nextmatch
--------------------------------------------
- $left =
$GLOBALS['phpgw']->nextmatchs->left('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',$start,$total_all_persons,"&order=$order&filter=$filter&sort=$sort&query=$query");
- $right =
$GLOBALS['phpgw']->nextmatchs->right('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',$start,$total_all_persons,"&order=$order&filter=$filter&sort=$sort&query=$query");
+ $left =
$GLOBALS['phpgw']->nextmatchs->left('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',$start,$total_all_persons,array('order'=>$order,'filter'=>$filter,'sort'=>$sort,'query'=>$query));
+ $right =
$GLOBALS['phpgw']->nextmatchs->right('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',$start,$total_all_persons,array('order'=>$order,'filter'=>$filter,'sort'=>$sort,'query'=>$query));
$GLOBALS['phpgw']->template->set_var('left',$left);
$GLOBALS['phpgw']->template->set_var('right',$right);
@@ -136,7 +161,7 @@
// --------------------------------------- end nextmatch
------------------------------------------
// ------------------- list header variable template-declaration
-----------------------
-
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
+//
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$GLOBALS['phpgw']->template->set_var('sort_firstname',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'per_first_name',$order,'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',lang('Firstname')));
$GLOBALS['phpgw']->template->set_var('sort_lastname',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'per_last_name',$order,'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',lang('Lastname')));
$GLOBALS['phpgw']->template->set_var('sort_company',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'org_name',$order,'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',lang('Company')));
@@ -147,13 +172,14 @@
//$GLOBALS['phpgw']->template->set_var('cats_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
// thanks to address@hidden for fixing drop down list filtering by
categories
-
$GLOBALS['phpgw']->template->set_var('cats_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query"));
+
$GLOBALS['phpgw']->template->set_var('cats_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',array('sort'=>$sort,'order'=>$order,'filter'=>$filter,'start'=>$start,'query'=>$query)));
// --------------------------- end header declaration
----------------------------------
+ $tr_class = 'row_off';
for ($i=0;$i<count($entries);$i++)
{
- $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
- $GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
+ $tr_class =
$GLOBALS['phpgw']->nextmatchs->alternate_row_class($tr_class);
+ $GLOBALS['phpgw']->template->set_var('tr_class',$tr_class);
$firstname = $entries[$i]['per_first_name'];
if (!$firstname)
{
@@ -188,8 +214,17 @@
}
$personal_part = $personal_firstname.$personal_lastname;
+ if(isset($entries_comm) && $entries_comm)
+ {
$tmp_email = get_comm_value($entries[$i]['contact_id'], 'work
email', $entries_comm);
$tmp_hemail = get_comm_value($entries[$i]['contact_id'], 'home
email', $entries_comm);
+ }
+ else
+ {
+ $tmp_email = '';
+ $tmp_hemail = '';
+ }
+
if (($personal_part == '') ||
($include_personal == False))
{
Index: inc/class.boattach_file.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.boattach_file.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- inc/class.boattach_file.inc.php 11 May 2005 14:23:59 -0000 1.7
+++ inc/class.boattach_file.inc.php 18 Dec 2006 11:02:13 -0000 1.8
@@ -8,7 +8,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: class.boattach_file.inc.php,v 1.7 2005/05/11 14:23:59
powerstat Exp $
+ * @version $Id: class.boattach_file.inc.php,v 1.8 2006/12/18 11:02:13
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
* @internal Squirrelmail circa 2000-2001 http://www.squirrelmail.org
*/
@@ -381,14 +381,14 @@
$GLOBALS['phpgw']->template->parse('V_delete_btn','B_delete_btn');
}
- $body_tags =
'bgcolor="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'"
alink="'.$GLOBALS['phpgw_info']['theme']['alink'].'"
link="'.$GLOBALS['phpgw_info']['theme']['link'].'"
vlink="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"';
- if (!$GLOBALS['phpgw_info']['server']['htmlcompliant'])
+ $body_tags =
'';//'bgcolor="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'"
alink="'.$GLOBALS['phpgw_info']['theme']['alink'].'"
link="'.$GLOBALS['phpgw_info']['theme']['link'].'"
vlink="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"';
+ if
(!isset($GLOBALS['phpgw_info']['server']['htmlcompliant']) ||
!$GLOBALS['phpgw_info']['server']['htmlcompliant'])
{
$body_tags .= ' topmargin="0" marginheight="0"
marginwidth="0" leftmargin="0"';
}
// begin DEBUG INFO (this is old, needs updating)
- $debuginfo .= '--uploadedfile info: <br />'
+ $debuginfo = '--uploadedfile info: <br />'
. '$GLOBALS[phpgw_info][server][temp_dir]:
'.$GLOBALS['phpgw_info']['server']['temp_dir'].'<br />'
. '$GLOBALS[phpgw_info][user][sessionid]:
'.$GLOBALS['phpgw_info']['user']['sessionid'].'<br />'
. '$this->uploaddir: '.$this->uploaddir.'<br />'
@@ -397,10 +397,10 @@
. 'file_size: ' .$this->file_data['file_size']
.'<br />'
. 'file_type: ' .$this->file_data['file_type']
.'<br />'
. '<br />'
- . 'totalfiles: ' .$totalfiles .'<br />'
- . 'file_info_count: '.count($file_info) .'<br
/>'
+ . 'totalfiles: ' .
(isset($totalfiles)?$totalfiles:'') .'<br />'
+ . 'file_info_count: '.
(isset($file_info)?count($file_info):'') .'<br />'
. '<br />';
- if (count($file_info) > 0)
+ if (isset($file_info) && count($file_info) > 0)
{
$debuginfo .= '<br />
file_info[0]='.$file_info[0] .'<br /> file_info[1]='.$file_info[1];
}
@@ -416,10 +416,10 @@
)
);
- $charset = lang('charset');
+ $charset = 'UTF8';
$GLOBALS['phpgw']->template->set_var('charset',$charset);
-
$GLOBALS['phpgw']->template->set_var('page_title',$GLOBALS['phpgw_flags']['currentapp']
. ' - ' .lang('File attachment'));
-
$GLOBALS['phpgw']->template->set_var('font_family',$GLOBALS['phpgw_info']['theme']['font']);
+
$GLOBALS['phpgw']->template->set_var('page_title',$GLOBALS['phpgw_info']['flags']['currentapp']
. ' - ' .lang('File attachment'));
+ //
$GLOBALS['phpgw']->template->set_var('font_family',$GLOBALS['phpgw_info']['theme']['font']);
$GLOBALS['phpgw']->template->set_var('body_tags',$body_tags);
if ($alert_msg != '')
{
Index: inc/class.bocompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bocompose.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- inc/class.bocompose.inc.php 17 Dec 2006 19:46:11 -0000 1.15
+++ inc/class.bocompose.inc.php 18 Dec 2006 11:02:13 -0000 1.16
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: class.bocompose.inc.php,v 1.15 2006/12/17 19:46:11
sigurdne Exp $
+ * @version $Id: class.bocompose.inc.php,v 1.16 2006/12/18 11:02:13
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -639,7 +639,7 @@
// grab your value from the prefs
// $this->addybook_choice (string) [ "orig" | "lex" ]
- $this->addybook_choice =
$GLOBALS['phpgw']->msg->get_pref_value('addressbook_choice',$acctnum);
+ $this->addybook_choice =
$GLOBALS['phpgw']->msg->get_pref_value('addressbook_choice',$GLOBALS['phpgw']->msg->get_acctnum());
// that is the flag indicating what address book should
pop up
if ($this->addybook_choice == 'lex')
@@ -653,25 +653,25 @@
$this->xi['js_addylink'] = $js_addylink;
//we need to set the width of the addybook window
according to user prefs
- $addywidth =
$GLOBALS['phpgw']->msg->get_pref_value('js_addressbook_screensize',$acctnum);
+ $addywidth =
$GLOBALS['phpgw']->msg->get_pref_value('js_addressbook_screensize',$GLOBALS['phpgw']->msg->get_acctnum());
$this->xi['jsaddybook_width']=$addywidth;
//this is to determine the addybook's height
$this->xi['jsaddybook_height']=$addywidth*3/4;
// Set Image Directory and icon size and theme
$this->xi['image_dir'] = PHPGW_IMAGES;
- $icon_theme =
$GLOBALS['phpgw']->msg->get_pref_value('icon_theme',$acctnum);
- $icon_size =
$GLOBALS['phpgw']->msg->get_pref_value('icon_size',$acctnum);
+ $icon_theme =
$GLOBALS['phpgw']->msg->get_pref_value('icon_theme',$GLOBALS['phpgw']->msg->get_acctnum());
+ $icon_size =
$GLOBALS['phpgw']->msg->get_pref_value('icon_size',$GLOBALS['phpgw']->msg->get_acctnum());
$this->xi['toolbar_font'] = 'Arial, Helvetica,
san-serif';
$this->xi['send_btn_action'] = $send_btn_action;
$this->xi['to_box_value'] = $to_box_value;
- $this->xi['cc_box_value'] = $cc_box_value;
- $this->xi['bcc_box_value'] = $bcc_box_value;
- $this->xi['subject'] = $subject;
- $this->xi['body'] = $body;
+ $this->xi['cc_box_value'] =
(isset($cc_box_value)?$cc_box_value:'');
+ $this->xi['bcc_box_value'] =
(isset($bcc_box_value)?$bcc_box_value:'');
+ $this->xi['subject'] = (isset($subject)?$subject:'');
+ $this->xi['body'] = (isset($body)?$body:'');
$this->xi['form1_name'] = 'doit';
$this->xi['form1_method'] = 'POST';
- $this->xi['buttons_bgcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder'];
+ // $this->xi['buttons_bgcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder'];
$this->xi['buttons_bgcolor_class'] = 'email_folder';
$this->mail_spell = CreateObject("email.spell");
// Set Variables for AddressBook button
@@ -702,7 +702,7 @@
$attachfile_js_image =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$icon_theme.'/add-attachment-'.$icon_size,'_on'),$attachfile_js_text,'','','0');
//$attachfile_js_image =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->common->image_on('email',$icon_theme.'-add-attachment-'.$icon_size,'_on'),$attachfile_js_text,'','','0');
// This code looksup the users preference for the type
of button and create the buttons to send to the UI
- switch
($GLOBALS['phpgw']->msg->get_pref_value('button_type',$acctnum)){
+ switch
($GLOBALS['phpgw']->msg->get_pref_value('button_type',$GLOBALS['phpgw']->msg->get_acctnum())){
case 'text':
$this->xi['addressbook_button'] = '<a
href="javascript:'.$addressbook_onclick.'">'.$addressbook_text.'</a>';
$this->xi['send_button'] = '<a
href="javascript:'.$send_onclick.'">'.$send_text.'</a>';
@@ -733,9 +733,9 @@
break;
}
- $this->xi['to_boxs_bgcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
+ // $this->xi['to_boxs_bgcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
$this->xi['to_boxs_bgcolor_class'] = 'th';
- $this->xi['to_boxs_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ // $this->xi['to_boxs_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
if($this->addybook_choice == 'lex')
{
//Okay, i dont know why the html class is
nowhere instantiated here
Index: inc/class.bosend.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bosend.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- inc/class.bosend.inc.php 11 May 2005 18:06:58 -0000 1.14
+++ inc/class.bosend.inc.php 18 Dec 2006 11:02:13 -0000 1.15
@@ -8,7 +8,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: class.bosend.inc.php,v 1.14 2005/05/11 18:06:58
powerstat Exp $
+ * @version $Id: class.bosend.inc.php,v 1.15 2006/12/18 11:02:13
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
* @internal Server side attachment storage technique borrowed from
Squirrelmail
*/
@@ -335,7 +335,7 @@
$returnccode = $this->smtp->Send();
- if( !$this->smtp->ErrorInfo && !$returncode)//need to
work out why it does this sometimes!
+ if( !$this->smtp->ErrorInfo && (!isset($returncode) ||
!$returncode))//need to work out why it does this sometimes!
{
$returncode = 1;
}
@@ -355,7 +355,7 @@
$success =
$this->copy_to_sent_folder($this->smtp->getHeader() . "\n" .
$this->smtp->getBody());
}
- if( $is_reply && $returncode )
+ if(isset($is_reply) && $is_reply && $returncode )
{
$this->mark_as_replied($msgball);
}
@@ -375,7 +375,7 @@
$this->smtp->ErrorInfo;
echo '</pre>'."\r\n";
echo '<p> <br /></p>'."\r\n";
- echo '<p>To go back to the msg list,
click <a href="'.$return_to_folder_href.'">here</a></p><br />';
+ echo '<p>To go back to the msg list,
click <a href="'.
$GLOBALS['phpgw']->link('/index.php',$return_to_folder_href).'">here</a></p><br
/>';
echo '</body></html>';
$this->send_message_cleanup();
}
@@ -385,7 +385,7 @@
$this->send_message_cleanup();
// redirect the browser to the index
page for the appropriate folder
//header('Location:
'.$return_to_folder_href);
-
$GLOBALS['phpgw']->redirect($return_to_folder_href);
+
$GLOBALS['phpgw']->redirect_link('/index.php',$return_to_folder_href);
// kill the rest of this script
if (is_object($GLOBALS['phpgw']->msg))
{
@@ -849,14 +849,24 @@
$fldball_candidate['folder'] =
$GLOBALS['phpgw']->msg->prep_folder_out('INBOX');
$fldball_candidate['acctnum'] =
(int)$GLOBALS['phpgw']->msg->get_acctnum();
}
- return $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uiindex.index'
-
.'&fldball[folder]='.$fldball_candidate['folder']
-
.'&fldball[acctnum]='.$fldball_candidate['acctnum']
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start'));
+/* return $GLOBALS['phpgw']->link(
+ '/index.php',array(
+
'menuaction'=>'email.uiindex.index',
+
'fldball[folder]'=>$fldball_candidate['folder'],
+
'fldball[acctnum]'=>$fldball_candidate['acctnum'],
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start')));
+
+*/
+ return array(
+
'menuaction'=>'email.uiindex.index',
+
'fldball[folder]'=>$fldball_candidate['folder'],
+
'fldball[acctnum]'=>$fldball_candidate['acctnum'],
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'));
+
}
@@ -868,8 +878,7 @@
$this->save_message($this->smtp->getHeader() . "\n" .
$this->smtp->getBody() . "\r\n",
'INBOX.Drafts', "\\Draft");
- Header('Location: ' .
$GLOBALS['phpgw']->link('/email/index.php') ); // . $this->get_return_to() );
- exit;
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'email.uiindex.index'));
}
}
?>
Index: inc/class.mail_smtp.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_smtp.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- inc/class.mail_smtp.inc.php 11 May 2005 18:52:06 -0000 1.2
+++ inc/class.mail_smtp.inc.php 18 Dec 2006 11:02:13 -0000 1.3
@@ -6,7 +6,7 @@
* @copyright Copyright (C) 2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: class.mail_smtp.inc.php,v 1.2 2005/05/11 18:52:06
powerstat Exp $
+ * @version $Id: class.mail_smtp.inc.php,v 1.3 2006/12/18 11:02:13
sigurdne Exp $
*/
/**
@@ -31,7 +31,7 @@
{
$this->IsSMTP(true);
$this->Host =
$GLOBALS['phpgw_info']['server']['smtp_server'];
- $this->Port =
$GLOBALS['phpgw_info']['server']['smtp_port'];
+ $this->Port =
(isset($GLOBALS['phpgw_info']['server']['smtp_port'])?$GLOBALS['phpgw_info']['server']['smtp_port']:'');
$this->Version = 'custom - phpGroupWare 1.72';
}
}
Index: inc/class.uicompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uicompose.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- inc/class.uicompose.inc.php 17 Dec 2006 19:46:11 -0000 1.12
+++ inc/class.uicompose.inc.php 18 Dec 2006 11:02:13 -0000 1.13
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: class.uicompose.inc.php,v 1.12 2006/12/17 19:46:11
sigurdne Exp $
+ * @version $Id: class.uicompose.inc.php,v 1.13 2006/12/18 11:02:13
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -122,11 +122,11 @@
'form1_method' =>
$this->bo->xi['form1_method'],
'js_addylink_link' =>
$this->bo->xi['js_addylink']['link'],
'js_addylink_oArgs' =>
$this->bo->xi['js_addylink']['oArgs'],
- 'buttons_bgcolor' =>
$this->bo->xi['buttons_bgcolor'],
+ // 'buttons_bgcolor' =>
$this->bo->xi['buttons_bgcolor'],
'buttons_bgcolor_class' =>
$this->bo->xi['buttons_bgcolor_class'],
- 'to_boxs_bgcolor' =>
$this->bo->xi['to_boxs_bgcolor'],
+ // 'to_boxs_bgcolor' =>
$this->bo->xi['to_boxs_bgcolor'],
'to_boxs_bgcolor_class' =>
$this->bo->xi['to_boxs_bgcolor_class'],
- 'to_boxs_font' =>
$this->bo->xi['to_boxs_font'],
+ // 'to_boxs_font' =>
$this->bo->xi['to_boxs_font'],
'to_box_desc' =>
$this->bo->xi['to_box_desc'],
'to_box_name' =>
$this->bo->xi['to_box_name'],
'cc_box_desc' =>
$this->bo->xi['cc_box_desc'],
@@ -146,7 +146,7 @@
'toolbar_font' =>
$this->bo->xi['toolbar_font'],
'addressbook_button' =>
$this->bo->xi['addressbook_button'],
'send_button' =>
$this->bo->xi['send_button'],
- 'spellcheck_button' =>
$this->bo->xi['spellcheck_button'],
+ 'spellcheck_button' =>
(isset($this->bo->xi['spellcheck_button'])?$this->bo->xi['spellcheck_button']:''),
'attachfile_js_button' =>
$this->bo->xi['attachfile_js_button'],
'attachfile_js_onclick' =>
$this->bo->xi['attachfile_js_onclick'],
'body_box_name' =>
$this->bo->xi['body_box_name'],
Index: templates/base/addressbook.tpl
===================================================================
RCS file: /sources/phpgroupware/email/templates/base/addressbook.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/base/addressbook.tpl 13 Mar 2005 23:22:44 -0000 1.3
+++ templates/base/addressbook.tpl 18 Dec 2006 11:02:13 -0000 1.4
@@ -1,23 +1,15 @@
-<!-- $Id: addressbook.tpl,v 1.3 2005/03/13 23:22:44 skwashd Exp $ -->
+<!-- $Id: addressbook.tpl,v 1.4 2006/12/18 11:02:13 sigurdne Exp $ -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
"http://www.w3.org/TR/REC-html40/loose.dtd";>
<HTML LANG="en">
-<head>
-<title>{title}</title>
-<meta http-equiv="content-type" content="text/html; charset={charset}">
-<STYLE type="text/css">
- A {text-decoration:none;}
- <!--
- A:link {text-decoration:none;}
- A:visted {text-decoration:none;}
- A:active {text-decoration:none;}
- body {margin-top: 0px; margin-right: 0px; margin-left: 0px;}
- td {text-decoration:none;}
- tr {text-decoration:none;}
- table {text-decoration:none;}
- center {text-decoration:none;}
- -->
-</STYLE>
-<script type="text/javascript">
+ <head>
+ <title>{title}</title>
+ <meta http-equiv="content-type" content="text/html;
charset={charset}">
+
+ <!-- BEGIN theme_stylesheet -->
+ <link href="{theme_style}" type="text/css" rel="StyleSheet">
+ <!-- END theme_stylesheet -->
+
+ <script type="text/javascript">
function ExchangeTo(thisform)
{
if (opener.document.doit.to.value =='')
@@ -51,28 +43,29 @@
opener.document.doit.bcc.value+=","+thisform.elements[0].value;
}
}
-</script>
-</head>
-<body bgcolor="{bg_color}">
-<center>
+ </script>
+ </head>
+ <body bgcolor="{bg_color}">
<p>
<font face="{font}"><b>{lang_addressbook_action}</b></font>
<br />
<hr noshade width="98%" align="center" size="1">
-
<table border="0" width="100%">
<tr>
<td width="33%" align="left">
-<form action="{cats_action}" name="form" method="POST">
- <select name="cat_id"
onChange="this.form.submit();"><option
value="">{lang_select_cats}</option>{cats_list}</select>
+ <form action="{cats_action}"
name="form" method="POST">
+ <select name="cat_id"
onChange="this.form.submit();">
+ <option
value="">{lang_select_cats}</option>
+ {cats_list}
+ </select>
<noscript> <input type="submit" name="submit"
value="{lang_submit}"></noscript>
-</form>
+ </form>
</td>
<td width="33%" align="center">
{lang_showing}
</td>
<td width="33%" align="right">
-<form method="POST" action="{search_action}">
+ <form method="POST"
action="{search_action}">
<table>
<tr>
<td>
@@ -84,17 +77,17 @@
<option value="" >Select Filter</option>
<option value="private">Private</option>
<option value="none">All</option>
- <option value="user_only">Only yours
</option></td>
+
<option value="user_only">Only yours </option>
+
</select>
+ </td>
</tr>
<tr>
-
<td colspan="3">
<center><input type="submit" name="search"
value="{lang_search}"></center>
</td>
</tr>
</table>
-
-</form>
+ </form>
</td>
</tr>
<tr>
@@ -112,72 +105,65 @@
</tr>
</table>
<table border="0" width="100%" cellpadding="2" cellspacing="2">
- <tr bgcolor="{th_bg}">
- <td width="25%" bgcolor="{th_bg}" align="center">
- <font face="{font}">{sort_firstname}</font>
+ <tr class="th">
+ <td width="25%" align="center">
+ {sort_firstname}
</td>
- <td width="15%" bgcolor="{th_bg}" align="center">
- <font face="{font}">{sort_lastname}</font>
+ <td width="15%" align="center">
+ {sort_lastname}
</td>
- <td width="15%" bgcolor="{th_bg}" align="center">
- <font face="{font}">{sort_company}</font>
+ <td width="15%" align="center">
+ {sort_company}
</td>
- <td width="25%" bgcolor="{th_bg}" align="center">
- <font face="{font}">{lang_email}</font>
+ <td width="25%" align="center">
+ {lang_email}
</td>
- <td width="25%" bgcolor="{th_bg}" align="center">
- <font face="{font}">{lang_hemail}</font>
+ <td width="25%" align="center">
+ {lang_hemail}
</td>
</tr>
<!-- BEGIN addressbook_list -->
- <tr bgcolor="{tr_color}">
+ <tr class="{tr_class}">
<td>
- <font face="{font}">{firstname}</font>
+ {firstname}
</td>
<td>
- <font face="{font}">{lastname}</font>
+ {lastname}
</td>
<td>
- <font face="{font}">{company}</font>
+ {company}
</td>
-<form>
+
<td width="20%" align="center">
- <font face="{font}" size="1">
+ <form>
<input type="text" size="20" name="email"
value="{email}">
<br />
<input type="button" size="25" name="button" value="To"
onClick="ExchangeTo(this.form);">
<input type="button" size="25" name="button" value="Cc"
onClick="ExchangeCc(this.form);">
<input type="button" size="25" name="button"
value="Bcc" onClick="ExchangeBcc(this.form);">
- </font>
+ </form>
</td>
-</form>
-<form>
<td align="center">
- <font face="{font}" size="1">
+ <form>
<input type="text" size="25" name="hemail"
value="{hemail}">
<br />
<input type="button" size="25" name="button" value="To"
onClick="ExchangeTo(this.form);">
<input type="button" size="25" name="button" value="Cc"
onClick="ExchangeCc(this.form);">
<input type="button" size="25" name="button"
value="Bcc" onClick="ExchangeBcc(this.form);">
- </font>
+ </form>
</td>
-</form>
</tr>
-<!-- END addressbook_list -->
-
+ <!-- END addressbook_list -->
</table>
<table cellpadding="2" cellspacing="2">
<tr>
-<form>
<td>
- <font face="{font}">
+ <form>
<input type="button" name="done" value="{lang_done}"
onClick="window.close()">
- </font>
-</form>
+ </form>
</td>
</tr>
</table>
-</center>
-</body>
+ </body>
</html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] email addressbook.php inc/class.boattach_file.i...,
Sigurd Nes <=