[Phpgroupware-cvs] property/inc/class.soalarm.inc.php, 1.2.2.6

[nomail]

Update of /property/inc
Modified Files:
        Branch: proposed-0_9_18-branch
          class.soalarm.inc.php

date: 2004/12/12 22:38:38;  author: sigurdne;  state: Exp;  lines: +11 -12

Log Message:
no message
=====================================================================
Index: property/inc/class.soalarm.inc.php
diff -u property/inc/class.soalarm.inc.php:1.2.2.5 
property/inc/class.soalarm.inc.php:1.2.2.6
--- property/inc/class.soalarm.inc.php:1.2.2.5  Tue Dec  7 09:04:28 2004
+++ property/inc/class.soalarm.inc.php  Sun Dec 12 22:38:38 2004
@@ -95,7 +95,6 @@
                                $ordermethod = ' order by id DESC';
                        }
 
-
                        $where = 'WHERE';
                        if ($filter > 0)
                        {
@@ -104,14 +103,6 @@
 
                        }
 
-/*                     if($query)
-                       {
-                               $query = ereg_replace("'",'',$query);
-                               $query = ereg_replace('"','',$query);
-
-                               $querymethod = " $where ( abid = '$query' or 
org_name $this->like '%$query%')";
-                       }
-*/
                        $id = $this->db->db_addslashes($id);
                        if (strpos($id,'%') !== False || strpos($id,'_') !== 
False)
                        {
@@ -126,7 +117,15 @@
                                $filtermethod = "$where id='$id'";
                        }
 
-                       $sql = "SELECT * FROM phpgw_async $filtermethod 
$querymethod";
+                       if($query)
+                       {
+                               $query = ereg_replace("'",'',$query);
+                               $query = ereg_replace('"','',$query);
+
+                               $querymethod = " AND (account_lid $this->like 
'%$query%' OR method $this->like '%$query%' OR id $this->like '%$query%')";
+                       }
+
+                       $sql = "SELECT 
phpgw_async.id,phpgw_async.next,phpgw_async.times,phpgw_async.method,phpgw_async.data,account_lid
 FROM phpgw_async $this->join phpgw_accounts on 
phpgw_async.account_id=phpgw_accounts.account_id $filtermethod $querymethod";
 
                        $this->db2->query($sql,__LINE__,__FILE__);
                        $this->total_records = $this->db2->num_rows();
@@ -153,7 +152,7 @@
                                        'method' => $this->db->f('method'),
                                        'data'   => $data,
                                        'enabled'   => (int)$data['enabled'],
-                                       'account_id'   => 
$this->db->f('account_id')
+                                       'user'   => $this->db->f('account_lid')
                                );
                        }
                        if (!count($jobs))