phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] email/inc/class.bopreferences.inc.php, 1.23.2.5


From: nomail
Subject: [Phpgroupware-cvs] email/inc/class.bopreferences.inc.php, 1.23.2.5
Date: Sat, 6 Nov 2004 17:13:46 +0100

Update of /email/inc
Modified Files:
        Branch: Version-0_9_16-branch
          class.bopreferences.inc.php

date: 2004/11/06 16:13:46;  author: powerstat;  state: Exp;  lines: +107 -107

Log Message:
replaced <br> with <br /> and <hr> with <hr /> for better w3c compatibility
=====================================================================
Index: email/inc/class.bopreferences.inc.php
diff -u email/inc/class.bopreferences.inc.php:1.23.2.4 
email/inc/class.bopreferences.inc.php:1.23.2.5
--- email/inc/class.bopreferences.inc.php:1.23.2.4      Sat Sep 13 01:46:14 2003
+++ email/inc/class.bopreferences.inc.php       Sat Nov  6 16:13:46 2004
@@ -57,7 +57,7 @@
                
                function bopreferences()
                {
-                       if ($this->debug_set_prefs > 0) { echo 
'email.bopreferences *constructor*: ENTERING <br>'; }
+                       if ($this->debug_set_prefs > 0) { echo 
'email.bopreferences *constructor*: ENTERING <br />'; }
                        /*!
                        @capability initialize class mail_msg object but do not 
login
                        @abstract we need functions in class mail_msg but we 
not want a login 
@@ -72,14 +72,14 @@
                        //$this->msg_bootstrap->set_do_login(False);
                        // USE NEW login instructions, defined in bootstrap 
class
                        $this->msg_bootstrap->set_do_login(BS_LOGIN_NEVER);
-                       if ($this->debug_set_prefs > 1) { echo 
'email.bopreferences. *constructor*: call 
this->msg_bootstrap->ensure_mail_msg_exists, msg_bootstrap->get_do_login(): 
'.serialize($this->msg_bootstrap->get_do_login()).'<br>'; }
+                       if ($this->debug_set_prefs > 1) { echo 
'email.bopreferences. *constructor*: call 
this->msg_bootstrap->ensure_mail_msg_exists, msg_bootstrap->get_do_login(): 
'.serialize($this->msg_bootstrap->get_do_login()).'<br />'; }
                        
$this->msg_bootstrap->ensure_mail_msg_exists('email.bopreferences. 
*constructor*', $this->debug_set_prefs);
                        // make the convience reference
                        if ($this->msg == '##NOTHING##')
                        {
                                $this->msg =& $GLOBALS['phpgw']->msg;
                        }
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences. *constructor*: LEAVING<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences. *constructor*: LEAVING<br />'); }
                        //return;
                }
                
@@ -107,7 +107,7 @@
                */
                function init_available_prefs()
                {
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.init_available_prefs: ENTERING, use 
debug level 4 for a data dump on leaving<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.init_available_prefs: ENTERING, use 
debug level 4 for a data dump on leaving<br />'); }
                        
                        $this->std_prefs = Array();
                        $i = 0;
@@ -599,8 +599,8 @@
                                'values'        => array(),
                                'long_desc' => lang('Only needed with the 
University of Washington &quot;UWash&quot; IMAP server. The default value is 
&quot;mail&quot; which means your mail folders, other then INBOX, are located 
in a directory called &quot;mail&quot; directly under your &quot;HOME&quot; 
directory. This box may be left empty, which means your mail folders are 
located in your &quot;HOME&quot; directory, not a subdirectory. If your mail 
folders are located in a subdirectory of &quot;HOME&quot; then put the name of 
that subdirectory here. Generally, it is not necessary to use any special 
slashes or tildes, &quot;HOME&quot; is always considered the base directory, 
and the slash bewteen &quot;HOME&quot; and the subdirectory will be added for 
you automatically, do not put the slash in this box.')
                        );
-                       if ($this->debug_set_prefs > 3) { 
$this->msg->dbug->out('email.bopreferences.init_available_prefs: data dump: 
calling debug_dump_prefs<br>');  $this->debug_dump_prefs(); }
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.init_available_prefs: LEAVING<br>'); 
}
+                       if ($this->debug_set_prefs > 3) { 
$this->msg->dbug->out('email.bopreferences.init_available_prefs: data dump: 
calling debug_dump_prefs<br />');  $this->debug_dump_prefs(); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.init_available_prefs: LEAVING<br 
/>'); }
                }
                
                
@@ -608,7 +608,7 @@
                function debug_dump_prefs()
                {
                        // DEBUG begin
-                       //$this->msg->dbug->out('<br><br>');
+                       //$this->msg->dbug->out('<br /><br />');
                        
$this->msg->dbug->out('email.bopreferences.debug_dump_prefs: std_prefs var 
DUMP:', $this->std_prefs);
                        
$this->msg->dbug->out('email.bopreferences.debug_dump_prefs: cust_prefs var 
DUMP:', $this->cust_prefs);
                        //Header('Location: ' . 
$GLOBALS['phpgw']->link('/preferences/index.php'));
@@ -657,7 +657,7 @@
                */
                function grab_set_prefs()
                {
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences: call to grab_set_prefs<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences: call to grab_set_prefs<br />'); }
                        // better make sure we have created the available prefs 
schema
                        $this->init_available_prefs();
 
@@ -671,8 +671,8 @@
                        }
                        else
                        {
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences: call to grab_set_prefs CALLER 
UNKNOWN<br>'); }
-                               $this->pref_errors .= 'email: bopreferences: 
grab_set_prefs: unsupported "caller" variable<br>';
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences: call to grab_set_prefs CALLER 
UNKNOWN<br />'); }
+                               $this->pref_errors .= 'email: bopreferences: 
grab_set_prefs: unsupported "caller" variable<br />';
                        }
                }
                
@@ -697,7 +697,7 @@
                */
                function grab_set_prefs_args_gpc()
                {
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences: call to 
grab_set_prefs_args_gpc<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences: call to grab_set_prefs_args_gpc<br 
/>'); }
                        // ----  HANDLE GRABBING PREFERENCE GPC HTTP_POST_VARS 
ARGS  -------
                        // for abstraction from phpgw UI and from PHP's GPC 
data, put the submitted GPC data
                        // into a class var $this->args[] array. This array is 
then used to represent the submitted
@@ -707,7 +707,7 @@
                        // ----  DEFAULT EMAIL ACCOUNT  ----
                        if 
(isset($GLOBALS['phpgw']->msg->ref_POST[$this->submit_token]))
                        {
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences: INSIDE grab_set_prefs_args_gpc for 
Default Email Account data<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences: INSIDE grab_set_prefs_args_gpc for 
Default Email Account data<br />'); }
                                
                                // EXPIRE stuff that may get stale by changing 
prefs
                                $this->expire_related_cached_items(0);
@@ -723,14 +723,14 @@
                                        // existence of $this->submit_token 
indicates this data is intended for the default email account
                                        if 
(!stristr($this->std_prefs[$i]['accts_usage'], 'default'))
                                        {
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) _SKIP_ this item 
['.$this->std_prefs[$i]['id'].'], it does not apply to the default email 
account<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) _SKIP_ this item 
['.$this->std_prefs[$i]['id'].'], it does not apply to the default email 
account<br />'); }
                                        }
                                        else
                                        {
                                                // ok, we have a pref item that 
applies to the default email account
                                                $this_pref_name = 
$this->std_prefs[$i]['id'];
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) $this_pref_name: 
'.$this_pref_name.'<br>'); }
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) 
$GLOBALS[HTTP_POST_VARS][$this_pref_name]: 
'.$GLOBALS['phpgw']->msg->ref_POST[$this_pref_name].'<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) $this_pref_name: 
'.$this_pref_name.'<br />'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) 
$GLOBALS[HTTP_POST_VARS][$this_pref_name]: 
'.$GLOBALS['phpgw']->msg->ref_POST[$this_pref_name].'<br />'); }
                                                if 
(isset($GLOBALS['phpgw']->msg->ref_POST[$this_pref_name]))
                                                {
                                                        
$this->args[$this_pref_name] = 
$GLOBALS['phpgw']->msg->ref_POST[$this_pref_name];
@@ -746,14 +746,14 @@
                                        // existence of $this->submit_token 
indicates this data is intended for the default email account
                                        if 
(!stristr($this->cust_prefs[$i]['accts_usage'], 'default'))
                                        {
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) _SKIP_ this item 
['.$this->cust_prefs[$i]['id'].'], it does not apply to the default email 
account<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) _SKIP_ this item 
['.$this->cust_prefs[$i]['id'].'], it does not apply to the default email 
account<br />'); }
                                        }
                                        else
                                        {
                                                // ok, we have a pref item that 
applies to the default email account
                                                $this_pref_name = 
$this->cust_prefs[$i]['id'];
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) $this_pref_name: 
'.$this_pref_name.'<br>'); }
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) 
$GLOBALS[HTTP_POST_VARS][$this_pref_name]: 
'.$GLOBALS['phpgw']->msg->ref_POST[$this_pref_name].'<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) $this_pref_name: 
'.$this_pref_name.'<br />'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) 
$GLOBALS[HTTP_POST_VARS][$this_pref_name]: 
'.$GLOBALS['phpgw']->msg->ref_POST[$this_pref_name].'<br />'); }
                                                if 
