[Phpgroupware-cvs] email/inc/class.uipreferences.inc.php, 1.16.2.5

[nomail]

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

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

Log Message:
replaced <br> with <br /> and <hr> with <hr /> for better w3c compatibility
=====================================================================
Index: email/inc/class.uipreferences.inc.php
diff -u email/inc/class.uipreferences.inc.php:1.16.2.4 
email/inc/class.uipreferences.inc.php:1.16.2.5
--- email/inc/class.uipreferences.inc.php:1.16.2.4      Sat Sep 13 01:46:18 2003
+++ email/inc/class.uipreferences.inc.php       Sat Nov  6 16:13:46 2004
@@ -66,7 +66,7 @@
                */
                function create_prefs_block($feed_prefs='')
                {
-                       if ($this->debug > 0 ) { echo 
'email.uipreferences.create_prefs_block: ENTERING, $this->bo->account_group: 
['.$this->bo->account_group.']; $this->bo->acctnum: 
['.$this->bo->acctnum.']<br>'; }
+                       if ($this->debug > 0 ) { echo 
'email.uipreferences.create_prefs_block: ENTERING, $this->bo->account_group: 
['.$this->bo->account_group.']; $this->bo->acctnum: ['.$this->bo->acctnum.']<br 
/>'; }
                        $return_block = '';
                        if(!$feed_prefs)
                        {
@@ -74,7 +74,7 @@
                        }
                        if (count($feed_prefs) == 0)
                        {
-                               if ($this->debug > 0 ) { echo 
'email.uipreferences.create_prefs_block: LEAVING early, $feed_prefs param was 
empty<br>'; }
+                               if ($this->debug > 0 ) { echo 
'email.uipreferences.create_prefs_block: LEAVING early, $feed_prefs param was 
empty<br />'; }
                                return $return_block;
                        }
                        
@@ -87,7 +87,7 @@
                        && (isset($this->bo->acctnum)))
                        {
                                // the existing prefs are for en ectra email 
account
-                               if ($this->debug > 1) { echo 
'email.uipreferences.create_prefs_block: ('.$this->bo->account_group.') get 
user prefs from DB by calling 
$GLOBALS[phpgw]->preferences->create_email_preferences(\'\', 
'.$this->bo->acctnum.')<br>'; }
+                               if ($this->debug > 1) { echo 
'email.uipreferences.create_prefs_block: ('.$this->bo->account_group.') get 
user prefs from DB by calling 
$GLOBALS[phpgw]->preferences->create_email_preferences(\'\', 
'.$this->bo->acctnum.')<br />'; }
                                //by calling this function with a specific 
acctnum, we get back fully procecessed prefs data from the DB
                                // for the that acctnum
                                $temp_prefs = 
$GLOBALS['phpgw']->preferences->create_email_preferences('', 
$this->bo->acctnum);
@@ -96,7 +96,7 @@
                        else
                        {
                                // default email account, top level data
-                               if ($this->debug > 1) { echo 
'email.uipreferences.create_prefs_block: ('.$this->bo->account_group.') for 
default account, top level prefs already processed<br>'; }
+                               if ($this->debug > 1) { echo 
'email.uipreferences.create_prefs_block: ('.$this->bo->account_group.') for 
default account, top level prefs already processed<br />'; }
                                $actual_user_prefs = $this->prefs;
                        }
                        if ($this->debug > 2) { echo 
'email.uipreferences.create_prefs_block: $this->bo->account_group: 
['.$this->bo->account_group.'] ; $this->bo->acctnum: ['.$this->bo->acctnum.'] ; 
$actual_user_prefs dump:<pre>'; print_r($actual_user_prefs); echo '</pre>'; }
@@ -116,26 +116,26 @@
                                        // 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 > 1) { echo ' * 
email.uipreferences.create_prefs_block: skip showing this item because it is 
not applicable to the default account<br>'; }
+                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: skip showing this item because it is 
not applicable to the default account<br />'; }
                                        continue;
                                }
                                elseif (($this->bo->account_group == 
'extra_accounts')
                                && (!stristr($this_item['accts_usage'] , 
'extra_accounts')))
                                {
                                        // we are not supposed to show this 
item for extra accounts, skip this pref item
-                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: skip showing this item because it is 
not applicable to the extra accounts<br>'; }
+                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: skip showing this item because it is 
not applicable to the extra accounts<br />'; }
                                        continue;
                                }
                                elseif (strstr($this_item['type'] , 'INACTIVE'))
                                {
                                        // this item has been depreciated or 
otherwise no longer is being used
                                        // we are not supposed to show this 
item, skip this pref item
-                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: skip showing this item because 
"INACTIVE" is in $this_item[type] : ['.$this_item['type'].']<br>'; }
+                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: skip showing this item because 
"INACTIVE" is in $this_item[type] : ['.$this_item['type'].']<br />'; }
                                        continue;
                                }
                                
                                // ----  ok to show this, continue...  ----
-                               if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block:  ... this item passed skip test, so it 
should be displayed ...<br>'; }
+                               if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block:  ... this item passed skip test, so it 
should be displayed ...<br />'; }
                                // ROW BACK COLOR
                                //$back_color = 
$this->nextmatchs->alternate_row_color($back_color);
                                $back_color = (($i + 1)/2 == floor(($i + 1)/2)) 
? $this->theme['row_off'] : $this->theme['row_on'];
@@ -152,7 +152,7 @@
                                // this will be the HTTP_POST_VARS[*key*] key 
value, the "id" for the submitted pref item
                                if ($this->bo->account_group == 'default')
                                {
-                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: html post array $key for this item is 
$this_item[id]: '.$this_item['id'].'<br>'; }
+                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: html post array $key for this item is 
$this_item[id]: '.$this_item['id'].'<br />'; }
                                        $this->tpl->set_var('pref_id', 
$this_item['id']);
                                }
                                else
@@ -162,31 +162,31 @@
                                        // so the submitted prefs are then 
array based, wit the acctnum being the top level array item
                                        // and the pref item "id"'s being child 
elements of that acctnum
                                        $html_pref_id = 
$this->bo->acctnum.'['.$this_item['id'].']';
-                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: html post array $key for this item is 
$html_pref_id: '.$html_pref_id.'<br>'; }
+                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: html post array $key for this item is 
$html_pref_id: '.$html_pref_id.'<br />'; }
                                        $this->tpl->set_var('pref_id', 
$html_pref_id);
                                }
                                
                                // we don't want to show a hidden value
                                if (!stristr($this_item['write_props'], 
'hidden'))
                                {
-                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: obtain $this_item_value, because 
"hidden" is not in $this_item[write_props]<br>'; }
+                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: obtain $this_item_value, because 
"hidden" is not in $this_item[write_props]<br />'; }
                                        // "user strings" may have quotes and 
stuff that need to be encoded b4 we display it
                                        if ($this_item['type'] == 'user_string')
                                        {
-                                               if ($this->debug > 1) { echo ' 
* email.uipreferences.create_prefs_block: $this_item[type] == "user string" , 
before htmlspecialchars_encode: 
[<code>'.$actual_user_prefs[$this_item['id']].'</code>]<br>'; }
+                                               if ($this->debug > 1) { echo ' 
* email.uipreferences.create_prefs_block: $this_item[type] == "user string" , 
before htmlspecialchars_encode: 
[<code>'.$actual_user_prefs[$this_item['id']].'</code>]<br />'; }
                                                $this_item_value = 
$GLOBALS['phpgw']->msg->htmlspecialchars_encode($actual_user_prefs[$this_item['id']]);
-                                               if ($this->debug > 1) { echo ' 
* email.uipreferences.create_prefs_block: $this_item[type] == "user string" , 
after htmlspecialchars_encode: [<code>'.$this_item_value.'</code>]<br>'; }
+                                               if ($this->debug > 1) { echo ' 
* email.uipreferences.create_prefs_block: $this_item[type] == "user string" , 
after htmlspecialchars_encode: [<code>'.$this_item_value.'</code>]<br />'; }
                                        }
                                        else
                                        {
                                                $this_item_value = 
$actual_user_prefs[$this_item['id']];
-                                               if ($this->debug > 1) { echo ' 
* email.uipreferences.create_prefs_block: $this_item[type] NOT a "user string" 
, so NO htmlspecialchars_encode required: $this_item_value: 
[<code>'.$this_item_value.'</code>]<br>'; }
+                                               if ($this->debug > 1) { echo ' 
* email.uipreferences.create_prefs_block: $this_item[type] NOT a "user string" 
, so NO htmlspecialchars_encode required: $this_item_value: 
[<code>'.$this_item_value.'</code>]<br />'; }
                                        }
                                }
                                else
                                {
                                        // if the data is hidden (ex. a 
password), we do not show the value (obviously)
-                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: HIDDEN $this_item_value should be empty 
string, this "hidden" is in $this_item[write_props]<br>'; }
+                                       if ($this->debug > 1) { echo ' * 
email.uipreferences.create_prefs_block: HIDDEN $this_item_value should be empty 
string, this "hidden" is in $this_item[write_props]<br />'; }
                                        $this_item_value = '';
                                        // tell user we are hiding the value 
(that's whay the box is empty)
                                        $prev_lang_blurb = 
$this->tpl->get_var('lang_blurb');
@@ -265,7 +265,7 @@
                                }
                                else
                                {
-                                       //$this->pref_errors .= 'call for 
unsupported widget:'.$this_item['widget'].'<br>';
+                                       //$this->pref_errors .= 'call for 
unsupported widget:'.$this_item['widget'].'<br />';
                                        $this->tpl->set_var('back_color', 
$back_color);
                                        $this->tpl->set_var('back_color_class', 
$back_color_class);
                                        $this->tpl->set_var('section_title', 
'call for unsupported widget:'.$this_item['widget']);
@@ -282,7 +282,7 @@
                                // for each loop, add the finished widget row 
to the return_block variable
                                $return_block .= $done_widget;
                        }
-                       if ($this->debug > 0 ) { echo 
'email.uipreferences.create_prefs_block: LEAVING, returning $return_block if 
widgets<br>'; }
+                       if ($this->debug > 0 ) { echo 
'email.uipreferences.create_prefs_block: LEAVING, returning $return_block if 
widgets<br />'; }
                        return $return_block;
                }
                
@@ -329,10 +329,10 @@
                function preferences_default_acct_zero()
                {
                        // this tells "create_prefs_block" that we are dealing 
with the default email account
-                       if ($this->debug > 0) { echo 
'email.uipreferences.preferences: ENTERING, this function *should* only be 
called for the default email account prefs submission<br>'; }
-                       if ($this->debug > 1) { echo 
'email.uipreferences.preferences: about to set $this->bo->account_group<br>'; }
+                       if ($this->debug > 0) { echo 
'email.uipreferences.preferences: ENTERING, this function *should* only be 
called for the default email account prefs submission<br />'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.preferences: about to set $this->bo->account_group<br />'; 
}
                        $this->bo->account_group = 'default';
-                       if ($this->debug > 1) { echo 
'email.uipreferences.preferences: just set $this->bo->account_group to 
['.$this->bo->account_group.']<br>'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.preferences: just set $this->bo->account_group to 
['.$this->bo->account_group.']<br />'; }
                        
                        if ($GLOBALS['phpgw']->msg->phpgw_before_xslt)
                        {
@@ -398,7 +398,7 @@
                        $this->tpl->set_var($var);
                        
                        // this will fill the $this->bo->std_prefs[] and 
cust_prefs[]  "schema" arrays
-                       if ($this->debug > 1) { echo 
'email.uipreferences.preferences: calling $this->bo->init_available_prefs() to 
init $this->bo->std_prefs[] and cust_prefs[]  "schema" arrays<br>'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.preferences: calling $this->bo->init_available_prefs() to 
init $this->bo->std_prefs[] and cust_prefs[]  "schema" arrays<br />'; }
                        $this->bo->init_available_prefs();                      
                        
                        if ($this->debug > 3) { echo 
'email.uipreferences.preferences: initiated schema dump:'; 
$this->bo->debug_dump_prefs(); }
@@ -435,7 +435,7 @@
                        // add the finished widget row to the main block 
variable
                        $prefs_ui_rows .= $done_widget;
                        // generate Std Prefs HTML Block
-                       if ($this->debug > 1) { echo 
'email.uipreferences.preferences: about to generate the html for standard email 
prefs block<br>'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.preferences: about to generate the html for standard email 
prefs block<br />'; }
                        $prefs_ui_rows .= 
$this->create_prefs_block($this->bo->std_prefs);
                        
                        // blank row
@@ -448,7 +448,7 @@
                        $done_widget = 
$this->tpl->parse('V_tr_sec_title','B_tr_sec_title');
                        $prefs_ui_rows .= $done_widget;
                        // generate Custom Prefs HTML Block
-                       if ($this->debug > 1) { echo 
'email.uipreferences.preferences: about to generate the html for custom email 
prefs block<br>'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.preferences: about to generate the html for custom email 
prefs block<br />'; }
                        $prefs_ui_rows .= 
$this->create_prefs_block($this->bo->cust_prefs);
                        
                        // blank row
@@ -471,7 +471,7 @@
                        $this->tpl->set_var('debugdata', 
$GLOBALS['phpgw']->msg->dbug->notice_pagedone());
                        
                        // output the template
-                       if ($this->debug > 0) { echo 
'email.uipreferences.preferences: LEAVING, about to output the template<br>'; }
+                       if ($this->debug > 0) { echo 
'email.uipreferences.preferences: LEAVING, about to output the template<br />'; 
}
                        if ($GLOBALS['phpgw']->msg->phpgw_before_xslt)
                        {
                                $this->tpl->set_unknowns('comment');
@@ -500,16 +500,16 @@
                function ex_accounts_edit()
                {
                        // this tells "create_prefs_block" that we are dealing 
with the extra email accounts
-                       if ($this->debug > 0) { echo 
'email.uipreferences.ex_accounts_edit: ENTERING, this function *should* only be 
called for the EXTRA email account prefs submission<br>'; }
-                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: about to set 
$this->bo->account_group<br>'; }
+                       if ($this->debug > 0) { echo 
'email.uipreferences.ex_accounts_edit: ENTERING, this function *should* only be 
called for the EXTRA email account prefs submission<br />'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: about to set $this->bo->account_group<br 
/>'; }
                        $this->bo->account_group = 'extra_accounts';
-                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: just set $this->bo->account_group to 
['.$this->bo->account_group.']<br>'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: just set $this->bo->account_group to 
['.$this->bo->account_group.']<br />'; }
                        
                        // obtain the acctnum for the extra email account we 
are dealing with here
                        $acctnum = $this->bo->obtain_ex_acctnum();
-                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: $this->bo->obtain_ex_acctnum() returns 
['.serialize($acctnum).']<br>'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: $this->bo->obtain_ex_acctnum() returns 
['.serialize($acctnum).']<br />'; }
                        $this->bo->acctnum = $acctnum;
-                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: we just set $this->bo->acctnum to 
['.serialize($this->bo->acctnum).']<br>'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: we just set $this->bo->acctnum to 
['.serialize($this->bo->acctnum).']<br />'; }
                        
                        if ($GLOBALS['phpgw']->msg->phpgw_before_xslt)
                        {
@@ -581,7 +581,7 @@
                        $this->tpl->set_var($var);
                        
                        // this will fill the $this->bo->std_prefs[] and 
cust_prefs[]  "schema" arrays
-                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: calling 
$this->bo->init_available_prefs() to init $this->bo->std_prefs[] and 
cust_prefs[]  "schema" arrays<br>'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: calling 
$this->bo->init_available_prefs() to init $this->bo->std_prefs[] and 
cust_prefs[]  "schema" arrays<br />'; }
                        $this->bo->init_available_prefs();                      
                        
                        if ($this->debug > 3) { echo 
'email.uipreferences.ex_accounts_edit: initiated schema dump:'; 
$this->bo->debug_dump_prefs(); }
@@ -625,7 +625,7 @@
                        // parse the block,
                        $done_widget = 
$this->tpl->parse('V_tr_sec_title','B_tr_sec_title');
                        // get the parsed data and put into a local variable
-                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: about to generate the html for standard 
email prefs block<br>'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: about to generate the html for standard 
email prefs block<br />'; }
                        // add the finished widget row to the main block 
variable
                        $prefs_ui_rows .= $done_widget;
                        
@@ -641,7 +641,7 @@
                        $done_widget = 
$this->tpl->parse('V_tr_sec_title','B_tr_sec_title');
                        $prefs_ui_rows .= $done_widget;
                        // generate Custom Prefs HTML Block
-                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: about to generate the html for custom 
email prefs block<br>'; }
+                       if ($this->debug > 1) { echo 
'email.uipreferences.ex_accounts_edit: about to generate the html for custom 
email prefs block<br />'; }
                        $prefs_ui_rows .= 
$this->create_prefs_block($this->bo->cust_prefs);
                        
                        // blank row
@@ -661,7 +661,7 @@
                        $this->tpl->set_var('debugdata', 
$GLOBALS['phpgw']->msg->dbug->notice_pagedone());
                        
                        // output the template
-                       if ($this->debug > 0) { echo 
'email.uipreferences.ex_accounts_edit: LEAVING, about to output the 
template<br>'; }
+                       if ($this->debug > 0) { echo 
'email.uipreferences.ex_accounts_edit: LEAVING, about to output the template<br 
/>'; }
                        if ($GLOBALS['phpgw']->msg->phpgw_before_xslt)
                        {
                                $this->tpl->set_unknowns('comment');