[Phpgroupware-cvs] property/inc class.acl2.inc.php class.boadmin_l...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/09/06 07:18:36

Modified files:
        inc            : class.acl2.inc.php 
                         class.boadmin_location.inc.php 
                         class.bolocation.inc.php class.menu.inc.php 
                         class.soadmin_entity.inc.php 
                         class.soadmin_location.inc.php 
                         class.solocation.inc.php 
                         class.uiadmin_location.inc.php 
                         class.uilocation.inc.php 

Log message:
        E_NOTICES

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.acl2.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boadmin_location.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bolocation.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.menu.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soadmin_entity.inc.php?cvsroot=phpgroupware&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soadmin_location.inc.php?cvsroot=phpgroupware&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.solocation.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiadmin_location.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uilocation.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29

Patches:
Index: class.acl2.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.acl2.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.acl2.inc.php  21 Apr 2006 19:09:20 -0000      1.11
+++ class.acl2.inc.php  6 Sep 2006 07:18:35 -0000       1.12
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.acl2.inc.php,v 1.11 2006/04/21 19:09:20 sigurdne 
Exp $
+       * @version $Id: class.acl2.inc.php,v 1.12 2006/09/06 07:18:35 sigurdne 
Exp $
        */
 
        /**
@@ -130,12 +130,12 @@
                        $this->db->query($sql,__LINE__,__FILE__);
                        while($this->db->next_record())
                        {
-                               
if($this->rights_cache[$args['app_id']][$args['account_id']][$args['location']] 
== 0)
+                               
if(!isset($this->rights_cache[$args['app_id']][$args['account_id']][$args['location']])
 || 
$this->rights_cache[$args['app_id']][$args['account_id']][$args['location']] == 
0)
                                {
                                        
$this->rights_cache[$args['app_id']][$args['account_id']][$this->db->f('acl_location')]
 = 0;
                                }
 
-                               
if($this->masks_cache[$args['app_id']][$args['account_id']][$args['location']] 
== 0)
+                               
if(!isset($this->masks_cache[$args['app_id']][$args['account_id']][$args['location']])
 || $this->masks_cache[$args['app_id']][$args['account_id']][$args['location']] 
== 0)
                                {
                                        
$this->masks_cache[$args['app_id']][$args['account_id']][$this->db->f('acl_location')]
 = 0;
                                }

Index: class.boadmin_location.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boadmin_location.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- class.boadmin_location.inc.php      17 Apr 2006 11:36:05 -0000      1.10
+++ class.boadmin_location.inc.php      6 Sep 2006 07:18:36 -0000       1.11
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: class.boadmin_location.inc.php,v 1.10 2006/04/17 
11:36:05 sigurdne Exp $
+       * @version $Id: class.boadmin_location.inc.php,v 1.11 2006/09/06 
07:18:36 sigurdne Exp $
        */
 
        /**
@@ -20,10 +20,8 @@
        {
                var $start;
                var $query;
-               var $filter;
                var $sort;
                var $order;
-               var $cat_id;
 
                var $public_functions = array
                (
@@ -69,8 +67,6 @@
                        $query  = get_var('query',array('POST','GET'));
                        $sort   = get_var('sort',array('POST','GET'));
                        $order  = get_var('order',array('POST','GET'));
-                       $filter = get_var('filter',array('POST','GET'));
-                       $cat_id = get_var('cat_id',array('POST','GET'));
                        $allrows        = 
get_var('allrows',array('POST','GET'));
 
                        if ($start)
@@ -86,10 +82,6 @@
                        {
                                $this->query = $query;
                        }
-                       if(!empty($filter))
-                       {
-                               $this->filter = $filter;
-                       }
                        if(isset($sort))
                        {
                                $this->sort = $sort;
@@ -98,10 +90,6 @@
                        {
                                $this->order = $order;
                        }
-                       if(isset($cat_id))
-                       {
-                               $this->cat_id = $cat_id;
-                       }
                        if(isset($allrows))
                        {
                                $this->allrows = $allrows;
@@ -121,13 +109,10 @@
                {
                        $data = 
$GLOBALS['phpgw']->session->appsession('session_data','standard_e');
 
-
                        $this->start    = $data['start'];
                        $this->query    = $data['query'];
-                       $this->filter   = $data['filter'];
                        $this->sort             = $data['sort'];
                        $this->order    = $data['order'];
-                       $this->cat_id   = $data['cat_id'];
                }
 
                function reset_fm_cache()

Index: class.bolocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.bolocation.inc.php    17 Apr 2006 11:36:05 -0000      1.15
+++ class.bolocation.inc.php    6 Sep 2006 07:18:36 -0000       1.16
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.bolocation.inc.php,v 1.15 2006/04/17 11:36:05 
sigurdne Exp $
+       * @version $Id: class.bolocation.inc.php,v 1.16 2006/09/06 07:18:36 
sigurdne Exp $
        */
 
        /**
@@ -684,7 +684,7 @@
                {
                        return $this->so->update_cat();
                }
-               function read_summary()
+               function read_summary($data=array())
                {
 
                        $summary = $this->so->read_summary(array('filter' => 
$this->filter,'type_id' => $data['type_id'],

Index: class.menu.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.menu.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.menu.inc.php  29 Aug 2006 13:13:03 -0000      1.25
+++ class.menu.inc.php  6 Sep 2006 07:18:36 -0000       1.26
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.menu.inc.php,v 1.25 2006/08/29 13:13:03 sigurdne 
Exp $
+       * @version $Id: class.menu.inc.php,v 1.26 2006/09/06 07:18:36 sigurdne 
Exp $
        */
 
        /**
@@ -440,7 +440,7 @@
                                        $i++;
                                }
 
-                               if ($sub == adm_loc && 
$this->acl2->check('.location',16))
+                               if ($sub == 'adm_loc' && 
$this->acl2->check('.location',16))
                                {
                                        if($page=='loc_type')
                                        {

Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- class.soadmin_entity.inc.php        19 Apr 2006 10:37:47 -0000      1.19
+++ class.soadmin_entity.inc.php        6 Sep 2006 07:18:36 -0000       1.20
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: class.soadmin_entity.inc.php,v 1.19 2006/04/19 10:37:47 
sigurdne Exp $
+       * @version $Id: class.soadmin_entity.inc.php,v 1.20 2006/09/06 07:18:36 
sigurdne Exp $
        */
 
        /**
@@ -45,7 +45,7 @@
                {
                        if(is_array($data))
                        {
-                               if ($data['start'])
+                               if (isset($data['start']))
                                {
                                        $start=$data['start'];
                                }
@@ -71,6 +71,7 @@
 
                        $table = 'fm_entity';
 
+                       $querymethod = '';
                        if($query)
                        {
                                $query = ereg_replace("'",'',$query);

Index: class.soadmin_location.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soadmin_location.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- class.soadmin_location.inc.php      2 Mar 2006 12:45:16 -0000       1.21
+++ class.soadmin_location.inc.php      6 Sep 2006 07:18:36 -0000       1.22
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: class.soadmin_location.inc.php,v 1.21 2006/03/02 
12:45:16 sigurdne Exp $
+       * @version $Id: class.soadmin_location.inc.php,v 1.22 2006/09/06 
07:18:36 sigurdne Exp $
        */
 
        /**
@@ -50,7 +50,7 @@
                {
                        if(is_array($data))
                        {
-                               if ($data['start'])
+                               if (isset($data['start']))
                                {
                                        $start=$data['start'];
                                }
@@ -75,6 +75,7 @@
 
                        $table = 'fm_location_type';
 
+                       $querymethod = '';
                        if($query)
                        {
                                $query = ereg_replace("'",'',$query);
@@ -104,7 +105,7 @@
 
                function read_config($data=0)
                {
-                       if ($data['start'])
+                       if (isset($data['start']))
                        {
                                $start=$data['start'];
                        }
@@ -120,7 +121,7 @@
                                $order = 
(isset($data['order'])?$data['order']:'');
                        }
 
-                       if ($order)
+                       if (isset($order))
                        {
                                $ordermethod = " order by $order $sort";
 
@@ -130,7 +131,8 @@
                                $ordermethod = ' order by column_name asc';
                        }
 
-                       if($query)
+                       $querymethod = '';
+                       if(isset($query))
                        {
                                $query = ereg_replace("'",'',$query);
                                $query = ereg_replace('"','',$query);
@@ -477,7 +479,7 @@
 //_debug_array($data);
                        if(is_array($data))
                        {
-                               if ($data['start'])
+                               if (isset($data['start']))
                                {
                                        $start=$data['start'];
                                }
@@ -512,6 +514,7 @@
 
                        }
 
+                       $querymethod = '';
                        if($query)
                        {
                                $query = ereg_replace("'",'',$query);

Index: class.solocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.solocation.inc.php    5 Sep 2006 17:47:06 -0000       1.31
+++ class.solocation.inc.php    6 Sep 2006 07:18:36 -0000       1.32
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.solocation.inc.php,v 1.31 2006/09/05 17:47:06 
sigurdne Exp $
+       * @version $Id: class.solocation.inc.php,v 1.32 2006/09/06 07:18:36 
sigurdne Exp $
        */
 
        /**
@@ -246,6 +246,7 @@
 
 */
                                $joinmethod ='';
