[Phpgroupware-cvs] phpgwapi/inc/accounts class.accounts_.inc.php c...

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   07/08/22 07:40:55

Modified files:
        inc/accounts   : class.accounts_.inc.php 
                         class.accounts_sql.inc.php 

Log message:
        case insensitive "like" for postgresql, notices

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/accounts/class.accounts_.inc.php?cvsroot=phpgwapi&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/accounts/class.accounts_sql.inc.php?cvsroot=phpgwapi&r1=1.23&r2=1.24

Patches:
Index: class.accounts_.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/accounts/class.accounts_.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.accounts_.inc.php     28 Dec 2006 01:35:29 -0000      1.14
+++ class.accounts_.inc.php     22 Aug 2007 07:40:55 -0000      1.15
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage accounts
-       * @version $Id: class.accounts_.inc.php,v 1.14 2006/12/28 01:35:29 
skwashd Exp $
+       * @version $Id: class.accounts_.inc.php,v 1.15 2007/08/22 07:40:55 
sigurdne Exp $
        */
        if (empty($GLOBALS['phpgw_info']['server']['account_repository']))
        {
@@ -230,6 +230,7 @@
                function accounts($account_id = null, $account_type = null)
                {
                        $this->db =& $GLOBALS['phpgw']->db;
+                       $this->like = $this->db->like;
 
                        if($account_id != '')
                        {

Index: class.accounts_sql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/accounts/class.accounts_sql.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.accounts_sql.inc.php  27 Dec 2006 05:54:47 -0000      1.23
+++ class.accounts_sql.inc.php  22 Aug 2007 07:40:55 -0000      1.24
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage accounts
-       * @version $Id: class.accounts_sql.inc.php,v 1.23 2006/12/27 05:54:47 
skwashd Exp $
+       * @version $Id: class.accounts_sql.inc.php,v 1.24 2007/08/22 07:40:55 
sigurdne Exp $
        */
 
        /**
@@ -162,8 +162,8 @@
                                        $whereclause = ' WHERE ( ';
                                }
 
-                               $whereclause .= " account_firstname LIKE 
'%$query%' OR account_lastname LIKE "
-                                       . "'%$query%' OR account_lid LIKE 
'%$query%' OR person_id LIKE '%$query%')";
+                               $whereclause .= " account_firstname $this->like 
'%$query%' OR account_lastname $this->like "
+                                       . "'%$query%' OR account_lid 
$this->like '%$query%' OR person_id $this->like '%$query%')";
                        }
 
                        $sql = "SELECT * FROM phpgw_accounts $whereclause 
$orderclause";
@@ -180,6 +180,7 @@
                                $this->db->limit_query($sql, 
$start,__LINE__,__FILE__, $offset);
                        }
 
+                       $accounts = array();
                        while ($this->db->next_record())
                        {
                                //echo '<pre>' . print_r($this->db->Record, 
true) . '</pre>';