(isset($GLOBALS['phpgw']->msg->ref_POST[$this_pref_name]))
                                                {
                                                        
$this->args[$this_pref_name] = 
$GLOBALS['phpgw']->msg->ref_POST[$this_pref_name];
@@ -764,7 +764,7 @@
                        // ----  EXTRA EMAIL ACCOUNTS  ----
                        elseif 
(isset($GLOBALS['phpgw']->msg->ref_POST[$this->submit_token_extra_accounts]))
                        {
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences: INSIDE grab_set_prefs_args_gpc for 
EXTRA EMAIL ACCOUNTS data<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences: INSIDE grab_set_prefs_args_gpc for 
EXTRA EMAIL ACCOUNTS data<br />'); }
                                
                                //$this->args['submit_prefs'] = 
$GLOBALS['phpgw']->msg->ref_POST['submit_prefs'];
                                $this->args[$this->submit_token_extra_accounts] 
= $GLOBALS['phpgw']->msg->ref_POST[$this->submit_token_extra_accounts];
@@ -789,14 +789,14 @@
                                        // extra email accounts
                                        if 
(!stristr($this->std_prefs[$i]['accts_usage'], 'extra_accounts'))
                                        {
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) _SKIP_ this item 
['.$this->std_prefs[$i]['id'].'], it does not apply to extra email 
accounts<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) _SKIP_ this item 
['.$this->std_prefs[$i]['id'].'], it does not apply to extra email accounts<br 
/>'); }
                                        }
                                        else
                                        {
                                                // ok, we have a pref item that 
applies to the default email account
                                                $this_pref_name = 
$this->std_prefs[$i]['id'];
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) $this_pref_name: 
'.$this_pref_name.'<br>'); }
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) 
$GLOBALS[HTTP_POST_VARS][$this->acctnum('.$this->acctnum.')][$this_pref_name('.$this_pref_name.')]:
 ['.$GLOBALS['phpgw']->msg->ref_POST[$this->acctnum][$this_pref_name].']<br>'); 
}
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) $this_pref_name: 
'.$this_pref_name.'<br />'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (std pref) 
$GLOBALS[HTTP_POST_VARS][$this->acctnum('.$this->acctnum.')][$this_pref_name('.$this_pref_name.')]:
 ['.$GLOBALS['phpgw']->msg->ref_POST[$this->acctnum][$this_pref_name].']<br 
/>'); }
                                                if 