+                               $paranthesis = '';
                                for ($j=($type_id-1); $j>0; $j--)
                                {
                                        $joinmethod .= " $this->join 
fm_location". ($j);
@@ -404,7 +405,7 @@
                                }
 
 
-                               $from .= " FROM $paranthesis 
fm_location$type_id ";
+                               $from = " FROM $paranthesis fm_location$type_id 
";
 
                                $sql = "SELECT $cols $from $joinmethod";
 
@@ -535,6 +536,7 @@
                        $cols_return_count      = count($cols_return);
                        $location_count = $type_id-1;
                        $contacts                       = 
CreateObject('phpgwapi.contacts');
+                       $location_list          = array();
 
                        while ($this->db->next_record())
                        {
@@ -1073,6 +1075,8 @@
                        }
 
                        $entity_table = 'fm_location' . $type_id ;
+                       $cols_return = array();
+                       $paranthesis = '';
 
                        $cols= "count(*) as number, $entity_table.category, 
$entity_table"."_category.descr as type";
 

Index: class.uiadmin_location.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiadmin_location.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.uiadmin_location.inc.php      17 Jun 2006 08:45:56 -0000      1.15
+++ class.uiadmin_location.inc.php      6 Sep 2006 07:18:36 -0000       1.16
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: class.uiadmin_location.inc.php,v 1.15 2006/06/17 
08:45:56 sigurdne Exp $
+       * @version $Id: class.uiadmin_location.inc.php,v 1.16 2006/09/06 
07:18:36 sigurdne Exp $
        */
 
        /**
@@ -84,15 +84,12 @@
 
                        while (is_array($standard_list) && list(,$standard) = 
each($standard_list))
                        {
-                               $words = split(' ',$standard['descr']);
-                               $first = "$words[0] $words[1] $words[2] 
$words[3]";
-
                                $content[] = array
                                (
                                        'id'                            => 
$standard['id'],
                                        'name'                          => 
$standard['name'],
                                        'prefix'                        => 
$standard['prefix'],
-                                       'first'                         => 
$first,
+                                       'first'                         => 
$standard['descr'],
                                        'link_categories'               => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.index&type=location&type_id='
 . $standard['id']),
                                        'link_attribute'                => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_location.list_attribute&type_id='
 . $standard['id']),
                                        'link_edit'                     => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_location.edit&id='
 . $standard['id']),

Index: class.uilocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- class.uilocation.inc.php    5 Sep 2006 12:46:01 -0000       1.28
+++ class.uilocation.inc.php    6 Sep 2006 07:18:36 -0000       1.29
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.uilocation.inc.php,v 1.28 2006/09/05 12:46:01 
sigurdne Exp $
+       * @version $Id: class.uilocation.inc.php,v 1.29 2006/09/06 07:18:36 
sigurdne Exp $
        */
 
        /**
@@ -147,6 +147,7 @@
 //_debug_array($location_list);
 //_debug_array($uicols);
 
+                       $content = array();
                        $j=0;
                        if (isSet($location_list) AND is_array($location_list))
                        {