[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [18976] fix : fixed classes names, calls and and incl
|
From: |
Pascal Vilarem |
|
Subject: |
[Phpgroupware-cvs] [18976] fix : fixed classes names, calls and and includes in phpgwapi for phpgwapi_sql_criteria, phpgwapi_sql_entity and phpgwapi_sql_ |
|
Date: |
Sat, 25 Oct 2008 20:16:24 +0000 |
Revision: 18976
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18976
Author: maat
Date: 2008-10-25 20:16:22 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
fix : fixed classes names, calls and and includes in phpgwapi for
phpgwapi_sql_criteria, phpgwapi_sql_entity and phpgwapi_sql_
Modified Paths:
--------------
core/trunk/phpgwapi/inc/class.bojsaddressbook.inc.php
core/trunk/phpgwapi/inc/class.contact_accounts.inc.php
core/trunk/phpgwapi/inc/class.contact_addr.inc.php
core/trunk/phpgwapi/inc/class.contact_categories.inc.php
core/trunk/phpgwapi/inc/class.contact_central.inc.php
core/trunk/phpgwapi/inc/class.contact_comm_descr.inc.php
core/trunk/phpgwapi/inc/class.contact_comm_type.inc.php
core/trunk/phpgwapi/inc/class.contact_note_type.inc.php
core/trunk/phpgwapi/inc/class.contact_org.inc.php
core/trunk/phpgwapi/inc/class.contact_org_person.inc.php
core/trunk/phpgwapi/inc/class.contact_person.inc.php
core/trunk/phpgwapi/inc/class.contacts_sql.inc.php
core/trunk/phpgwapi/inc/class.sql.inc.php
core/trunk/phpgwapi/inc/class.sql_builder.inc.php
core/trunk/phpgwapi/inc/class.sql_criteria.inc.php
core/trunk/phpgwapi/inc/class.sql_entity.inc.php
core/trunk/phpgwapi/inc/class.vfs_sql.inc.php
Modified: core/trunk/phpgwapi/inc/class.bojsaddressbook.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.bojsaddressbook.inc.php 2008-10-25
19:22:24 UTC (rev 18975)
+++ core/trunk/phpgwapi/inc/class.bojsaddressbook.inc.php 2008-10-25
20:16:22 UTC (rev 18976)
@@ -586,7 +586,7 @@
if(intval($list))
{
$criteria =
$this->contactsobject->criteria_for_index($GLOBALS['phpgw_info']['user']['account_id'],
PHPGW_CONTACTS_ALL, $list);
- $new = sql_criteria::token_and($criteria,
sql_criteria::_equal('comm_descr',
$this->contactsobject->search_comm_descr('work email')));
+ $new =
phpgwapi_sql_criteria::token_and($criteria,
pgpgwapi_sql_criteria::_equal('comm_descr',
$this->contactsobject->search_comm_descr('work email')));
$persons =
$this->contactsobject->get_persons(array('per_full_name', 'comm_data'), '', '',
'', '', '', $new);
if(!is_array($persons))
{
Modified: core/trunk/phpgwapi/inc/class.contact_accounts.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contact_accounts.inc.php 2008-10-25
19:22:24 UTC (rev 18975)
+++ core/trunk/phpgwapi/inc/class.contact_accounts.inc.php 2008-10-25
20:16:22 UTC (rev 18976)
@@ -27,19 +27,19 @@
/**
* Use SQL criteria
*/
- include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+ phpgw::import_class('phpgwapi.sql_criteria');
/**
* Use SQL entity
*/
- include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
-
+ phpgw::import_class('phpgwapi.sql_entity');
+
/**
* Query statements for "account" table
*
* @package phpgwapi
* @subpackage contacts
*/
- class contact_accounts extends sql_entity
+ class contact_accounts extends phpgwapi_sql_entity
{
var $map = array('account_id' => array('select'
=> '',
'criteria'
=> '',
@@ -82,7 +82,7 @@
function criteria_person_only($element)
{
-
$this->_add_criteria($this->put_alias(sql_criteria::not_null($this->real_field('account_person_id'))));
+
$this->_add_criteria($this->put_alias(phpgwapi_sql_criteria::not_null($this->real_field('account_person_id'))));
}
function criteria_account_person_id($element)
Modified: core/trunk/phpgwapi/inc/class.contact_addr.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contact_addr.inc.php 2008-10-25 19:22:24 UTC
(rev 18975)
+++ core/trunk/phpgwapi/inc/class.contact_addr.inc.php 2008-10-25 20:16:22 UTC
(rev 18976)
@@ -27,19 +27,19 @@
/**
* Use SQL criteria
*/
- include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+ phpgw::import_class('phpgwapi.sql_criteria');
/**
* Use SQL entity
*/
- include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
-
+ phpgw::import_class('phpgwapi.sql_entity');
+
/**
* Query statements for "addr" table
*
* @package phpgwapi
* @subpackage contacts
*/
- class contact_addr extends sql_entity
+ class contact_addr extends phpgwapi_sql_entity
{
var $map = array('key_addr_id' => array('select'
=> '',
'criteria'
=> '',
@@ -280,7 +280,7 @@
*/
function select_addr_address($element)
{
- $this->field_list['addr_address'] =
sql::concat_null(array($this->put_alias('add1'), $this->put_alias('add2'),
$this->put_alias('add3')));
+ $this->field_list['addr_address'] =
phpgwapi_sql_::concat_null(array($this->put_alias('add1'),
$this->put_alias('add2'), $this->put_alias('add3')));
}
/**
@@ -292,7 +292,7 @@
function select_adr_one_street($element)
{
$this->set_primary_address($element);
-
$this->field_list['adr_one_street']=sql::concat_null(array($this->put_alias('add1'),
$this->put_alias('add2'), $this->put_alias('add3')));
+
$this->field_list['adr_one_street']=phpgwapi_sql_::concat_null(array($this->put_alias('add1'),
$this->put_alias('add2'), $this->put_alias('add3')));
}
@@ -317,7 +317,7 @@
function select_adr_two_street($element)
{
$this->set_secondary_address($element);
-
$this->field_list['adr_one_street']=sql_criteria::concat_null(array($this->put_alias('add1'),
$this->put_alias('add2'), $this->put_alias('add3')));
+
$this->field_list['adr_one_street']=phpgwapi_sql_criteria::concat_null(array($this->put_alias('add1'),
$this->put_alias('add2'), $this->put_alias('add3')));
}
/**
@@ -329,7 +329,7 @@
function select_secondary($element)
{
$this->set_secondary_address($element);
- $this->field_list[$element['field']] =
$this->put_alias(sql::string($element['real_field']));
+ $this->field_list[$element['field']] =
$this->put_alias(phpgwapi_sql_::string($element['real_field']));
}
/**
@@ -342,8 +342,8 @@
function criteria_adr_one_street($element)
{
$this->set_primary_address($element);
-
$criteria=sql_criteria::or_(sql_criteria::has($this->put_alias('add1'),$element['value']),
-
sql_criteria::has($this->put_alias('add2'),$element['value']));
+
$criteria=phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::has($this->put_alias('add1'),$element['value']),
+
phpgwapi_sql_criteria::has($this->put_alias('add2'),$element['value']));
$this->_add_criteria($criteria);
}
@@ -351,12 +351,12 @@
* Get primary address from database
*
* @param mixed $element
- * @internal Generic criteria builder for adr_one type fields.
They need an extra precedence and then are a LIKE clause which is given by
sql_criteria::has(). So, if the user asks for adr_one_country, the resulting
query will be tablename.country = %%value%%
+ * @internal Generic criteria builder for adr_one type fields.
They need an extra precedence and then are a LIKE clause which is given by
phpgwapi_sql_criteria::has(). So, if the user asks for adr_one_country, the
resulting query will be tablename.country = %%value%%
*/
function criteria_primary($element)
{
$this->set_primary_address($element);
-
$criteria=sql_criteria::has($this->put_alias($element['real_field']),sql::string($element['value']));
+
$criteria=phpgwapi_sql_criteria::has($this->put_alias($element['real_field']),phpgwapi_sql_::string($element['value']));
$this->add_criteria($criteria);
}
@@ -369,8 +369,8 @@
function criteria_adr_two_street($element)
{
$this->set_secondary_address($element);
-
$criteria=sql_criteria::or_(sql_criteria::has($this->put_alias('add1'),sql::string($element['value'])),
-
sql_criteria::has($this->put_alias('add2'),sql::string($element['value'])));
+
$criteria=phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::has($this->put_alias('add1'),phpgwapi_sql_::string($element['value'])),
+
phpgwapi_sql_criteria::has($this->put_alias('add2'),phpgwapi_sql_::string($element['value'])));
$this->_add_criteria($criteria);
}
@@ -378,7 +378,7 @@
function criteria_secondary($element)
{
$this->set_secondary_address($element);
-
$criteria=sql_criteria::has($this->put_alias($element['real_field']),sql::string($element['value']));
+
$criteria=phpgwapi_sql_criteria::has($this->put_alias($element['real_field']),phpgwapi_sql_::string($element['value']));
$this->_add_criteria($criteria);
}
@@ -386,7 +386,7 @@
{
if($this->primary_set != 'primary')
{
-
$criteria=sql_criteria::equal($this->put_alias('precedence'),'1');
+
$criteria=phpgwapi_sql_criteria::equal($this->put_alias('precedence'),'1');
$this->_add_criteria($criteria);
$this->primary_set='primary';
}
@@ -397,7 +397,7 @@
{
if($this->secondary_set != 'secondary')
{
-
$criteria=sql_criteria::equal($this->put_alias('precedence'),'2');
+
$criteria=phpgwapi_sql_criteria::equal($this->put_alias('precedence'),'2');
$this->_add_criteria($criteria);
$this->secondary_set='secondary';
}
@@ -407,8 +407,8 @@
function criteria_addr_pref_val($element)
{
$field = $this->put_alias($element['real_field']);
- $criteria =
sql_criteria::or_(sql_criteria::equal($field, sql::string($element['value'])),
-
sql_criteria::is_null($field));
+ $criteria =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::equal($field,
phpgwapi_sql_::string($element['value'])),
+
phpgwapi_sql_criteria::is_null($field));
$this->_add_criteria($criteria);
return $criteria;
}
@@ -418,11 +418,11 @@
$field = $this->put_alias($element['real_field']);
if(is_array($element['value']))
{
- $this->_add_criteria(sql_criteria::in($field,
$element['value']));
+
$this->_add_criteria(phpgwapi_sql_criteria::in($field, $element['value']));
}
else
{
-
$this->_add_criteria(sql_criteria::equal($field, $element['value']));
+
$this->_add_criteria(phpgwapi_sql_criteria::equal($field, $element['value']));
}
}
}
Modified: core/trunk/phpgwapi/inc/class.contact_categories.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contact_categories.inc.php 2008-10-25
19:22:24 UTC (rev 18975)
+++ core/trunk/phpgwapi/inc/class.contact_categories.inc.php 2008-10-25
20:16:22 UTC (rev 18976)
@@ -27,19 +27,19 @@
/**
* Use SQL criteria
*/
- include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+ phpgw::import_class('phpgwapi.sql_criteria');
/**
* Use SQL entity
*/
- include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
-
+ phpgw::import_class('phpgwapi.sql_entity');
+
/**
* Query statements for "categories" table
*
* @package phpgwapi
* @subpackage contacts
*/
- class contact_categories extends sql_entity
+ class contact_categories extends phpgwapi_sql_entity
{
var $map = array('key_cat_id' => array('select'
=> '',
'criteria'
=> '',
Modified: core/trunk/phpgwapi/inc/class.contact_central.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contact_central.inc.php 2008-10-25
19:22:24 UTC (rev 18975)
+++ core/trunk/phpgwapi/inc/class.contact_central.inc.php 2008-10-25
20:16:22 UTC (rev 18976)
@@ -180,16 +180,16 @@
{
foreach($element['value'] as $value)
{
- $data[] =
sql_criteria::or_(sql_criteria::equal($field, sql::string($value)),
-
sql_criteria::has($field, ',' . $value . ','));
+ $data[] =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::equal($field,
phpgwapi_sql_::string($value)),
+
phpgwapi_sql_criteria::has($field, ',' . $value . ','));
}
- $criteria = sql_criteria::append_or($data);
+ $criteria =
phpgwapi_sql_criteria::append_or($data);
$this->_add_criteria($criteria);
}
else
{
-
$this->_add_criteria(sql_criteria::equal($field,
sql::string($element['value'])));
+
$this->_add_criteria(phpgwapi_sql_criteria::equal($field,
phpgwapi_sql_::string($element['value'])));
}
}
}
Modified: core/trunk/phpgwapi/inc/class.contact_comm_descr.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contact_comm_descr.inc.php 2008-10-25
19:22:24 UTC (rev 18975)
+++ core/trunk/phpgwapi/inc/class.contact_comm_descr.inc.php 2008-10-25
20:16:22 UTC (rev 18976)
@@ -27,19 +27,19 @@
/**
* Use SQL criteria
*/
- include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+ phpgw::import_class('phpgwapi.sql_criteria');
/**
* Use SQL entity
*/
- include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
-
+ phpgw::import_class('phpgwapi.sql_entity');
+
/**
* Query statements for "comm_descr" table
*
* @package phpgwapi
* @subpackage contacts
*/
- class contact_comm_descr extends sql_entity
+ class contact_comm_descr extends phpgwapi_sql_entity
{
var $map = array('comm_descr_id' => array('select'
=> '',
'criteria'
=> '',
@@ -99,10 +99,10 @@
foreach($element['value'] as $value)
{
- $data[] = sql_criteria::equal($field,
sql::string($value));
+ $data[] = phpgwapi_sql_criteria::equal($field,
phpgwapi_sql_::string($value));
}
- $criteria = sql_criteria::append_or($data);
+ $criteria = phpgwapi_sql_criteria::append_or($data);
$this->_add_criteria($criteria);
}
}
Modified: core/trunk/phpgwapi/inc/class.contact_comm_type.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contact_comm_type.inc.php 2008-10-25
19:22:24 UTC (rev 18975)
+++ core/trunk/phpgwapi/inc/class.contact_comm_type.inc.php 2008-10-25
20:16:22 UTC (rev 18976)
@@ -27,19 +27,19 @@
/**
* Use SQL criteria
*/
- include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+ phpgw::import_class('phpgwapi.sql_criteria');
/**
* Use SQL entity
*/
- include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
-
+ phpgw::import_class('phpgwapi.sql_entity');
+
/**
* Query statements for "comm_type" table
*
* @package phpgwapi
* @subpackage contacts
*/
- class contact_comm_type extends sql_entity
+ class contact_comm_type extends phpgwapi_sql_entity
{
var $map = array('comm_type_id'=> array('select' => '',
'criteria' => '',
Modified: core/trunk/phpgwapi/inc/class.contact_note_type.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contact_note_type.inc.php 2008-10-25
19:22:24 UTC (rev 18975)
+++ core/trunk/phpgwapi/inc/class.contact_note_type.inc.php 2008-10-25
20:16:22 UTC (rev 18976)
@@ -27,19 +27,19 @@
/**
* Use SQL criteria
*/
- include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+ phpgw::import_class('phpgwapi.sql_criteria');
/**
* Use SQL entity
*/
- include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
-
+ phpgw::import_class('phpgwapi.sql_entity');
+
/**
* Query statements for "note_type" table
*
* @package phpgwapi
* @subpackage contacts
*/
- class contact_note_type extends sql_entity
+ class contact_note_type extends phpgwapi_sql_entity
{
var $map = array('note_type_id' => array('select'
=> '',
'criteria'
=> '',
Modified: core/trunk/phpgwapi/inc/class.contact_org.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contact_org.inc.php 2008-10-25 19:22:24 UTC
(rev 18975)
+++ core/trunk/phpgwapi/inc/class.contact_org.inc.php 2008-10-25 20:16:22 UTC
(rev 18976)
@@ -27,19 +27,19 @@
/**
* Use SQL criteria
*/
- include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+ phpgw::import_class('phpgwapi.sql_criteria');
/**
* Use SQL entity
*/
- include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
-
+ phpgw::import_class('phpgwapi.sql_entity');
+
/**
* Query statements for "org" table
*
* @package phpgwapi
* @subpackage contacts
*/
- class contact_org extends sql_entity
+ class contact_org extends phpgwapi_sql_entity
{
var $map = array('org_id' => array('select' => '',
'criteria' => '',
@@ -154,11 +154,11 @@
$field = $this->put_alias($element['real_field']);
if(is_array($element['value']))
{
- $this->_add_criteria(sql_criteria::in($field,
$element['value']));
+
$this->_add_criteria(phpgwapi_sql_criteria::in($field, $element['value']));
}
else
{
-
$this->_add_criteria(sql_criteria::equal($field, $element['value']));
+
$this->_add_criteria(phpgwapi_sql_criteria::equal($field, $element['value']));
}
}
Modified: core/trunk/phpgwapi/inc/class.contact_org_person.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contact_org_person.inc.php 2008-10-25
19:22:24 UTC (rev 18975)
+++ core/trunk/phpgwapi/inc/class.contact_org_person.inc.php 2008-10-25
20:16:22 UTC (rev 18976)
@@ -27,19 +27,19 @@
/**
* Use SQL criteria
*/
- include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+ phpgw::import_class('phpgwapi.sql_criteria');
/**
* Use SQL entity
*/
- include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
-
+ phpgw::import_class('phpgwapi.sql_entity');
+
/**
* Query statements for "org_person" table
*
* @package phpgwapi
* @subpackage contacts
*/
- class contact_org_person extends sql_entity
+ class contact_org_person extends phpgwapi_sql_entity
{
var $map = array('my_org_id' => array('select' => '',
'criteria' => '',
@@ -122,7 +122,7 @@
function criteria_my_org_id($element)
{
$field = $this->put_alias($element['real_field']);
- $new_criteria = sql_criteria::equal($field,
$element['value']);
+ $new_criteria = phpgwapi_sql_criteria::equal($field,
$element['value']);
$this->_add_criteria($new_criteria);
$this->relink_person();
}
@@ -130,7 +130,7 @@
function criteria_my_person_id($element)
{
$field = $this->put_alias($element['real_field']);
- $new_criteria = sql_criteria::equal($field,
$element['value']);
+ $new_criteria = phpgwapi_sql_criteria::equal($field,
$element['value']);
$this->_add_criteria($new_criteria);
$this->relink_org();
}
@@ -148,8 +148,8 @@
function criteria_my_preferred($element)
{
$field = $this->put_alias($element['real_field']);
- $criteria =
sql_criteria::or_(sql_criteria::equal($field, sql::string($element['value'])),
-
sql_criteria::is_null($field));
+ $criteria =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::equal($field,
phpgwapi_sql_::string($element['value'])),
+
phpgwapi_sql_criteria::is_null($field));
$this->_add_criteria($criteria);
return $criteria;
}
Modified: core/trunk/phpgwapi/inc/class.contact_person.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contact_person.inc.php 2008-10-25
19:22:24 UTC (rev 18975)
+++ core/trunk/phpgwapi/inc/class.contact_person.inc.php 2008-10-25
20:16:22 UTC (rev 18976)
@@ -27,19 +27,19 @@
/**
* Use SQL criteria
*/
- include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+ phpgw::import_class('phpgwapi.sql_criteria');
/**
* Use SQL entity
*/
- include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
-
+ phpgw::import_class('phpgwapi.sql_entity');
+
/**
* Query statements for "person" table
*
* @package phpgwapi
* @subpackage contacts
*/
- class contact_person extends sql_entity
+ class contact_person extends phpgwapi_sql_entity
{
var $map = array('person_id' => array('select'
=> '',
'criteria'
=> '',
@@ -336,8 +336,8 @@
function full_name()
{
- $this->add_field('per_full_name',
sql::concat_null(array($this->real_field('per_first_name'), sql::string(' '),
-
$this->real_field('per_middle_name'), sql::string(' '),
+ $this->add_field('per_full_name',
phpgwapi_sql_::concat_null(array($this->real_field('per_first_name'),
phpgwapi_sql_::string(' '),
+
$this->real_field('per_middle_name'), phpgwapi_sql_::string(' '),
$this->real_field('per_last_name'))));
}
Modified: core/trunk/phpgwapi/inc/class.contacts_sql.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contacts_sql.inc.php 2008-10-25 19:22:24 UTC
(rev 18975)
+++ core/trunk/phpgwapi/inc/class.contacts_sql.inc.php 2008-10-25 20:16:22 UTC
(rev 18976)
@@ -35,13 +35,13 @@
* Include SQL criteria
* @see sql_criteria
*/
- include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+ phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Include SQL entity
- * @see sql_entity
+ * Use SQL entity
*/
- include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ phpgw::import_class('phpgwapi.sql_entity');
+
/**
* All categories
@@ -1101,7 +1101,7 @@
function update_single_extra_field($id, $name, $value)
{
$other = createObject('phpgwapi.contact_others');
- $criteria =
sql_criteria::token_and(sql_criteria::_equal('other_name', $name),
sql_criteria::_equal('contact_id', $id));
+ $criteria =
phpgwapi_sql_criteria::token_and(phpgwapi_sql_criteria::_equal('other_name',
$name), phpgwapi_sql_criteria::_equal('contact_id', $id));
$other->update($id, array('other_value' => $value),
$criteria);
}
@@ -1115,7 +1115,7 @@
* @param string $orderby The field which you want order
* @param string $sort ASC | DESC depending what you want
* @param mixed $criteria All criterias what you want
- * @param mixed $criteria_token same like $criteria but
builded<br>with sql_criteria class, more powerfull
+ * @param mixed $criteria_token same like $criteria but
builded<br>with phpgwapi_sql_criteria class, more powerfull
* @return array Array person with records
*/
function get_persons($fields, $limit='', $ofset='',
$orderby='', $sort='', $criteria='', $criteria_token='')
@@ -1139,7 +1139,7 @@
}
else
{
- $criteria_token =
sql_criteria::token_and(sql_criteria::_equal('contact_type',
$this->search_contact_type($this->_contact_person)), $criteria_token);
+ $criteria_token =
phpgwapi_sql_criteria::token_and(phpgwapi_sql_criteria::_equal('contact_type',
$this->search_contact_type($this->_contact_person)), $criteria_token);
$this->criteria_token($criteria_token);
}
}
@@ -1246,7 +1246,7 @@
* @param string $orderby The field which you want order
* @param string $sort ASC | DESC depending what you want
* @param array $criteria All criterias what you want
- * @param mixed $criteria_token same like $criteria but
builded<br>with sql_criteria class, more powerfull
+ * @param mixed $criteria_token same like $criteria but
builded<br>with phpgwapi_sql_criteria class, more powerfull
* @return array Array with organization with records
*/
function get_orgs($fields, $limit='', $ofset='', $orderby='',
$sort='', $criteria='', $criteria_token='')
@@ -1272,7 +1272,7 @@
}
else
{
- $criteria_token =
sql_criteria::token_and(sql_criteria::_equal('contact_type',
$this->search_contact_type($this->_contact_org)), $criteria_token);
+ $criteria_token =
phpgwapi_sql_criteria::token_and(phpgwapi_sql_criteria::_equal('contact_type',
$this->search_contact_type($this->_contact_org)), $criteria_token);
$this->criteria_token($criteria_token);
}
}
@@ -1670,7 +1670,7 @@
}
$this->request('person_id');
- // sql::in() is better than make a select by each
account
+ // phpgwapi_sql_::in() is better than make a select by
each account
$this->criteria(array('person_id' => $people));
return $this->get_query($action, __LINE__, __FILE__);
}
@@ -1732,7 +1732,7 @@
{
$sql = 'SELECT cat2.cat_id FROM phpgw_categories as cat
'
.'INNER JOIN phpgw_categories as cat2 ON
cat.cat_id=cat2.cat_parent '
- .'WHERE '.sql::in('cat.cat_id', $cat_id);
+ .'WHERE '.phpgwapi_sql_::in('cat.cat_id',
$cat_id);
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
@@ -1901,7 +1901,7 @@
* This function try to be a comprensive way to get data from
contacts
* convert the contacts database output on a multidimensional
array
* @param integer|array $contact_id
- * @param mixed $optional_criteria criteria built with
sql_criteria
+ * @param mixed $optional_criteria criteria built with
phpgwapi_sql_criteria
* @param integer $line where this function is called, usefull
for debug
* @param integer $file where this function is called, usefull
for debug
* @return array All the data of contact (contacts).
@@ -1916,7 +1916,7 @@
// this is an error
return ;
}
-
$this->criteria_token(sql_criteria::_equal('contact_id', $contact_id));
+
$this->criteria_token(phpgwapi_sql_criteria::_equal('contact_id', $contact_id));
}
else
{
@@ -2123,7 +2123,7 @@
{
$principal['owner'] =
$GLOBALS['phpgw_info']['user']['account_id'];
}
- return $contact->update($principal,
sql_criteria::_equal('contact_id',sql::integer($cid)), $action);
+ return $contact->update($principal,
phpgwapi_sql_criteria::_equal('contact_id',phpgwapi_sql_::integer($cid)),
$action);
}
/**
@@ -2145,7 +2145,7 @@
{
$data['per_modby'] = $this->get_user_id();
}
- return $person->update($data,
sql_criteria::_equal('person_id',sql::integer($id)), $action);
+ return $person->update($data,
phpgwapi_sql_criteria::_equal('person_id',phpgwapi_sql_::integer($id)),
$action);
}
/**
@@ -2167,7 +2167,7 @@
{
$data['org_modby'] = $this->get_user_id();
}
- return $org->update($data,
sql_criteria::_equal('org_id',sql::integer($id)), $action);
+ return $org->update($data,
phpgwapi_sql_criteria::_equal('org_id',phpgwapi_sql_::integer($id)), $action);
}
@@ -2190,7 +2190,7 @@
{
$data['addr_modby'] = $this->get_user_id();
}
- return $loc->update($data,
sql_criteria::_equal('contact_addr_id',sql::integer($id)), $action);
+ return $loc->update($data,
phpgwapi_sql_criteria::_equal('contact_addr_id',phpgwapi_sql_::integer($id)),
$action);
}
/**
@@ -2212,7 +2212,7 @@
{
$data['addr_modby'] = $this->get_user_id();
}
- return $loc->update($data,
sql_criteria::_equal('contact_id',sql::integer($contact_id)), $action);
+ return $loc->update($data,
phpgwapi_sql_criteria::_equal('contact_id',phpgwapi_sql_::integer($contact_id)),
$action);
}
/**
@@ -2234,7 +2234,7 @@
{
$data['comm_modby'] = $this->get_user_id();
}
- return $comm->update($data,
sql_criteria::_equal('comm_id',sql::integer($id)), $action);
+ return $comm->update($data,
phpgwapi_sql_criteria::_equal('comm_id',phpgwapi_sql_::integer($id)), $action);
}
/**
@@ -2248,7 +2248,7 @@
function edit_other($id, $data, $action=PHPGW_SQL_RETURN_SQL)
{
$comm = createObject('phpgwapi.contact_others');
- return $comm->update($data,
sql_criteria::_equal('other_id',sql::integer($id)), $action);
+ return $comm->update($data,
phpgwapi_sql_criteria::_equal('other_id',phpgwapi_sql_::integer($id)), $action);
}
/**
@@ -2262,7 +2262,7 @@
function edit_comms_by_contact($id, $data,
$action=PHPGW_SQL_RETURN_SQL)
{
$comm = createObject('phpgwapi.contact_comm');
- return $comm->update($data,
sql_criteria::_equal('contact_id',sql::integer($id)), $action);
+ return $comm->update($data,
phpgwapi_sql_criteria::_equal('contact_id',phpgwapi_sql_::integer($id)),
$action);
}
/**
@@ -2280,16 +2280,16 @@
$relation = createObject('phpgwapi.contact_org_person');
if($org_id && $person_id)
{
- $criteria =
sql_criteria::and_(sql_criteria::equal('org_id',sql::integer($org_id)),
-
sql_criteria::equal('person_id',sql::integer($person_id)));
+ $criteria =
phpgwapi_sql_criteria::and_(phpgwapi_sql_criteria::equal('org_id',phpgwapi_sql_::integer($org_id)),
+
phpgwapi_sql_criteria::equal('person_id',phpgwapi_sql_::integer($person_id)));
}
elseif($org_id)
{
- $criteria =
sql_criteria::equal('org_id',sql::integer($org_id));
+ $criteria =
phpgwapi_sql_criteria::equal('org_id',phpgwapi_sql_::integer($org_id));
}
elseif($person_id)
{
- $criteria =
sql_criteria::equal('person_id',sql::integer($person_id));
+ $criteria =
phpgwapi_sql_criteria::equal('person_id',phpgwapi_sql_::integer($person_id));
}
return $relation->update($data, $criteria, $action);
@@ -2310,7 +2310,7 @@
}
$contact = createObject('phpgwapi.contact_central');
return $contact->update(array('owner' => $new_owner),
-
sql_criteria::_equal('owner',sql::integer($old_owner)),
+
phpgwapi_sql_criteria::_equal('owner',phpgwapi_sql_::integer($old_owner)),
PHPGW_SQL_RUN_SQL);
}
@@ -2329,7 +2329,7 @@
}
$contact = createObject('phpgwapi.contact_others');
return $contact->update(array('contact_owner' =>
$new_owner),
-
sql_criteria::_equal('contact_owner',sql::integer($old_owner)),
+
phpgwapi_sql_criteria::_equal('contact_owner',phpgwapi_sql_::integer($old_owner)),
PHPGW_SQL_RUN_SQL);
}
@@ -2346,8 +2346,8 @@
function edit_other_by_owner($id, $new_data, $old_data,
$field_data, $action=PHPGW_SQL_RUN_SQL)
{
$other = createObject('phpgwapi.contact_others');
- $criteria =
sql_criteria::append_and(array(sql_criteria::equal('contact_owner',
sql::integer($id)),
-
sql_criteria::equal($field_data, sql::string($old_data))));
+ $criteria =
phpgwapi_sql_criteria::append_and(array(phpgwapi_sql_criteria::equal('contact_owner',
phpgwapi_sql_::integer($id)),
+
phpgwapi_sql_criteria::equal($field_data, phpgwapi_sql_::string($old_data))));
return $other->update(array($field_data => $new_data),
$criteria, $action);
}
@@ -2363,7 +2363,7 @@
{
$contact = createObject('phpgwapi.contact_central');
$principal['cat_id'] =
$this->get_categories($categories);
- return $contact->update($principal,
sql_criteria::_equal('contact_id',sql::integer($cid)), $action);
+ return $contact->update($principal,
phpgwapi_sql_criteria::_equal('contact_id',phpgwapi_sql_::integer($cid)),
$action);
}
@@ -2757,7 +2757,7 @@
}
foreach ($entity_keys as $key)
{
- $return_value =
$this->_delete(sql_criteria::_equal($key, $cid), PHPGW_SQL_RUN_SQL);
+ $return_value =
$this->_delete(phpgwapi_sql_criteria::_equal($key, $cid), PHPGW_SQL_RUN_SQL);
}
if($transaction)
{
@@ -2811,8 +2811,8 @@
{
$this->transaction_begin();
}
- $return_value[] =
$this->_delete(sql_criteria::_equal('contact_id', $cid), $action);
- $return_value[] =
$this->_delete(sql_criteria::_equal($type.'_id', $cid), $action);
+ $return_value[] =
$this->_delete(phpgwapi_sql_criteria::_equal('contact_id', $cid), $action);
+ $return_value[] =
$this->_delete(phpgwapi_sql_criteria::_equal($type.'_id', $cid), $action);
if ($action == PHPGW_SQL_RUN_SQL)
{
$this->transaction_end();
@@ -2830,7 +2830,7 @@
*/
function delete_orgs_by_person($cid, $action=PHPGW_SQL_RUN_SQL)
{
- return
$this->_delete(sql_criteria::_equal('my_person_id', $cid), $action);
+ return
$this->_delete(phpgwapi_sql_criteria::_equal('my_person_id', $cid), $action);
}
/**
@@ -2842,7 +2842,7 @@
*/
function delete_people_by_org($cid, $action=PHPGW_SQL_RUN_SQL)
{
- return $this->_delete(sql_criteria::_equal('my_org_id',
$cid), $action);
+ return
$this->_delete(phpgwapi_sql_criteria::_equal('my_org_id', $cid), $action);
}
/**
@@ -2857,8 +2857,8 @@
{
$relations =
createObject('phpgwapi.contact_org_person');
$this->lock_table($relations->table);
- $criteria =
$relations->entity_criteria(sql_criteria::token_and(sql_criteria::_equal('my_org_id',
$org_id),
-
sql_criteria::_equal('my_person_id', $person_id)));
+ $criteria =
$relations->entity_criteria(phpgwapi_sql_criteria::token_and(phpgwapi_sql_criteria::_equal('my_org_id',
$org_id),
+
phpgwapi_sql_criteria::_equal('my_person_id', $person_id)));
$sql = $relations->delete($criteria, $action);
$this->unlock_table();
return $sql;
@@ -2873,7 +2873,7 @@
*/
function delete_locations($cid, $action=PHPGW_SQL_RETURN_SQL)
{
- return
$this->_delete(sql_criteria::_equal('addr_contact_id',$cid), $action);
+ return
$this->_delete(phpgwapi_sql_criteria::_equal('addr_contact_id',$cid), $action);
}
/**
@@ -2885,7 +2885,7 @@
*/
function delete_comms($cid, $action=PHPGW_SQL_RETURN_SQL)
{
- return
$this->_delete(sql_criteria::_equal('comm_contact_id',$cid), $action);
+ return
$this->_delete(phpgwapi_sql_criteria::_equal('comm_contact_id',$cid), $action);
}
/**
@@ -2897,7 +2897,7 @@
*/
function delete_others($cid, $action=PHPGW_SQL_RETURN_SQL)
{
- return
$this->_delete(sql_criteria::_equal('other_contact_id',$cid), $action);
+ return
$this->_delete(phpgwapi_sql_criteria::_equal('other_contact_id',$cid), $action);
}
/**
@@ -2909,7 +2909,7 @@
*/
function delete_notes($cid, $action=PHPGW_SQL_RETURN_SQL)
{
- return
$this->_delete(sql_criteria::_equal('note_contact_id',$cid), $action);
+ return
$this->_delete(phpgwapi_sql_criteria::_equal('note_contact_id',$cid), $action);
}
/**
@@ -2921,7 +2921,7 @@
*/
function delete_specified_comm($id,
$action=PHPGW_SQL_RETURN_SQL)
{
- return
$this->_delete(sql_criteria::_equal('key_comm_id',$id), $action);
+ return
$this->_delete(phpgwapi_sql_criteria::_equal('key_comm_id',$id), $action);
}
/**
@@ -2933,7 +2933,7 @@
*/
function delete_specified_location($id,
$action=PHPGW_SQL_RETURN_SQL)
{
- return
$this->_delete(sql_criteria::_equal('key_addr_id',$id), $action);
+ return
$this->_delete(phpgwapi_sql_criteria::_equal('key_addr_id',$id), $action);
}
/**
@@ -2945,7 +2945,7 @@
*/
function delete_specified_other($id,
$action=PHPGW_SQL_RETURN_SQL)
{
- return
$this->_delete(sql_criteria::_equal('key_other_id',$id), $action);
+ return
$this->_delete(phpgwapi_sql_criteria::_equal('key_other_id',$id), $action);
}
/**
@@ -2957,7 +2957,7 @@
*/
function delete_specified_note($id,
$action=PHPGW_SQL_RETURN_SQL)
{
- return
$this->_delete(sql_criteria::_equal('key_note_id',$id), $action);
+ return
$this->_delete(phpgwapi_sql_criteria::_equal('key_note_id',$id), $action);
}
/**
@@ -3213,15 +3213,15 @@
}
else
{
- $elements[] =
sql_criteria::in($field, $value);
+ $elements[] =
phpgwapi_sql_criteria::in($field, $value);
}
}
else
{
- $elements[] =
sql_criteria::token_has($field, $value);
+ $elements[] =
phpgwapi_sql_criteria::token_has($field, $value);
}
}
- return sql_criteria::_append_or($elements);
+ return phpgwapi_sql_criteria::_append_or($elements);
}
/**
@@ -3249,20 +3249,20 @@
{
if (count($value) == 1)
{
- $elements[] =
sql_criteria::_equal($field, current($value));
+ $elements[] =
phpgwapi_sql_criteria::_equal($field, current($value));
}
else
{
- $elements[] =
sql_criteria::_in($field, $value);
+ $elements[] =
phpgwapi_sql_criteria::_in($field, $value);
}
}
}
else
{
- $elements[] =
sql_criteria::_equal($field, $value);
+ $elements[] =
phpgwapi_sql_criteria::_equal($field, $value);
}
}
- return sql_criteria::_append_and($elements);
+ return phpgwapi_sql_criteria::_append_and($elements);
}
/**
@@ -3561,17 +3561,17 @@
switch($access)
{
case PHPGW_CONTACTS_MINE:
- $criteria =
sql_criteria::_equal('owner', $owner);
+ $criteria =
phpgwapi_sql_criteria::_equal('owner', $owner);
break;
case PHPGW_CONTACTS_PRIVATE:
- $criteria =
sql_criteria::token_and(sql_criteria::_equal('access', 'private'),
-
sql_criteria::_equal('owner', $owner));
+ $criteria =
phpgwapi_sql_criteria::token_and(phpgwapi_sql_criteria::_equal('access',
'private'),
+
phpgwapi_sql_criteria::_equal('owner', $owner));
break;
case PHPGW_CONTACTS_ALL:
default:
- $criteria =
sql_criteria::token_or(sql_criteria::token_and(sql_criteria::_equal('access',
'public'),
-
sql_criteria::_in('owner',
$this->get_contacts_shared($owner, PHPGW_ACL_READ))),
-
sql_criteria::_equal('owner', $owner));
+ $criteria =
phpgwapi_sql_criteria::token_or(phpgwapi_sql_criteria::token_and(phpgwapi_sql_criteria::_equal('access',
'public'),
+
phpgwapi_sql_criteria::_in('owner',
$this->get_contacts_shared($owner, PHPGW_ACL_READ))),
+
phpgwapi_sql_criteria::_equal('owner', $owner));
}
if($categories != PHPGW_CONTACTS_CATEGORIES_ALL)
{
@@ -3585,11 +3585,11 @@
{
foreach($categories_array as $cat_id)
{
- $search_categories[] =
sql_criteria::token_or(sql_criteria::_equal('sel_cat_id', $cat_id),
-
sql_criteria::token_has('sel_cat_id', ','.$cat_id.','));
+ $search_categories[] =
phpgwapi_sql_criteria::token_or(phpgwapi_sql_criteria::_equal('sel_cat_id',
$cat_id),
+
phpgwapi_sql_criteria::token_has('sel_cat_id', ','.$cat_id.','));
}
- $categories_criteria =
sql_criteria::_append_or($search_categories);
- $criteria =
sql_criteria::token_and($criteria, $categories_criteria);
+ $categories_criteria =
phpgwapi_sql_criteria::_append_or($search_categories);
+ $criteria =
phpgwapi_sql_criteria::token_and($criteria, $categories_criteria);
}
}
@@ -3601,9 +3601,9 @@
if($search_count <= 0 && $show_count > 0)
{
- $addr_preferred_criteria =
sql_criteria::token_or(sql_criteria::_equal('addr_pref_val', 'Y'),
-
sql_criteria::_is_null('key_addr_id'));
- $criteria = sql_criteria::token_and($criteria,
$addr_preferred_criteria);
+ $addr_preferred_criteria =
phpgwapi_sql_criteria::token_or(phpgwapi_sql_criteria::_equal('addr_pref_val',
'Y'),
+
phpgwapi_sql_criteria::_is_null('key_addr_id'));
+ $criteria =
phpgwapi_sql_criteria::token_and($criteria, $addr_preferred_criteria);
}
if( isset($search_fields['comm_media'])
@@ -3627,10 +3627,10 @@
{
foreach($search_fields as $field)
{
- $search_array[] =
sql_criteria::token_has($field, $pattern);
+ $search_array[] =
phpgwapi_sql_criteria::token_has($field, $pattern);
}
- $criteria = sql_criteria::token_and($criteria,
sql_criteria::_append_or($search_array));
+ $criteria =
phpgwapi_sql_criteria::token_and($criteria,
phpgwapi_sql_criteria::_append_or($search_array));
}
if( $pattern
@@ -3640,10 +3640,10 @@
{
foreach($search_fields_comms as $field)
{
- $search_array_comm[] =
sql_criteria::token_and(sql_criteria::token_has('comm_data', $pattern),
-
sql_criteria::_equal('comm_descr', $this->search_comm_descr($field)));
+ $search_array_comm[] =
phpgwapi_sql_criteria::token_and(phpgwapi_sql_criteria::token_has('comm_data',
$pattern),
+
phpgwapi_sql_criteria::_equal('comm_descr',
$this->search_comm_descr($field)));
}
- $criteria = sql_criteria::token_and($criteria,
sql_criteria::_append_or($search_array_comm));
+ $criteria =
phpgwapi_sql_criteria::token_and($criteria,
phpgwapi_sql_criteria::_append_or($search_array_comm));
}
return $criteria;
}
@@ -3664,9 +3664,9 @@
foreach($search_fields as $field)
{
- $search_array[] =
sql_criteria::token_has($field, $pattern);
+ $search_array[] =
phpgwapi_sql_criteria::token_has($field, $pattern);
}
- $criteria =
sql_criteria::_append_or($search_array);
+ $criteria =
phpgwapi_sql_criteria::_append_or($search_array);
}
$this->request('contact_id');
@@ -4109,7 +4109,9 @@
function get_mkdate()
{
- $date = mktime();
+ // TODO use again mktime with timezone properly defined
+ // $date=mktime();
+ $date = time();
return $date;
}
Modified: core/trunk/phpgwapi/inc/class.sql.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.sql.inc.php 2008-10-25 19:22:24 UTC (rev
18975)
+++ core/trunk/phpgwapi/inc/class.sql.inc.php 2008-10-25 20:16:22 UTC (rev
18976)
@@ -332,11 +332,11 @@
if (is_array($values))
{
//this never gets executed!
- return phpgwapi_sql::equal($field,
phpgwapi_sql::$type(current($values)));
+ return phpgwapi_sql_::equal($field,
phpgwapi_sql_::$type(current($values)));
}
else
{
- return phpgwapi_sql::equal($field,
phpgwapi_sql::$type($values));
+ return phpgwapi_sql_::equal($field,
phpgwapi_sql_::$type($values));
}
}
}
@@ -399,7 +399,7 @@
public static function character($str)
{
- return phpgwapi_sql::string($str);
+ return phpgwapi_sql_::string($str);
}
/**
@@ -419,10 +419,10 @@
switch(gettype($date))
{
case 'integer':
- return
phpgwapi_sql::int_date2str($date, $format);
+ return
phpgwapi_sql_::int_date2str($date, $format);
default:
- return
phpgwapi_sql::str_date2int($date, $format);
+ return
phpgwapi_sql_::str_date2int($date, $format);
}
}
@@ -434,9 +434,9 @@
switch(gettype($time))
{
case 'integer':
- return phpgwapi_sql::int_time2str($time,
$format);
+ return phpgwapi_sql_::int_time2str($time,
$format);
default:
- return phpgwapi_sql::str_time2int($time,
$format);
+ return phpgwapi_sql_::str_time2int($time,
$format);
}
}
@@ -464,7 +464,7 @@
public static function str_time2int($time)
{
- return (int) phpgwapi_sql::str_date2int($time);
+ return (int) phpgwapi_sql_::str_date2int($time);
}
/*************************************************************\
Modified: core/trunk/phpgwapi/inc/class.sql_builder.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.sql_builder.inc.php 2008-10-25 19:22:24 UTC
(rev 18975)
+++ core/trunk/phpgwapi/inc/class.sql_builder.inc.php 2008-10-25 20:16:22 UTC
(rev 18976)
@@ -366,7 +366,7 @@
$fields = '';
if ($lcriteria && !$this->_criteria_built)
{
- $this->all_criteria =
sql_criteria::append_and(array($lcriteria, $this->all_criteria));
+ $this->all_criteria =
phpgwapi_sql_criteria::append_and(array($lcriteria, $this->all_criteria));
}
}
$from = $this->get_join();
@@ -431,7 +431,7 @@
else
{
$this->external_criteria_value[1] = $criteria;
- return
sql_criteria::criteria($this->external_criteria_value);
+ return
phpgwapi_sql_criteria::criteria($this->external_criteria_value);
}
}
@@ -701,7 +701,7 @@
* Recieve $data that is an array (operand_left, operand_right,
operator)
* If operant_left is array I call... myself :), else try to get
the field name.
* If right operand is array can myself to, else, nothing.
- * Third operator IS_ a operator name that send to
sql::operate();
+ * Third operator IS_ a operator name that send to
phpgwapi_sql_::operate();
* @param array $data Genertaded by calls of sql class.
* @param string $operation Is one of: insert, select, delete,
update, if is diferent to select, then the result will not include the alias
for table.
* @return Criteria for any sql query.
@@ -749,11 +749,11 @@
if ($operator == 'append_and' || $operator ==
'append_or')
{
$param = array($left, $right);
- $local_criteria =
sql_criteria::operate($operator,$param);
+ $local_criteria =
phpgwapi_sql_criteria::operate($operator,$param);
}
else
{
- $local_criteria =
sql_criteria::operate($operator,$left,$right);
+ $local_criteria =
phpgwapi_sql_criteria::operate($operator,$left,$right);
}
break;
default:
@@ -762,13 +762,13 @@
{
$criterias[] =
$this->builder_criteria($criteria, $operation);
}
- $local_criteria =
sql_criteria::operate($operator,$criterias);
+ $local_criteria =
phpgwapi_sql_criteria::operate($operator,$criterias);
}
return $local_criteria;
}
/**
- * This is an optional criteria generator, powerfull because use
sql_criteria and sql_entity
+ * This is an optional criteria generator, powerfull because use
phpgwapi_sql_criteria and sql_entity
*/
function criteria_token($criteria, $operation='select')
{
Modified: core/trunk/phpgwapi/inc/class.sql_criteria.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.sql_criteria.inc.php 2008-10-25 19:22:24 UTC
(rev 18975)
+++ core/trunk/phpgwapi/inc/class.sql_criteria.inc.php 2008-10-25 20:16:22 UTC
(rev 18976)
@@ -289,18 +289,18 @@
{
if (is_array($operand) || $optional_operand == '' ||
$optional_operand == FALSE)
{
- return phpgwapi_sql::$operator($operand);
+ return phpgwapi_sql_::$operator($operand);
}
else
{
- return phpgwapi_sql::$operator($operand,
$optional_operand);
+ return phpgwapi_sql_::$operator($operand,
$optional_operand);
}
}
/**
* Generate a criteria stirng suitable for SQL queries, update
and delete.
*
- * @param array $tokens array Multidimensional array created
with calls to sql_criteria class methods
+ * @param array $tokens array Multidimensional array created
with calls to phpgwapi_sql_criteria class methods
* @return string Return a criteria string based on tokens
*/
public static function criteria($tokens)
@@ -321,7 +321,7 @@
}
else
{
- $operand_right = phpgwapi_sql::null();
+ $operand_right = phpgwapi_sql_::null();
}
return self::$operator($operand_left, $operand_right);
}
Modified: core/trunk/phpgwapi/inc/class.sql_entity.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.sql_entity.inc.php 2008-10-25 19:22:24 UTC
(rev 18975)
+++ core/trunk/phpgwapi/inc/class.sql_entity.inc.php 2008-10-25 20:16:22 UTC
(rev 18976)
@@ -62,7 +62,7 @@
* @package phpgwapi
* @subpackage database
*/
- class sql_entity
+ class phpgwapi_sql_entity
{
/* List of fields to mantain in each query, it morph if select,
* if insert, if update.
@@ -85,7 +85,7 @@
var $ondebug;
var $table;
- function sql_entity()
+ function phpgwapi_sql_entity()
{
}
@@ -344,7 +344,7 @@
$this->ldebug('default_criteria',
array('Field' => $field));
- $new_criteria = sql_criteria::has($field,
+ $new_criteria = phpgwapi_sql_criteria::has($field,
$element['value']);
$this->ldebug('default_criteria',
array('New Criteria' =>
$new_criteria));
@@ -362,7 +362,7 @@
$this->ldebug('_add_criteria',
array('New Criteria' => $new_criteria,
'All Criteria Prev' =>
$this->criteria));
- $this->criteria =
sql_criteria::append_and(array($new_criteria,
+ $this->criteria =
phpgwapi_sql_criteria::append_and(array($new_criteria,
$this->criteria));
$this->ldebug('_add_criteria',
array('All Criteria Post' =>
$this->criteria));
@@ -382,26 +382,26 @@
if(count($element['value']) == 1)
{
$value =
$this->cast(current($element['value']), $element['field']);
- return sql_criteria::equal($field,
$value);
+ return
phpgwapi_sql_criteria::equal($field, $value);
}
elseif(count($element['value']) > 1)
{
- return sql_criteria::in($field,
$element['value'], $this->get_datatype($field));
+ return
phpgwapi_sql_criteria::in($field, $element['value'],
$this->get_datatype($field));
}
}
else
{
$value = $this->cast($element['value'],
$element['field']);
- return sql_criteria::equal($field, $value);
+ return phpgwapi_sql_criteria::equal($field,
$value);
}
}
/**
* Analize a criteria created by tokens and create a string that
represent it, useful for any kind of operation that use criteria I guess.
*
- * @param $token_criteria array Array with all the criteria in
tokens, generated with sql_criteria
+ * @param $token_criteria array Array with all the criteria in
tokens, generated with phpgwapi_sql_criteria
* @return string Criteria string (All that goes in WHERE clause)
- * @see sql_criteria
+ * @see phpgwapi_sql_criteria
*/
function entity_criteria($token_criteria)
@@ -437,11 +437,11 @@
{
$right =
$this->entity_criteria($right);
}
- $local_criteria =
sql_criteria::operate($operator,$left,$right);
+ $local_criteria =
phpgwapi_sql_criteria::operate($operator,$left,$right);
break;
default:
$operator = array_pop($token_criteria);
- $local_criteria =
sql_criteria::operate($operator,$token_criteria);
+ $local_criteria =
phpgwapi_sql_criteria::operate($operator,$token_criteria);
}
return $local_criteria;
}
@@ -574,7 +574,7 @@
}
$type = $this->get_datatype($false_field);
- return $data === sql::null() ? sql::null() :
sql::$type($data);
+ return $data === phpgwapi_sql_::null() ?
phpgwapi_sql_::null() : phpgwapi_sql_::$type($data);
}
/**
@@ -638,7 +638,7 @@
}
else
{
-
$this->set_criteria(sql_criteria::criteria($criteria));
+
$this->set_criteria(phpgwapi_sql_criteria::criteria($criteria));
}
if(!empty($this->values))
@@ -697,7 +697,7 @@
*/
function set_update_data($element)
{
- $value = ($element['value'] || $element['value'] == 0)
? $this->cast($element['value'], $element['field']) : sql::null();
+ $value = ($element['value'] || $element['value'] == 0)
? $this->cast($element['value'], $element['field']) : phpgwapi_sql_::null();
$this->values .= (($this->values)?',
':'').$element['real_field'].' = '.$value;
}
Modified: core/trunk/phpgwapi/inc/class.vfs_sql.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.vfs_sql.inc.php 2008-10-25 19:22:24 UTC
(rev 18975)
+++ core/trunk/phpgwapi/inc/class.vfs_sql.inc.php 2008-10-25 20:16:22 UTC
(rev 18976)
@@ -617,7 +617,7 @@
*/
function acl_check ($data)
{
- //echo 'checking vfs_sql::acl_check(' . print_r($data,
true) . '</pre>';
+ //echo 'checking vfs_phpgwapi_sql_::acl_check(' .
print_r($data, true) . '</pre>';
if (!is_array ($data))
{
$data = array ();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [18976] fix : fixed classes names, calls and and includes in phpgwapi for phpgwapi_sql_criteria, phpgwapi_sql_entity and phpgwapi_sql_,
Pascal Vilarem <=