[Phpgroupware-cvs] property/inc class.socommon.inc.php class.boadm...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/10/12 09:09:28

Modified files:
        inc            : class.socommon.inc.php 
                         class.boadmin_entity.inc.php 
                         class.soadmin_entity.inc.php 
                         class.uiadmin_entity.inc.php 
                         class.boadmin_location.inc.php 
                         class.boadmin.inc.php 
                         class.uiadmin_location.inc.php 
                         class.bocommon.inc.php class.solocation.inc.php 

Log message:
        Tuning for speed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.socommon.inc.php?cvsroot=phpgroupware&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boadmin_entity.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soadmin_entity.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiadmin_entity.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boadmin_location.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boadmin.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiadmin_location.inc.php?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.solocation.inc.php?cvsroot=phpgroupware&r1=1.37&r2=1.38

Patches:
Index: class.socommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- class.socommon.inc.php      9 Oct 2006 17:27:33 -0000       1.30
+++ class.socommon.inc.php      12 Oct 2006 09:09:27 -0000      1.31
@@ -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.socommon.inc.php,v 1.30 2006/10/09 17:27:33 
sigurdne Exp $
+       * @version $Id: class.socommon.inc.php,v 1.31 2006/10/12 09:09:27 
sigurdne Exp $
        */
 
        /**
@@ -95,6 +95,28 @@
                        }
                }
 
+               /**
+               * Clear all content from cache
+               *
+               */
+
+               function reset_fm_cache()
+               {
+                       $this->db->query("DELETE FROM fm_cache 
",__LINE__,__FILE__);
+               }
+
+               /**
+               * Clear computed userlist for location and rights from cache
+               *
+               * @return integer number of values was found and cleared
+               */
+
+               function reset_fm_cache_userlist()
+               {
+                       $this->db->query("DELETE FROM fm_cache WHERE name 
$this->like 'acl_userlist_%'",__LINE__,__FILE__);
+                       return $this->db->affected_rows();
+               }
+
                function create_preferences($app='',$user_id='')
                {
                                $this->db->query("SELECT preference_value FROM 
phpgw_preferences where preference_app = '$app' AND 
preference_owner=".(int)$user_id );

Index: class.boadmin_entity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boadmin_entity.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.boadmin_entity.inc.php        6 Oct 2006 12:23:22 -0000       1.11
+++ class.boadmin_entity.inc.php        12 Oct 2006 09:09:27 -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 admin
-       * @version $Id: class.boadmin_entity.inc.php,v 1.11 2006/10/06 12:23:22 
sigurdne Exp $
+       * @version $Id: class.boadmin_entity.inc.php,v 1.12 2006/10/12 09:09:27 
sigurdne Exp $
        */
 
        /**
@@ -138,12 +138,6 @@
                        $this->allrows  = $data['allrows'];
                }
 
-               function reset_fm_cache()
-               {
-                       $this->so->reset_fm_cache();
-               }
-
-
                function get_location_level_list($selected='')
                {
 

Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.soadmin_entity.inc.php        6 Oct 2006 12:23:22 -0000       1.23
+++ class.soadmin_entity.inc.php        12 Oct 2006 09:09:27 -0000      1.24
@@ -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.23 2006/10/06 12:23:22 
sigurdne Exp $
+       * @version $Id: class.soadmin_entity.inc.php,v 1.24 2006/10/12 09:09:27 
sigurdne Exp $
        */
 
        /**
@@ -36,11 +36,6 @@
                        }
                }
 
-               function reset_fm_cache()
-               {
-                       $this->db->query("DELETE FROM fm_cache 
",__LINE__,__FILE__);
-               }
-
                function read($data)
                {
                        if(is_array($data))

Index: class.uiadmin_entity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiadmin_entity.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.uiadmin_entity.inc.php        6 Oct 2006 12:23:22 -0000       1.23
+++ class.uiadmin_entity.inc.php        12 Oct 2006 09:09:27 -0000      1.24
@@ -10,7 +10,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: class.uiadmin_entity.inc.php,v 1.23 2006/10/06 12:23:22 
sigurdne Exp $
+       * @version $Id: class.uiadmin_entity.inc.php,v 1.24 2006/10/12 09:09:27 
sigurdne Exp $
        */
 
        /**
@@ -95,7 +95,7 @@
                                
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=> 
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=> 
$this->acl_location));
                        }
 
-                       $this->bo->reset_fm_cache();
+                       $this->bocommon->reset_fm_cache();
                        $GLOBALS['phpgw']->xslttpl->add_file(array(
                                                                'admin_entity',
                                                                'nextmatchs',

Index: class.boadmin_location.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boadmin_location.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- class.boadmin_location.inc.php      3 Oct 2006 09:58:09 -0000       1.12
+++ class.boadmin_location.inc.php      12 Oct 2006 09:09:27 -0000      1.13
@@ -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.12 2006/10/03 
09:58:09 sigurdne Exp $
+       * @version $Id: class.boadmin_location.inc.php,v 1.13 2006/10/12 
09:09:27 sigurdne Exp $
        */
 
        /**
@@ -115,12 +115,6 @@
                        $this->order    = $data['order'];
                }
 
-               function reset_fm_cache()
-               {
-                       $this->so->reset_fm_cache();
-               }
-
-
                function read()
                {
                        $standard = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order));

Index: class.boadmin.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boadmin.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.boadmin.inc.php       5 Oct 2006 13:13:08 -0000       1.14
+++ class.boadmin.inc.php       12 Oct 2006 09:09:27 -0000      1.15
@@ -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.inc.php,v 1.14 2006/10/05 13:13:08 
sigurdne Exp $
+       * @version $Id: class.boadmin.inc.php,v 1.15 2006/10/12 09:09:27 
sigurdne Exp $
        */
 
        /**
@@ -280,8 +280,9 @@
 
                        $this->set_permission2($values['right'], $process, 
$grantor, 0);
                        $this->set_permission2($values['mask'], $process, 
$grantor, 1);
-
+                       $cleared = $this->bocommon->reset_fm_cache_userlist();
                        $receipt['message'][] = array('msg' => 
lang('permissions are updated!'));
+                       $receipt['message'][] = array('msg' => lang('%1 
userlists cleared from cache',$cleared));
                        return $receipt;
                }
 

Index: class.uiadmin_location.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiadmin_location.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.uiadmin_location.inc.php      9 Oct 2006 15:54:42 -0000       1.20
+++ class.uiadmin_location.inc.php      12 Oct 2006 09:09:27 -0000      1.21
@@ -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.20 2006/10/09 
15:54:42 sigurdne Exp $
+       * @version $Id: class.uiadmin_location.inc.php,v 1.21 2006/10/12 
09:09:27 sigurdne Exp $
        */
 
        /**
@@ -84,7 +84,7 @@
                                
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=> 
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=> 
$this->acl_location));
                        }
 
-                       $this->bo->reset_fm_cache();
+                       $this->bocommon->reset_fm_cache();
                        $GLOBALS['phpgw']->xslttpl->add_file(array(
                                                                
'admin_location',
                                                                'nextmatchs',

Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- class.bocommon.inc.php      7 Oct 2006 15:44:07 -0000       1.46
+++ class.bocommon.inc.php      12 Oct 2006 09:09:27 -0000      1.47
@@ -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.bocommon.inc.php,v 1.46 2006/10/07 15:44:07 
sigurdne Exp $
+       * @version $Id: class.bocommon.inc.php,v 1.47 2006/10/12 09:09:27 
sigurdne Exp $
        */
 
        /**
@@ -428,32 +428,34 @@
 
                function 
get_user_list_right($right='',$selected='',$acl_location='')
                {
+                       if(!$employees = 
$this->socommon->fm_cache('acl_userlist_'. $right . '_' . $acl_location))
+                       {
                        
$employees=$this->socommon->get_user_list_right($right,$acl_location);
+                               $this->socommon->fm_cache('acl_userlist_'. 
$right . '_' . $acl_location,$employees);
+                       }
+
                        while (is_array($employees) && list(,$user) = 
each($employees))
                        {
-                               $sel_user = '';
                                if ($user['account_lid']==$selected)
                                {
-                                       $sel_user = 'selected';
-                               }
-
                                $user_list[] = array
                                (
                                        'lid'                   => 
$user['account_lid'],
                                        'firstname'             => 
$user['account_firstname'],
                                        'lastname'              => 
$user['account_lastname'],
-                                       'selected'              => $sel_user
+                                               'selected'              => 
'selected'
                                );
                        }
-
-                       for ($i=0;$i<count($user_list);$i++)
-                       {
-                               if ($user_list[$i]['selected'] != 'selected')
+                               else
                                {
-                                       unset($user_list[$i]['selected']);
+                                       $user_list[] = array
+                                       (
+                                               'lid'                   => 
$user['account_lid'],
+                                               'firstname'             => 
$user['account_firstname'],
+                                               'lastname'              => 
$user['account_lastname'],
+                                       );                              
                                }
                        }
-
                        return $user_list;
                }
 
@@ -486,7 +488,11 @@
                                }
                        }
 
+                       if(!$users = $this->socommon->fm_cache('acl_userlist_'. 
$right . '_' . $acl_location))
+                       {
                        
$users=$this->socommon->get_user_list_right($right,$acl_location);
+                               $this->socommon->fm_cache('acl_userlist_'. 
$right . '_' . $acl_location,$users);
+                       }
 
                        if ((isset($users_extra) && is_array($users_extra)) && 
is_array($users))
                        {
@@ -499,30 +505,28 @@
 
                        while (is_array($users) && list(,$user) = each($users))
                        {
-                               $sel_user = '';
+                               $name = 
(isset($user['account_lastname'])?$user['account_lastname'].' 
':'').$user['account_firstname'];
                                if ($user['account_id']==$selected)
                                {
-                                       $sel_user = 'selected';
-                               }
-
                                $user_list[] = array
                                (
                                        'user_id'       => $user['account_id'],
-                                       'name'          => 
(isset($user['account_lastname'])?$user['account_lastname'].' 
':'').$user['account_firstname'],
-                                       'selected'      => $sel_user
+                                               'name'          => $name,
+                                               'selected'      => 'selected'
                                );
                        }
-
-                       if(isset($user_list) && is_array($user_list))
-                       {
-                               for ($i=0;$i<count($user_list);$i++)
-                               {
-                                       if ($user_list[$i]['selected'] != 
'selected')
+                               else
                                        {
-                                               
unset($user_list[$i]['selected']);
+                                       $user_list[] = array
+                                       (
+                                               'user_id'       => 
$user['account_id'],
+                                               'name'          => $name
+                                       );
                                        }
                                }
 
+                       if(isset($user_list) && is_array($user_list))
+                       {
                                return $user_list;
                        }
                }
@@ -1255,6 +1259,27 @@
                        return $this->socommon->fm_cache($name,$value);
                }
 
+               /**
+               * Clear all content from cache
+               *
+               */
+
+               function reset_fm_cache()
+               {
+                       $this->socommon->reset_fm_cache();
+               }
+
+               /**
+               * Clear computed userlist for location and rights from cache
+               *
+               * @return integer number of values was found and cleared
+               */
+
+               function reset_fm_cache_userlist()
+               {
+                       return $this->socommon->reset_fm_cache_userlist();
+               }
+
                function next_id($table,$key='')
                {
                        return $this->socommon->next_id($table,$key);

Index: class.solocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- class.solocation.inc.php    3 Oct 2006 09:58:09 -0000       1.37
+++ class.solocation.inc.php    12 Oct 2006 09:09:28 -0000      1.38
@@ -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.37 2006/10/03 09:58:09 
sigurdne Exp $
+       * @version $Id: class.solocation.inc.php,v 1.38 2006/10/12 09:09:28 
sigurdne Exp $
        */
 
        /**