(isset($GLOBALS['phpgw']->msg->ref_POST[$this->acctnum][$this_pref_name]))
                                                {
                                                        
$this->args[$this->acctnum][$this_pref_name] = 
$GLOBALS['phpgw']->msg->ref_POST[$this->acctnum][$this_pref_name];
@@ -813,14 +813,14 @@
                                        // extra email accounts
                                        if 
(!stristr($this->cust_prefs[$i]['accts_usage'], 'extra_accounts'))
                                        {
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) _SKIP_ this item 
['.$this->cust_prefs[$i]['id'].'], it does not apply to extra email 
accounts<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) _SKIP_ this item 
['.$this->cust_prefs[$i]['id'].'], it does not apply to extra email accounts<br 
/>'); }
                                        }
                                        else
                                        {
                                                // ok, we have a pref item that 
applies to extra email accounts
                                                $this_pref_name = 
$this->cust_prefs[$i]['id'];
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) $this_pref_name: 
'.$this_pref_name.'<br>'); }
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) 
$GLOBALS[HTTP_POST_VARS][$this->acctnum('.$this->acctnum.')][$this_pref_name('.$this_pref_name.')]:
 ['.$GLOBALS['phpgw']->msg->ref_POST[$this->acctnum][$this_pref_name].']<br>'); 
}
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) $this_pref_name: 
'.$this_pref_name.'<br />'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out(' * * (cust pref) 
$GLOBALS[HTTP_POST_VARS][$this->acctnum('.$this->acctnum.')][$this_pref_name('.$this_pref_name.')]:
 ['.$GLOBALS['phpgw']->msg->ref_POST[$this->acctnum][$this_pref_name].']<br 
/>'); }
                                                if 
