[Phpgroupware-cvs] addressbook/inc/class.uiaddressbook.inc.php, 1.36.2.15.2.54

[nomail]

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

date: 2004/05/04 18:24:05;  author: jarg;  state: Exp;  lines: +30 -20

Log Message:
bugfix #8777 and general fix about some lang function calls
=====================================================================
Index: addressbook/inc/class.uiaddressbook.inc.php
diff -u addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.53 
addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.54
--- addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.53  Sat Apr  3 
23:27:31 2004
+++ addressbook/inc/class.uiaddressbook.inc.php Tue May  4 18:24:05 2004
@@ -411,7 +411,6 @@
                        
$this->template->set_var('th_font',$GLOBALS['phpgw_info']['theme']['font']);
                        
$this->template->set_var('th_text',$GLOBALS['phpgw_info']['theme']['th_text']);
                        $this->template->set_var('lang_add',lang('Add'));
-
                        
$this->template->set_var('lang_cat_cont',lang('Categorize'));
                        $this->template->set_var('cat_cont_url', 
$GLOBALS['phpgw']->link('/index.php',
                                                                                
         'menuaction=addressbook.uicategorize_contacts.index'));
@@ -582,7 +581,7 @@
                        $this->managment_functions($this->action);
 
                        //save the old tab data
-                       $this->save_tab_session($this->entry['old_tab'], 
$this->entry);
+                       
$this->save_tab_session(stripslashes($this->entry['old_tab']), $this->entry);
                        
                        //if not exist tab selected use as defaul person_data
                        if(!$this->tab)
@@ -659,7 +658,7 @@
                        $this->managment_functions($this->action);
                        
                        //save the old tab data
-                       $this->save_tab_session($this->entry['old_tab'], 
$this->entry);
+                       
$this->save_tab_session(stripslashes($this->entry['old_tab']), $this->entry);
 
                        //if not exist tab selected use as defaul person_data
                        if(!$this->tab)
@@ -796,7 +795,7 @@
                        $this->managment_functions($this->action);
 
                        //save the old tab data
-                       $this->save_tab_session($this->entry['old_tab'], 
$this->entry);
+                       
$this->save_tab_session(stripslashes($this->entry['old_tab']), $this->entry);
                        
                        //if not exist tab selected use as defaul person_data
                        if(!$this->tab)
@@ -870,7 +869,7 @@
                        $this->managment_functions($this->action);
 
                        //save the old tab data
-                       $this->save_tab_session($this->entry['old_tab'], 
$this->entry);
+                       
$this->save_tab_session(stripslashes($this->entry['old_tab']), $this->entry);
 
                        //if not exist tab selected use as defaul person_data
                        if(!$this->tab)
@@ -1262,7 +1261,7 @@
                {
                        $this->form_start();
 
-                       $this->template->set_var('lang_general_data', 
lang('Communication Data for ' . $this->record_name));
+                       $this->template->set_var('lang_general_data', 
lang('Communication Data for').' '.$this->record_name);
 
                        $types_data = array('data1' => array('type'  => 'data',
                                                             'field' => 
'comm_description'),
@@ -1308,7 +1307,7 @@
                        
                        $this->form_start();
                        
-                       $this->template->set_var('lang_general_data', 
lang('Address Data for ' . $this->record_name));
+                       $this->template->set_var('lang_general_data', 
lang('Address Data for').' '.$this->record_name);
 
                        $this->template->set_var('current_id_name', 
$key_addr_id_name);
                        $this->template->set_var('current_id', $key_addr_id);
@@ -1389,7 +1388,7 @@
                        $this->form_start();
 
                        //set values
-                       $this->template->set_var('lang_general_data', 
lang('Other Data for ' . $this->record_name));
+                       $this->template->set_var('lang_general_data', 
lang('Other Data for').' '.$this->record_name);
 
                        $this->template->set_var('current_id_name', 
$key_other_id_name);
                        $this->template->set_var('current_id', $key_other_id);
@@ -1472,7 +1471,7 @@
                                . $fields['per_pubkey'] . '">';
                        
                        $this->form_start();
-                       $this->template->set_var('lang_general_data', 
lang('Person extra fields for ' . $this->record_name));
+                       $this->template->set_var('lang_general_data', 
lang('Person extra fields for').' '.$this->record_name);
                        
                        $this->set_form_fields(array(1 => array('Suffix', 
'entry[per_suffix]', $fields['per_suffix']),
                                                     2 => array('Initials', 
'entry[per_initials]', $fields['per_initials']),
@@ -1505,6 +1504,7 @@
                        {
                                $owner_title = 'Org';
                                $owner_value = $this->record_name;
+                               
                        }
                        
                        $all_data = '<select multiple size="5" name="' 
@@ -1525,19 +1525,28 @@
                        $this->template->set_file(array('person_action' => 
'many_actions.tpl'));
                        $this->template->set_block('person_action', 
'many_actions', 'many_actions');
 
-                       $this->template->set_var('lang_general_data', 
lang($option.' Data for '.$this->record_name));
-
-                       $this->template->set_var('lang_person', 
lang($owner_title));
-                       $this->template->set_var('person', $owner_value);
-
                        if ($option==$this->tab_orgs)
                        {
-                               $this->template->set_var('lang_defaul', 
lang('Defaul ' . $option . ':'));
+                               $option_label = 'Organizations';
+                               $this->template->set_var('lang_defaul', 
lang('Default ' . $option_label) . ':');
                                $this->template->set_var('options', 
$defaul_data_cbo);
                        }
+                       elseif($option==$this->tab_persons)
+                       {
+                               $option_label = 'Persons';
+                       }
+                       elseif($option==$this->tab_cats)
+                       {
+                               $option_label = 'Categories';
+                       }
 
-                       $this->template->set_var('lang_title_left', lang('All ' 
. $option));
-                       $this->template->set_var('lang_title_rigth', 
lang('Current ' . $option));
+
+                       $this->template->set_var('lang_general_data', 
lang($option_label.' Data for').' '.$this->record_name);
+                       $this->template->set_var('lang_title_left', lang('All ' 
. $option_label));
+                       $this->template->set_var('person', $owner_value);
+                       
+                       $this->template->set_var('lang_person', 
lang($owner_title). ' ');
+                       $this->template->set_var('lang_title_rigth', 
lang('Current ' . $option_label));
 
                        $this->template->set_var('options_left', $all_data);
                        $this->template->set_var('options_rigth', $my_data);
@@ -1868,7 +1877,8 @@
                                $this->firsttime = false;
                        }
 
-                       $this->tab = get_var('bname', array('post', 'get'));
+                       $_tab = get_var('bname', array('post', 'get'));
+                       $this->tab = stripslashes($_tab);
                        $this->entry = get_var('entry', array('post','get'));
 
                        $this->contact_id = get_var('ab_id', 
array('post','get'));
@@ -2211,7 +2221,7 @@
                                           'old_comm',
                                           'old_others');
 
-                       if($tabs_data[$tab])
+                       if($tab!='')
                        {
                                $GLOBALS['phpgw']->session->appsession($tab, 
'addressbook', NULL);
                        }