[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email inc/class.boindex.inc.php inc/class.mail_...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] email inc/class.boindex.inc.php inc/class.mail_... |
|
Date: |
Wed, 13 Dec 2006 14:57:21 +0000 |
CVSROOT: /sources/phpgroupware
Module name: email
Changes by: Sigurd Nes <sigurdne> 06/12/13 14:57:21
Modified files:
inc : class.boindex.inc.php
class.mail_msg_base.inc.php
class.so_mail_msg.inc.php
class.uicompose.inc.php class.uifilters.inc.php
class.uifolder.inc.php class.uiindex.inc.php
class.uijsaddressbook.inc.php
class.uimessage.inc.php
class.uipreferences.inc.php
class.uisearch.inc.php
templates/base : index_main_b0_l2.tpl
Log message:
disable xslt-version for now, set template root
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.boindex.inc.php?cvsroot=phpgroupware&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_base.inc.php?cvsroot=phpgroupware&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.so_mail_msg.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uicompose.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uifilters.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uifolder.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uiindex.inc.php?cvsroot=phpgroupware&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uijsaddressbook.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uimessage.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uipreferences.inc.php?cvsroot=phpgroupware&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uisearch.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/email/templates/base/index_main_b0_l2.tpl?cvsroot=phpgroupware&r1=1.3&r2=1.4
Patches:
Index: inc/class.boindex.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.boindex.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- inc/class.boindex.inc.php 11 May 2005 14:23:59 -0000 1.33
+++ inc/class.boindex.inc.php 13 Dec 2006 14:57:20 -0000 1.34
@@ -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.boindex.inc.php,v 1.33 2005/05/11 14:23:59
powerstat Exp $
+ * @version $Id: class.boindex.inc.php,v 1.34 2006/12/13 14:57:20
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -312,7 +312,7 @@
//{form_folder_switch_closetag}
$my_widgets->new_form();
$my_widgets->set_form_name('folder_switch');
-
$my_widgets->set_form_action($GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index'));
+
$my_widgets->set_form_action($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.uiindex.index')));
$my_widgets->set_form_method('post');
$tpl->set_var('form_folder_switch_opentag',
$my_widgets->get_form());
$tpl->set_var('folder_switch_combobox',
$my_widgets->all_folders_combobox('folder_switch'));
@@ -482,8 +482,7 @@
$this->xi['folder_info'] =
$GLOBALS['phpgw']->msg->get_folder_status_info();
}
$this->xi['arrows_form_action'] =
$GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uiindex.index');
+
'/index.php',array('menuaction'=>'email.uiindex.index'));
$this->xi['arrows_form_name'] = 'arrownav';
$this->xi['arrows_backcolor'] =
$GLOBALS['phpgw_info']['theme']['row_off'];
$this->xi['arrows_backcolor_class'] = 'row_off';
@@ -495,12 +494,12 @@
$this->xi['current_start'] =
$GLOBALS['phpgw']->msg->get_arg_value('start');
$nav_common_uri = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uiindex.index'
-
.'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum()
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order'));
+
'/index.php',array(
+
'menuaction'=>'email.uiindex.index',
+
'fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum(),
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order')));
$nav_args = Array (
'start' =>
$GLOBALS['phpgw']->msg->get_arg_value('start'),
@@ -519,33 +518,33 @@
'/index.php',
$GLOBALS['phpgw']->msg->get_arg_value('start'),
$this->xi['folder_info']['number_all'],
-
'&menuaction=email.uiindex.index'
-
.'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum()
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order'));
+
array('menuaction'=>'email.uiindex.index',
+
'fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum(),
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order')));
// depreciated, only for template 1
$this->xi['td_next_arrows'] = $this->nextmatchs->right(
'/index.php',
$GLOBALS['phpgw']->msg->get_arg_value('start'),
$this->xi['folder_info']['number_all'],
-
'&menuaction=email.uiindex.index'
-
.'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum()
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order'));
+
array('menuaction'=>'email.uiindex.index',
+
'fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum(),
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order')));
$this->xi['ctrl_bar_back2'] =
$GLOBALS['phpgw_info']['theme']['row_off'];
$this->xi['compose_link'] = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uicompose.compose'
+
'/index.php',array(
+
'menuaction'=>'email.uicompose.compose',
// this data
tells us where to return to after sending a message
-
.'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_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'));
+
'fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_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')));
$this->xi['compose_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/compose-message-'.$this->icon_size,'_on'),$this->xi['compose_txt'],'','','0');
$this->xi['ilnk_compose'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['compose_link'],$this->xi['compose_img']);
@@ -564,11 +563,11 @@
if ($this->xi['mailsvr_supports_folders'])
{
$this->xi['folders_link'] =
$GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uifolder.folder'
+
'/index.php',array(
+
'menuaction'=>'email.uifolder.folder',
// going to the
folder list page, we only need log into the INBOX folder
-
.'&fldball[folder]='.'INBOX'
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
+
'fldball[folder]'=>'INBOX',
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
$this->xi['folders_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/folder-'.$this->icon_size,'_on'),$this->xi['folders_txt1'],'','','0');
$this->xi['ilnk_folders'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['folders_link'],$this->xi['folders_img']);
@@ -585,8 +584,7 @@
}
$this->xi['filters_link'] = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uifilters.filters_list');
+
'/index.php',array('menuaction'=>'email.uifilters.filters_list'));
$this->xi['filters_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/filters-'.$this->icon_size,'_on'),$this->xi['folders_txt1'],'','','0');
$this->xi['ilnk_filters'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['filters_link'],$this->xi['filters_img']);
@@ -595,9 +593,9 @@
// FIXME
$this->xi['email_prefs_link'] = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uipreferences.preferences'
-
.'&ex_acctnum='.$GLOBALS['phpgw']->msg->get_acctnum());
+
'/index.php',array(
+
'menuaction'=>'email.uipreferences.preferences',
+
'ex_acctnum'=>$GLOBALS['phpgw']->msg->get_acctnum()));
$this->xi['email_prefs_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/customize-'.$this->icon_size,'_on'),$this->xi['folders_txt1'],'','','0');
$this->xi['ilnk_email_prefs'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['email_prefs_link'],$this->xi['email_prefs_img']);
@@ -608,8 +606,8 @@
//
'menuaction=email.uipreferences.ex_accounts'
// .'&acctnum=1');
$this->xi['accounts_link'] = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uipreferences.ex_accounts_list');
+
'/index.php',array(
+
'menuaction'=>'email.uipreferences.ex_accounts_list'));
$this->xi['accounts_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/accounts-'.$this->icon_size,'_on'),$this->xi['folders_txt1'],'','','0');
$this->xi['ilnk_accounts'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['accounts_link'],$this->xi['accounts_img']);
@@ -669,8 +667,8 @@
.'<option value="6"' .$sort_selected[6]
.'>'.$this->xi['lang_size'].'</option>' ."\r\n";
$this->xi['sortbox_action'] = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uiindex.index');
+
'/index.php',array(
+
'menuaction'=>'email.uiindex.index'));
$this->xi['sortbox_on_change'] =
'document.sortbox.submit()';
$this->xi['sortbox_select_name'] = 'sort';
@@ -896,8 +894,8 @@
}
// user may select individual messages to move, make
combobox to select destination folder
$this->xi['frm_delmov_action'] =
$GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.boaction.delmov');
+
'/index.php',array(
+
'menuaction'=>'email.boaction.delmov'));
$this->xi['frm_delmov_name'] = 'delmov';
if ($this->xi['mailsvr_supports_folders'])
{
@@ -1084,10 +1082,10 @@
$this->xi['ctrl_bar_back2'] =
$GLOBALS['phpgw_info']['theme']['row_off'];
$this->xi['compose_link'] = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uicompose.compose'
-
.'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
+
'/index.php',array(
+
'menuaction'=>'email.uicompose.compose',
+
'fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
if ($this->xi['mailsvr_supports_folders'])
{
@@ -1106,8 +1104,8 @@
$this->xi['folders_btn'] = ' ';
}
$this->xi['email_prefs_link'] = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uipreferences.preferences');
+
'/index.php',array(
+
'menuaction'=>'email.uipreferences.preferences'));
$this->xi['filters_link'] = $GLOBALS['phpgw']->link(
'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/filters.php');
$this->xi['filters_href'] = '<a
href="'.$this->xi['filters_link'].'">'.$this->xi['filters_txt'].'</a>';
@@ -1281,8 +1279,8 @@
// NOT YET IMPLEMENTED IN MLIST
// user may select individual messages to move, make
combobox to select destination folder
$this->xi['frm_delmov_action'] =
$GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uiindex.index');
+
'/index.php',array(
+
'menuaction'=>'email.uiindex.index'));
$this->xi['frm_delmov_name'] = 'delmov';
if ($this->xi['mailsvr_supports_folders'])
{
Index: inc/class.mail_msg_base.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- inc/class.mail_msg_base.inc.php 26 Nov 2006 14:16:48 -0000 1.85
+++ inc/class.mail_msg_base.inc.php 13 Dec 2006 14:57:20 -0000 1.86
@@ -9,7 +9,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package email
- * @version $Id: class.mail_msg_base.inc.php,v 1.85 2006/11/26 14:16:48
sigurdne Exp $
+ * @version $Id: class.mail_msg_base.inc.php,v 1.86 2006/12/13 14:57:20
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
* @internal Originally Based on Aeromail http://the.cushman.net/
*/
@@ -474,7 +474,9 @@
{
if (is_object($GLOBALS['phpgw']->xslttpl))
{
- $this->phpgw_before_xslt = False;
+// $this->phpgw_before_xslt = False; //
disable xslt-version for now (seems to have issues with utf)
+ $this->phpgw_before_xslt = true;
+
}
else
{
@@ -3207,7 +3209,7 @@
}
// if there's no data we'll get back a FALSE
- if ($cached_data)
+ if ($cached_data && is_array($cached_data))
{
//if
($this->debug_args_special_handlers > 1) { echo 'mail_msg: get_folder_list:
using *Prefs DB* cached folder list data<br />';}
if ($this->debug_args_special_handlers
> 1) { $this->dbug->out('mail_msg: get_folder_list: using appsession cached
folder list data<br />'); }
Index: inc/class.so_mail_msg.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.so_mail_msg.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- inc/class.so_mail_msg.inc.php 31 Aug 2006 02:39:41 -0000 1.6
+++ inc/class.so_mail_msg.inc.php 13 Dec 2006 14:57:20 -0000 1.7
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package email
- * @version $Id: class.so_mail_msg.inc.php,v 1.6 2006/08/31 02:39:41
skwashd Exp $
+ * @version $Id: class.so_mail_msg.inc.php,v 1.7 2006/12/13 14:57:20
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -642,7 +642,7 @@
*/
function so_delete_data($data_key)
{
- $account_id =
get_account_id($accountid,$GLOBALS['phpgw']->session->account_id);
+ $account_id =
get_account_id((isset($accountid)?$accountid:''),$GLOBALS['phpgw']->session->account_id);
$data_key =
$GLOBALS['phpgw']->db->db_addslashes($data_key);
$GLOBALS['phpgw']->db->query("DELETE FROM
phpgw_anglemail "
. " WHERE account_id='" . $account_id . "' AND
data_key='" . $data_key . "'",__LINE__,__FILE__);
Index: inc/class.uicompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uicompose.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- inc/class.uicompose.inc.php 11 May 2005 19:09:36 -0000 1.8
+++ inc/class.uicompose.inc.php 13 Dec 2006 14:57:20 -0000 1.9
@@ -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.8 2005/05/11 19:09:36
powerstat Exp $
+ * @version $Id: class.uicompose.inc.php,v 1.9 2006/12/13 14:57:20
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -76,7 +76,8 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
+ $this->tpl->set_root(PHPGW_APP_TPL);
}
else
{
Index: inc/class.uifilters.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uifilters.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- inc/class.uifilters.inc.php 11 May 2005 19:09:36 -0000 1.17
+++ inc/class.uifilters.inc.php 13 Dec 2006 14:57:20 -0000 1.18
@@ -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.uifilters.inc.php,v 1.17 2005/05/11 19:09:36
powerstat Exp $
+ * @version $Id: class.uifilters.inc.php,v 1.18 2006/12/13 14:57:20
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -83,7 +83,8 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
+ $this->tpl->set_root(PHPGW_APP_TPL);
}
else
{
@@ -659,7 +660,8 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
+ $this->tpl->set_root(PHPGW_APP_TPL);
}
else
{
Index: inc/class.uifolder.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uifolder.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- inc/class.uifolder.inc.php 11 May 2005 19:09:36 -0000 1.8
+++ inc/class.uifolder.inc.php 13 Dec 2006 14:57:20 -0000 1.9
@@ -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.uifolder.inc.php,v 1.8 2005/05/11 19:09:36
powerstat Exp $
+ * @version $Id: class.uifolder.inc.php,v 1.9 2006/12/13 14:57:20
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -56,7 +56,8 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
+ $this->tpl->set_root(PHPGW_APP_TPL);
// HOWEVER still this class must NOT invoke
$GLOBALS['phpgw']->common->phpgw_header()
// even though we had to output the header (go
figure... :)
}
Index: inc/class.uiindex.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uiindex.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- inc/class.uiindex.inc.php 25 Sep 2006 13:06:23 -0000 1.26
+++ inc/class.uiindex.inc.php 13 Dec 2006 14:57:20 -0000 1.27
@@ -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.uiindex.inc.php,v 1.26 2006/09/25 13:06:23
skwashd Exp $
+ * @version $Id: class.uiindex.inc.php,v 1.27 2006/12/13 14:57:20
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -87,6 +87,7 @@
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
$GLOBALS['phpgw']->common->phpgw_header(true);
+ $this->tpl->set_root(PHPGW_APP_TPL);
// HOWEVER still this class must NOT invoke
$GLOBALS['phpgw']->common->phpgw_header()
// even though we had to output the header (go
figure... :)
// later: What does that mean ?
@@ -99,6 +100,7 @@
'T_index_blocks' => 'index_blocks.tpl',
'T_index_main' =>
'index_main_b'.$this->bo->xi['my_browser'].'_l'.$this->bo->xi['my_layout'].
'.tpl'
));
+
$this->tpl->set_block('T_index_main','B_action_report','V_action_report');
//$this->tpl->set_block('T_index_main','B_show_size','V_show_size');
//$this->tpl->set_block('T_index_main','B_get_size','V_get_size');
@@ -589,6 +591,7 @@
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
$GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
// NOTE: as of Dec 10, 2001 a call from menuaction
defaults to NOT modular
// HOWEVER still this class must NOT invoke
$GLOBALS['phpgw']->common->phpgw_header()
// even though we had to output the header and navbar,
(go figure... :)
Index: inc/class.uijsaddressbook.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uijsaddressbook.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- inc/class.uijsaddressbook.inc.php 11 May 2005 19:09:36 -0000 1.7
+++ inc/class.uijsaddressbook.inc.php 13 Dec 2006 14:57:20 -0000 1.8
@@ -9,7 +9,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.uijsaddressbook.inc.php,v 1.7 2005/05/11 19:09:36
powerstat Exp $
+ * @version $Id: class.uijsaddressbook.inc.php,v 1.8 2006/12/13 14:57:20
sigurdne Exp $
*/
@@ -215,7 +215,8 @@
//$this->template->set_root(PHPGW_SERVER_ROOT."/email/templates/".$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']);
// (angles) fix suggested by Dave Hall allows email app
compose page to be used with any template,
// fixes bug where email app compose page needed an
(empty) template named dir in the email dir tree to use said named template
-
$this->template->set_root($GLOBALS['phpgw']->common->get_tpl_dir('email'));
+
//$this->template->set_root($GLOBALS['phpgw']->common->get_tpl_dir('email'));
+ $this->template->set_root(PHPGW_APP_TPL);
$this->template->set_file(array(
'mainframe_t' =>
'addressbook-js-frameset.tpl'
));
Index: inc/class.uimessage.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uimessage.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- inc/class.uimessage.inc.php 11 May 2005 19:09:36 -0000 1.14
+++ inc/class.uimessage.inc.php 13 Dec 2006 14:57:20 -0000 1.15
@@ -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.uimessage.inc.php,v 1.14 2005/05/11 19:09:36
powerstat Exp $
+ * @version $Id: class.uimessage.inc.php,v 1.15 2006/12/13 14:57:20
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -65,7 +65,8 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
+ $this->tpl->set_root(PHPGW_APP_TPL);
// HOWEVER still this class must NOT invoke
$GLOBALS['phpgw']->common->phpgw_header()
// even though we had to output the header (go
figure... :)
}
Index: inc/class.uipreferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uipreferences.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- inc/class.uipreferences.inc.php 25 Sep 2006 13:07:06 -0000 1.21
+++ inc/class.uipreferences.inc.php 13 Dec 2006 14:57:20 -0000 1.22
@@ -9,7 +9,7 @@
* @copyright Copyright (C) 2003-2006 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.uipreferences.inc.php,v 1.21 2006/09/25 13:07:06
skwashd Exp $
+ * @version $Id: class.uipreferences.inc.php,v 1.22 2006/12/13 14:57:20
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
* @internal Based on Aeromail http://the.cushman.net/
*/
@@ -368,7 +368,8 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
+ $this->tpl->set_root(PHPGW_APP_TPL);
}
else
{
@@ -546,7 +547,8 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
+ $this->tpl->set_root(PHPGW_APP_TPL);
}
else
{
@@ -720,7 +722,8 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
+ $this->tpl->set_root(PHPGW_APP_TPL);
}
else
{
@@ -799,9 +802,9 @@
}
}
$add_new_acct_url = $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.uipreferences.ex_accounts_edit'
-
.'&ex_acctnum='.$this->bo->add_new_account_token);
+
'/index.php',array(
+
'menuaction'=>'email.uipreferences.ex_accounts_edit',
+
'ex_acctnum'=>$this->bo->add_new_account_token));
$add_new_acct_href = '<a
href="'.$add_new_acct_url.'">'.lang('New Account').'</a>';
$this->tpl->set_var('add_new_acct_href',$add_new_acct_href);
Index: inc/class.uisearch.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uisearch.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inc/class.uisearch.inc.php 11 May 2005 19:09:36 -0000 1.4
+++ inc/class.uisearch.inc.php 13 Dec 2006 14:57:20 -0000 1.5
@@ -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.uisearch.inc.php,v 1.4 2005/05/11 19:09:36
powerstat Exp $
+ * @version $Id: class.uisearch.inc.php,v 1.5 2006/12/13 14:57:20
sigurdne Exp $
*/
@@ -70,7 +70,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
//$GLOBALS['phpgw']->msg =
CreateObject('email.mail_msg');
//$GLOBALS['phpgw']->msg->begin_request(
array("do_login" => True) );
@@ -88,6 +88,7 @@
$month_date = $this->get_week_date(5);
$t = $GLOBALS['phpgw']->template;
+ $t->set_root(PHPGW_APP_TPL);
$t->set_file("frmhandle", "search_form.tpl");
# make a "fldball" to remember what account and folder
we came from initially
@@ -275,7 +276,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
//$GLOBALS['phpgw']->msg =
CreateObject('email.mail_msg');
//$GLOBALS['phpgw']->msg->begin_request(
array("do_login" => True) );
@@ -287,6 +288,7 @@
# output the javascript stuff
$jst = $GLOBALS['phpgw']->template;
+ $jst->set_root(PHPGW_APP_TPL);
$jst->set_file('search_js', 'search_results_js.tpl');
$jst->pparse('output', 'search_js');
Index: templates/base/index_main_b0_l2.tpl
===================================================================
RCS file: /sources/phpgroupware/email/templates/base/index_main_b0_l2.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/base/index_main_b0_l2.tpl 13 Mar 2005 23:22:44 -0000 1.3
+++ templates/base/index_main_b0_l2.tpl 13 Dec 2006 14:57:21 -0000 1.4
@@ -34,6 +34,16 @@
}
</script>
+<!-- BEGIN B_action_report -->
+<table border="0" cellpadding="0" cellspacing="0" width="100%" align="center">
+<tr>
+ <td colspan="7" align="center">
+ <font face="{stats_font}"
size="{stats_font_size}">{report_this}</font>
+ </td>
+</tr>
+</table>
+<!-- END B_action_report -->
+
{auto_refresh_widget}
{widget_toolbar}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] email inc/class.boindex.inc.php inc/class.mail_...,
Sigurd Nes <=