[Phpgroupware-cvs] CVS: email/inc class.boindex.inc.php,1.19,1.20 class.mail_msg_base.inc.php,1.58,1.59 class.uiindex.inc.php,1.16,1.17

[Angelo Tony Puglisi <address@hidden>]

Update of /cvsroot/phpgroupware//email/inc
In directory subversions:/tmp/cvs-serv28936/email/inc

Modified Files:
        class.boindex.inc.php class.mail_msg_base.inc.php 
        class.uiindex.inc.php 
Log Message:
skip for each account loop if no extra accounts exist, add label next to box

Index: class.boindex.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/inc/class.boindex.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.boindex.inc.php       11 Jan 2002 10:09:45 -0000      1.19
--- class.boindex.inc.php       11 Jan 2002 10:39:27 -0000      1.20
***************
*** 135,138 ****
--- 135,140 ----
                                'filters_txt'           => lang('EMail 
Filters'),
                                'accounts_txt'          => lang('Manage 
Accounts'),
+                               //'accounts_label'      => lang('Accounts:'),
+                               'accounts_label'        => lang('Switch 
Accounts'),
                                // some langs for the sort by box
                                'lang_sort_by'          => lang('Sort By'),

Index: class.mail_msg_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** class.mail_msg_base.inc.php 11 Jan 2002 10:09:45 -0000      1.58
--- class.mail_msg_base.inc.php 11 Jan 2002 10:39:27 -0000      1.59
***************
*** 710,744 ****
                
                // ---- what accounts have some data defined
!               while(list($key,$value) = 
each($tmp_prefs['email']['ex_accounts']))
                {
!                       if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: inside loop: for each $tmp_prefs[email][ex_accounts] ; $key: 
['.serialize($key).'] $value: ['.serialize($value).']<br>';}
!                       // if we are here at all then this array item must have 
some data defined
!                       $next_pos = count($this->defined_ex_accounts);
!                       $this->defined_ex_accounts[$next_pos] = $key;
!                       // is this account "enabled"
!                       if ( 
(isset($tmp_prefs['email']['ex_accounts'][$key]['ex_account_enabled']))
!                       && 
((string)$tmp_prefs['email']['ex_accounts'][$key]['ex_account_enabled'] != ''))
                        {
!                               // this account is defined AND enabled, add it 
to $this->enabled_ex_accounts
!                               if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: inside loop: account enabled: 
$tmp_prefs[email][ex_accounts]['.$key.'][ex_account_enabled]:  
['.serialize($tmp_prefs['email']['ex_accounts'][$key]['ex_account_enabled']).']<br>';}
!                               $next_pos = count($this->enabled_ex_accounts);
!                               $this->enabled_ex_accounts[$next_pos] = $key;
                        }
-               }
-               if ($this->debug_logins > 1) { echo 'mail_msg: begin_request: 
$this->defined_ex_accounts: ['.serialize($this->defined_ex_accounts).'] ; 
$this->enabled_ex_accounts: ['.serialize($this->enabled_ex_accounts).']<br>';}
-               
-               // PROCESS EXTRA ACCOUNT PREFS
-               // run thru the create prefs function requesting this 
particular acctnum
-               // fills in certain missing data, and does some sanity checks, 
and any data processing that may be necessary
-               for ($i=0; $i <count($this->enabled_ex_accounts); $i++)
-               {
-                       $tmp_prefs = array();
-                       // we "fool" create_email_preferences into processing 
extra account info as if it were top level data
-                       // by specifing the secong function arg as the integer 
of this particular enabled account
-                       $this_ex_acctnum = $this->enabled_ex_accounts[$i];
-                       if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: about to call create_email_preferences("", $this_ex_acctnum) 
where $this_ex_acctnum: ['.serialize($this_ex_acctnum).'] <br>'; }
-                       $tmp_prefs = 
$GLOBALS['phpgw']->preferences->create_email_preferences('', $this_ex_acctnum);
-                       // now put these processed prefs in the correct 
location  in our prefs array
-                       $this->set_pref_array($tmp_prefs['email'], 
$this_ex_acctnum);
                }
                // clear the temp var
--- 710,747 ----
                
                // ---- what accounts have some data defined
!               if ($this->num_ex_accounts > 0)
                {
!                       while(list($key,$value) = 
each($tmp_prefs['email']['ex_accounts']))
                        {
!                               if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: inside loop: for each $tmp_prefs[email][ex_accounts] ; $key: 
['.serialize($key).'] $value: ['.serialize($value).']<br>';}
!                               // if we are here at all then this array item 
must have some data defined
!                               $next_pos = count($this->defined_ex_accounts);
!                               $this->defined_ex_accounts[$next_pos] = $key;
!                               // is this account "enabled"
!                               if ( 
(isset($tmp_prefs['email']['ex_accounts'][$key]['ex_account_enabled']))
!                               && 
((string)$tmp_prefs['email']['ex_accounts'][$key]['ex_account_enabled'] != ''))
!                               {
!                                       // this account is defined AND enabled, 
add it to $this->enabled_ex_accounts
!                                       if ($this->debug_logins > 1) { echo 
'mail_msg: begin_request: inside loop: account enabled: 
$tmp_prefs[email][ex_accounts]['.$key.'][ex_account_enabled]:  
['.serialize($tmp_prefs['email']['ex_accounts'][$key]['ex_account_enabled']).']<br>';}
!                                       $next_pos = 
count($this->enabled_ex_accounts);
!                                       $this->enabled_ex_accounts[$next_pos] = 
$key;
!                               }
!                       }
!                       if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: $this->defined_ex_accounts: 
['.serialize($this->defined_ex_accounts).'] ; $this->enabled_ex_accounts: 
['.serialize($this->enabled_ex_accounts).']<br>';}
!                       
!                       // PROCESS EXTRA ACCOUNT PREFS
!                       // run thru the create prefs function requesting this 
particular acctnum
!                       // fills in certain missing data, and does some sanity 
checks, and any data processing that may be necessary
!                       for ($i=0; $i <count($this->enabled_ex_accounts); $i++)
!                       {
!                               $tmp_prefs = array();
!                               // we "fool" create_email_preferences into 
processing extra account info as if it were top level data
!                               // by specifing the secong function arg as the 
integer of this particular enabled account
!                               $this_ex_acctnum = 
$this->enabled_ex_accounts[$i];
!                               if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: about to call create_email_preferences("", $this_ex_acctnum) 
where $this_ex_acctnum: ['.serialize($this_ex_acctnum).'] <br>'; }
!                               $tmp_prefs = 
$GLOBALS['phpgw']->preferences->create_email_preferences('', $this_ex_acctnum);
!                               // now put these processed prefs in the correct 
location  in our prefs array
!                               $this->set_pref_array($tmp_prefs['email'], 
$this_ex_acctnum);
                        }
                }
                // clear the temp var

Index: class.uiindex.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/inc/class.uiindex.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.uiindex.inc.php       11 Jan 2002 10:09:45 -0000      1.16
--- class.uiindex.inc.php       11 Jan 2002 10:39:27 -0000      1.17
***************
*** 262,265 ****
--- 262,266 ----
                                'ctrl_bar_acct_1_link'  => 
$this->bo->xi['ctrl_bar_acct_1_link'],
  
+                               'accounts_label'        => 
$this->bo->xi['accounts_label'],
                                'acctbox_frm_name'      => 
$this->bo->xi['acctbox_frm_name'],
                                'acctbox_action'        => 
$this->bo->xi['acctbox_action'],