[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email/inc class.bocompose.inc.php,1.1.2.4,1.1.2.
|
From: |
Alejandro Borges (lex) <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: email/inc class.bocompose.inc.php,1.1.2.4,1.1.2.5 class.bopreferences.inc.php,1.10.2.4,1.10.2.5 |
|
Date: |
Fri, 06 Dec 2002 18:47:08 -0500 |
Update of /cvsroot/phpgroupware/email/inc
In directory subversions:/tmp/cvs-serv30500/email/inc
Modified Files:
Tag: Version-0_9_14-branch
class.bocompose.inc.php class.bopreferences.inc.php
Log Message:
Preferences for addressbook type and screensize are fixed for multiple
accounts. Thx a lot GreenGiant.
/me goes hide in shame.
Index: class.bocompose.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bocompose.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** class.bocompose.inc.php 21 Nov 2002 23:54:27 -0000 1.1.2.4
--- class.bocompose.inc.php 6 Dec 2002 23:47:06 -0000 1.1.2.5
***************
*** 619,624 ****
// grab your value from the prefs
// $this->addybook_choice (string) [ "orig" | "lex" ]
! // FIX ME: this pref only respects account 0, should
each acct have a different choice?
! $this->addybook_choice =
$GLOBALS['phpgw']->msg->get_pref_value('addressbook_choice',0);
// that is the flag indicating what address book should
pop up
--- 619,623 ----
// grab your value from the prefs
// $this->addybook_choice (string) [ "orig" | "lex" ]
! $this->addybook_choice =
$GLOBALS['phpgw']->msg->get_pref_value('addressbook_choice',$acctnum);
// that is the flag indicating what address book should
pop up
***************
*** 635,641 ****
$this->xi['js_addylink'] = $js_addylink;
//we need to set the width of the addybook window
according to user prefs
!
//$addywidth=$GLOBALS['phpgw_info']['user']['preferences']['email']['js_addressbook_screensize'];
! // FIX ME: this pref only respects account 0, should
each acct have a different choice?
! $addywidth =
$GLOBALS['phpgw']->msg->get_pref_value('js_addressbook_screensize',0);
$this->xi['jsaddybook_width']=$addywidth;
--- 634,638 ----
$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);
$this->xi['jsaddybook_width']=$addywidth;
***************
*** 644,649 ****
// Set Image Directory and icon size and theme
$this->xi['image_dir'] = PHPGW_IMAGES;
! $this->icon_theme =
$GLOBALS['phpgw']->msg->get_pref_value('icon_theme');
! $this->icon_size =
$GLOBALS['phpgw']->msg->get_pref_value('icon_size');
$this->xi['toolbar_font'] = 'Arial, Helvetica,
san-serif';
$this->xi['send_btn_action'] = $send_btn_action;
--- 641,646 ----
// Set Image Directory and icon size and theme
$this->xi['image_dir'] = PHPGW_IMAGES;
! $this->icon_theme =
$GLOBALS['phpgw']->msg->get_pref_value('icon_theme',$acctnum);
! $this->icon_size =
$GLOBALS['phpgw']->msg->get_pref_value('icon_size',$acctnum);
$this->xi['toolbar_font'] = 'Arial, Helvetica,
san-serif';
$this->xi['send_btn_action'] = $send_btn_action;
***************
*** 656,668 ****
$this->xi['form1_method'] = 'POST';
$this->xi['buttons_bgcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder'];
! $this->addressbook_text = lang('Address Book');
! $this->addressbook_image =
$GLOBALS['phpgw']->msg->img_maketag($this->xi['image_dir'].'/'.$this->icon_theme.'-address-conduit-'.$this->icon_size.'.gif',$this->xi['addressbook_text'],'','','0');
! $this->addressbook_onclick = 'addybook()';
! $this->send_text = lang('Send');
! $this->send_image =
$GLOBALS['phpgw']->msg->img_maketag($this->xi['image_dir'].'/'.$this->icon_theme.'-send-'.$this->icon_size.'.gif',$this->xi['send_text'],'','','0');
! $this->send_onclick = 'send()';
! $this->spellcheck_text = lang('Spell Check');
! $this->spellcheck_image =
$GLOBALS['phpgw']->msg->img_maketag($this->xi['image_dir'].'/'.$this->icon_theme.'-spellcheck-'.$this->icon_size.'.gif',$this->xi['spellcheck_text'],'','','0');
! $this->spellcheck_onclick = 'spellcheck()';
// Create Spell Object so we can check and see if we
need a spell check button
$this->mail_spell = CreateObject("email.spell");
--- 653,665 ----
$this->xi['form1_method'] = 'POST';
$this->xi['buttons_bgcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder'];
! $addressbook_text = lang('Address Book');
! $addressbook_image =
$GLOBALS['phpgw']->msg->img_maketag($this->xi['image_dir'].'/'.$this->icon_theme.'-address-conduit-'.$this->icon_size.'.gif',$this->xi['addressbook_text'],'','','0');
! $addressbook_onclick = 'addybook()';
! $send_text = lang('Send');
! $send_image =
$GLOBALS['phpgw']->msg->img_maketag($this->xi['image_dir'].'/'.$this->icon_theme.'-send-'.$this->icon_size.'.gif',$this->xi['send_text'],'','','0');
! $send_onclick = 'send()';
! $spellcheck_text = lang('Spell Check');
! $spellcheck_image =
$GLOBALS['phpgw']->msg->img_maketag($this->xi['image_dir'].'/'.$this->icon_theme.'-spellcheck-'.$this->icon_size.'.gif',$this->xi['spellcheck_text'],'','','0');
! $spellcheck_onclick = 'spellcheck()';
// Create Spell Object so we can check and see if we
need a spell check button
$this->mail_spell = CreateObject("email.spell");
***************
*** 673,707 ****
)
);
! $this->attachfile_js_onclick =
'attach_window(\''.$this->attachfile_js_link.'\')';
! $this->attachfile_js_text = lang('Attach file');
! $this->attachfile_js_image =
$GLOBALS['phpgw']->msg->img_maketag($this->xi['image_dir'].'/'.$this->icon_theme.'-add-attachment-'.$this->icon_size.'.gif',$this->xi['attachfile_js_txt'],'','','0');
// This code creates the buttons
switch
($GLOBALS['phpgw']->msg->get_pref_value('button_type')){
case 'text':
! $this->xi['addressbook_button'] = '<a
href="javascript:'.$this->addressbook_onclick.'">'.$this->addressbook_text.'</a>';
! $this->xi['send_button'] = '<a
href="javascript:'.$this->send_onclick.'">'.$this->send_text.'</a>';
! $this->xi['attachfile_js_button'] = '<a
href="javascript:'.$this->attachfile_js_onclick.'">'.$this->attachfile_js_text.'</a>';
if ($this->mail_spell->get_can_spell())
{
! $this->xi['spellcheck_button']
= '<a
href="javascript:'.$this->spellcheck_onclick.'">'.$this->spellcheck_text.'</a><input
type=hidden name="btn_spellcheck">';
}
break;
case 'image':
! $this->xi['send_button'] = '<a
href="javascript:'.$this->send_onclick.'">'.$this->send_image.'</a>';
! $this->xi['addressbook_button'] = '<a
href="javascript:'.$this->addressbook_onclick.'">'.$this->addressbook_image.'</a>';
! $this->xi['attachfile_js_button'] = '<a
href="javascript:'.$this->attachfile_js_onclick.'">'.$this->attachfile_js_image.'</a>';
if ($this->mail_spell->get_can_spell())
{
! $this->xi['spellcheck_button']
= '<a
href="javascript:'.$this->spellcheck_onclick.'">'.$this->spellcheck_image.'</a><input
type=hidden name="btn_spellcheck">';
}
break;
case 'both':
! $this->xi['send_button'] = '<a
href="javascript:'.$this->send_onclick.'">'.$this->send_image.' '.$this->send_text.'</a>';
! $this->xi['addressbook_button'] = '<a
href="javascript:'.$this->addressbook_onclick.'">'.$this->addressbook_image.' '.$this->addressbook_text.'</a>';
! $this->xi['attachfile_js_button'] = '<a
href="javascript:'.$this->attachfile_js_onclick.'">'.$this->attachfile_js_image.' '.$this->attachfile_js_text.'</a>';
if ($this->mail_spell->get_can_spell())
{
! $this->xi['spellcheck_button']
= '<a
href="javascript:'.$this->spellcheck_onclick.'">'.$this->spellcheck_image.' '.$this->spellcheck_text.'</a><input
type=hidden name="btn_spellcheck">';
}
break;
--- 670,704 ----
)
);
! $attachfile_js_onclick =
'attach_window(\''.$this->attachfile_js_link.'\')';
! $attachfile_js_text = lang('Attach file');
! $attachfile_js_image =
$GLOBALS['phpgw']->msg->img_maketag($this->xi['image_dir'].'/'.$this->icon_theme.'-add-attachment-'.$this->icon_size.'.gif',$this->xi['attachfile_js_txt'],'','','0');
// This code creates the buttons
switch
($GLOBALS['phpgw']->msg->get_pref_value('button_type')){
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>';
! $this->xi['attachfile_js_button'] = '<a
href="javascript:'.$attachfile_js_onclick.'">'.$attachfile_js_text.'</a>';
if ($this->mail_spell->get_can_spell())
{
! $this->xi['spellcheck_button']
= '<a href="javascript:'.$spellcheck_onclick.'">'.$spellcheck_text.'</a><input
type=hidden name="btn_spellcheck">';
}
break;
case 'image':
! $this->xi['send_button'] = '<a
href="javascript:'.$send_onclick.'">'.$send_image.'</a>';
! $this->xi['addressbook_button'] = '<a
href="javascript:'.$addressbook_onclick.'">'.$addressbook_image.'</a>';
! $this->xi['attachfile_js_button'] = '<a
href="javascript:'.$attachfile_js_onclick.'">'.$attachfile_js_image.'</a>';
if ($this->mail_spell->get_can_spell())
{
! $this->xi['spellcheck_button']
= '<a href="javascript:'.$spellcheck_onclick.'">'.$spellcheck_image.'</a><input
type=hidden name="btn_spellcheck">';
}
break;
case 'both':
! $this->xi['send_button'] = '<a
href="javascript:'.$send_onclick.'">'.$send_image.' '.$send_text.'</a>';
! $this->xi['addressbook_button'] = '<a
href="javascript:'.$addressbook_onclick.'">'.$addressbook_image.' '.$addressbook_text.'</a>';
! $this->xi['attachfile_js_button'] = '<a
href="javascript:'.$attachfile_js_onclick.'">'.$attachfile_js_image.' '.$attachfile_js_text.'</a>';
if ($this->mail_spell->get_can_spell())
{
! $this->xi['spellcheck_button']
= '<a
href="javascript:'.$spellcheck_onclick.'">'.$spellcheck_image.' '.$spellcheck_text.'</a><input
type=hidden name="btn_spellcheck">';
}
break;
Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bopreferences.inc.php,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -C2 -r1.10.2.4 -r1.10.2.5
*** class.bopreferences.inc.php 20 Nov 2002 23:03:24 -0000 1.10.2.4
--- class.bopreferences.inc.php 6 Dec 2002 23:47:06 -0000 1.10.2.5
***************
*** 525,529 ****
'type' => 'known_string',
'widget' => 'combobox',
! 'accts_usage' => 'default',
'lang_blurb' => lang('Select your style for
the addressbook. The traditional, simple style. Or the new javascript enabled
complex addressbook'),
'init_default' => 'string,simple',
--- 525,529 ----
'type' => 'known_string',
'widget' => 'combobox',
! 'accts_usage' => 'default,extra_accounts',
'lang_blurb' => lang('Select your style for
the addressbook. The traditional, simple style. Or the new javascript enabled
complex addressbook'),
'init_default' => 'string,simple',
***************
*** 539,543 ****
'type' => 'known_string',
'widget' => 'combobox',
! 'accts_usage' => 'default',
'lang_blurb' => lang('Select your screensize
for propper showing of the Javascript addressbook'),
'init_default' => 'string,700',
--- 539,543 ----
'type' => 'known_string',
'widget' => 'combobox',
! 'accts_usage' => 'default,extra_accounts',
'lang_blurb' => lang('Select your screensize
for propper showing of the Javascript addressbook'),
'init_default' => 'string,700',
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email/inc class.bocompose.inc.php,1.1.2.4,1.1.2.5 class.bopreferences.inc.php,1.10.2.4,1.10.2.5,
Alejandro Borges (lex) <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: email/inc class.mail_msg_wrappers.inc.php,1.23.2.4,1.23.2.5
- Next by Date:
[Phpgroupware-cvs] CVS: email/inc class.bocompose.inc.php,1.6,1.7 class.bopreferences.inc.php,1.21,1.22
- Previous by thread:
[Phpgroupware-cvs] CVS: email/inc class.mail_msg_wrappers.inc.php,1.23.2.4,1.23.2.5
- Next by thread:
[Phpgroupware-cvs] CVS: email/inc class.bocompose.inc.php,1.6,1.7 class.bopreferences.inc.php,1.21,1.22
- Index(es):