[Fmsystem-commits] [8562] bkbooking: fix of filters on messages

[Kjell Arne Espedal]

Revision: 8562
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8562
Author:   kjell
Date:     2012-01-12 14:50:07 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
bkbooking: fix of filters on messages

Modified Paths:
--------------
    trunk/booking/inc/class.uisystem_message.inc.php

Modified: trunk/booking/inc/class.uisystem_message.inc.php
===================================================================
--- trunk/booking/inc/class.uisystem_message.inc.php    2012-01-12 14:46:47 UTC 
(rev 8561)
+++ trunk/booking/inc/class.uisystem_message.inc.php    2012-01-12 14:50:07 UTC 
(rev 8562)
@@ -115,18 +115,10 @@
                                                        'label' => 
lang('Created')
                                                ),
                                                array(
-                                                       'key' => 'modified',
-                                                       'label' => lang('Last 
modified')
-                                               ),
-                                               array(
                                                        'key' => 'what',
                                                        'label' => lang('What')
                                                ),
                                                array(
-                                                       'key' => 
'activity_name',
-                                                       'label' => 
lang('Activity')
-                                               ),
-                                               array(
                                                        'key' => 'contact_name',
                                                        'label' => 
lang('Contact')
                                                ),
@@ -155,35 +147,34 @@
                        while ($record = array_shift($this->db->resultSet)) {
                                $current_user_building_data[] = 
$record['object_id'];
                        }
+
                        $filters['building_id'] = $current_user_building_data;
 
                        if(isset($_SESSION['showall']))
                        {
                                unset($filters['building_id']);
-                       unset($filters['building_name']);
-                       unset($filters['type']);
-                       unset($filters['status']);
                        } else {
+                               $filters['building_id'] = 
$current_user_building_data;
+                       }
 
-                $testdata =  phpgw::get_var('filter_building_id', 'int', 
'REQUEST', null);
-                if ($testdata != 0) {
-                    $filters['building_name'] = 
$this->bo->so->get_building(phpgw::get_var('filter_building_id', 'int', 
'REQUEST', null));        
-                } else {
-                    unset($filters['building_name']);                
-                }
-                $testdata2 =  phpgw::get_var('type', 'str', 'REQUEST');
-                if ($testdata2 != '') {
-                    $filters['type'] = phpgw::get_var('type', 'str', 
'REQUEST');        
-                } else {
-                    unset($filters['type']);
-                }
-                $testdata2 =  phpgw::get_var('status', 'str', 'REQUEST');
-                if ($testdata2 != '') {
-                    $filters['status'] = phpgw::get_var('status', 'str', 
'REQUEST');        
-                } else {
-                    unset($filters['status']);
-                }
+            $testdata =  phpgw::get_var('filter_building_id', 'int', 
'REQUEST', null);
+            if ($testdata != 0) {
+                   $filters['building_name'] = 
$this->bo->so->get_building(phpgw::get_var('filter_building_id', 'int', 
'REQUEST', null));        
+            } else {
+                   unset($filters['building_name']);                
             }
+            $testdata2 =  phpgw::get_var('type', 'str', 'REQUEST');
+            if ($testdata2 != '') {
+                   $filters['type'] = phpgw::get_var('type', 'str', 
'REQUEST');        
+            } else {
+                   unset($filters['type']);
+            }
+            $testdata2 =  phpgw::get_var('status', 'str', 'REQUEST');
+            if ($testdata2 != '') {
+                   $filters['status'] = phpgw::get_var('status', 'str', 
'REQUEST');        
+            } else {
+                   unset($filters['status']);
+            }
             
                        $params = array(
                                'start' => phpgw::get_var('startIndex', 'int', 
'REQUEST', 0),