[Phpgroupware-cvs] phpgwapi/inc class.uijsaddressbook.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   06/12/20 14:33:08

Modified files:
        inc            : class.uijsaddressbook.inc.php 

Log message:
        notices

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.uijsaddressbook.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5

Patches:
Index: class.uijsaddressbook.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.uijsaddressbook.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.uijsaddressbook.inc.php       3 Sep 2006 06:15:27 -0000       1.4
+++ class.uijsaddressbook.inc.php       20 Dec 2006 14:33:08 -0000      1.5
@@ -9,7 +9,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.uijsaddressbook.inc.php,v 1.4 2006/09/03 06:15:27 
skwashd Exp $
+       * @version $Id: class.uijsaddressbook.inc.php,v 1.5 2006/12/20 14:33:08 
sigurdne Exp $
        * @internal Inherited some code from the addressbook.php file
        */
 
@@ -162,6 +162,8 @@
 
                var $wait_image_path = "in_constructor";
 
+               var $query;
+
                //@function uijsaddressbook constructor
                //@discussion
                //This is the main initializator. Here, we output the 
mainframe. Tats all we do. Its an important function
@@ -283,14 +285,14 @@
                                                'mainframe_t' => 
'addressbook-js-frameset.tpl'
                                                ));
                        //Set the charset (important for translations)
-                       $charset = 
$GLOBALS['phpgw']->translation->translate('charset');
+                       $charset = 
'utf-8';//$GLOBALS['phpgw']->translation->translate('charset');
                        //Set your normal variables
                        $this->template->set_var('charset',$charset);
                        $this->template->set_var('title',$this->title);
-                       
$this->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
+               //      
$this->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
                        //Dont forget to include oour main javascript file
                        
$this->template->set_var('include_link',$GLOBALS['phpgw']->link("/phpgwapi/js/contacts/selectboxes.js"));
-                       
$this->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
+               //      
$this->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
                        
$this->template->set_var('please_update_opener',$this->update_opener);
                        //Get the hider values where needed
                        //$this->hideto  = get_var('hideto',$this->get_order);
@@ -431,7 +433,7 @@
                                get from both. Good thing about get_var in 
0.9.15.
                         */
                        //nameselect is the value of the first selection in the 
nameselectbox
-                       $this->nameselect = $this->nameselectbox[0];
+                       $this->nameselect = isset($this->nameselectbox[0]) ? 
$this->nameselectbox[0] : '';
                        //To selectbox must be hidden,set variables 
acordinlgy....likewise for cc and bcc
                        if($this->hideto)
                        {
@@ -585,7 +587,7 @@
                        
$this->template->set_var('lang_addressbook_action',lang('Address book'));
                        $this->template->set_var('main_form_name',"mainform");
                        $this->template->set_var('lang_search',lang('Search'));
-                       
$this->template->set_var('searchbox_value',(($searchbox) ? $searchbox : ""));
+                       
$this->template->set_var('searchbox_value',(isset($searchbox) && ($searchbox) ? 
$searchbox : ""));
                        
$this->template->set_var('search_ac_value',(($this->searchautocomplete) ? 
$this->searchautocomplete : ""));
                        //Label settings------------
                        //for columns!
@@ -625,7 +627,7 @@
                        
$this->template->set_var('selected_cat_name',$this->selected_cat_name);
                        
$this->template->set_var('selected_cat_value',($this->cat_id=="")?-2:$this->cat_id);
                        //End Label setting--------------
-                       
$this->template->set_var('search_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook-js.php',"sort=$this->sort&order=$this->order&filter=$this->filter&start=$this->start&cat_id=$this->cat_id"));
+                       
$this->template->set_var('search_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook-js.php',array('sort'=>$this->sort,'order'=>$this->order,'filter'=>$this->filter,'start'=>$this->start,'cat_id'=>$this->cat_id)));
                                $this->template->set_var('query',$query);
                                $this->template->set_var('order',$order);
                                
$this->template->set_var('searchbox_value',$this->searchbox);
@@ -744,7 +746,9 @@
                                
                                        // --------------------- template 
declaration for list records --------------------------
                                        //if it went into the other boxes, we 
dont let him be in the select from box
-                                       if((!$this->toselectbox[$id]) && 
(!$this->ccselectbox[$id]) && (!$this->bccselectbox[$id]))
+                                       if((!isset($this->toselectbox[$id]) || 
!$this->toselectbox[$id])
+                                               && 
(!isset($this->ccselectbox[$id]) || !$this->ccselectbox[$id])
+                                               && 
(!isset($this->bccselectbox[$id]) || !$this->bccselectbox[$id]))
                                        {
                                                
$this->template->set_var('name_option_value',$id);
                                                
$this->template->set_var('name_option_name',$fullname);