[Phpgroupware-cvs] property/inc class.bolocation.inc.php class.soa...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/11/24 14:49:02

Modified files:
        inc            : class.bolocation.inc.php 
                         class.soadmin_location.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bolocation.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soadmin_location.inc.php?cvsroot=phpgroupware&r1=1.35&r2=1.36

Patches:
Index: class.bolocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.bolocation.inc.php    24 Nov 2006 14:37:04 -0000      1.25
+++ class.bolocation.inc.php    24 Nov 2006 14:49:02 -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 location
-       * @version $Id: class.bolocation.inc.php,v 1.25 2006/11/24 14:37:04 
sigurdne Exp $
+       * @version $Id: class.bolocation.inc.php,v 1.26 2006/11/24 14:49:02 
sigurdne Exp $
        */
 
        /**
@@ -24,6 +24,7 @@
                var $sort;
                var $order;
                var $cat_id;
+               var $type_id;
 
                var $public_functions = array
                (
@@ -129,6 +130,10 @@
                                $this->allrows = $allrows;
                        }
 
+                       if(!$this->type_id)
+                       {
+                               $this->type_id = 1;
+                       }
                        $this->acl_location                     = '.location.' 
. $this->type_id;
                }
 

Index: class.soadmin_location.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soadmin_location.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- class.soadmin_location.inc.php      24 Nov 2006 14:37:04 -0000      1.35
+++ class.soadmin_location.inc.php      24 Nov 2006 14:49:02 -0000      1.36
@@ -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.35 2006/11/24 
14:37:04 sigurdne Exp $
+       * @version $Id: class.soadmin_location.inc.php,v 1.36 2006/11/24 
14:49:02 sigurdne Exp $
        */
 
        /**
@@ -452,7 +452,7 @@
                        $value_set=array(
                                'name'                  => 
$this->db->db_addslashes($values['name']),
                                'descr'                 => 
$this->db->db_addslashes($values['descr']),
-                               'list_info'             => 
serialize($values['list_info']),
+                               'list_info'             => 
(isset($values['list_info'])?serialize($values['list_info']):''),
                                'list_address'  => 
(isset($values['list_address'])?$values['list_address']:''),
                                );