[Fmsystem-commits] [9439]

[Torstein]

Revision: 9439
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9439
Author:   vator
Date:     2012-05-29 01:26:04 +0000 (Tue, 29 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socheck_item.inc.php

Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php     2012-05-25 12:11:14 UTC 
(rev 9438)
+++ trunk/controller/inc/class.socheck_item.inc.php     2012-05-29 01:26:04 UTC 
(rev 9439)
@@ -287,12 +287,11 @@
                                $sql .= "AND cic.status = 2 ";
                        else if($status == 'open_or_waiting')
                                $sql .= "AND (cic.status = 0 OR cic.status = 2) 
";
-                               
-                       if($type == 'control_item_type_1')
-                               $sql .= "AND coi.type = 'control_item_type_1' ";
-                       else if($type == 'control_item_type_2')
-                               $sql .= "AND coi.type = 'control_item_type_2' ";
-                                                       
+                       
+                       if($type != null){
+                               $sql .= "AND coi.type = '$type' ";
+                       }
+                                                                               
                        if($messageStatus != null & $messageStatus == 
'no_message_registered')
                                $sql .= "AND cic.location_item_id IS NULL ";
                        else if($messageStatus != null &  $messageStatus == 
'message_registered')