[Fmsystem-commits] [16096] remove obselete, fix typo

[sigurdne]

Revision: 16096
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16096
Author:   sigurdne
Date:     2016-12-18 12:52:52 +0000 (Sun, 18 Dec 2016)
Log Message:
-----------
remove obselete, fix typo

Modified Paths:
--------------
    trunk/property/inc/class.boadmin_entity.inc.php
    trunk/property/inc/class.uiadmin_entity.inc.php

Modified: trunk/property/inc/class.boadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.boadmin_entity.inc.php     2016-12-18 12:23:06 UTC 
(rev 16095)
+++ trunk/property/inc/class.boadmin_entity.inc.php     2016-12-18 12:52:52 UTC 
(rev 16096)
@@ -94,12 +94,6 @@
                        $this->bocommon = CreateObject('property.bocommon');
                        $this->custom = createObject('property.custom_fields');
 
-                       if ($session)
-                       {
-                               $this->read_sessiondata();
-                               $this->use_session = true;
-                       }
-
                        $start = phpgw::get_var('start', 'int', 'REQUEST', 0);
                        $query = phpgw::get_var('query');
                        $sort = phpgw::get_var('sort');
@@ -109,6 +103,9 @@
                        $allrows = phpgw::get_var('allrows', 'bool');
                        $entity_id = phpgw::get_var('entity_id', 'int');
 
+                       $this->so = CreateObject('property.soadmin_entity', '', 
'', $this->bocommon);
+                       $this->type_app = $this->so->get_type_app();
+
                        $this->start = $start ? $start : 0;
                        $this->query = isset($query) ? $query : $this->query;
                        $this->sort = isset($sort) && $sort ? $sort : '';
@@ -117,32 +114,10 @@
                        $this->cat_id = isset($cat_id) && $cat_id ? $cat_id : 
'';
                        $this->entity_id = isset($entity_id) && $entity_id ? 
$entity_id : '';
                        $this->allrows = phpgw::get_var('allrows', 'bool');
-                       $this->so = CreateObject('property.soadmin_entity', '', 
'', $this->bocommon);
                        $this->so->type = $this->type;
-                       $this->type_app = $this->so->get_type_app();
-               }
 
-               function save_sessiondata( $data )
-               {
-                       if ($this->use_session)
-                       {
-                               
$GLOBALS['phpgw']->session->appsession('session_data', 'standard_e', $data);
-                       }
                }
 
-               function read_sessiondata()
-               {
-                       $data = 
$GLOBALS['phpgw']->session->appsession('session_data', 'standard_e');
-
-                       $this->start = isset($data['start']) ? $data['start'] : 
'';
-                       $this->query = isset($data['query']) ? $data['query'] : 
'';
-                       $this->sort = isset($data['sort']) ? $data['sort'] : '';
-                       $this->order = isset($data['order']) ? $data['order'] : 
'';
-                       $this->cat_id = isset($data['cat_id']) ? 
$data['cat_id'] : '';
-                       $this->entity_id = isset($data['entity_id']) ? 
$data['entity_id'] : '';
-                       $this->allrows = isset($data['allrows']) ? 
$data['allrows'] : '';
-               }
-
                function get_location_level_list( $selected = '' )
                {
 

Modified: trunk/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_entity.inc.php     2016-12-18 12:23:06 UTC 
(rev 16095)
+++ trunk/property/inc/class.uiadmin_entity.inc.php     2016-12-18 12:52:52 UTC 
(rev 16096)
@@ -95,20 +95,6 @@
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
"admin::{$this->type_app[$this->type]}::entity";
                }
 
-               function save_sessiondata()
-               {
-                       $data = array
-                               (
-                               'start' => $this->start,
-                               'query' => $this->query,
-                               'sort' => $this->sort,
-                               'order' => $this->order,
-                               'entity_id' => $this->entity_id,
-                               'cat_id' => $this->cat_id
-                       );
-                       $this->bo->save_sessiondata($data);
-               }
-
                function index()
                {
                        if (!$this->acl_read)