[Phpgroupware-cvs] [18977] fix : fixed classes names, calls and and includes in calendar for phpgwapi_sql_criteria, phpgwapi_sql_entity and phpgwapi_sql_

[Pascal Vilarem]

Revision: 18977
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18977
Author:   maat
Date:     2008-10-25 20:19:33 +0000 (Sat, 25 Oct 2008)

Log Message:
-----------
fix : fixed classes names, calls and and includes in calendar for 
phpgwapi_sql_criteria, phpgwapi_sql_entity and phpgwapi_sql_

Modified Paths:
--------------
    core/trunk/calendar/inc/class.bocalendar.inc.php
    core/trunk/calendar/inc/class.socalendar_sql.inc.php

Modified: core/trunk/calendar/inc/class.bocalendar.inc.php
===================================================================
--- core/trunk/calendar/inc/class.bocalendar.inc.php    2008-10-25 20:16:22 UTC 
(rev 18976)
+++ core/trunk/calendar/inc/class.bocalendar.inc.php    2008-10-25 20:19:33 UTC 
(rev 18977)
@@ -3273,17 +3273,17 @@
                {
                        $fields = array ('contact_id', 'org_name');
 
-                       $criteria_search[] = 
sql_criteria::token_begin('org_name', $lookup);
+                       $criteria_search[] = 
phpgwapi_sql_criteria::token_begin('org_name', $lookup);
 
-                       $criteria[] = 
sql_criteria::_append_or($criteria_search);
+                       $criteria[] = 
phpgwapi_sql_criteria::_append_or($criteria_search);
                        $criteria[] = 
$this->contacts->criteria_for_index($GLOBALS['phpgw_info']['user']['account_id']);
 
                        if ( $cat_id )
                        {
-                               $criteria[] = sql_criteria::_equal('cat_id', 
phpgw::get_var('cat_id', 'int', 'bool') );
+                               $criteria[] = 
phpgwapi_sql_criteria::_equal('cat_id', phpgw::get_var('cat_id', 'int', 'bool') 
);
                        }
 
-                       $criteria_token = sql_criteria::_append_and($criteria);
+                       $criteria_token = 
phpgwapi_sql_criteria::_append_and($criteria);
                        return $this->contacts->get_orgs($fields, 0, 0, 
'org_name', 'ASC', '', $criteria_token);
                }
 
@@ -3300,18 +3300,18 @@
                        //echo "lookup == $lookup and user_id == 
{$GLOBALS['phpgw_info']['user']['account_id']}";
                        $fields = array ('contact_id', 'per_first_name', 
'per_last_name');
 
-                       $criteria_search[] = 
sql_criteria::token_begin('per_first_name', $lookup);
-                       $criteria_search[] = 
sql_criteria::token_begin('per_last_name', $lookup);
+                       $criteria_search[] = 
phpgwapi_sql_criteria::token_begin('per_first_name', $lookup);
+                       $criteria_search[] = 
phpgwapi_sql_criteria::token_begin('per_last_name', $lookup);
 
-                       $criteria[] = 
sql_criteria::_append_or($criteria_search);
+                       $criteria[] = 
phpgwapi_sql_criteria::_append_or($criteria_search);
                        $criteria[] = $this->contacts->criteria_for_index((int) 
$GLOBALS['phpgw_info']['user']['account_id']);
 
                        if ( $cat_id )
                        {
-                               $criteria[] = sql_criteria::_equal('cat_id', 
phpgw::get_var('cat_id', 'int', 'bool') );
+                               $criteria[] = 
phpgwapi_sql_criteria::_equal('cat_id', phpgw::get_var('cat_id', 'int', 'bool') 
);
                        }
 
-                       $criteria_token = sql_criteria::_append_and($criteria);
+                       $criteria_token = 
phpgwapi_sql_criteria::_append_and($criteria);
                        return $this->contacts->get_persons($fields, 0, 0, 
'per_first_name, per_last_name', 'ASC', '', $criteria_token);
                }
 

Modified: core/trunk/calendar/inc/class.socalendar_sql.inc.php
===================================================================
--- core/trunk/calendar/inc/class.socalendar_sql.inc.php        2008-10-25 
20:16:22 UTC (rev 18976)
+++ core/trunk/calendar/inc/class.socalendar_sql.inc.php        2008-10-25 
20:19:33 UTC (rev 18977)
@@ -589,7 +589,7 @@
        {
                if ( $this->debug )
                {
-                       error_log('socal_sql:: get_event_etags(' . 
print_r($user_ids, true) . ", $event_id)" );
+                       error_log('socal_phpgwapi_sql_:: get_event_etags(' . 
print_r($user_ids, true) . ", $event_id)" );
                }
 
                if ( !is_array($user_ids) )