(isset($GLOBALS['phpgw']->msg->ref_POST[$this->acctnum][$this_pref_name]))
                                                {
                                                        
$this->args[$this->acctnum][$this_pref_name] = 
$GLOBALS['phpgw']->msg->ref_POST[$this->acctnum][$this_pref_name];
@@ -845,7 +845,7 @@
                function grab_set_prefs_args_xmlrpc()
                {
                        // STUB, for future use
-                       $this->msg->dbug->out('email boprefs: call to 
un-implemented function grab_set_prefs_args_xmlrpc<br>');
+                       $this->msg->dbug->out('email boprefs: call to 
un-implemented function grab_set_prefs_args_xmlrpc<br />');
                }
                
                /*!
@@ -868,13 +868,13 @@
                        $c_prefs = count($prefs_set);
                        if ($c_prefs == 0)
                        {
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: process_submitted_prefs: empty 
array, no prefs set supplied, exiting<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: process_submitted_prefs: empty 
array, no prefs set supplied, exiting<br />'); }
                                return False;
                        }
                        
                        for($i=0;$i<$c_prefs;$i++)
                        {
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: process_submitted_prefs: inside 
preferences loop ['.$i.']<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: process_submitted_prefs: inside 
preferences loop ['.$i.']<br />'); }
                                
                                $this_pref = $prefs_set[$i];
                                
@@ -886,7 +886,7 @@
                                        // we are not supposed to show this 
item for the default account, skip this pref item
                                        // continue is used within looping 
structures to skip the rest of the current loop 
                                        // iteration and continue execution at 
the beginning of the next iteration
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: process_submitted_prefs: _SKIP_ 
this item ["'.$this_pref['id'].'"], it does not apply to the default email 
account<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: process_submitted_prefs: _SKIP_ 
this item ["'.$this_pref['id'].'"], it does not apply to the default email 
account<br />'); }
                                        continue;
                                }
                                
@@ -898,7 +898,7 @@
                                        // ----  OR an empty string was 
submitted for this pref item  ----
                                        
                                        // so how do we handle this, for this 
pref...
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: process_submitted_prefs: 
submitted_pref for ["'.$this_pref['id'].'"] not set or empty string<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: process_submitted_prefs: 
submitted_pref for ["'.$this_pref['id'].'"] not set or empty string<br />'); }
                                        if (stristr($this_pref['write_props'], 
'empty_no_delete'))
                                        {
                                                // DO NOT DELETE
@@ -906,7 +906,7 @@
                                                // note there may or may not 
actually be an existing value in the prefs table
                                                // but it does not matter here, 
because we do not touch this items value at all.
                                                // Typical Usage: passwords
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: no change to repository for 
empty or blank ["'.$this_pref['id'].'"] because of "empty_no_delete"<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: no change to repository for 
empty or blank ["'.$this_pref['id'].'"] because of "empty_no_delete"<br />'); }
                                        }
                                        elseif 
(stristr($this_pref['write_props'], 'empty_string_ok'))
                                        {
@@ -914,7 +914,7 @@
                                                // i.e. this pref can take an 
empty string as a valid value
                                                // whereas most other prefs are 
simply deleted from the repository if value is empty
                                                // Typical Usage: email sig, 
UWash Mail Folder
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: save empty string to repository 
for ["'.$this_pref['id'].'"] because of "empty_string_ok"<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: save empty string to repository 
for ["'.$this_pref['id'].'"] because of "empty_string_ok"<br />'); }
                                                // a) as always, delete the 
pref before we assign a value
                                                
$GLOBALS['phpgw']->preferences->delete('email',$this_pref['id']);
                                                // b) now assign a blank string 
value
@@ -923,7 +923,7 @@
                                        else
                                        {
                                                // just delete it from the 
preferences repository
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: deleting empty or blank pref 
["'.$this_pref['id'].'"] from the repository<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: deleting empty or blank pref 
["'.$this_pref['id'].'"] from the repository<br />'); }
                                                
$GLOBALS['phpgw']->preferences->delete('email',$this_pref['id']);
                                        }
                                }
@@ -935,7 +935,7 @@
                                        $submitted_pref = 
$this->args[$this_pref['id']];
                                        // init a var to hold the processed 
submitted_pref
                                        $processed_pref = '';
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('* * ** email: bopreferences: process_submitted_prefs:  
submitted_pref: ['.$submitted_pref.']<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('* * ** email: bopreferences: process_submitted_prefs:  
submitted_pref: ['.$submitted_pref.']<br />'); }
                                        
                                        // most "user_string"s need special 
processing before they can go into the repository
                                        if ($this_pref['type'] == 'user_string')
@@ -1007,13 +1007,13 @@
                */
                function preferences()
                {
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.preferences(): ENTERING<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.preferences(): ENTERING<br />'); }
                        // establish all available prefs for email
-                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences(): about to call 
$this->init_available_prefs()<br>'); }
+                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences(): about to call 
$this->init_available_prefs()<br />'); }
                        $this->init_available_prefs();
                        
                        // this will fill $this->args[] array with any 
submitted prefs args
-                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences(): about to call 
$this->grab_set_prefs()<br>'); }
+                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences(): about to call 
$this->grab_set_prefs()<br />'); }
                        $this->grab_set_prefs();
                        
                        // ----  HANDLE SETING PREFERENCE   -------
@@ -1025,25 +1025,25 @@
                                // constructor will initialize 
$GLOBALS['phpgw']->msg
                                
                                // ---  Process Standard Prefs  ---
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences: about to process 
Standard Prefs<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences: about to process 
Standard Prefs<br />'); }
                                
$this->process_submitted_prefs($this->std_prefs);
                                
                                // ---  Process Custom Prefs  ---
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences: about to process Custom 
Prefs<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences: about to process Custom 
Prefs<br />'); }
                                if (isset($this->args['use_custom_settings']))
                                {
                                        // custom settings are in use, process 
them
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences: custom prefs are in 
use, calling $this->process_submitted_prefs($this->cust_prefs)<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences: custom prefs are in 
use, calling $this->process_submitted_prefs($this->cust_prefs)<br />'); }
                                        
$this->process_submitted_prefs($this->cust_prefs);
                                }
                                else
                                {
                                        // custom settings are NOT being used, 
DELETE them from the repository
                                        $c_prefs = count($this->cust_prefs);    
                
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences: custom prefs NOT in 
use, deleting them<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences: custom prefs NOT in 
use, deleting them<br />'); }
                                        for($i=0;$i<$c_prefs;$i++)
                                        {
-                                               if ($this->debug_set_prefs > 2) 
{ $this->msg->dbug->out(' *(loop)* email.bopreferences: preferences: deleting 
custom pref $this->cust_prefs['.$i.'][id] : 
['.$this->cust_prefs[$i]['id'].']<br>'); }
+                                               if ($this->debug_set_prefs > 2) 
{ $this->msg->dbug->out(' *(loop)* email.bopreferences: preferences: deleting 
custom pref $this->cust_prefs['.$i.'][id] : 
['.$this->cust_prefs[$i]['id'].']<br />'); }
                                                
$GLOBALS['phpgw']->preferences->delete('email',$this->cust_prefs[$i]['id']);
                                        }
                                }
@@ -1051,11 +1051,11 @@
                                // DONE processing prefs, SAVE to the Repository
                                if ($this->debug_set_prefs > 1) 
                                {
-                                       
$this->msg->dbug->out('email.bopreferences.preferences(): *debug* at 
['.$this->debug_set_prefs.'] so skipping save_repository<br>');
+                                       
$this->msg->dbug->out('email.bopreferences.preferences(): *debug* at 
['.$this->debug_set_prefs.'] so skipping save_repository<br />');
                                }
                                else
                                {
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences(): SAVING 
REPOSITORY<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.preferences(): SAVING REPOSITORY<br 
/>'); }
                                        
$GLOBALS['phpgw']->preferences->save_repository();
                                }
                                // end the email session
@@ -1065,14 +1065,14 @@
                                $take_me_to_url = $GLOBALS['phpgw']->link(
                                                                                
        '/preferences/index.php');
                        
-                               if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.preferences(): almost LEAVING, about 
to issue a redirect to:<br>'.$take_me_to_url.'<br>'); }
+                               if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.preferences(): almost LEAVING, about 
to issue a redirect to:<br />'.$take_me_to_url.'<br />'); }
                                if ($this->debug_set_prefs > 1) 
                                {
-                                       
$this->msg->dbug->out('email.bopreferences.preferences(): LEAVING, *debug* at 
['.$this->debug_set_prefs.'] so skipping Header redirection to: 
['.$take_me_to_url.']<br>');
+                                       
$this->msg->dbug->out('email.bopreferences.preferences(): LEAVING, *debug* at 
['.$this->debug_set_prefs.'] so skipping Header redirection to: 
['.$take_me_to_url.']<br />');
                                }
                                else
                                {
-                                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.preferences: LEAVING with redirect 
to: <br>'.$take_me_to_url.'<br>'); }
+                                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.preferences: LEAVING with redirect 
to: <br />'.$take_me_to_url.'<br />'); }
                                        Header('Location: ' . $take_me_to_url);
                                }
                        }
@@ -1212,7 +1212,7 @@
                                }
                                if ($this->debug_set_prefs > 1) 
                                {
-                                       echo 'email.bopreferences: *debug* 
skipping save_repository<br>';
+                                       echo 'email.bopreferences: *debug* 
skipping save_repository<br />';
                                }
                                else
                                {
@@ -1222,7 +1222,7 @@
                        }
                        if ($this->debug_set_prefs > 1) 
                        {
-                               echo 'email.bopreferences: *debug* skipping 
Header redirection<br>';
+                               echo 'email.bopreferences: *debug* skipping 
Header redirection<br />';
                        }
                        else
                        {
@@ -1240,7 +1240,7 @@
                */
                function process_ex_accounts_submitted_prefs($prefs_set='')
                {
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: ENTERING<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: ENTERING<br />'); }
                        // basicly, copy and paste the real 
"process_submitted_prefs" and tweak for extra_accounts applicablility
                        if(!$prefs_set)
                        {
@@ -1249,22 +1249,22 @@
                        $c_prefs = count($prefs_set);
                        if ($c_prefs == 0)
                        {
-                               if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: LEAVING, empty array, no prefs set 
supplied<br>'); }
+                               if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: LEAVING, empty array, no prefs set 
supplied<br />'); }
                                return False;
                        }
                        
                        // ==== ACCTNUM ====
-                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: pre discovery $this->acctnum : 
['.serialize($this->acctnum).']<br>'); }
+                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: pre discovery $this->acctnum : 
['.serialize($this->acctnum).']<br />'); }
                        if ((!isset($this->acctnum))
                        || ((string)$this->acctnum == ''))
                        {
                                $this->acctnum = $this->obtain_ex_acctnum();
                        }
-                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: post discovery $this->acctnum : 
['.serialize($this->acctnum).']<br>'); }
+                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: post discovery $this->acctnum : 
['.serialize($this->acctnum).']<br />'); }
                        
                        for($i=0;$i<$c_prefs;$i++)
                        {
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out(' <b>* (next loop) *</b> email: bopreferences: 
process_ex_accounts_submitted_prefs: inside preferences loop ['.$i.']<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out(' <b>* (next loop) *</b> email: bopreferences: 
process_ex_accounts_submitted_prefs: inside preferences loop ['.$i.']<br />'); }
                                
                                $this_pref = $prefs_set[$i];
                                if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: $this_pref = $prefs_set['.$i.'] : 
$this_pref DUMP:', $prefs_set[$i]); }
@@ -1276,7 +1276,7 @@
                                        // we are not supposed to handle this 
item for the extra email accounts, skip this pref item
                                        // continue is used within looping 
structures to skip the rest of the current loop 
                                        // iteration and continue execution at 
the beginning of the next iteration
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: _SKIP_ this item ["'.$this_pref['id'].'"], 
it does not apply to Extra Email Accounts <br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: _SKIP_ this item ["'.$this_pref['id'].'"], 
it does not apply to Extra Email Accounts <br />'); }
                                        continue;
                                }
                                
@@ -1286,7 +1286,7 @@
                                {
                                        // nothing submitted for this 
preference item
                                        // OR an empty string was submitted for 
this pref item
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: submitted_pref for 
["'.$this_pref['id'].'"] not set or empty string<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: submitted_pref for 
["'.$this_pref['id'].'"] not set or empty string<br />'); }
                                        if (stristr($this_pref['write_props'], 
'empty_no_delete'))
                                        {
                                                // DO NOT DELETE
@@ -1294,7 +1294,7 @@
                                                // note there may or may not 
actually be an existing value in the prefs table
                                                // but it does not matter here, 
because we do not touch this items value at all.
                                                // Typical Usage: passwords
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: no change to repository for empty or blank 
["'.$this_pref['id'].'"] because of "empty_no_delete"<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: no change to repository for empty or blank 
["'.$this_pref['id'].'"] because of "empty_no_delete"<br />'); }
                                        }
                                        elseif 
(stristr($this_pref['write_props'], 'empty_string_ok'))
                                        {
@@ -1302,21 +1302,21 @@
                                                // i.e. this pref can take an 
empty string as a valid value
                                                // whereas most other prefs are 
simply deleted from the repository if value is empty
                                                // Typical Usage: email sig, 
UWash Mail Folder
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences 
process_ex_accounts_submitted_prefs: save empty string to repository for 
["'.$this_pref['id'].'"] because of "empty_string_ok"<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences 
process_ex_accounts_submitted_prefs: save empty string to repository for 
["'.$this_pref['id'].'"] because of "empty_string_ok"<br />'); }
                                                // a) as always, delete the 
pref before we assign a value
                                                $pref_struct_str = 
'["ex_accounts"]['.$this->acctnum.']["'.$this_pref['id'].'"]';
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences 
process_ex_accounts_submitted_prefs: using preferences->delete_struct("email", 
$pref_struct_str) which will eval $pref_struct_str='.$pref_struct_str.'<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences 
process_ex_accounts_submitted_prefs: using preferences->delete_struct("email", 
$pref_struct_str) which will eval $pref_struct_str='.$pref_struct_str.'<br 
/>'); }
                                                
$GLOBALS['phpgw']->preferences->delete_struct('email',$pref_struct_str);
                                                // b) now assign a blank string 
value
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: using preferences->add_struct("email", 
$pref_struct_str, \'\') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: using preferences->add_struct("email", 
$pref_struct_str, \'\') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'); }
                                                
$GLOBALS['phpgw']->preferences->add_struct('email',$pref_struct_str,'');
                                        }
                                        else
                                        {
                                                // just delete it from the 
preferences repository
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs deleting empty or blank pref 
["'.$this_pref['id'].'"] from the repository<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs deleting empty or blank pref 
["'.$this_pref['id'].'"] from the repository<br />'); }
                                                $pref_struct_str = 
'["ex_accounts"]['.$this->acctnum.']["'.$this_pref['id'].'"]';
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: using preferences->delete_struct("email", 
$pref_struct_str) which will eval $pref_struct_str='.$pref_struct_str.'<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: using preferences->delete_struct("email", 
$pref_struct_str) which will eval $pref_struct_str='.$pref_struct_str.'<br 
/>'); }
                                                
$GLOBALS['phpgw']->preferences->delete_struct('email',$pref_struct_str);
                                        }
                                }
@@ -1326,7 +1326,7 @@
                                        $submitted_pref = 
$this->args[$this->acctnum][$this_pref['id']];
                                        // init a var to hold the processed 
submitted_pref
                                        $processed_pref = '';
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('* * email: bopreferences: 
process_ex_accounts_submitted_prefs:  submitted_pref: 
['.$submitted_pref.']<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('* * email: bopreferences: 
process_ex_accounts_submitted_prefs:  submitted_pref: ['.$submitted_pref.']<br 
/>'); }
                                        
                                        // most "user_string"s need special 
processing before they can go into the repository
                                        if ($this_pref['type'] == 'user_string')
@@ -1370,10 +1370,10 @@
                                        
                                        // a) as always, delete the pref before 
we assign a value
                                        $pref_struct_str = 
'["ex_accounts"]['.$this->acctnum.']["'.$this_pref['id'].'"]';
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences 
process_ex_accounts_submitted_prefs: using preferences->delete_struct("email", 
$pref_struct_str) which will eval $pref_struct_str='.$pref_struct_str.'<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences 
process_ex_accounts_submitted_prefs: using preferences->delete_struct("email", 
$pref_struct_str) which will eval $pref_struct_str='.$pref_struct_str.'<br 
/>'); }
                                        
$GLOBALS['phpgw']->preferences->delete_struct('email',$pref_struct_str);
                                        // b) now assign that processed data to 
this pref item in the repository
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: using preferences->add_struct("email", 
$pref_struct_str, $processed_pref) which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences: 
process_ex_accounts_submitted_prefs: using preferences->add_struct("email", 
$pref_struct_str, $processed_pref) which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'); }
                                        
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$processed_pref);
                                        // SORT THAT ARRAY by key, so the 
integer array heys go from lowest to hightest
                                        
ksort($GLOBALS['phpgw']->preferences->data['email']['ex_accounts']);
@@ -1393,7 +1393,7 @@
                */
                function ex_accounts_delete($acctnum='')
                {
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete ENTERING feed 
acctnum: ['.serialize($acctnum).']<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete ENTERING feed 
acctnum: ['.serialize($acctnum).']<br />'); }
                        if ($this->debug_set_prefs > 2) { 
$this->msg->dbug->out('email: bopreferences.ex_accounts_delete: 
$GLOBALS[HTTP_POST_VARS] DUMP:', $GLOBALS['phpgw']->msg->ref_POST); }
                        if ($this->debug_set_prefs > 2) { 
$this->msg->dbug->out('email: bopreferences.ex_accounts_delete: 
$GLOBALS[HTTP_GET_VARS] DUMP:', $GLOBALS['phpgw']->msg->ref_GET); }
                        
@@ -1413,16 +1413,16 @@
                        }
                        
                        $actually_did_something = False;
-                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete obtained acctnum 
['.$this->acctnum.']<br>'); }
+                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete obtained acctnum 
['.$this->acctnum.']<br />'); }
                        
                        if ((isset($this->acctnum))
                        && ((string)$this->acctnum != ''))
                        {
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete obtained VALID 
acctnum ['.$this->acctnum.'], proceed...<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete obtained VALID 
acctnum ['.$this->acctnum.'], proceed...<br />'); }
                                
                                // delete the extra account pref item
                                $pref_struct_str = 
'["ex_accounts"]['.$this->acctnum.']';
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences.ex_accounts_delete: using 
preferences->delete_struct("email", $pref_struct_str) which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences.ex_accounts_delete: using 
preferences->delete_struct("email", $pref_struct_str) which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'); }
                                
$GLOBALS['phpgw']->preferences->delete_struct('email',$pref_struct_str);
                                
                                if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences.ex_accounts_delete: 
$GLOBALS[phpgw]->preferences->data DUMP:', 
$GLOBALS['phpgw']->preferences->data); }
@@ -1434,12 +1434,12 @@
                        if (!$actually_did_something)
                        {
                                // nothing happened above that requires saving 
the repository
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete: nothing happened 
that requires save_repository, 
$actually_did_something='.serialize($actually_did_something).'<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete: nothing happened 
that requires save_repository, 
$actually_did_something='.serialize($actually_did_something).'<br />'); }
                        }
                        elseif ($this->debug_set_prefs > 2)
                        {
                                // we actually did something that requires 
saving repository, but are we in debug mode
-                               
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete: *debug* skipping 
save_repository<br>');
+                               
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete: *debug* skipping 
save_repository<br />');
                        }
                        else
                        {
@@ -1454,7 +1454,7 @@
                        // redirect user back to main preferences page
                        if ($this->debug_set_prefs > 2)
                        {
-                               
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete: *debug* skipping 
Header redirection<br>');
+                               
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete: *debug* skipping 
Header redirection<br />');
                        }
                        else
                        {
@@ -1462,7 +1462,7 @@
                                                                                
        '/index.php',
                                                                                
        'menuaction=email.uipreferences.ex_accounts_list');
                                
-                               if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete: LEAVING with 
redirect to: ['.$take_me_to_url.']<br>'); }
+                               if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_delete: LEAVING with 
redirect to: ['.$take_me_to_url.']<br />'); }
                                Header('Location: ' . $take_me_to_url);
                        }
                }
@@ -1476,7 +1476,7 @@
                */
                function ex_accounts_edit($acctnum='')
                {
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit ENTERING <br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit ENTERING <br />'); }
                        if ($this->debug_set_prefs > 2) { 
$this->msg->dbug->out('email: bopreferences.ex_accounts_edit: 
$GLOBALS[HTTP_POST_VARS] DUMP:', $GLOBALS['phpgw']->msg->ref_POST); }
                        if ($this->debug_set_prefs > 2) { 
$this->msg->dbug->out('email: bopreferences.ex_accounts_edit: 
$GLOBALS[HTTP_GET_VARS] DUMP:', $GLOBALS['phpgw']->msg->ref_GET); }
                        
@@ -1504,7 +1504,7 @@
                        // this will fill $this->args[] array with any 
submitted prefs args
                        $this->grab_set_prefs();
                        
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): just passed 
this->grab_set_prefs<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): just passed 
this->grab_set_prefs<br />'); }
                        
                        // ----  HANDLE SETING PREFERENCE   -------
                        if 
(isset($this->args[$this->submit_token_extra_accounts]))
@@ -1518,39 +1518,39 @@
                                // constructor will (has taken care of) 
initialize $GLOBALS['phpgw']->msg
                                
                                // ---  Process Standard Prefs  ---
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): about to 
process_ex_accounts_submitted_prefs Standard Prefs<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): about to 
process_ex_accounts_submitted_prefs Standard Prefs<br />'); }
                                
$this->process_ex_accounts_submitted_prefs($this->std_prefs);
                                
                                // ---  Process Custom Prefs  ---
                                // CUSTOM PREFS ARE MANDATORY! FOR EXTRA 
ACCOUNTS
                                // first, delete whatever value was there for 
"use custom settings" (during pre-release, at times this actually was an 
option, make sure it's gone grom the db)
                                $pref_struct_str = 
'["ex_accounts"]['.$this->acctnum.']["'.$this->cust_prefs[0]['id'].'"]';
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences.ex_accounts_edit(): 
"use_custom_settings" pref, delete it, reference it by 
["ex_accounts"][$this->acctnum]["$this->cust_prefs[0][id]"]<br>'); }
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences.ex_accounts_edit(): using 
preferences->delete_struct("email", $pref_struct_str) which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences.ex_accounts_edit(): 
"use_custom_settings" pref, delete it, reference it by 
["ex_accounts"][$this->acctnum]["$this->cust_prefs[0][id]"]<br />'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email: bopreferences.ex_accounts_edit(): using 
preferences->delete_struct("email", $pref_struct_str) which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'); }
                                
$GLOBALS['phpgw']->preferences->delete_struct('email',$pref_struct_str);
 
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): about to 
process_ex_accounts_submitted_prefs Custom Prefs, which are MANDATORY for extra 
email accounts<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): about to 
process_ex_accounts_submitted_prefs Custom Prefs, which are MANDATORY for extra 
email accounts<br />'); }
                                
$this->process_ex_accounts_submitted_prefs($this->cust_prefs);
                                
                                /*
                                // ---  Process Custom Prefs  ---
                                // if they were not mandatory, but that does 
not work
-                               if ($this->debug_set_prefs > 1) { echo 
'email.bopreferences.ex_accounts_edit(): about to process Custom Prefs<br>'; }
+                               if ($this->debug_set_prefs > 1) { echo 
'email.bopreferences.ex_accounts_edit(): about to process Custom Prefs<br />'; }
                                if (isset($this->args['use_custom_settings']))
                                {
                                        // custom settings are in use, process 
them
-                                       if ($this->debug_set_prefs > 1) { echo 
'email.bopreferences.ex_accounts_edit(): custom prefs are in use<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'email.bopreferences.ex_accounts_edit(): custom prefs are in use<br />'; }
                                        
$this->process_ex_accounts_submitted_prefs($this->cust_prefs);
                                }
                                else
                                {
                                        // custom settings are NOT being used, 
DELETE them from the repository
                                        $c_prefs = count($this->cust_prefs);    
                
-                                       if ($this->debug_set_prefs > 1) { echo 
'email.bopreferences.ex_accounts_edit(): custom prefs NOT in use, deleting 
them<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'email.bopreferences.ex_accounts_edit(): custom prefs NOT in use, deleting 
them<br />'; }
                                        for($i=0;$i<$c_prefs;$i++)
                                        {
                                                $pref_struct_str = 
'["ex_accounts"]['.$this->acctnum.']["'.$this->cust_prefs[$i]['id'].'"]';
-                                               if ($this->debug_set_prefs > 1) 
{ echo ' ** (looping) email: bopreferences.ex_accounts_edit(): using 
preferences->delete_struct("email", $pref_struct_str) which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                                               if ($this->debug_set_prefs > 1) 
{ echo ' ** (looping) email: bopreferences.ex_accounts_edit(): using 
preferences->delete_struct("email", $pref_struct_str) which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                                
$GLOBALS['phpgw']->preferences->delete_struct('email',$pref_struct_str);
                                        }
                                }
@@ -1563,17 +1563,17 @@
                        if (!$actually_did_something)
                        {
                                // nothing happened above that requires saving 
the repository
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): nothing happened 
that requires save_repository, 
$actually_did_something='.serialize($actually_did_something).'<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): nothing happened 
that requires save_repository, 
$actually_did_something='.serialize($actually_did_something).'<br />'); }
                        }
                        elseif ($this->debug_set_prefs > 1) 
                        {
                                // we actually did something that requires 
saving repository, but are we in debug mode
-                               
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): *debug* at 
['.$this->debug_set_prefs.'] so skipping save_repository<br>');
+                               
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): *debug* at 
['.$this->debug_set_prefs.'] so skipping save_repository<br />');
                        }
                        else
                        {
                                // we actually did something that requires 
saving repository, and we have the go-ahead
-                               if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): SAVING 
REPOSITORY<br>'); }
+                               if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): SAVING 
REPOSITORY<br />'); }
                                
$GLOBALS['phpgw']->preferences->save_repository();
                        }
                        
@@ -1588,14 +1588,14 @@
                                                                                
'/index.php',
                                                                                
'menuaction=email.uipreferences.ex_accounts_list');
                        
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): almost LEAVING, 
about to issue a redirect to:<br>'.$take_me_to_url.'<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): almost LEAVING, 
about to issue a redirect to:<br />'.$take_me_to_url.'<br />'); }
                        if ($this->debug_set_prefs > 1) 
                        {
-                               
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): LEAVING, *debug* 
at ['.$this->debug_set_prefs.'] so skipping Header redirection to: 
['.$take_me_to_url.']<br>');
+                               
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit(): LEAVING, *debug* 
at ['.$this->debug_set_prefs.'] so skipping Header redirection to: 
['.$take_me_to_url.']<br />');
                        }
                        else
                        {
-                               if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit: LEAVING with 
redirect to: <br>'.$take_me_to_url.'<br>'); }
+                               if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_edit: LEAVING with 
redirect to: <br />'.$take_me_to_url.'<br />'); }
                                Header('Location: ' . $take_me_to_url);
                        }
                }
@@ -1608,7 +1608,7 @@
                */
                function ex_accounts_list()
                {
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: ENTERING<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: ENTERING<br />'); }
                        
                        // list accounts, except "empty" ones (show "enabled" 
and "disabled"
                        $return_list = array();
@@ -1618,14 +1618,14 @@
                                $this_acctnum = 
$GLOBALS['phpgw']->msg->extra_accounts[$i]['acctnum'];
                                $this_status = 
$GLOBALS['phpgw']->msg->extra_accounts[$i]['status'];
                                
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: 
$GLOBALS[phpgw]->msg->extra_accounts['.$i.'][acctnum]=['.$this_acctnum.'] ;  
[status]=['.$this->extra_accounts[$i]['status'].'] <br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: 
$GLOBALS[phpgw]->msg->extra_accounts['.$i.'][acctnum]=['.$this_acctnum.'] ;  
[status]=['.$this->extra_accounts[$i]['status'].'] <br />'); }
                                if ($this_status == 'empty')
                                {
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: 
$GLOBALS[phpgw]->msg->extra_accounts['.$i.'][status] == empty <br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: 
$GLOBALS[phpgw]->msg->extra_accounts['.$i.'][status] == empty <br />'); }
                                }
                                else
                                {
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: 
$GLOBALS[phpgw]->msg->extra_accounts['.$i.'][status] != empty <br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: 
$GLOBALS[phpgw]->msg->extra_accounts['.$i.'][status] != empty <br />'); }
                                        $next_pos = count($return_list);
                                        //$next_pos = $this_acctnum - 1;
                                        $return_list[$next_pos]['acctnum'] = 
$this_acctnum;
@@ -1694,11 +1694,11 @@
                                        }
                                        // NEXT: html encode the acctname string
                                        // html encode entities on the fullname 
so it's safe to display in the browser, and prefix with the acctnum
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: fullname raw: 
<code>'.serialize($accountname).'</code><br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: fullname raw: 
<code>'.serialize($accountname).'</code><br />'); }
                                        $accountname = 
$GLOBALS['phpgw']->msg->htmlspecialchars_decode($accountname);
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: fullname B: 
<code>'.serialize($accountname).'</code><br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: fullname B: 
<code>'.serialize($accountname).'</code><br />'); }
                                        $accountname = 
$GLOBALS['phpgw']->msg->htmlspecialchars_encode($accountname);
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: fullname C: 
<code>'.serialize($accountname).'</code><br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: fullname C: 
<code>'.serialize($accountname).'</code><br />'); }
                                        // FINALLY we have a string we are 
going to display to the user that is the name of the account
                                        
$return_list[$next_pos]['display_string'] = '['.$this_acctnum.'] '.$accountname;
                                        
@@ -1716,7 +1716,7 @@
                                }
                        }
                        if ($this->debug_set_prefs > 2) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: returning 
$return_list[] DUMP:', $return_list); }
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: LEAVING, returning 
$return_list <br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.ex_accounts_list: LEAVING, returning 
$return_list <br />'); }
                        return $return_list;
                }
                
@@ -1728,12 +1728,12 @@
                */
                function get_first_empty_ex_acctnum()
                {
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: 
ENTERING<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: 
ENTERING<br />'); }
                        if ($this->debug_set_prefs > 2) { 
$this->msg->dbug->out('email: bopreferences.get_first_empty_ex_acctnum: 
$GLOBALS[phpgw]->msg->extra_accounts DUMP:', 
$GLOBALS['phpgw']->msg->extra_accounts); }
                        $loops = count($GLOBALS['phpgw']->msg->extra_accounts);
                        if ($loops == 0)
                        {
-                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: 
count($GLOBALS[phpgw]->msg->extra_accounts 
=['.serialize(count($GLOBALS['phpgw']->msg->extra_accounts)).']<br>'); }
+                               if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: 
count($GLOBALS[phpgw]->msg->extra_accounts 
=['.serialize(count($GLOBALS['phpgw']->msg->extra_accounts)).']<br />'); }
                                $first_empty_ex_acctnum = 1;
                        }
                        else
@@ -1744,10 +1744,10 @@
                                        $this_acctnum = 
$GLOBALS['phpgw']->msg->extra_accounts[$i]['acctnum'];
                                        $this_status = 
$GLOBALS['phpgw']->msg->extra_accounts[$i]['status'];
                                        // loop =0 *would* = acctnum 1 *if* 
acctnum slots are filled in order, they'd always be 1 apart
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: in loop 
['.$i.'] : status: ['.$this_status.'] ; acctnum: ['.$this_acctnum.']<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: in loop 
['.$i.'] : status: ['.$this_status.'] ; acctnum: ['.$this_acctnum.']<br />'); }
                                        if ($this_status == 'empty')
                                        {
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: 
[status] == empty for acctnum ['.$this_acctnum.']<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: 
[status] == empty for acctnum ['.$this_acctnum.']<br />'); }
                                                $first_empty_ex_acctnum = 
(int)$this_acctnum;
                                                $did_get_acctnum = True;
                                                break;
@@ -1755,7 +1755,7 @@
                                        elseif ((int)($i+1) != 
(int)$this_acctnum)
                                        {
                                                $first_empty_ex_acctnum = 
(int)($i+1);
-                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: slots 
have an empty spot, unused $acctnum is ['.$first_empty_ex_acctnum.']<br>'); }
+                                               if ($this->debug_set_prefs > 1) 
{ $this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: slots 
have an empty spot, unused $acctnum is ['.$first_empty_ex_acctnum.']<br />'); }
                                                $did_get_acctnum = True;
                                                break;
                                        }
@@ -1766,10 +1766,10 @@
                                        $first_empty_ex_acctnum = 
count($GLOBALS['phpgw']->msg->extra_accounts);
                                        // since extra accounts are not zero 
based, add one to that count to get real next available
                                        $first_empty_ex_acctnum++;
-                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: no empty 
spaces extra_accounts[], advance to next int: $first_empty_ex_acctnum 
['.$first_empty_ex_acctnum.']<br>'); }
+                                       if ($this->debug_set_prefs > 1) { 
$this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: no empty 
spaces extra_accounts[], advance to next int: $first_empty_ex_acctnum 
['.$first_empty_ex_acctnum.']<br />'); }
                                }
                        }
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: LEAVING, 
returning $first_empty_ex_acctnum 
['.serialize($first_empty_ex_acctnum).']<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.get_first_empty_ex_acctnum: LEAVING, 
returning $first_empty_ex_acctnum ['.serialize($first_empty_ex_acctnum).']<br 
/>'); }
                        return $first_empty_ex_acctnum;
                }
                
@@ -1781,7 +1781,7 @@
                */
                function obtain_ex_acctnum()
                {
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email: bopreferences.obtain_ex_acctnum: ENTERING<br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email: bopreferences.obtain_ex_acctnum: ENTERING<br 
/>'); }
                        if ($this->debug_set_prefs > 2) { 
$this->msg->dbug->out('email: bopreferences.obtain_ex_acctnum: 
$GLOBALS[HTTP_POST_VARS] DUMP:', $GLOBALS['phpgw']->msg->ref_POST); }
                        if ($this->debug_set_prefs > 2) { 
$this->msg->dbug->out('email: bopreferences.obtain_ex_acctnum: 
$GLOBALS[HTTP_GET_VARS] DUMP:', $GLOBALS['phpgw']->msg->ref_GET); }
                        // get fromPOST or GET
@@ -1812,7 +1812,7 @@
                        {
                                $final_acctnum = $prelim_acctnum;
                        }
-                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.obtain_ex_acctnum: LEAVING, 
returning $final_acctnum: ['.serialize($final_acctnum).'] <br>'); }
+                       if ($this->debug_set_prefs > 0) { 
$this->msg->dbug->out('email.bopreferences.obtain_ex_acctnum: LEAVING, 
returning $final_acctnum: ['.serialize($final_acctnum).'] <br />'); }
                        return $final_acctnum;
                }
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]