[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] addressbook/inc/class.uiaddressbook_prefs.inc.php, 1
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] addressbook/inc/class.uiaddressbook_prefs.inc.php, 1.1.2.5 |
|
Date: |
Sat, 6 Nov 2004 17:13:43 +0100 |
Update of /addressbook/inc
Modified Files:
Branch: Version-0_9_16-branch
class.uiaddressbook_prefs.inc.php
date: 2004/11/06 16:13:43; author: powerstat; state: Exp; lines: +45 -45
Log Message:
replaced <br> with <br /> and <hr> with <hr /> for better w3c compatibility
=====================================================================
Index: addressbook/inc/class.uiaddressbook_prefs.inc.php
diff -u addressbook/inc/class.uiaddressbook_prefs.inc.php:1.1.2.4
addressbook/inc/class.uiaddressbook_prefs.inc.php:1.1.2.5
--- addressbook/inc/class.uiaddressbook_prefs.inc.php:1.1.2.4 Tue Apr 6
09:30:51 2004
+++ addressbook/inc/class.uiaddressbook_prefs.inc.php Sat Nov 6 16:13:43 2004
@@ -96,7 +96,7 @@
if($this->is_current_admin())
{
$temp=get_var('adm_pref_type',array('get','post'));
- //print "<BR><B>Admin user var
is".$temp."</B><BR>";
+ //print "<br /><B>Admin user var
is".$temp."</B><br />";
//Changed preference type tav
if(isset($temp))
{
@@ -104,7 +104,7 @@
if($temp !=
$this->map_tpl_to_real['adm_pref_type'])
{
- //print "<BR><B>Flushing
cache</B><BR>";
+ //print "<br /><B>Flushing
cache</B><br />";
$this->clear_dinamic_data();
}
$this->map_tpl_to_real['adm_pref_type']=$temp;
@@ -112,7 +112,7 @@
$this->build_admin_tabs();
}
$this->bo->read_preferences($this->map_tpl_to_real['adm_pref_type']);
- // print "<BR><B>current tab
is".$this->map_tpl_to_real['adm_pref_type']."</B><BR>";
+ // print "<br /><B>current tab
is".$this->map_tpl_to_real['adm_pref_type']."</B><br />";
$this->map_tpl_to_real['org_preferences_link']=$GLOBALS['phpgw']->link('/index.php',
array(
@@ -145,11 +145,11 @@
$tmp->app_name='addressbook';
//Forced category, can be an administrator not the
forced
//preferences tab
- //print "<BR><B>Default category is
".$this->bo->default_category_forced."</B><BR>";
- // print "<BR><B>Tab is
".$this->map_tpl_to_real['adm_pref_type']."</B><BR>";
+ //print "<br /><B>Default category is
".$this->bo->default_category_forced."</B><br />";
+ // print "<br /><B>Tab is
".$this->map_tpl_to_real['adm_pref_type']."</B><br />";
if($this->bo->default_category_forced &&
$this->map_tpl_to_real['adm_pref_type']!='forced')
{
- //print "<BR><B>FORCED cat</B><BR";
+ //print "<br /><B>FORCED cat</B><BR";
$ret="<option value='"
.$this->bo->default_category.
"'>".
@@ -239,7 +239,7 @@
//They have hit the button to add selected fields
if(get_var('select_fields',array('post','get')))
{
- /* print '<BR><B>selectfields</B><BR>'; */
+ /* print '<br /><B>selectfields</B><br />'; */
$temp='select_fields';
}
elseif(get_var('save',array('post','get')))
@@ -253,7 +253,7 @@
else
{
$temp=get_var('remove_me',array('get','post'));
- /*print '<BR><B>remove type'.$temp.'</B><BR>';*/
+ /*print '<br /><B>remove type'.$temp.'</B><br
/>';*/
if($this->selected_fields[$this->org_or_person][$temp])
{
@@ -268,9 +268,9 @@
$this->submit=$temp;
- /*print '<BR><B>selected </B>';
+ /*print '<br /><B>selected </B>';
print_r($this->selected_fields);
- print '<BR><B>Submited</B>';
+ print '<br /><B>Submited</B>';
print $this->submit; */
$temp=get_var('org_or_person',array('get','post'));
if($temp=='Organizations' || $temp == 'Persons')
@@ -295,11 +295,11 @@
$this->map_tpl_to_real['cat_options']=$this->get_addressbook_cats($temp);
}
$this->map_tpl_to_real['cat_id']=$temp;
- //print '<br><b>Selected
catid!'.$temp.'</b><br>';
+ //print '<br /><b>Selected
catid!'.$temp.'</b><br />';
}
else
{
- /// print '<br><b>Cached catid</b><br>';
+ /// print '<br /><b>Cached catid</b><br />';
//fetch from preferences
$this->map_tpl_to_real['cat_id']=$this->bo->default_category;
@@ -317,7 +317,7 @@
$this->map_tpl_to_real['cat_options']=$this->get_addressbook_cats($this->map_tpl_to_real['cat_id']);
}
- // print '<br><b>Preference catid</b><br>';
+ // print '<br /><b>Preference catid</b><br
/>';
}
}
@@ -355,8 +355,8 @@
$org_person_array['Persons']=$this->contacts->get_person_properties();
$org_person_array['Organizations']=$this->contacts->get_organization_properties();
- //print "<BR><B>orgpersonarray
properties".$orgpersonarray."</B><BR>";
- /*print "<br><b>catalogs</b><br>";*/
+ //print "<br /><B>orgpersonarray
properties".$orgpersonarray."</B><br />";
+ /*print "<br /><b>catalogs</b><br />";*/
//now go translating each field
reset($this->contacts->stock_contact_fields);
//Constructing simple 'showable' fields
@@ -371,7 +371,7 @@
if(!
in_array($falsefield,$org_person_array['Organizations']) )
{
$this->fields_show_selectbox[$falsefield]=$GLOBALS['phpgw']->lang($this->contacts->stock_contact_fields[$falsefield]);
- // print "<br><br><b>
$falsefield<\b>";
+ // print "<br /><br /><b>
$falsefield<\b>";
$this->lang_fields[$falsefield]=$this->fields_show_selectbox[$falsefield];
}
unset($org_person_array['Organizations'][$falsefield]);
@@ -401,23 +401,23 @@
{
if(!$this->selected_fields[$this->org_or_person]['comm_types'][$v])
{
- // print "<B><BR>Commtypes
$this->selected_fields[$this->org_or_person]['comm_types'][$v]</b><br>";
+ // print "<B><br />Commtypes
$this->selected_fields[$this->org_or_person]['comm_types'][$v]</b><br />";
$this->fields_show_selectbox['comm_types'][$v]=$v;
}
else
{
- // print "<B><BR>langfields
$this->lang_fields[$v]=$v</b><br>";
+ // print "<B><br />langfields
$this->lang_fields[$v]=$v</b><br />";
$this->lang_fields[$v]=$v;
}
}
/*
- print "<br><b>Columns</b><br>";
+ print "<br /><b>Columns</b><br />";
print_r($this->lang_fields);
- print "<br><b>Columns</b><br>"; */
+ print "<br /><b>Columns</b><br />"; */
}
function linearize_query($qresult,$key)
{
@@ -432,40 +432,40 @@
function get_exact_fields()
{
//Selecting fields, let it roll
- /*print '<BR><B>SELECTFIELDS!</B><BR>';*/
+ /*print '<br /><B>SELECTFIELDS!</B><br />';*/
if(is_array($this->cached_selected_fields[$this->org_or_person]) &&
is_array($this->selected_fields[$this->org_or_person]))
{
//We have cached selected fields, and someone
selected more
//Need to agregate the selected to the cached
- /*print '<BR><B>Merging Selected
Fields</B><BR>';
+ /*print '<br /><B>Merging Selected
Fields</B><br />';
print_r($this->selected_fields[$this->org_or_person]);
- print '<BR><B>Merging Cached Selected
Fields</B><BR>';
+ print '<br /><B>Merging Cached Selected
Fields</B><br />';
print_r($this->cached_selected_fields[$this->org_or_person]);
*/
$this->cached_selected_fields[$this->org_or_person]=$this->selected_fields[$this->org_or_person]=array_merge_recursive($this->cached_selected_fields[$this->org_or_person],$this->selected_fields[$this->org_or_person]);
- // print '<BR><B>Merging Result</B><BR>';
+ // print '<br /><B>Merging Result</B><br />';
//
print_r($this->selected_fields[$this->org_or_person]);
}
elseif(is_array($this->selected_fields[$this->org_or_person]))
{
$this->cached_selected_fields[$this->org_or_person]=$this->selected_fields[$this->org_or_person];
- //print '<BR><B>Selected awright</B><BR>';
+ //print '<br /><B>Selected awright</B><br />';
}
elseif(is_array($this->cached_selected_fields[$this->org_or_person]))
{
$this->selected_fields[$this->org_or_person]=$this->cached_selected_fields[$this->org_or_person];
- //print '<BR><B>Cached awright</B><BR>';
+ //print '<br /><B>Cached awright</B><br />';
}
elseif($this->org_or_person == 'Persons' &&
is_array($this->bo->person_columns))
{
- //print '<BR><B>Old preferences found</B><BR>';
+ //print '<br /><B>Old preferences found</B><br
/>';
$this->selected_fields['Persons']=$this->cached_selected_fields['Persons']=$this->bo->person_columns;
}
elseif($this->org_or_person == 'Organizations' &&
is_array($this->bo->org_columns))
{
- //print '<BR><B>Old preferences
found</B><BR>';
+ //print '<br /><B>Old preferences found</B><br
/>';
$this->selected_fields['Organizations']=$this->cached_selected_fields['Organizations']=$this->bo->org_columns;
}
@@ -473,7 +473,7 @@
function index()
{
$this->get_vars();
- /*print '<BR><B>It is a
!'.$this->org_or_person.'</B><BR>';*/
+ /*print '<br /><B>It is a
!'.$this->org_or_person.'</B><br />';*/
switch($this->submit)
{
@@ -509,10 +509,10 @@
$this->bo->org_columns=$org_columns;
- //print
'<BR><B>Catid'.$this->map_tpl_to_real['cat_id'].'</B><BR>';
+ //print '<br
/><B>Catid'.$this->map_tpl_to_real['cat_id'].'</B><br />';
$this->bo->default_category=$this->map_tpl_to_real['cat_id'];
- //print "<BR><B>Person Columns";
-
//print_r($this->bo->person_columns)."</B><BR>";
+ //print "<br /><B>Person Columns";
+
//print_r($this->bo->person_columns)."</B><br />";
$this->bo->save_preferences($this->map_tpl_to_real['adm_pref_type']);
// $this->save_sessiondata(true);
@@ -527,16 +527,16 @@
{
//if removing
- //print '<BR><B>Removing!</B><BR>';
+ //print '<br /><B>Removing!</B><br />';
if($this->cached_selected_fields[$this->org_or_person][$this->remove_me])
{
//kill the field to be removed
- //print
'<BR><B>Removing!'.$this->remove_me.'</B><BR>';
+ //print '<br
/><B>Removing!'.$this->remove_me.'</B><br />';
unset($this->cached_selected_fields[$this->org_or_person][$this->remove_me]);
}
elseif($this->cached_selected_fields[$this->org_or_person]['comm_types'][$this->remove_me])
{
- //print
'<BR><B>Removing!'.$this->remove_me.'</B><BR>';
+ //print '<br
/><B>Removing!'.$this->remove_me.'</B><br />';
unset($this->cached_selected_fields[$this->org_or_person]['comm_types'][$this->remove_me]);
}
//Look if we remove_me is the last
field to be removed
@@ -563,7 +563,7 @@
//Selecting fields, let it roll
- //print '<BR><B>SELECTFIELDS!</B><BR>';
+ //print '<br /><B>SELECTFIELDS!</B><br
/>';
$this->get_exact_fields();
//print_r($this->selected_fields);
@@ -634,7 +634,7 @@
$this->template->set_block('principal_tabs_t','principal_button');
$this->template->set_block('principal_tabs_t','principal_tab');
- //print '<BR><B>Now it is a '.$this->org_or_person.'</B><BR>';
+ //print '<br /><B>Now it is a '.$this->org_or_person.'</B><br
/>';
$this->parse_principal_tabs(
$this->map_tpl_to_real['person_preferences_link'],
$this->get_class_css(
@@ -685,7 +685,7 @@
if(count($this->fields_show_selectbox) > 1)
{
reset($this->fields_show_selectbox);
- // print "<BR><B> To Show in
Selectbox<br>".print_r($this->fields_show_selectbox)."</B><BR>";
+ // print "<br /><B> To Show in
Selectbox<br />".print_r($this->fields_show_selectbox)."</B><br />";
while(list($field,$lang)=each($this->fields_show_selectbox))
{
//not a comtype
@@ -727,7 +727,7 @@
}
$this->template->set_block('selected_rows_t','B_selected_rows','V_selected_rows');
- //print "<BR><B>Selected</B><BR>";
+ //print "<br /><B>Selected</B><br />";
//print_r($this->selected_fields[$this->org_or_person]);
reset($this->selected_fields[$this->org_or_person]);
while(list($k,$v)=each($this->selected_fields[$this->org_or_person]))
@@ -817,7 +817,7 @@
}
else
{
- // print '<BR><B>Clearing Cache </B><BR>';
+ // print '<br /><B>Clearing Cache </B><br />';
$GLOBALS['phpgw']->session->appsession('session_data','addressbookpref','');
}
@@ -825,7 +825,7 @@
function read_sessiondata()
{
-// print '<BR><B>READING SESSIONDATA!</B><BR>';
+// print '<br /><B>READING SESSIONDATA!</B><br />';
$data=$GLOBALS['phpgw']->session->appsession('session_data','addressbookpref');
$this->cached_selected_fields=$data['selected_fields'];
$this->map_tpl_to_real=$data['map_tpl_to_real'];
@@ -845,7 +845,7 @@
function session_data_saved()
{
$data=$GLOBALS['phpgw']->session->appsession('session_data','addressbookpref');
- //print "<BR><B>Actually got sessiondata</B><BR>";
+ //print "<br /><B>Actually got sessiondata</B><br />";
//print_r($data);
return is_array($data);
}
@@ -861,7 +861,7 @@
}
function get_class_css($tab, $current_tab)
{
- //print "<BR><B>ITS AN $tab == $current_tab";
+ //print "<br /><B>ITS AN $tab == $current_tab";
if ($tab == $current_tab)
{
return 'button_style_sel';
@@ -912,8 +912,8 @@
function is_current_admin()
{
-// print "<BR><B> Current is admin? ".
-
$GLOBALS['phpgw']->acl->check('run',1,'admin')."</B><BR>";
+// print "<br /><B> Current is admin? ".
+
$GLOBALS['phpgw']->acl->check('run',1,'admin')."</B><br />";
return $GLOBALS['phpgw']->acl->check('run',1,'admin');
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] addressbook/inc/class.uiaddressbook_prefs.inc.php, 1.1.2.5,
nomail <=