[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc class.acl.inc.php class.applicatio...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/inc class.acl.inc.php class.applicatio... |
|
Date: |
Sun, 03 Sep 2006 06:15:28 +0000 |
CVSROOT: /cvsroot/phpgwapi
Module name: phpgwapi
Changes by: Dave Hall <skwashd> 06/09/03 06:15:27
Modified files:
inc : class.acl.inc.php class.applications.inc.php
class.asyncservice.inc.php
class.bojsaddressbook.inc.php
class.calendar_holidays.inc.php
class.common.inc.php class.contact_addr.inc.php
class.contact_addr_type.inc.php
class.contact_central.inc.php
class.contact_org_person.inc.php
class.contacts_shared.inc.php
class.contacts_sql.inc.php class.css.inc.php
class.custom_fields.inc.php
class.datetime.inc.php class.db.inc.php
class.errorlog.inc.php class.excel.inc.php
class.gdbutton.inc.php class.gdgraph.inc.php
class.gdimage.inc.php class.historylog.inc.php
class.hooks.inc.php class.html2text.inc.php
class.http_dav_client.inc.php
class.interserver.inc.php
class.ipc_manager.inc.php
class.javascript.inc.php
class.jscalendar.inc.php class.log.inc.php
class.menutree.inc.php
class.object_factory.inc.php
class.ofphpgwapi.inc.php class.pdf.inc.php
class.phpgw.inc.php class.portalbox.inc.php
class.sbox2.inc.php class.schema_proc.inc.php
class.schema_proc_mssql.inc.php
class.schema_proc_mysql.inc.php
class.schema_proc_oracle.inc.php
class.schema_proc_pgsql.inc.php
class.schema_proc_sapdb.inc.php
class.send.inc.php class.service.inc.php
class.sessions.inc.php
class.sessions_db.inc.php
class.sessions_php4.inc.php class.setup.inc.php
class.setup_detection.inc.php
class.setup_html.inc.php
class.setup_process.inc.php
class.setup_translation.inc.php
class.shm.inc.php class.soap_server.inc.php
class.soapclient.inc.php class.soapmsg.inc.php
class.soapval.inc.php class.sql_builder.inc.php
class.sql_entity.inc.php
class.translation_sql.inc.php
class.uijsaddressbook.inc.php
class.utilities.inc.php class.vcard.inc.php
class.xml.inc.php class.xmlrpc_client.inc.php
class.xmlrpc_server.inc.php
class.xmlrpcmsg.inc.php
class.xmlrpcresp.inc.php
class.xmlrpcval.inc.php
class.xslttemplates.inc.php
common_functions.inc.php functions.inc.php
xml_functions.inc.php xmlrpc.interop.php
inc/accounts : class.accounts_.inc.php
class.accounts_contacts.inc.php
class.accounts_ldap.inc.php
class.accounts_sql.inc.php
inc/auth : class.auth_ads.inc.php
class.auth_exchange.inc.php
class.auth_ldap.inc.php class.auth_mail.inc.php
class.auth_nis.inc.php class.auth_sql.inc.php
class.auth_sqlssl.inc.php
Removed files:
inc : class.contacts_ldap.inc.php
Log message:
formatting, docs and other little cleanups along the way
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.acl.inc.php?cvsroot=phpgwapi&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.applications.inc.php?cvsroot=phpgwapi&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.asyncservice.inc.php?cvsroot=phpgwapi&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.bojsaddressbook.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.calendar_holidays.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.common.inc.php?cvsroot=phpgwapi&r1=1.240&r2=1.241
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.contact_addr.inc.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.contact_addr_type.inc.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.contact_central.inc.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.contact_org_person.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.contacts_shared.inc.php?cvsroot=phpgwapi&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.contacts_sql.inc.php?cvsroot=phpgwapi&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.css.inc.php?cvsroot=phpgwapi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.custom_fields.inc.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.datetime.inc.php?cvsroot=phpgwapi&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.db.inc.php?cvsroot=phpgwapi&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.errorlog.inc.php?cvsroot=phpgwapi&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.excel.inc.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.gdbutton.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.gdgraph.inc.php?cvsroot=phpgwapi&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.gdimage.inc.php?cvsroot=phpgwapi&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.historylog.inc.php?cvsroot=phpgwapi&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.hooks.inc.php?cvsroot=phpgwapi&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.html2text.inc.php?cvsroot=phpgwapi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.http_dav_client.inc.php?cvsroot=phpgwapi&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.interserver.inc.php?cvsroot=phpgwapi&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.ipc_manager.inc.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.javascript.inc.php?cvsroot=phpgwapi&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.jscalendar.inc.php?cvsroot=phpgwapi&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.log.inc.php?cvsroot=phpgwapi&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.menutree.inc.php?cvsroot=phpgwapi&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.object_factory.inc.php?cvsroot=phpgwapi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.ofphpgwapi.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.pdf.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.phpgw.inc.php?cvsroot=phpgwapi&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.portalbox.inc.php?cvsroot=phpgwapi&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.sbox2.inc.php?cvsroot=phpgwapi&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.schema_proc.inc.php?cvsroot=phpgwapi&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.schema_proc_mssql.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.schema_proc_mysql.inc.php?cvsroot=phpgwapi&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.schema_proc_oracle.inc.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.schema_proc_pgsql.inc.php?cvsroot=phpgwapi&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.schema_proc_sapdb.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.send.inc.php?cvsroot=phpgwapi&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.service.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.sessions.inc.php?cvsroot=phpgwapi&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.sessions_db.inc.php?cvsroot=phpgwapi&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.sessions_php4.inc.php?cvsroot=phpgwapi&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.setup.inc.php?cvsroot=phpgwapi&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.setup_detection.inc.php?cvsroot=phpgwapi&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.setup_html.inc.php?cvsroot=phpgwapi&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.setup_process.inc.php?cvsroot=phpgwapi&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.setup_translation.inc.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.shm.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.soap_server.inc.php?cvsroot=phpgwapi&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.soapclient.inc.php?cvsroot=phpgwapi&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.soapmsg.inc.php?cvsroot=phpgwapi&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.soapval.inc.php?cvsroot=phpgwapi&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.sql_builder.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.sql_entity.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.translation_sql.inc.php?cvsroot=phpgwapi&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.uijsaddressbook.inc.php?cvsroot=phpgwapi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.utilities.inc.php?cvsroot=phpgwapi&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.vcard.inc.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.xml.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.xmlrpc_client.inc.php?cvsroot=phpgwapi&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.xmlrpc_server.inc.php?cvsroot=phpgwapi&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.xmlrpcmsg.inc.php?cvsroot=phpgwapi&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.xmlrpcresp.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.xmlrpcval.inc.php?cvsroot=phpgwapi&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.xslttemplates.inc.php?cvsroot=phpgwapi&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/common_functions.inc.php?cvsroot=phpgwapi&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/functions.inc.php?cvsroot=phpgwapi&r1=1.195&r2=1.196
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/xml_functions.inc.php?cvsroot=phpgwapi&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/xmlrpc.interop.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.contacts_ldap.inc.php?cvsroot=phpgwapi&r1=1.18&r2=0
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/accounts/class.accounts_.inc.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/accounts/class.accounts_contacts.inc.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/accounts/class.accounts_ldap.inc.php?cvsroot=phpgwapi&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/accounts/class.accounts_sql.inc.php?cvsroot=phpgwapi&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/auth/class.auth_ads.inc.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/auth/class.auth_exchange.inc.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/auth/class.auth_ldap.inc.php?cvsroot=phpgwapi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/auth/class.auth_mail.inc.php?cvsroot=phpgwapi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/auth/class.auth_nis.inc.php?cvsroot=phpgwapi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/auth/class.auth_sql.inc.php?cvsroot=phpgwapi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/auth/class.auth_sqlssl.inc.php?cvsroot=phpgwapi&r1=1.1&r2=1.2
Patches:
Index: class.acl.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.acl.inc.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- class.acl.inc.php 29 Aug 2006 08:17:28 -0000 1.84
+++ class.acl.inc.php 3 Sep 2006 06:15:26 -0000 1.85
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.acl.inc.php,v 1.84 2006/08/29 08:17:28 skwashd
Exp $
+ * @version $Id: class.acl.inc.php,v 1.85 2006/09/03 06:15:26 skwashd
Exp $
*/
/**
@@ -19,8 +19,8 @@
* @package phpgwapi
* @subpackage accounts
* @internal syntax: CreateObject('phpgwapi.acl',int account_id);
- * @internal example: $acl = CreateObject('phpgwapi.acl',5); // 5 is
the user id
- * @internal example: $acl = CreateObject('phpgwapi.acl',10); // 10 is
the user id
+ * @internal example: $acl = createObject('phpgwapi.acl',5); // 5 is
the user id
+ * @internal example: $acl = createObject('phpgwapi.acl',10); // 10 is
the user id
*/
class acl
{
@@ -161,7 +161,7 @@
/**
* Add ACL record
*
- * @param string|boolean $appname Application name. Default:
false derives value from $phpgw_info['flags']['currentapp']
+ * @param string|boolean $appname Application name. Default:
false derives value from $GLOBALS['phpgw_info']['flags']['currentapp']
* @param string $location Application location
* @param integer $rights Access rights in bitmask form
* @return array Array with ACL records
@@ -224,7 +224,7 @@
/**
* Delete ACL records
*
- * @param string|boolean $appname Application name, defaults to
false which means $phpgw_info['flags']['currentapp']
+ * @param string|boolean $appname Application name, defaults to
false which means $GLOBALS['phpgw_info']['flags']['currentapp']
* @param string $location Application location
* @return array Array with ACL records
*/
@@ -357,7 +357,7 @@
* Get rights from the repository not specific to this object
*
* @param $location Application location
- * @param string|boolean $appname Application name, defaults to
false which means $phpgw_info['flags']['currentapp']
+ * @param string|boolean $appname Application name, defaults to
false which means $GLOBALS['phpgw_info']['flags']['currentapp']
* @return integer Access rights in bitmask form
*/
function get_rights($location,$appname =
False,$grantor=False,$type=False,$account_type=False)
@@ -430,7 +430,7 @@
*
* @param string $location Application location
* @param integer $required Required right (bitmask) to check
against
- * @param string|boolean $appname Application name, defaults to
false which means $phpgw_info['flags']['currentapp']
+ * @param string|boolean $appname Application name, defaults to
false which means $GLOBALS['phpgw_info']['flags']['currentapp']
* @return boolean True when $required bitmap matched otherwise
false
*/
function check($location, $required, $appname = False)
@@ -451,7 +451,7 @@
*
* @param string $location Application location
* @param integer $required Required right (bitmask) to check
against
- * @param string|boolean $appname Application name, defaults to
false which means $phpgw_info['flags']['currentapp']
+ * @param string|boolean $appname Application name, defaults to
false which means $GLOBALS['phpgw_info']['flags']['currentapp']
* @param integer $grantor useraccount to check against
* @param integer $type mask or right (1 means mask , 0 means
right) to check against
* @param array $account_type to check for righst given by
groups and accounts separately
@@ -483,7 +483,7 @@
* Get specific rights
*
* @param string $location Application location
- * @param string|boolean $appname Application name, defaults to
false which means $phpgw_info['flags']['currentapp']
+ * @param string|boolean $appname Application name, defaults to
false which means $GLOBALS['phpgw_info']['flags']['currentapp']
* @return integer Access rights in bitmask form
*/
function get_specific_rights($location, $appname = False)
@@ -526,7 +526,7 @@
*
* @param string $location Application location
* @param integer $required Required rights as bitmap
- * @param string|boolean $appname Application name, defaults to
false which means $phpgw_info['flags']['currentapp']
+ * @param string|boolean $appname Application name, defaults to
false which means $GLOBALS['phpgw_info']['flags']['currentapp']
* @return boolean True when $required bitmap matched otherwise
false
*/
function check_specific($location, $required, $appname = False)
@@ -654,7 +654,7 @@
*
* @param string $location Application location
* @param integer $required Access rights as bitmap
- * @param integer $account_id Account id defaults to
$phpgw_info['user']['account_id'];
+ * @param integer $account_id Account id defaults to
$GLOBALS['phpgw_info']['user']['account_id'];
* @return boolean|array Array with list of applications or false
*/
function get_app_list_for_id($location, $required, $accountid =
'')
@@ -700,7 +700,7 @@
*
* @param string $app Application name
* @param integer $required Required access rights in bitmap form
- * @param integer $account_id Account id defaults to
$phpgw_info['user']['account_id'];
+ * @param integer $account_id Account id defaults to
$GLOBALS['phpgw_info']['user']['account_id'];
* @return array|boolean Array with location list or false
*/
function get_location_list_for_id($app, $required, $accountid =
'')
@@ -745,7 +745,7 @@
*
* @param string $location Application location
* @param integer $required Required access rights in bitmap
format
- * @param string $app Application name, defaults to
$phpgw_info['flags']['currentapp'];
+ * @param string $app Application name, defaults to
$GLOBALS['phpgw_info']['flags']['currentapp'];
* @return array|boolean Array with account ids or false
*/
function get_ids_for_location($location, $required, $app =
False)
@@ -778,7 +778,7 @@
/**
* Get a list of applications a user has rights to
*
- * @param integer $account_id Account id, defaults to
$phpgw_info['user']['account_id']
+ * @param integer $account_id Account id, defaults to
$GLOBALS['phpgw_info']['user']['account_id']
* @return array|boolean Associativ array containing list of
application rights in bitmap form or false
*/
function get_user_applications($accountid = '')
@@ -851,7 +851,7 @@
/**
* Get application specific account based granted rights list
*
- * @param string $app Application name, defaults to
$phpgw_info['flags']['currentapp']
+ * @param string $app Application name, defaults to
$GLOBALS['phpgw_info']['flags']['currentapp']
* @param string $location location within Application name
* @param integer $type mask or right (1 means mask , 0 means
right) to check against
* @return array Assoziativ array with granted access rights for
accounts
@@ -874,7 +874,7 @@
$acct_ids = array($this->account_id);
- $myaccounts = CreateObject('phpgwapi.accounts');
+ $myaccounts = createObject('phpgwapi.accounts');
$my_memberships =
$myaccounts->membership($this->account_id);
unset($myaccounts);
foreach ( $my_memberships as $key => $group )
Index: class.applications.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.applications.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- class.applications.inc.php 6 Aug 2006 04:51:25 -0000 1.55
+++ class.applications.inc.php 3 Sep 2006 06:15:26 -0000 1.56
@@ -7,7 +7,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.applications.inc.php,v 1.55 2006/08/06 04:51:25
skwashd Exp $
+ * @version $Id: class.applications.inc.php,v 1.56 2006/09/03 06:15:26
skwashd Exp $
*/
/**
@@ -35,7 +35,7 @@
*/
function applications($account_id = '')
{
- $this->db = $GLOBALS['phpgw']->db;
+ $this->db =& $GLOBALS['phpgw']->db;
$this->account_id = get_account_id($account_id);
$this->xmlrpc_methods[] = array(
@@ -105,7 +105,7 @@
reset($GLOBALS['phpgw_info']['apps']);
while ($app = each($GLOBALS['phpgw_info']['apps']))
{
-// $check = $phpgw->acl->check('run',1,$app[0]);
+// $check =
$GLOBALS['phpgw']->acl->check('run',1,$app[0]);
$check =
(isset($apps[$app[0]])?$apps[$app[0]]:False);
if ($check)
{
Index: class.asyncservice.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.asyncservice.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- class.asyncservice.inc.php 6 Aug 2006 04:51:25 -0000 1.8
+++ class.asyncservice.inc.php 3 Sep 2006 06:15:26 -0000 1.9
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.asyncservice.inc.php,v 1.8 2006/08/06 04:51:25
skwashd Exp $
+ * @version $Id: class.asyncservice.inc.php,v 1.9 2006/09/03 06:15:26
skwashd Exp $
*/
/**
@@ -39,7 +39,7 @@
*/
function asyncservice()
{
- $this->db = $GLOBALS['phpgw']->db;
+ $this->db =& $GLOBALS['phpgw']->db;
$this->cronline = PHPGW_SERVER_ROOT .
'/phpgwapi/cron/asyncservices.php '.$GLOBALS['phpgw_info']['user']['domain'];
$this->only_fallback = substr(php_uname(), 0, 7) ==
"Windows"; // atm cron-jobs dont work on win
}
Index: class.bojsaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.bojsaddressbook.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.bojsaddressbook.inc.php 11 May 2005 21:23:20 -0000 1.4
+++ class.bojsaddressbook.inc.php 3 Sep 2006 06:15:26 -0000 1.5
@@ -141,8 +141,8 @@
*/
function bojsaddressbook($contactquery="",$queryresults="")
{
- $this->contactsobject =
CreateObject('phpgwapi.contacts');
- $this->boaddressbook =
CreateObject('addressbook.boaddressbook');
+ $this->contactsobject =
createObject('phpgwapi.contacts');
+ $this->boaddressbook =
createObject('addressbook.boaddressbook');
//the idea is that here, right here, nowhere else, do
we decide what to keep
//from the cache and what to go and query again
Index: class.calendar_holidays.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.calendar_holidays.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -b -r1.240 -r1.241
--- class.common.inc.php 29 Aug 2006 05:00:49 -0000 1.240
+++ class.common.inc.php 3 Sep 2006 06:15:26 -0000 1.241
@@ -8,7 +8,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage utilities
- * @version $Id: class.common.inc.php,v 1.240 2006/08/29 05:00:49
skwashd Exp $
+ * @version $Id: class.common.inc.php,v 1.241 2006/09/03 06:15:26
skwashd Exp $
*/
/**
@@ -599,7 +599,7 @@
/**
* Get directory of application
*
- * @param string $appname Name of application defaults to
$phpgw_info['flags']['currentapp']
+ * @param string $appname Name of application defaults to
$GLOBALS['phpgw_info']['flags']['currentapp']
* @return string|boolean Application directory or false
*/
function get_app_dir($appname = '')
@@ -633,7 +633,7 @@
/**
* Get include directory of application
*
- * @param string $appname Name of application, defaults to
$phpgw_info['flags']['currentapp']
+ * @param string $appname Name of application, defaults to
$GLOBALS['phpgw_info']['flags']['currentapp']
* @return string|boolean Include directory or false
*/
function get_inc_dir($appname = '')
@@ -725,7 +725,7 @@
/**
* Get template dir of an application
*
- * @param string $appname application name optional can be
derived from $phpgw_info['flags']['currentapp'];
+ * @param string $appname application name optional can be
derived from $GLOBALS['phpgw_info']['flags']['currentapp'];
* @param string? $layout optional can force the template set to
a specific layout
*/
function get_tpl_dir($appname = '',$layout = '')
@@ -814,7 +814,7 @@
/**
* Get image directory of an application
*
- * @param string $appname Application name, defaults to
$phpgw_info['flags']['currentapp']
+ * @param string $appname Application name, defaults to
$GLOBALS['phpgw_info']['flags']['currentapp']
* @return string|boolean Image directory of given application
or false
*/
function get_image_dir($appname = '')
@@ -848,7 +848,7 @@
/**
* Get image path of an application
*
- * @param string $appname Appication name, defaults to
$phpgw_info['flags']['currentapp']
+ * @param string $appname Appication name, defaults to
$GLOBALS['phpgw_info']['flags']['currentapp']
* @return string|boolean Image directory path of given
application or false
*/
function get_image_path($appname = '')
@@ -1373,7 +1373,7 @@
{
if(!is_object($GLOBALS['phpgw']->datetime))
{
- $GLOBALS['phpgw']->datetime =
createobject('phpgwapi.datetime');
+ $GLOBALS['phpgw']->datetime =
createObject('phpgwapi.datetime');
}
if (!$t || (substr(php_uname(), 0, 7) == "Windows" &&
intval($t) <= 0))
@@ -1491,7 +1491,7 @@
}
else
{
- $GLOBALS['phpgw']->msg =
CreateObject('email.mail_msg');
+ $GLOBALS['phpgw']->msg =
createObject('email.mail_msg');
$do_free_me = True;
}
Index: class.contact_addr.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.contact_addr.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- class.contact_addr.inc.php 30 Dec 2004 06:47:30 -0000 1.2
+++ class.contact_addr.inc.php 3 Sep 2006 06:15:27 -0000 1.3
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage contacts
- * @version $Id: class.contact_addr.inc.php,v 1.2 2004/12/30 06:47:30
skwashd Exp $
+ * @version $Id: class.contact_addr.inc.php,v 1.3 2006/09/03 06:15:27
skwashd Exp $
*/
/**
Index: class.contact_addr_type.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.contact_addr_type.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- class.contact_addr_type.inc.php 30 Dec 2004 06:47:30 -0000 1.2
+++ class.contact_addr_type.inc.php 3 Sep 2006 06:15:27 -0000 1.3
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage contacts
- * @version $Id: class.contact_addr_type.inc.php,v 1.2 2004/12/30
06:47:30 skwashd Exp $
+ * @version $Id: class.contact_addr_type.inc.php,v 1.3 2006/09/03
06:15:27 skwashd Exp $
*/
/**
Index: class.contact_central.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.contact_central.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- class.contact_central.inc.php 30 Dec 2004 06:47:30 -0000 1.2
+++ class.contact_central.inc.php 3 Sep 2006 06:15:27 -0000 1.3
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage contacts
- * @version $Id: class.contact_central.inc.php,v 1.2 2004/12/30 06:47:30
skwashd Exp $
+ * @version $Id: class.contact_central.inc.php,v 1.3 2006/09/03 06:15:27
skwashd Exp $
*/
/**
Index: class.contact_org_person.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.contact_org_person.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.contact_org_person.inc.php 29 Aug 2006 10:55:17 -0000 1.4
+++ class.contact_org_person.inc.php 3 Sep 2006 06:15:27 -0000 1.5
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage contacts
- * @version $Id: class.contact_org_person.inc.php,v 1.4 2006/08/29
10:55:17 skwashd Exp $
+ * @version $Id: class.contact_org_person.inc.php,v 1.5 2006/09/03
06:15:27 skwashd Exp $
*/
/**
Index: class.contacts_shared.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.contacts_shared.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.contacts_shared.inc.php 30 Dec 2004 06:47:30 -0000 1.15
+++ class.contacts_shared.inc.php 3 Sep 2006 06:15:27 -0000 1.16
@@ -9,7 +9,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage contacts
- * @version $Id: class.contacts_shared.inc.php,v 1.15 2004/12/30
06:47:30 skwashd Exp $
+ * @version $Id: class.contacts_shared.inc.php,v 1.16 2006/09/03
06:15:27 skwashd Exp $
*/
/**
@@ -287,8 +287,8 @@
function formatted_address($id, $business = True, $afont = '',
$asize = '2')
{
- $t =
CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
- $s = CreateObject('phpgwapi.sbox');
+ $t =
createObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
+ $s = createObject('phpgwapi.sbox');
$fields = array
(
@@ -387,8 +387,8 @@
function formatted_address_full($id, $business = True, $afont =
'', $asize = '2')
{
- $t =
CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
- $s = CreateObject('phpgwapi.sbox');
+ $t =
createObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
+ $s = createObject('phpgwapi.sbox');
$fields = array
(
@@ -505,8 +505,8 @@
function formatted_address_line($id, $business = True, $afont =
'', $asize = '2')
{
- $t =
CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
- $s = CreateObject('phpgwapi.sbox');
+ $t =
createObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
+ $s = createObject('phpgwapi.sbox');
$fields = array
(
Index: class.contacts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.contacts_sql.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.contacts_sql.inc.php 1 Sep 2006 14:44:58 -0000 1.31
+++ class.contacts_sql.inc.php 3 Sep 2006 06:15:27 -0000 1.32
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage contacts
- * @version $Id: class.contacts_sql.inc.php,v 1.31 2006/09/01 14:44:58
skwashd Exp $
+ * @version $Id: class.contacts_sql.inc.php,v 1.32 2006/09/03 06:15:27
skwashd Exp $
* @internal Development of this application was funded by
http://www.sogrp.com
*/
@@ -57,7 +57,7 @@
* Note that changes here must also work in the LDAP version.
* @package phpgwapi
* @subpackage contacts
- * @internal example: $contacts = CreateObject('phpgwapi.contacts');
+ * @internal example: $contacts = createObject('phpgwapi.contacts');
*/
class contacts_ extends sql_builder
{
@@ -605,7 +605,7 @@
$this->db = &$GLOBALS['phpgw']->db;
if(!is_object($GLOBALS['phpgw']->session))
{
- $GLOBALS['phpgw']->session =
CreateObject('phpgwapi.sessions');
+ $GLOBALS['phpgw']->session =
createObject('phpgwapi.sessions');
}
$this->stock_contact_fields=&$this->contact_fields['showable'];
@@ -986,7 +986,7 @@
*/
function
add_single_extra_field($id,$owner,$field_name,$field_value)
{
- $this->other_fields =
CreateObject('phpgwapi.contact_others');
+ $this->other_fields =
createObject('phpgwapi.contact_others');
$this->other_fields->insert(array('other_contact_id' =>
$id, 'other_name' => $field_name, 'other_value' => $field_value));
}
@@ -1071,7 +1071,7 @@
*/
function update_single_extra_field($id, $name, $value)
{
- $other = CreateObject('phpgwapi.contact_others');
+ $other = createObject('phpgwapi.contact_others');
$criteria =
sql_criteria::token_and(sql_criteria::_equal('other_name', $name),
sql_criteria::_equal('contact_id', $id));
$other->update($id, array('other_value' => $value),
$criteria);
}
@@ -2076,7 +2076,7 @@
*/
function edit_contact($cid, $principal,
$action=PHPGW_SQL_RETURN_SQL)
{
- $contact = CreateObject('phpgwapi.contact_central');
+ $contact = createObject('phpgwapi.contact_central');
if (isset($principal['cat_id']))
{
$principal['cat_id'] =
$this->get_categories($principal['cat_id']);
@@ -2098,7 +2098,7 @@
*/
function edit_person($id, $data, $action=PHPGW_SQL_RUN_SQL)
{
- $person = CreateObject('phpgwapi.contact_person');
+ $person = createObject('phpgwapi.contact_person');
if(!isset($data['per_modon']))
{
$data['per_modon'] = $this->get_mkdate();
@@ -2120,7 +2120,7 @@
*/
function edit_org($id, $data, $action=PHPGW_SQL_RETURN_SQL)
{
- $org = CreateObject('phpgwapi.contact_org');
+ $org = createObject('phpgwapi.contact_org');
if(!isset($data['org_modon']))
{
$data['org_modon'] = $this->get_mkdate();
@@ -2143,7 +2143,7 @@
*/
function edit_location($id, $data, $action=PHPGW_SQL_RETURN_SQL)
{
- $loc = CreateObject('phpgwapi.contact_addr');
+ $loc = createObject('phpgwapi.contact_addr');
if(!isset($data['addr_modon']))
{
$data['addr_modon'] = $this->get_mkdate();
@@ -2165,7 +2165,7 @@
*/
function edit_comms($id, $data, $action=PHPGW_SQL_RETURN_SQL)
{
- $comm = CreateObject('phpgwapi.contact_comm');
+ $comm = createObject('phpgwapi.contact_comm');
if(!isset($data['comm_modon']))
{
$data['comm_modon'] = $this->get_mkdate();
@@ -2187,7 +2187,7 @@
*/
function edit_other($id, $data, $action=PHPGW_SQL_RETURN_SQL)
{
- $comm = CreateObject('phpgwapi.contact_others');
+ $comm = createObject('phpgwapi.contact_others');
return $comm->update($data,
sql_criteria::_equal('other_id',sql::integer($id)), $action);
}
@@ -2201,7 +2201,7 @@
*/
function edit_comms_by_contact($id, $data,
$action=PHPGW_SQL_RETURN_SQL)
{
- $comm = CreateObject('phpgwapi.contact_comm');
+ $comm = createObject('phpgwapi.contact_comm');
return $comm->update($data,
sql_criteria::_equal('contact_id',sql::integer($id)), $action);
}
@@ -2216,7 +2216,7 @@
*/
function edit_org_person_relation($org_id='', $person_id='',
$data=array(), $action=PHPGW_SQL_RETURN_SQL)
{
- $relation = CreateObject('phpgwapi.contact_org_person');
+ $relation = createObject('phpgwapi.contact_org_person');
if($org_id && $person_id)
{
$criteria =
sql_criteria::and_(sql_criteria::equal('org_id',sql::integer($org_id)),
@@ -2247,7 +2247,7 @@
{
return False;
}
- $contact = CreateObject('phpgwapi.contact_central');
+ $contact = createObject('phpgwapi.contact_central');
return $contact->update(array('owner' => $new_owner),
sql_criteria::_equal('owner',sql::integer($old_owner)),
PHPGW_SQL_RUN_SQL);
@@ -2266,7 +2266,7 @@
{
return False;
}
- $contact = CreateObject('phpgwapi.contact_others');
+ $contact = createObject('phpgwapi.contact_others');
return $contact->update(array('contact_owner' =>
$new_owner),
sql_criteria::_equal('contact_owner',sql::integer($old_owner)),
PHPGW_SQL_RUN_SQL);
@@ -2284,7 +2284,7 @@
*/
function edit_other_by_owner($id, $new_data, $old_data,
$field_data, $action=PHPGW_SQL_RUN_SQL)
{
- $other = CreateObject('phpgwapi.contact_others');
+ $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))));
return $other->update(array($field_data => $new_data),
$criteria, $action);
@@ -2300,7 +2300,7 @@
*/
function edit_category($cid, $categories=array(),
$action=PHPGW_SQL_RETURN_SQL)
{
- $contact = CreateObject('phpgwapi.contact_central');
+ $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);
}
@@ -2322,7 +2322,7 @@
*/
function add_contact($type, $principal=array(), $comms=array(),
$locations=array(), $categories=array(), $others=array(),
$contact_relations=array(), $notes=array())
{
- $this->contact =
CreateObject('phpgwapi.contact_central');
+ $this->contact =
createObject('phpgwapi.contact_central');
$owner =
$principal['owner']?$principal['owner']:$GLOBALS['phpgw_info']['user']['account_id'];
$this->lock_table($this->contact->table);
@@ -2396,7 +2396,7 @@
*/
function add_org($principal, $cid, $action=PHPGW_SQL_RETURN_SQL)
{
- $this->org = CreateObject('phpgwapi.contact_org');
+ $this->org = createObject('phpgwapi.contact_org');
if ($action == PHPGW_SQL_RUN_SQL)
{
$this->lock_table($this->org->table);
@@ -2422,7 +2422,7 @@
*/
function add_person($principal, $cid,
$action=PHPGW_SQL_RETURN_SQL)
{
- $this->person = CreateObject('phpgwapi.contact_person');
+ $this->person = createObject('phpgwapi.contact_person');
if ($action == PHPGW_SQL_RUN_SQL)
{
$this->lock_table($this->person->table);
@@ -2460,7 +2460,7 @@
foreach($people as $person)
{
$orgs = $this->has_preferred_org($person);
- $this->relations =
CreateObject('phpgwapi.contact_org_person');
+ $this->relations =
createObject('phpgwapi.contact_org_person');
$data['my_person_id'] = $person;
$data['my_creaton'] = $this->get_mkdate();
$data['my_creatby'] = $this->get_user_id();
@@ -2499,7 +2499,7 @@
{
foreach($organizations as $org)
{
- $this->relations =
CreateObject('phpgwapi.contact_org_person');
+ $this->relations =
createObject('phpgwapi.contact_org_person');
$data['my_org_id'] = $org;
$data['my_addr_id'] = $addr_id;
if ($preferred_org == $org)
@@ -2534,7 +2534,7 @@
function add_location($location, $cid,
$action=PHPGW_SQL_RETURN_SQL)
{
$addr = $this->has_preferred_location($cid);
- $this->location = CreateObject('phpgwapi.contact_addr');
+ $this->location = createObject('phpgwapi.contact_addr');
if ($action == PHPGW_SQL_RUN_SQL)
{
$this->lock_table($this->location->table);
@@ -2567,7 +2567,7 @@
*/
function add_communication_media($comm, $cid = '',
$action=PHPGW_SQL_RETURN_SQL)
{
- $this->comm = CreateObject('phpgwapi.contact_comm');
+ $this->comm = createObject('phpgwapi.contact_comm');
if ($action == PHPGW_SQL_RUN_SQL)
{
$this->lock_table($this->comm->table);
@@ -2593,7 +2593,7 @@
*/
function add_note($note, $cid = '',
$action=PHPGW_SQL_RETURN_SQL)
{
- $this->note = CreateObject('phpgwapi.contact_note');
+ $this->note = createObject('phpgwapi.contact_note');
if ($action == PHPGW_SQL_RUN_SQL)
{
$this->lock_table($this->note->table);
@@ -2619,7 +2619,7 @@
*/
function add_others($others, $cid='',
$action=PHPGW_SQL_RETURN_SQL)
{
- $this->others = CreateObject('phpgwapi.contact_others');
+ $this->others = createObject('phpgwapi.contact_others');
if ($action == PHPGW_SQL_RUN_SQL)
{
$this->lock_table($this->others->table);
@@ -2789,7 +2789,7 @@
*/
function delete_org_person_relation($org_id, $person_id,
$action=PHPGW_SQL_RUN_SQL)
{
- $relations =
CreateObject('phpgwapi.contact_org_person');
+ $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)));
@@ -3407,13 +3407,13 @@
function get_person_properties()
{
- $person = CreateObject('phpgwapi.contact_person');
+ $person = createObject('phpgwapi.contact_person');
return $person->get_false_fields();
}
function get_organization_properties()
{
- $org = CreateObject('phpgwapi.contact_org');
+ $org = createObject('phpgwapi.contact_org');
return $org->get_false_fields();
}
@@ -3521,7 +3521,7 @@
}
}
- $location = CreateObject('phpgwapi.contact_addr');
+ $location = createObject('phpgwapi.contact_addr');
$search_fields = (empty($search_fields) ||
!is_array($search_fields)) ? array() : $search_fields;
$show_fields = (empty($show_fields) ||
!is_array($show_fields)) ? array() : $show_fields;
$search_count =
count(array_intersect($location->get_false_fields(), $search_fields));
@@ -3774,7 +3774,7 @@
{
foreach($records as $data)
{
- $this->relations =
CreateObject('phpgwapi.contact_org_person');
+ $this->relations =
createObject('phpgwapi.contact_org_person');
$this->lock_table($this->relations->table);
$data['my_creaton'] =
$this->get_mkdate();
$data['my_creatby'] =
$this->get_user_id();
@@ -3800,7 +3800,7 @@
{
if(!$this->exist_org_person_relation($new_organization_id,
$data['my_person_id']))
{
- $this->relations =
CreateObject('phpgwapi.contact_org_person');
+ $this->relations =
createObject('phpgwapi.contact_org_person');
$this->lock_table($this->relations->table);
$data['my_creaton'] =
$this->get_mkdate();
$data['my_creatby'] =
$this->get_user_id();
@@ -4146,7 +4146,7 @@
$db2LDAP_map['website'] = 'labeledURI';
$comms = $this->get_comm_contact_data($id, '');
- $validator = CreateObject('phpgwapi.validator');
+ $validator = createObject('phpgwapi.validator');
for ($i=0; $i < count($comms); $i++)
{
$key =
$db2LDAP_map[$comms[$i]['comm_description']];
Index: class.css.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.css.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- class.css.inc.php 15 Mar 2005 01:12:14 -0000 1.1
+++ class.css.inc.php 3 Sep 2006 06:15:27 -0000 1.2
@@ -15,7 +15,7 @@
* <code>
* if(address@hidden($GLOBALS['phpgw']->css))
* {
- * $GLOBALS['phpgw']->css = CreateObject('phpgwapi.css');
+ * $GLOBALS['phpgw']->css = createObject('phpgwapi.css');
* }
* </code>
*
Index: class.custom_fields.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.custom_fields.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- class.custom_fields.inc.php 19 Jul 2006 01:40:11 -0000 1.2
+++ class.custom_fields.inc.php 3 Sep 2006 06:15:27 -0000 1.3
@@ -8,7 +8,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package phpgwapi
- * @version $Id: class.custom_fields.inc.php,v 1.2 2006/07/19 01:40:11
skwashd Exp $
+ * @version $Id: class.custom_fields.inc.php,v 1.3 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -966,7 +966,7 @@
function _init_process()
{
- $this->oProc =
CreateObject('phpgwapi.schema_proc',$GLOBALS['phpgw_info']['server']['db_type']);
+ $this->oProc =
createObject('phpgwapi.schema_proc',$GLOBALS['phpgw_info']['server']['db_type']);
$this->oProc->m_odb =& $this->db;
$this->oProc->m_odb->Halt_On_Error = 'report';
}
Index: class.datetime.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.datetime.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.datetime.inc.php 30 Dec 2004 06:47:30 -0000 1.20
+++ class.datetime.inc.php 3 Sep 2006 06:15:27 -0000 1.21
@@ -8,7 +8,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage utilities
- * @version $Id: class.datetime.inc.php,v 1.20 2004/12/30 06:47:30
skwashd Exp $
+ * @version $Id: class.datetime.inc.php,v 1.21 2006/09/03 06:15:27
skwashd Exp $
*/
$d1 = strtolower(@substr(PHPGW_API_INC,0,3));
@@ -66,7 +66,7 @@
$error_occured = False;
if(address@hidden($GLOBALS['phpgw']->network))
{
- $GLOBALS['phpgw']->network =
createobject('phpgwapi.network');
+ $GLOBALS['phpgw']->network =
createObject('phpgwapi.network');
}
$server_time = time();
@@ -113,7 +113,7 @@
$error_occured = False;
if(address@hidden($GLOBALS['phpgw']->network))
{
- $GLOBALS['phpgw']->network =
createobject('phpgwapi.network');
+ $GLOBALS['phpgw']->network =
createObject('phpgwapi.network');
}
$server_time = time();
Index: class.db.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.db.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- class.db.inc.php 1 Sep 2006 01:00:11 -0000 1.29
+++ class.db.inc.php 3 Sep 2006 06:15:27 -0000 1.30
@@ -9,7 +9,7 @@
* @link http://www.sanisoft.com/phplib/manual/DB_sql.php
* @package phpgwapi
* @subpackage database
- * @version $Id: class.db.inc.php,v 1.29 2006/09/01 01:00:11 skwashd Exp
$
+ * @version $Id: class.db.inc.php,v 1.30 2006/09/03 06:15:27 skwashd Exp
$
*/
if (empty($GLOBALS['phpgw_info']['server']['db_type']))
@@ -103,7 +103,7 @@
//do nothing for now
}
- $this->adodb =
NewADOConnection($GLOBALS['phpgw_info']['server']['db_type']);
+ $this->adodb =
newADOConnection($GLOBALS['phpgw_info']['server']['db_type']);
$this->adodb->SetFetchMode(3);
if($query != '')
{
@@ -713,7 +713,7 @@
$this->adodb->Disconnect(); //close the dead
connection to be safe
}
- $this->adodb =
NewADOConnection($GLOBALS['phpgw_info']['server']['db_type']);
+ $this->adodb =
newADOConnection($GLOBALS['phpgw_info']['server']['db_type']);
$this->adodb->NConnect($this->Host, $adminname,
$adminpasswd);
if ( !$this->adodb->IsConnected() )
Index: class.errorlog.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.errorlog.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.errorlog.inc.php 30 Dec 2004 06:47:30 -0000 1.13
+++ class.errorlog.inc.php 3 Sep 2006 06:15:27 -0000 1.14
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.errorlog.inc.php,v 1.13 2004/12/30 06:47:30
skwashd Exp $
+ * @version $Id: class.errorlog.inc.php,v 1.14 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -105,7 +105,7 @@
function commit()
{
- $db = $GLOBALS['phpgw']->db;
+ $db =& $GLOBALS['phpgw']->db;
// $db->lock('phpgw_log');
$db->query("insert into phpgw_log (log_date, log_user,
log_app, log_severity) values "
."('".
$GLOBALS['phpgw']->db->to_timestamp(time())
Index: class.excel.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.excel.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- class.excel.inc.php 3 Sep 2006 04:07:00 -0000 1.2
+++ class.excel.inc.php 3 Sep 2006 06:15:27 -0000 1.3
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package phpgwapi
* @subpackage utilities
- * @version $Id: class.excel.inc.php,v 1.2 2006/09/03 04:07:00 skwashd
Exp $
+ * @version $Id: class.excel.inc.php,v 1.3 2006/09/03 06:15:27 skwashd
Exp $
*
* Example
* <code>
@@ -22,8 +22,8 @@
*
* $filename= $GLOBALS['phpgw_info']['user']['account_lid'].'.xls';
*
- * $workbook = CreateObject('phpgwapi.excel',"-");
- * $browser = CreateObject('phpgwapi.browser');
+ * $workbook = createObject('phpgwapi.excel',"-");
+ * $browser = createObject('phpgwapi.browser');
* $browser->content_header($filename,'application/vnd.ms-excel');
*
* $worksheet1 =& $workbook->add_worksheet('First One');
Index: class.gdbutton.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.gdbutton.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.gdbutton.inc.php 26 Apr 2005 09:43:08 -0000 1.5
+++ class.gdbutton.inc.php 3 Sep 2006 06:15:27 -0000 1.6
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.gdbutton.inc.php,v 1.5 2005/04/26 09:43:08
powerstat Exp $
+ * @version $Id: class.gdbutton.inc.php,v 1.6 2006/09/03 06:15:27
skwashd Exp $
* @internal Some methods based on former class.graphics 2001 Lars
Kneschke
*/
@@ -43,7 +43,7 @@
$this->xspace = 4;
$this->yspace = 4;
- $this->save_dir =
$GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT'] . PHPGW_IMAGES_DIR . SEP;
+ $this->save_dir = $_SERVER['DOCUMENT_ROOT'] .
PHPGW_IMAGES_DIR . SEP;
$this->img_dir = PHPGW_IMAGES_DIR . SEP;
}
@@ -183,11 +183,11 @@
return;
}
- if (is_array($GLOBALS['HTTP_POST_VARS']))
+ if (is_array($_POST))
{
- while( list($key, $val) =
each($GLOBALS['HTTP_POST_VARS']))
+ while( list($key, $val) = each($_POST))
{
- if (ereg("(.*)_x",$key,$varName) &&
$HTTP_POST_VARS[$varName[1]."_y"])
+ if (ereg("(.*)_x",$key,$varName) &&
$_POST[$varName[1]."_y"])
{
$name = $varName[1];
global $$name;
Index: class.gdgraph.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.gdgraph.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.gdgraph.inc.php 26 Apr 2005 09:43:08 -0000 1.20
+++ class.gdgraph.inc.php 3 Sep 2006 06:15:27 -0000 1.21
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.gdgraph.inc.php,v 1.20 2005/04/26 09:43:08
powerstat Exp $
+ * @version $Id: class.gdgraph.inc.php,v 1.21 2006/09/03 06:15:27
skwashd Exp $
* @internal This class based on boGraph.php3 - Double Choco Latte -
Source Configuration Management System Copyright (C) 1999 Michael L. Dean &
Tim R. Norman
*/
@@ -77,7 +77,7 @@
$this->margin_bottom = 40;
$this->margin_right = 20;
- $this->img =
CreateObject('phpgwapi.gdimage');
+ $this->img =
createObject('phpgwapi.gdimage');
$this->temp_file = $this->img->temp_file;
}
Index: class.gdimage.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.gdimage.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.gdimage.inc.php 26 Apr 2005 09:43:08 -0000 1.11
+++ class.gdimage.inc.php 3 Sep 2006 06:15:27 -0000 1.12
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.gdimage.inc.php,v 1.11 2005/04/26 09:43:08
powerstat Exp $
+ * @version $Id: class.gdimage.inc.php,v 1.12 2006/09/03 06:15:27
skwashd Exp $
* @internal This class based on htmlGD.php3 - Double Choco Latte -
Source Configuration Management System - Copyright (C) 1999 Michael L. Dean &
Tim R. Norman
*/
Index: class.historylog.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.historylog.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.historylog.inc.php 4 May 2005 13:05:20 -0000 1.13
+++ class.historylog.inc.php 3 Sep 2006 06:15:27 -0000 1.14
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.historylog.inc.php,v 1.13 2005/05/04 13:05:20
powerstat Exp $
+ * @version $Id: class.historylog.inc.php,v 1.14 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -36,7 +36,7 @@
}
$this->appname = $appname;
- $this->db = $GLOBALS['phpgw']->db;
+ $this->db =& $GLOBALS['phpgw']->db;
}
function delete($record_id)
@@ -111,8 +111,8 @@
function return_html($filter_out,$orderby = '',$sort = '',
$record_id)
{
- $this->template =
createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
- $this->nextmatchs = createobject('phpgwapi.nextmatchs');
+ $this->template =
createObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+ $this->nextmatchs = createObject('phpgwapi.nextmatchs');
$this->template->set_file('_history','history_list.tpl');
Index: class.hooks.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.hooks.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- class.hooks.inc.php 30 Dec 2004 06:47:30 -0000 1.19
+++ class.hooks.inc.php 3 Sep 2006 06:15:27 -0000 1.20
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.hooks.inc.php,v 1.19 2004/12/30 06:47:30 skwashd
Exp $
+ * @version $Id: class.hooks.inc.php,v 1.20 2006/09/03 06:15:27 skwashd
Exp $
*/
/**
@@ -34,19 +34,18 @@
//echo '</pre>';
}
- /*!
- @function process
- @abstract executes all the hooks (the user has rights to) for a
given location
- @syntax process($args,$order='',$no_permission_check = False)
- @param $args location-name as string or array:
- @param $args['location'] location-name
- @param $order or $args['order'] array of appnames (as value),
which should be executes first
- @param $args is passed to the hook, if its a new method-hook
- @param $no_permission_check if True execute all hooks, not only
the ones a user has rights to
- @note $no_permission_check should *ONLY* be used when it *HAS*
to be. (jengo)
- @returns array with results of each hook call (with appname as
key): \
- False if no hook exists, True if old hook exists \
- and whatever the new methode-hook returns (can be True
or False too!).
+ /**
+ * executes all the hooks (the user has rights to) for a given
location
+ *
+ * @param $args location-name as string or array:
+ * @param $args['location'] location-name
+ * @param $order or $args['order'] array of appnames (as
value), which should be executes first
+ * @param $args is passed to the hook, if its a new method-hook
+ * @param $no_permission_check if True execute all hooks, not
only the ones a user has rights to
+ * $no_permission_check should *ONLY* be used when it *HAS* to
be. (jengo)
+ * @return array with results of each hook call (with appname
as key): \
+ * False if no hook exists, True if old hook exists \
+ * and whatever the new methode-hook returns (can be True
or False too!).
*/
function process($args, $order = '', $no_permission_check =
False)
{
@@ -88,18 +87,17 @@
return $results;
}
- /*!
- @function single
- @abstract executes a single hook of a given location and
application
- @syntax single($args,$appname='',$no_permission_check = False)
- @param $args location-name as string or array:
- @param $args['location'] location-name
- @param $appname or $args['appname'] name of the app, which's
hook to execute, if empty the current app is used
- @param $args is passed to the hook, if its a new method-hook
- @param $no_permission_check if True execute all hooks, not only
the ones a user has rights to
- @param $try_unregisterd If true, try to include old file-hook
anyway (for setup)
- @note $no_permission_check should *ONLY* be used when it *HAS*
to be. (jengo)
- @returns False if no hook exists, True if an old hook exist and
whatever the new method-hook returns
+ /**
+ * executes a single hook of a given location and application
+ *
+ * @param $args location-name as string or array:
+ * @param $args['location'] location-name
+ * @param $appname or $args['appname'] name of the app, which's
hook to execute, if empty the current app is used
+ * @param $args is passed to the hook, if its a new method-hook
+ * @param $no_permission_check if True execute all hooks, not
only the ones a user has rights to
+ * @param $try_unregisterd If true, try to include old
file-hook anyway (for setup)
+ * $no_permission_check should *ONLY* be used when it *HAS* to
be. (jengo)
+ * @return False if no hook exists, True if an old hook exist
and whatever the new method-hook returns
*/
function single($args, $appname = '', $no_permission_check =
False,$try_unregistered = False)
{
@@ -152,9 +150,9 @@
}
}
- /*!
- @function count
- @abstract loop through the applications and count the hooks
+ /**
+ * loop through the applications and count the hooks
+ *
*/
function count($location)
{
@@ -169,9 +167,9 @@
return $count;
}
- /*!
- @function read()
- @abstract currently not being used
+ /**
+ * currently not being used
+ *
*/
function read()
{
@@ -182,12 +180,11 @@
return $this->found_hooks;
}
- /*!
- @function register_hooks
- @abstract Register and/or de-register an application's hooks
- @syntax register_hooks($appname,$hooks='')
- @param $appname Application 'name'
- @param $hooks array with hooks to register, eg
$setup_info[$app]['hooks'] or not used for only deregister the hooks
+ /**
+ * Register and/or de-register an application's hooks
+ *
+ * @param $appname Application 'name'
+ * @param $hooks array with hooks to register, eg
$setup_info[$app]['hooks'] or not used for only deregister the hooks
*/
function register_hooks($appname,$hooks='')
{
@@ -222,9 +219,9 @@
}
- /*!
- @function register_all_hooks
- @abstract Register the hooks of all applications (used by admin)
+ /**
+ * Register the hooks of all applications (used by admin)
+ *
*/
function register_all_hooks()
{
Index: class.html2text.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.html2text.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Index: class.http_dav_client.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.http_dav_client.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- class.http_dav_client.inc.php 25 Feb 2006 18:58:12 -0000 1.16
+++ class.http_dav_client.inc.php 3 Sep 2006 06:15:27 -0000 1.17
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage network
- * @version $Id: class.http_dav_client.inc.php,v 1.16 2006/02/25
18:58:12 Caeies Exp $
+ * @version $Id: class.http_dav_client.inc.php,v 1.17 2006/09/03
06:15:27 skwashd Exp $
* @internal At the moment much of this is simply a wrapper around the
NET_HTTP_Client class, with some other methods for parsing the returned XML etc
Ideally this will eventually use groupware's inbuilt HTTP class
*/
@@ -240,7 +240,7 @@
function http_dav_client()
{
- $this->http_client =
CreateObject('phpgwapi.net_http_client');
+ $this->http_client =
createObject('phpgwapi.net_http_client');
$this->set_debug(0);
}
Index: class.interserver.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.interserver.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.interserver.inc.php 30 Dec 2004 06:47:30 -0000 1.25
+++ class.interserver.inc.php 3 Sep 2006 06:15:27 -0000 1.26
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage communication
- * @version $Id: class.interserver.inc.php,v 1.25 2004/12/30 06:47:30
skwashd Exp $
+ * @version $Id: class.interserver.inc.php,v 1.26 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -77,7 +77,7 @@
function interserver($serverid='')
{
- $this->db = $GLOBALS['phpgw']->db;
+ $this->db =& $GLOBALS['phpgw']->db;
if($serverid)
{
$this->serverid = intval($serverid);
@@ -107,7 +107,7 @@
$this->read_repository();
if($this->server['trust_level'])
{
- $this->accounts =
CreateObject('phpgwapi.accounts');
+ $this->accounts =
createObject('phpgwapi.accounts');
$this->accounts->server = $this->serverid;
}
$this->security = $this->server['server_security'];
@@ -154,8 +154,8 @@
list($uri,$hostpart) = $this->_split_url($url);
if(gettype($args) != 'array')
{
- $arr[] =
CreateObject('phpgwapi.xmlrpcval',$args,'string');
- $f = CreateObject('phpgwapi.xmlrpcmsg',
$method_name, $arr,'string');
+ $arr[] =
createObject('phpgwapi.xmlrpcval',$args,'string');
+ $f = createObject('phpgwapi.xmlrpcmsg',
$method_name, $arr,'string');
}
else
{
@@ -165,21 +165,21 @@
{
while(list($x,$y) = each($val))
{
- $tmp[$x] =
CreateObject('phpgwapi.xmlrpcval',$y, 'string');
+ $tmp[$x] =
createObject('phpgwapi.xmlrpcval',$y, 'string');
}
- $ele[$key] =
CreateObject('phpgwapi.xmlrpcval',$tmp,'struct');
+ $ele[$key] =
createObject('phpgwapi.xmlrpcval',$tmp,'struct');
}
else
{
- $ele[$key] =
CreateObject('phpgwapi.xmlrpcval',$val, 'string');
+ $ele[$key] =
createObject('phpgwapi.xmlrpcval',$val, 'string');
}
}
- $arr[] =
CreateObject('phpgwapi.xmlrpcval',$ele,'struct');
- $f = CreateObject('phpgwapi.xmlrpcmsg',
$method_name, $arr,'struct');
+ $arr[] =
createObject('phpgwapi.xmlrpcval',$ele,'struct');
+ $f = createObject('phpgwapi.xmlrpcmsg',
$method_name, $arr,'struct');
}
$this->debug("<pre>" . htmlentities($f->serialize()) .
"</pre>\n",$debug);
- $c = CreateObject('phpgwapi.xmlrpc_client',$uri,
$hostpart, 443);
+ $c = createObject('phpgwapi.xmlrpc_client',$uri,
$hostpart, 443);
$c->setCredentials($this->sessionid,$this->kp3);
$c->setDebug(0);
$r = $c->send($f,0,'https');
@@ -206,8 +206,8 @@
list($uri,$hostpart) = $this->_split_url($url);
if(gettype($args) != 'array')
{
- $arr[] =
CreateObject('phpgwapi.xmlrpcval',$args,'string');
- $f = CreateObject('phpgwapi.xmlrpcmsg',
$method_name, $arr,'string');
+ $arr[] =
createObject('phpgwapi.xmlrpcval',$args,'string');
+ $f = createObject('phpgwapi.xmlrpcmsg',
$method_name, $arr,'string');
}
else
{
@@ -217,21 +217,21 @@
{
while(list($x,$y) = each($val))
{
- $tmp[$x] =
CreateObject('phpgwapi.xmlrpcval',$y, 'string');
+ $tmp[$x] =
createObject('phpgwapi.xmlrpcval',$y, 'string');
}
- $ele[$key] =
CreateObject('phpgwapi.xmlrpcval',$tmp,'struct');
+ $ele[$key] =
createObject('phpgwapi.xmlrpcval',$tmp,'struct');
}
else
{
- $ele[$key] =
CreateObject('phpgwapi.xmlrpcval',$val, 'string');
+ $ele[$key] =
createObject('phpgwapi.xmlrpcval',$val, 'string');
}
}
- $arr[] =
CreateObject('phpgwapi.xmlrpcval',$ele,'struct');
- $f = CreateObject('phpgwapi.xmlrpcmsg',
$method_name, $arr,'struct');
+ $arr[] =
createObject('phpgwapi.xmlrpcval',$ele,'struct');
+ $f = createObject('phpgwapi.xmlrpcmsg',
$method_name, $arr,'struct');
}
$this->debug('<pre>' . htmlentities($f->serialize()) .
'</pre>' . "\n",$debug);
- $c = CreateObject('phpgwapi.xmlrpc_client',$uri,
$hostpart, 80);
+ $c = createObject('phpgwapi.xmlrpc_client',$uri,
$hostpart, 80);
$c->setCredentials($this->sessionid,$this->kp3);
// _debug_array($c);
$c->setDebug(0);
@@ -260,7 +260,7 @@
list($uri,$hostpart) = $this->_split_url($url);
if(gettype($args) != 'array')
{
- $arr[] =
CreateObject('phpgwapi.soapval','','string',$args);
+ $arr[] =
createObject('phpgwapi.soapval','','string',$args);
}
else
{
@@ -270,20 +270,20 @@
{
while(list($x,$y) = each($val))
{
- $tmp[] =
CreateObject('phpgwapi.soapval',$x,'string',$y);
+ $tmp[] =
createObject('phpgwapi.soapval',$x,'string',$y);
}
- $arr[] =
CreateObject('phpgwapi.soapval',$key, 'array',$tmp);
+ $arr[] =
createObject('phpgwapi.soapval',$key, 'array',$tmp);
}
else
{
- $arr[] =
CreateObject('phpgwapi.soapval',$key, 'string',$val);
+ $arr[] =
createObject('phpgwapi.soapval',$key, 'string',$val);
}
}
}
- $soap_message =
CreateObject('phpgwapi.soapmsg',$method_name,$arr);
+ $soap_message =
createObject('phpgwapi.soapmsg',$method_name,$arr);
/* print_r($soap_message);exit; */
- $soap =
CreateObject('phpgwapi.soap_client',$uri,$hostpart);
+ $soap =
createObject('phpgwapi.soap_client',$uri,$hostpart);
$soap->username = $this->sessionid;
$soap->password = $this->kp3;
/* _debug_array($soap);exit; */
@@ -316,26 +316,26 @@
{
while(list($x,$y) = each($val))
{
- $tmp[] =
CreateObject('phpgwapi.soapval',$x,'string',$y);
+ $tmp[] =
createObject('phpgwapi.soapval',$x,'string',$y);
}
- $ele[] =
CreateObject('phpgwapi.soapval',$key, 'array',$tmp);
+ $ele[] =
createObject('phpgwapi.soapval',$key, 'array',$tmp);
$complex = True;
}
else
{
- $ele[] =
CreateObject('phpgwapi.soapval',$key, 'string',$val);
+ $ele[] =
createObject('phpgwapi.soapval',$key, 'string',$val);
}
}
- $arr[] =
CreateObject('phpgwapi.soapval','','struct',$ele);
+ $arr[] =
createObject('phpgwapi.soapval','','struct',$ele);
}
else
{
- $arr[] =
CreateObject('phpgwapi.soapval','','string',$args);
+ $arr[] =
createObject('phpgwapi.soapval','','string',$args);
}
$this->request = $arr;
- $soap_message =
CreateObject('phpgwapi.soapmsg',$method_name,$this->request);
- $soap =
CreateObject('phpgwapi.soap_client',$uri,$hostpart);
+ $soap_message =
createObject('phpgwapi.soapmsg',$method_name,$this->request);
+ $soap =
createObject('phpgwapi.soap_client',$uri,$hostpart);
$soap->username = $this->sessionid;
$soap->password = $this->kp3;
if($r = $soap->send($soap_message,$method_name))
@@ -363,7 +363,7 @@
{
$ele[$key] =
$this->build_request($val,True,$key);
}
- $this->request[] =
CreateObject('phpgwapi.soapval',$ext,'struct',$ele);
+ $this->request[] =
createObject('phpgwapi.soapval',$ext,'struct',$ele);
$ext = '';
}
else
@@ -375,7 +375,7 @@
}
else
{
- $this->request[$ext] =
CreateObject('phpgwapi.soapval',$ext,$_type,$_req);
+ $this->request[$ext] =
createObject('phpgwapi.soapval',$ext,$_type,$_req);
}
}
}
Index: class.ipc_manager.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.ipc_manager.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.ipc_manager.inc.php 8 Apr 2005 08:55:34 -0000 1.6
+++ class.ipc_manager.inc.php 3 Sep 2006 06:15:27 -0000 1.7
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage communication
- * @version $Id: class.ipc_manager.inc.php,v 1.6 2005/04/08 08:55:34
fipsfuchs Exp $
+ * @version $Id: class.ipc_manager.inc.php,v 1.7 2006/09/03 06:15:27
skwashd Exp $
*/
/**
Index: class.javascript.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.javascript.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- class.javascript.inc.php 6 Aug 2006 12:54:20 -0000 1.8
+++ class.javascript.inc.php 3 Sep 2006 06:15:27 -0000 1.9
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.javascript.inc.php,v 1.8 2006/08/06 12:54:20
skwashd Exp $
+ * @version $Id: class.javascript.inc.php,v 1.9 2006/09/03 06:15:27
skwashd Exp $
* @link http://docs.phpgroupware.org/wiki/classJavaScript
*/
@@ -17,7 +17,7 @@
* <code>
* if(address@hidden($GLOBALS['phpgw']->js))
* {
- * $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
+ * $GLOBALS['phpgw']->js = createObject('phpgwapi.javascript');
* }
* </code>
*
Index: class.jscalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.jscalendar.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.jscalendar.inc.php 1 Sep 2006 00:59:02 -0000 1.11
+++ class.jscalendar.inc.php 3 Sep 2006 06:15:27 -0000 1.12
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.jscalendar.inc.php,v 1.11 2006/09/01 00:59:02
skwashd Exp $
+ * @version $Id: class.jscalendar.inc.php,v 1.12 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -19,12 +19,11 @@
*/
class jscalendar
{
- /*!
- @function jscalendar
- @syntax jscalendar( $do_header=True )
- @author ralfbecker
- @abstract constructor of the class
- @param $do_header if true, necessary javascript and css gets loaded,
only needed for input
+ /**
+ * @author ralfbecker
+ * constructor of the class
+ *
+ * @param $do_header if true, necessary javascript and css gets loaded,
only needed for input
*/
function jscalendar($do_header=True)
{
@@ -57,16 +56,15 @@
$this->_input_modern($name);
}
- /*!
- @function input
- @syntax input( $name,$date,$year=0,$month=0,$day=0 )
- @author ralfbecker
- @abstract creates an inputfield for the jscalendar (returns the
necessary html and js)
- @param $name name and id of the input-field (it also names the id of
the img $name.'-toggle')
- @param $date date as string or unix timestamp (in users localtime)
- @param $year,$month,$day if $date is not used
- @param $helpmsg a helpmessage for the statusline of the browser
- @param $options any other options to the inputfield
+ /**
+ * @author ralfbecker
+ * creates an inputfield for the jscalendar (returns the necessary html
and js)
+ *
+ * @param $name name and id of the input-field (it also names the id of
the img $name.'-toggle')
+ * @param $date date as string or unix timestamp (in users localtime)
+ * @param $year,$month,$day if $date is not used
+ * @param $helpmsg a helpmessage for the statusline of the browser
+ * @param $options any other options to the inputfield
*/
function input($name, $date=0, $year=0, $month=0, $day=0, $helpmsg='',
$options='')
{
@@ -82,14 +80,13 @@
}
}
- /*!
- @function input2date
- @syntax input2date(
$datestr,$raw='raw',$day='day',$month='month',$year='year' )
- @author ralfbecker
- @abstract converts the date-string back to an array with year, month,
day and a timestamp
- @param $datestr content of the inputfield generated by
jscalendar::input()
- @param $raw key of the timestamp-field in the returned array or False
of no timestamp
- @param $day,$month,$year keys for the array, eg. to set mday instead of
day
+ /**
+ * @author ralfbecker
+ * converts the date-string back to an array with year, month, day and
a timestamp
+ *
+ * @param $datestr content of the inputfield generated by
jscalendar::input()
+ * @param $raw key of the timestamp-field in the returned array or
False of no timestamp
+ * @param $day,$month,$year keys for the array, eg. to set mday instead
of day
*/
function
input2date($datestr,$raw='raw',$day='day',$month='month',$year='year')
{
Index: class.log.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.log.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- class.log.inc.php 28 Apr 2005 18:20:15 -0000 1.9
+++ class.log.inc.php 3 Sep 2006 06:15:27 -0000 1.10
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.log.inc.php,v 1.9 2005/04/28 18:20:15 fipsfuchs
Exp $
+ * @version $Id: class.log.inc.php,v 1.10 2006/09/03 06:15:27 skwashd
Exp $
*/
/**
@@ -99,7 +99,7 @@
$parms['severity']=$level;
- $err =
CreateObject('phpgwapi.log_message',$parms);
+ $err =
createObject('phpgwapi.log_message',$parms);
$this->write_error_to_db($err);
$this->handle_fatal_error($err);
// this is here instead of in fatal() because I still support
// the old methods.
@@ -173,7 +173,7 @@
}
function write_error_to_db($err) {
- $db = $GLOBALS['phpgw']->db;
+ $db =& $GLOBALS['phpgw']->db;
$db->lock('phpgw_log');
$db->query("insert into phpgw_log (log_date, log_app,
log_account_id, log_account_lid, log_severity, log_file, log_line, log_msg)
values "
. "('" .
$GLOBALS['phpgw']->db->to_timestamp(time()) . "'"
@@ -239,14 +239,14 @@
// write() left in for backward compatibility
function write($parms)
{
- $err = CreateObject('phpgwapi.log_message',$parms);
+ $err = createObject('phpgwapi.log_message',$parms);
$this->write_error_to_db($err);
return true;
}
// message() left in for backward compatibility
function message($parms)
{
- $err = CreateObject('phpgwapi.log_message',$parms);
+ $err = createObject('phpgwapi.log_message',$parms);
$this->write_error_to_db($err);
return true;
}
Index: class.menutree.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.menutree.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- class.menutree.inc.php 30 Dec 2004 06:47:30 -0000 1.21
+++ class.menutree.inc.php 3 Sep 2006 06:15:27 -0000 1.22
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.menutree.inc.php,v 1.21 2004/12/30 06:47:30
skwashd Exp $
+ * @version $Id: class.menutree.inc.php,v 1.22 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -246,7 +246,7 @@
// $cnt=0;
- $browser = CreateObject('phpgwapi.browser');
+ $browser = createObject('phpgwapi.browser');
$browser->browser();
$browser_agent = $browser->get_agent();
switch($browser_agent)
Index: class.object_factory.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.object_factory.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- class.object_factory.inc.php 29 Aug 2006 07:50:33 -0000 1.3
+++ class.object_factory.inc.php 3 Sep 2006 06:15:27 -0000 1.4
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.object_factory.inc.php,v 1.3 2006/08/29 07:50:33
skwashd Exp $
+ * @version $Id: class.object_factory.inc.php,v 1.4 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -24,17 +24,16 @@
}
- /*!
- @function CreateObject
- @abstract Load a class and include the class file if not done
so already.
- @author mdean
- @author milosch
- @author (thanks to jengo and ralf)
- @discussion This function is used to create an instance of a
class, and if the class file has not been included it will do so.
- @syntax CreateObject('app.class', 'constructor_params');
- @example $phpgw->acl = CreateObject('phpgwapi.acl');
- @param $classname name of class
- @param $p1-$p16 class parameters (all optional)
+ /**
+ * Load a class and include the class file if not done so
already.
+ *
+ * @author mdean
+ * @author milosch
+ * @author (thanks to jengo and ralf)
+ * This function is used to create an instance of a class, and
if the class file has not been included it will do so.
+ * $GLOBALS['phpgw']->acl = createObject('phpgwapi.acl');
+ * @param $classname name of class
+ * @param $p1-$p16 class parameters (all optional)
*/
function CreateObject($class,
$p1='_UNDEF_',$p2='_UNDEF_',$p3='_UNDEF_',$p4='_UNDEF_',
@@ -82,15 +81,14 @@
}
}
- /*!
- @function getClassInfo
- @abstract Convert the class string into an array.
- @author Dirk Schaller <address@hidden>
- @discussion This function is used to convert the first
parameter of CreateObject method ('app.class') into an array (array('app'=>app,
'class'=>class)).
- @syntax getClassInfo('app.class');
- @example $ci = CreateObject('phpgwapi.acl');
- @param $class 'app.class' string
- @return array with key 'app' and key 'class'.
+ /**
+ * Convert the class string into an array.
+ *
+ * @author Dirk Schaller <address@hidden>
+ * This function is used to convert the first parameter of
CreateObject method ('app.class') into an array (array('app'=>app,
'class'=>class)).
+ * $ci = createObject('phpgwapi.acl');
+ * @param $class 'app.class' string
+ * @return array with key 'app' and key 'class'.
*/
function getClassInfo($class)
{
Index: class.ofphpgwapi.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.ofphpgwapi.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.ofphpgwapi.inc.php 29 Aug 2006 04:24:29 -0000 1.4
+++ class.ofphpgwapi.inc.php 3 Sep 2006 06:15:27 -0000 1.5
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.ofphpgwapi.inc.php,v 1.4 2006/08/29 04:24:29
skwashd Exp $
+ * @version $Id: class.ofphpgwapi.inc.php,v 1.5 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -18,17 +18,16 @@
*/
class ofphpgwapi extends object_factory
{
- /*!
- @function CreateObject
- @abstract Load a class and include the class file if not done
so already.
- @author mdean
- @author milosch
- @author (thanks to jengo and ralf)
- @discussion This function is used to create an instance of a
class, and if the class file has not been included it will do so.
- @syntax CreateObject('app.class', 'constructor_params');
- @example $phpgw->acl = CreateObject('phpgwapi.acl');
- @param $classname name of class
- @param $p1-$p16 class parameters (all optional)
+ /**
+ * Load a class and include the class file if not done so
already.
+ *
+ * @author mdean
+ * @author milosch
+ * @author (thanks to jengo and ralf)
+ * This function is used to create an instance of a class, and
if the class file has not been included it will do so.
+ * $GLOBALS['phpgw']->acl = createObject('phpgwapi.acl');
+ * @param $classname name of class
+ * @param $p1-$p16 class parameters (all optional)
*/
function CreateObject($class,
$p1='_UNDEF_',$p2='_UNDEF_',$p3='_UNDEF_',$p4='_UNDEF_',
Index: class.pdf.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.pdf.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.pdf.inc.php 3 Sep 2006 04:07:00 -0000 1.5
+++ class.pdf.inc.php 3 Sep 2006 06:15:27 -0000 1.6
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package phpgwapi
* @subpackage utilities
- * @version $Id: class.pdf.inc.php,v 1.5 2006/09/03 04:07:00 skwashd Exp
$
+ * @version $Id: class.pdf.inc.php,v 1.6 2006/09/03 06:15:27 skwashd Exp
$
*
* Example
* <code>
@@ -19,7 +19,7 @@
* 'xslt_app' => false
* );
*
- * $pdf = CreateObject('phpgwapi.pdf');
+ * $pdf = createObject('phpgwapi.pdf');
*
* @set_time_limit(1800); //allows for generation of complex
documents
* $pdf -> ezSetMargins(50,70,50,50);
@@ -45,7 +45,7 @@
*/
function print_pdf($document = '',$document_name = 'document')
{
- $browser = CreateObject('phpgwapi.browser');
+ $browser = createObject('phpgwapi.browser');
if($browser->BROWSER_AGENT != 'IE')
{
Index: class.phpgw.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.phpgw.inc.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- class.phpgw.inc.php 30 May 2006 05:50:12 -0000 1.51
+++ class.phpgw.inc.php 3 Sep 2006 06:15:27 -0000 1.52
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.phpgw.inc.php,v 1.51 2006/05/30 05:50:12 skwashd
Exp $
+ * @version $Id: class.phpgw.inc.php,v 1.52 2006/09/03 06:15:27 skwashd
Exp $
*/
/**
@@ -127,7 +127,7 @@
/**
* Handles redirects under iis and apache
*
- * This function handles redirects under iis and apache it
assumes that $phpgw->link() has already been called
+ * This function handles redirects under iis and apache it
assumes that $GLOBALS['phpgw']->link() has already been called
*
* @access public
* @param string The url ro redirect to
@@ -172,7 +172,7 @@
*/
function lang($key, $m1 = '', $m2 = '', $m3 = '', $m4 = '')
{
- /* global $phpgw; */
+ /* */
return $this->translation->translate($key);
}
} /* end of class */
Index: class.portalbox.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.portalbox.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- class.portalbox.inc.php 30 Dec 2004 06:47:31 -0000 1.30
+++ class.portalbox.inc.php 3 Sep 2006 06:15:27 -0000 1.31
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.portalbox.inc.php,v 1.30 2004/12/30 06:47:31
skwashd Exp $
+ * @version $Id: class.portalbox.inc.php,v 1.31 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -85,7 +85,7 @@
function start_template()
{
- $this->p =
CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('home'));
+ $this->p =
createObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('home'));
$this->p->set_file(
array(
'PORTAL' => 'portal.tpl'
Index: class.sbox2.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.sbox2.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- class.sbox2.inc.php 30 Dec 2004 06:47:31 -0000 1.16
+++ class.sbox2.inc.php 3 Sep 2006 06:15:27 -0000 1.17
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.sbox2.inc.php,v 1.16 2004/12/30 06:47:31 skwashd
Exp $
+ * @version $Id: class.sbox2.inc.php,v 1.17 2006/09/03 06:15:27 skwashd
Exp $
*/
if(!isset($GLOBALS['phpgw_info']['flags']['included_classes']['sbox']))
@@ -128,7 +128,7 @@
{
if (!is_object($this->bocal))
{
- $this->bocal =
createobject('calendar.bocalendar');
+ $this->bocal =
createObject('calendar.bocalendar');
}
if (!is_array($event) && (int) $event > 0)
{
@@ -174,7 +174,7 @@
{
if (!is_object($this->bocal))
{
- $this->bocal =
createobject('calendar.bocalendar');
+ $this->bocal =
createObject('calendar.bocalendar');
}
if ($query_name)
{
@@ -239,7 +239,7 @@
// echo
"<p>getAddress('$name',$id_name,'$query_name','$title')</p>";
if ($id_name || $query_name)
{
- $contacts = createobject('phpgwapi.contacts');
+ $contacts = createObject('phpgwapi.contacts');
if ($query_name)
{
@@ -271,7 +271,7 @@
if (!is_array($addr))
{
$home = substr($addr,-1) == 'h';
- $contacts = createobject('phpgwapi.contacts');
+ $contacts = createObject('phpgwapi.contacts');
list( $addr ) = $contacts->read_single_entry(
intval($addr) );
}
if ($home)
@@ -305,7 +305,7 @@
// echo
"<p>getAddress('$name',$id_name,'$query_name','$title')</p>";
if ($id_name || $query_name)
{
- $contacts = createobject('phpgwapi.contacts');
+ $contacts = createObject('phpgwapi.contacts');
if ($query_name)
{
@@ -362,7 +362,7 @@
}
if ($id_name || $query_name)
{
- $projects = createobject('projects.boprojects');
+ $projects = createObject('projects.boprojects');
if (!is_object($projects))
{
return '';
@@ -494,8 +494,8 @@
if (!is_array($account_data))
{
- $accounts =
createobject('phpgwapi.accounts',$id);
- $accounts->db = $GLOBALS['phpgw']->db;
+ $accounts =
createObject('phpgwapi.accounts',$id);
+ $accounts->db =& $GLOBALS['phpgw']->db;
$accounts->read_repository();
$account_data = $accounts->data;
}
@@ -518,8 +518,8 @@
*/
function
getAccount($name,$id,$longnames=0,$type='accounts',$multiple=0,$options='')
{
- $accounts = createobject('phpgwapi.accounts');
- $accounts->db = $GLOBALS['phpgw']->db;
+ $accounts = createObject('phpgwapi.accounts');
+ $accounts->db =& $GLOBALS['phpgw']->db;
$accs = $accounts->get_list($type);
if ($multiple < 0)
@@ -561,7 +561,7 @@
{
if (!is_object($this->cat))
{
- $this->cat =
CreateObject('phpgwapi.categories');
+ $this->cat =
createObject('phpgwapi.categories');
}
if ($jscript)
{
Index: class.schema_proc.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.schema_proc.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.schema_proc.inc.php 23 Apr 2006 11:30:22 -0000 1.14
+++ class.schema_proc.inc.php 3 Sep 2006 06:15:27 -0000 1.15
@@ -8,7 +8,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage database
- * @version $Id: class.schema_proc.inc.php,v 1.14 2006/04/23 11:30:22
sigurdne Exp $
+ * @version $Id: class.schema_proc.inc.php,v 1.15 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -30,29 +30,29 @@
switch($dbms)
{
case 'mysql':
- $this->m_oTranslator =
CreateObject('phpgwapi.schema_proc_mysql');
+ $this->m_oTranslator =
createObject('phpgwapi.schema_proc_mysql');
break;
case 'postgres':
- $this->m_oTranslator =
CreateObject('phpgwapi.schema_proc_pgsql');
+ $this->m_oTranslator =
createObject('phpgwapi.schema_proc_pgsql');
break;
case 'oracle':
- $this->m_oTranslator =
CreateObject('phpgwapi.schema_proc_oracle');
+ $this->m_oTranslator =
createObject('phpgwapi.schema_proc_oracle');
break;
case 'sapdb':
- $this->m_oTranslator =
CreateObject('phpgwapi.schema_proc_sapdb');
+ $this->m_oTranslator =
createObject('phpgwapi.schema_proc_sapdb');
break;
case 'mssql':
- $this->m_oTranslator =
CreateObject('phpgwapi.schema_proc_mssql');
+ $this->m_oTranslator =
createObject('phpgwapi.schema_proc_mssql');
break;
default:
//what now?
}
- $this->m_oDeltaProc =
CreateObject('phpgwapi.schema_proc_array');
+ $this->m_oDeltaProc =
createObject('phpgwapi.schema_proc_array');
$this->m_aTables = array();
$this->m_bDeltaOnly = False; // Default to
false here in case it's just a CreateTable script
$this->dbms = $dbms;
Index: class.schema_proc_mssql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.schema_proc_mssql.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- class.schema_proc_mssql.inc.php 28 Apr 2005 18:20:15 -0000 1.7
+++ class.schema_proc_mssql.inc.php 3 Sep 2006 06:15:27 -0000 1.8
@@ -8,7 +8,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage database
- * @version $Id: class.schema_proc_mssql.inc.php,v 1.7 2005/04/28
18:20:15 fipsfuchs Exp $
+ * @version $Id: class.schema_proc_mssql.inc.php,v 1.8 2006/09/03
06:15:27 skwashd Exp $
*/
/**
Index: class.schema_proc_mysql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.schema_proc_mysql.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- class.schema_proc_mysql.inc.php 15 Aug 2006 13:52:55 -0000 1.16
+++ class.schema_proc_mysql.inc.php 3 Sep 2006 06:15:27 -0000 1.17
@@ -8,7 +8,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage database
- * @version $Id: class.schema_proc_mysql.inc.php,v 1.16 2006/08/15
13:52:55 skwashd Exp $
+ * @version $Id: class.schema_proc_mysql.inc.php,v 1.17 2006/09/03
06:15:27 skwashd Exp $
*/
/**
@@ -32,7 +32,7 @@
$this->m_sStatementTerminator = ';';
/* The use of a temp_db is to allow this process to be
run from other than setup*/
- $temp_db = CreateObject('phpgwapi.db');
+ $temp_db = createObject('phpgwapi.db');
if( isset($GLOBALS['phpgw_info']['server']['db_name'])
&& strlen($GLOBALS['phpgw_info']['server']['db_name']) )
{
Index: class.schema_proc_oracle.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.schema_proc_oracle.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- class.schema_proc_oracle.inc.php 30 Dec 2004 06:47:31 -0000 1.2
+++ class.schema_proc_oracle.inc.php 3 Sep 2006 06:15:27 -0000 1.3
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage database
- * @version $Id: class.schema_proc_oracle.inc.php,v 1.2 2004/12/30
06:47:31 skwashd Exp $
+ * @version $Id: class.schema_proc_oracle.inc.php,v 1.3 2006/09/03
06:15:27 skwashd Exp $
*/
/**
Index: class.schema_proc_pgsql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.schema_proc_pgsql.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.schema_proc_pgsql.inc.php 17 May 2006 19:36:51 -0000 1.17
+++ class.schema_proc_pgsql.inc.php 3 Sep 2006 06:15:27 -0000 1.18
@@ -12,7 +12,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage database
- * @version $Id: class.schema_proc_pgsql.inc.php,v 1.17 2006/05/17
19:36:51 sigurdne Exp $
+ * @version $Id: class.schema_proc_pgsql.inc.php,v 1.18 2006/09/03
06:15:27 skwashd Exp $
* @link http://www.greatbridge.org/project/phppgadmin
* @internal SQL for table properties taken from phpPgAdmin Version 2.2.1
*/
Index: class.schema_proc_sapdb.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.schema_proc_sapdb.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.schema_proc_sapdb.inc.php 30 Dec 2004 06:47:31 -0000 1.4
+++ class.schema_proc_sapdb.inc.php 3 Sep 2006 06:15:27 -0000 1.5
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage database
- * @version $Id: class.schema_proc_sapdb.inc.php,v 1.4 2004/12/30
06:47:31 skwashd Exp $
+ * @version $Id: class.schema_proc_sapdb.inc.php,v 1.5 2006/09/03
06:15:27 skwashd Exp $
*/
/**
Index: class.send.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.send.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- class.send.inc.php 30 Dec 2004 06:47:31 -0000 1.19
+++ class.send.inc.php 3 Sep 2006 06:15:27 -0000 1.20
@@ -7,15 +7,15 @@
* @copyright Portions Copyright (C) 2004 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
- * @subpackage network
- * @version $Id: class.send.inc.php,v 1.19 2004/12/30 06:47:31 skwashd
Exp $
+ * @subpackage communication
+ * @version $Id: class.send.inc.php,v 1.20 2006/09/03 06:15:27 skwashd
Exp $
*/
/**
* SMTP mailer
*
* @package phpgwapi
- * @subpackage network
+ * @package communication
* This module should replace php's mail() function. It is fully syntax
* compatible. In addition, when an error occures, a detailed error info
* is stored in the array $send->err (see ../inc/email/global.inc.php for
@@ -44,8 +44,44 @@
$sender =
$GLOBALS['phpgw_info']['user']['fullname'].'
<'.$GLOBALS['phpgw_info']['user']['preferences']['email']['address'].'>';
}
- if ($service == "email")
+ switch( $service )
{
+ case 'email':
+ $this->send_email($to, $subject, $body,
$msgtype, $cc, $bcc, $from, $sender, $content_type,
$boundary='Message-Boundary');
+ break;
+ }
+ }
+
+ function send_email($to, $subject, $body, $msgtype, $cc, $bcc,
$from, $sender, $content_type, $ignored)
+ {
+ $smtp = createObject('phpgwapi.mailer_smtp');
+ $from_array = split('<', $from);
+ unset($from);
+ if ( count($from_array) == 2 )
+ {
+ $smtp->From = $from_array[1];
+ $stmp->FromName = $from_array[0];
+ }
+ else
+ {
+ $smtp->From = $from_array[0];
+ }
+
+ $to_array = split('<', $to);
+ unset($to);
+ if ( count($to_array) == 2 )
+ {
+ $mail->AddAddress($to_array[1], $to_array[0]);
+ }
+ else
+ {
+ $mail->AddAddress($to_array[0]);
+ }
+
+ $smtp->subject = $subject;
+ }
+
+ /*
$now = getdate();
$header = 'Date: '.gmdate('D, d M Y H:i:s').'
+0000'."\n";
$header .= 'From: '.$from."\n";
@@ -69,15 +105,6 @@
}
$header .= 'X-Mailer: phpGroupWare
(http://www.phpgroupware.org)'."\n";
- /* // moved to email/send_message.php
- if
($GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig'] &&
$attach_sig)
- {
- //$body .=
"\n-----\n".$GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig'];
- $get_sig =
$this->sig_html_to_text($GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig']);
- $body .= "\n-----\n" .$get_sig;
- }
- */
-
if (empty($content_type))
{
$content_type ='plain';
@@ -118,7 +145,7 @@
{
if(!is_object($GLOBALS['phpgw']->msg))
{
- $GLOBALS['phpgw']->msg =
CreateObject('email.mail_msg');
+ $GLOBALS['phpgw']->msg =
createObject('email.mail_msg');
}
$args_array = Array();
$args_array['do_login'] = True;
@@ -145,15 +172,16 @@
// nothing is here?
}
}
+ */
// ==================================================[ some
sub-functions ]===
- /*!
- @function encode_subject
- @abstract encode 8-bit chars in subject-line
- @author ralfbecker
- @note the quoted subjects get a header stateing the charset
(eg. "=?iso-8859-1?Q?"), the \
- 8-bit chars as '=XX' (XX is the hex-representation of
the char) and a trainling '?='.
+ /**
+ * encode 8-bit chars in subject-line
+ *
+ * @author ralfbecker
+ * the quoted subjects get a header stateing the charset (eg.
"=?iso-8859-1?Q?"), the \
+ * 8-bit chars as '=XX' (XX is the hex-representation of
the char) and a trainling '?='.
*/
function encode_subject($subject)
{
Index: class.service.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.service.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.service.inc.php 4 May 2005 08:23:35 -0000 1.5
+++ class.service.inc.php 3 Sep 2006 06:15:27 -0000 1.6
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.service.inc.php,v 1.5 2005/05/04 08:23:35
powerstat Exp $
+ * @version $Id: class.service.inc.php,v 1.6 2006/09/03 06:15:27 skwashd
Exp $
*/
/**
@@ -38,10 +38,10 @@
case 'contacts':
case 'notes':
case 'todo':
- $child =
CreateObject('phpgwapi.service_' . $service);
+ $child =
createObject('phpgwapi.service_' . $service);
break;
default:
- $child = CreateObject($service);
+ $child = createObject($service);
}
if($function)
{
Index: class.sessions.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.sessions.inc.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- class.sessions.inc.php 30 Aug 2006 15:23:14 -0000 1.114
+++ class.sessions.inc.php 3 Sep 2006 06:15:27 -0000 1.115
@@ -10,7 +10,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.sessions.inc.php,v 1.114 2006/08/30 15:23:14
skwashd Exp $
+ * @version $Id: class.sessions.inc.php,v 1.115 2006/09/03 06:15:27
skwashd Exp $
* @link http://www.sanisoft.com/phplib/manual/session.php
*/
@@ -136,7 +136,7 @@
$this->kp3 = get_var('kp3',array('GET','COOKIE'));
/* Create the crypto object */
- $GLOBALS['phpgw']->crypto =
CreateObject('phpgwapi.crypto');
+ $GLOBALS['phpgw']->crypto =
createObject('phpgwapi.crypto');
$this->phpgw_set_cookiedomain();
// verfiy and if necessary create and save our config
settings
@@ -187,7 +187,7 @@
}
if ($save_rep)
{
- $config =
CreateObject('phpgwapi.config','phpgwapi');
+ $config =
createObject('phpgwapi.config','phpgwapi');
$config->read_repository();
$config->value('max_access_log_age',$GLOBALS['phpgw_info']['server']['max_access_log_age']);
$config->value('block_time',$GLOBALS['phpgw_info']['server']['block_time']);
@@ -672,7 +672,7 @@
if(!is_object($GLOBALS['phpgw']->send))
{
- $GLOBALS['phpgw']->send =
CreateObject('phpgwapi.send');
+ $GLOBALS['phpgw']->send =
createObject('phpgwapi.send');
}
$subject =
$GLOBALS['phpgw']->send->encode_subject($subject);
$admin_mails =
explode(',',$GLOBALS['phpgw_info']['server']['admin_mails']);
@@ -681,7 +681,7 @@
$GLOBALS['phpgw']->send->msg('email',$to,$subject,$body,'','','',$from,$from);
}
// save time of mail, to not send to many mails
- $config =
CreateObject('phpgwapi.config','phpgwapi');
+ $config =
createObject('phpgwapi.config','phpgwapi');
$config->read_repository();
$config->value('login_blocked_mail_time',time());
$config->save_repository();
@@ -698,7 +698,7 @@
*/
function verify_server($sessionid, $kp3)
{
- $GLOBALS['phpgw']->interserver =
CreateObject('phpgwapi.interserver');
+ $GLOBALS['phpgw']->interserver =
createObject('phpgwapi.interserver');
$this->sessionid = $sessionid;
$this->kp3 = $kp3;
@@ -828,7 +828,7 @@
*/
function create_server($login,$passwd)
{
- $GLOBALS['phpgw']->interserver =
CreateObject('phpgwapi.interserver');
+ $GLOBALS['phpgw']->interserver =
createObject('phpgwapi.interserver');
$this->login = $login;
$this->passwd = $passwd;
$this->clean_sessions();
Index: class.sessions_db.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.sessions_db.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.sessions_db.inc.php 12 May 2005 18:00:08 -0000 1.20
+++ class.sessions_db.inc.php 3 Sep 2006 06:15:27 -0000 1.21
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.sessions_db.inc.php,v 1.20 2005/05/12 18:00:08
fipsfuchs Exp $
+ * @version $Id: class.sessions_db.inc.php,v 1.21 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -196,9 +196,9 @@
return $values;
}
- /*!
- @function total
- @abstract get number of normal / non-anonymous sessions
+ /**
+ * get number of normal / non-anonymous sessions
+ *
*/
function total()
{
Index: class.sessions_php4.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.sessions_php4.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.sessions_php4.inc.php 30 Aug 2006 15:23:14 -0000 1.25
+++ class.sessions_php4.inc.php 3 Sep 2006 06:15:27 -0000 1.26
@@ -8,7 +8,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.sessions_php4.inc.php,v 1.25 2006/08/30 15:23:14
skwashd Exp $
+ * @version $Id: class.sessions_php4.inc.php,v 1.26 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -189,11 +189,11 @@
$b[$GLOBALS['phpgw']->session->sort_by]) * $sign;
}
- /*!
- @function list_sessions
- @abstract get list of normal / non-anonymous sessions
- @note The data form the session-files get cached in the
app_session phpgwapi/php4_session_cache
- @author ralfbecker
+ /**
+ * get list of normal / non-anonymous sessions
+ *
+ * The data form the session-files get cached in the
app_session phpgwapi/php4_session_cache
+ * @author ralfbecker
*/
function list_sessions($start,$order,$sort,$all_no_sort = False)
{
@@ -278,10 +278,10 @@
return $values;
}
- /*!
- @function total
- @abstract get number of normal / non-anonymous sessions
- @author ralfbecker
+ /**
+ * get number of normal / non-anonymous sessions
+ *
+ * @author ralfbecker
*/
function total()
{
Index: class.setup.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.setup.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- class.setup.inc.php 15 Aug 2006 13:57:01 -0000 1.26
+++ class.setup.inc.php 3 Sep 2006 06:15:27 -0000 1.27
@@ -9,7 +9,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.setup.inc.php,v 1.26 2006/08/15 13:57:01 skwashd
Exp $
+ * @version $Id: class.setup.inc.php,v 1.27 2006/09/03 06:15:27 skwashd
Exp $
*/
/**
@@ -36,8 +36,8 @@
function setup($html = False, $translation = False)
{
- $this->detection =
CreateObject('phpgwapi.setup_detection');
- $this->process =
CreateObject('phpgwapi.setup_process');
+ $this->detection =
createObject('phpgwapi.setup_detection');
+ $this->process =
createObject('phpgwapi.setup_process');
/* The setup application needs these */
$this->html = $html ?
CreateObject('phpgwapi.setup_html') : '';
@@ -48,9 +48,9 @@
$this->tbl_hooks = $this->get_hooks_table_name();
}
- /*!
- @function loaddb
- @abstract include api db class for the ConfigDomain and connect
to the db
+ /**
+ * include api db class for the ConfigDomain and connect to the
db
+ *
*/
function loaddb()
{
@@ -59,7 +59,7 @@
$GLOBALS['phpgw_info']['server']['db_type'] =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_type'];
- $this->db = CreateObject('phpgwapi.db');
+ $this->db = createObject('phpgwapi.db');
$this->db->Host =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_host'];
$this->db->Type =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_type'];
$this->db->Database =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_name'];
@@ -69,10 +69,10 @@
$GLOBALS['ConfigDomain'] = $ConfigDomain;
}
- /*!
- @function auth
- @abstract authenticate the setup user
- @param $auth_type ???
+ /**
+ * authenticate the setup user
+ *
+ * @param $auth_type ???
*/
function auth($auth_type='Config')
{
@@ -261,10 +261,10 @@
return True;
}
- /*!
- @function get_major
- @abstract Return X.X.X major version from X.X.X.X versionstring
- @param $
+ /**
+ * Return X.X.X major version from X.X.X.X versionstring
+ *
+ * @param $
*/
function get_major($versionstring)
{
@@ -280,10 +280,10 @@
return $major;
}
- /*!
- @function clear_session_cache
- @abstract Clear system/user level cache so as to have it
rebuilt with the next access
- @param None
+ /**
+ * Clear system/user level cache so as to have it rebuilt with
the next access
+ *
+ * @param None
*/
function clear_session_cache()
{
@@ -302,11 +302,11 @@
}
}
- /*!
- @function register_app
- @abstract Add an application to the phpgw_applications table
- @param $appname Application 'name' with a matching
$setup_info[$appname] array slice
- @param $enable optional, set to True/False to override
setup.inc.php setting
+ /**
+ * Add an application to the phpgw_applications table
+ *
+ * @param $appname Application 'name' with a
matching $setup_info[$appname] array slice
+ * @param $enable * optional, set to True/False
to override setup.inc.php setting
*/
function register_app($appname,$enable=99)
{
@@ -359,11 +359,11 @@
}
}
- /*!
- @function app_registered
- @abstract Check if an application has info in the db
- @param $appname Application 'name' with a matching
$setup_info[$appname] array slice
- @param $enabled optional, set to False to not enable
this app
+ /**
+ * Check if an application has info in the db
+ *
+ * @param $appname Application 'name' with a
matching $setup_info[$appname] array slice
+ * @param $enabled optional, set to False to not
enable this app
*/
function app_registered($appname)
{
@@ -406,11 +406,11 @@
return False;
}
- /*!
- @function update_app
- @abstract Update application info in the db
- @param $appname Application 'name' with a matching
$setup_info[$appname] array slice
- @param $enabled optional, set to False to not enable
this app
+ /**
+ * Update application info in the db
+ *
+ * @param $appname Application 'name' with a
matching $setup_info[$appname] array slice
+ * @param $enabled optional, set to False to not
enable this app
*/
function update_app($appname)
{
@@ -464,12 +464,12 @@
}
}
- /*!
- @function update_app_version
- @abstract Update application version in applications table,
post upgrade
- @param $setup_info Array of application
information (multiple apps or single)
- @param $appname Application 'name' with a
matching $setup_info[$appname] array slice
- @param $tableschanged ???
+ /**
+ * Update application version in applications table, post
upgrade
+ *
+ * @param $setup_info * Array of application
information (multiple apps or single)
+ * @param $appname * Application 'name'
with a matching $setup_info[$appname] array slice
+ * @param $tableschanged ???
*/
function update_app_version($setup_info, $appname,
$tableschanged = True)
{
@@ -498,10 +498,10 @@
return $setup_info;
}
- /*!
- @function deregister_app
- @abstract de-Register an application
- @param $appname Application 'name' with a matching
$setup_info[$appname] array slice
+ /**
+ * de-Register an application
+ *
+ * @param $appname Application 'name' with a
matching $setup_info[$appname] array slice
*/
function deregister_app($appname)
{
@@ -525,10 +525,10 @@
$this->clear_session_cache();
}
- /*!
- @function register_hooks
- @abstract Register an application's hooks
- @param $appname Application 'name' with a matching
$setup_info[$appname] array slice
+ /**
+ * Register an application's hooks
+ *
+ * @param $appname Application 'name' with a
matching $setup_info[$appname] array slice
*/
function register_hooks($appname)
{
@@ -547,25 +547,25 @@
if ( !isset($this->hooks) || !is_object($this->hooks))
{
- $this->hooks =
CreateObject('phpgwapi.hooks',$this->db);
+ $this->hooks =
createObject('phpgwapi.hooks',$this->db);
}
$this->hooks->register_hooks($appname,$setup_info[$appname]['hooks']);
}
- /*!
- @function update_hooks
- @abstract Update an application's hooks
- @param $appname Application 'name' with a matching
$setup_info[$appname] array slice
+ /**
+ * Update an application's hooks
+ *
+ * @param $appname Application 'name' with a
matching $setup_info[$appname] array slice
*/
function update_hooks($appname)
{
$this->register_hooks($appname);
}
- /*!
- @function deregister_hooks
- @abstract de-Register an application's hooks
- @param $appname Application 'name' with a matching
$setup_info[$appname] array slice
+ /**
+ * de-Register an application's hooks
+ *
+ * @param $appname Application 'name' with a
matching $setup_info[$appname] array slice
*/
function deregister_hooks($appname)
{
@@ -583,22 +583,22 @@
//echo "DELETING hooks for: " .
$setup_info[$appname]['name'];
if (!is_object($this->hooks))
{
- $this->hooks =
CreateObject('phpgwapi.hooks',$this->db);
+ $this->hooks =
createObject('phpgwapi.hooks',$this->db);
}
$this->hooks->register_hooks($appname);
}
- /*!
- @function hook
- @abstract call the hooks for a single application
- @param $location hook location - required
- @param $appname application name - optional
+ /**
+ * call the hooks for a single application
+ *
+ * @param $location hook location - required
+ * @param $appname application name - optional
*/
function hook($location, $appname='')
{
if (!is_object($this->hooks))
{
- $this->hooks =
CreateObject('phpgwapi.hooks',$this->db);
+ $this->hooks =
createObject('phpgwapi.hooks',$this->db);
}
return
$this->hooks->single($location,$appname,True,True);
}
@@ -692,12 +692,12 @@
}
}
- /*!
- @function amorethanb
- @abstract phpgw version checking, is param 1 > param 2 in phpgw
versionspeak?
- @param $a phpgw version number to check if more than $b
- @param $b phpgw version number to check $a against
- #return True if $a < $b
+ /**
+ * phpgw version checking, is param 1 > param 2 in phpgw
versionspeak?
+ *
+ * @param $a phpgw version number to check if more
than $b
+ * @param $b phpgw version number to check $a against
+ * #return True if $a < $b
*/
function amorethanb($a,$b,$DEBUG=False)
{
Index: class.setup_detection.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.setup_detection.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- class.setup_detection.inc.php 15 Aug 2006 13:50:10 -0000 1.12
+++ class.setup_detection.inc.php 3 Sep 2006 06:15:27 -0000 1.13
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.setup_detection.inc.php,v 1.12 2006/08/15
13:50:10 skwashd Exp $
+ * @version $Id: class.setup_detection.inc.php,v 1.13 2006/09/03
06:15:27 skwashd Exp $
*/
/**
Index: class.setup_html.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.setup_html.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.setup_html.inc.php 3 Jan 2005 21:48:48 -0000 1.11
+++ class.setup_html.inc.php 3 Sep 2006 06:15:27 -0000 1.12
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.setup_html.inc.php,v 1.11 2005/01/03 21:48:48
skwashd Exp $
+ * @version $Id: class.setup_html.inc.php,v 1.12 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -18,9 +18,9 @@
*/
class setup_html
{
- /*!
- @function generate_header
- @abstract generate header.inc.php file output - NOT a generic
html header function
+ /**
+ * generate header.inc.php file output - NOT a generic html
header function
+ *
*/
function generate_header()
{
Index: class.setup_process.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.setup_process.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.setup_process.inc.php 23 Aug 2006 01:57:24 -0000 1.17
+++ class.setup_process.inc.php 3 Sep 2006 06:15:27 -0000 1.18
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.setup_process.inc.php,v 1.17 2006/08/23 01:57:24
skwashd Exp $
+ * @version $Id: class.setup_process.inc.php,v 1.18 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -32,20 +32,20 @@
function setup_process()
{
- $this->translation =
CreateObject('phpgwapi.setup_translation');
+ $this->translation =
createObject('phpgwapi.setup_translation');
}
- /*!
- @function init_process
- @abstract create schema_proc object
- @param none
+ /**
+ * create schema_proc object
+ *
+ * @param none
*/
function init_process()
{
$ConfigDomain =
get_var('ConfigDomain',array('COOKIE','POST'));
$phpgw_domain = $GLOBALS['phpgw_domain'];
- $GLOBALS['phpgw_setup']->oProc =
CreateObject('phpgwapi.schema_proc',$phpgw_domain[$ConfigDomain]['db_type']);
+ $GLOBALS['phpgw_setup']->oProc =
createObject('phpgwapi.schema_proc',$phpgw_domain[$ConfigDomain]['db_type']);
$GLOBALS['phpgw_setup']->oProc->m_odb =
$GLOBALS['phpgw_setup']->db;
$GLOBALS['phpgw_setup']->oProc->m_odb->Host =
$phpgw_domain[$ConfigDomain]['db_host'];
$GLOBALS['phpgw_setup']->oProc->m_odb->Database =
$phpgw_domain[$ConfigDomain]['db_name'];
@@ -55,13 +55,13 @@
$GLOBALS['phpgw_setup']->oProc->m_odb->connect();
}
- /*!
- @function pass
- @abstract the mother of all multipass upgrade parental loop
functions
- @param $setup_info array of application info from
setup.inc.php files
- @param $type optional, defaults to new(install),
could also be 'upgrade'
- @param $DEBUG optional, print debugging info
- @param $force_en optional, install english language files
+ /**
+ * the mother of all multipass upgrade parental loop functions
+ *
+ * @param $setup_info array of application info from
setup.inc.php files
+ * @param $type optional, defaults to new(install),
could also be 'upgrade'
+ * @param $DEBUG optional, print debugging info
+ * @param $force_en optional, install english language files
*/
function
pass($setup_info,$method='new',$DEBUG=False,$force_en=False)
{
@@ -184,10 +184,10 @@
return ($setup_info);
}
- /*!
- @function droptables
- @abstract drop tables per application, check that they are in
the db first
- @param $setup_info array of application info from
setup.inc.php files, etc.
+ /**
+ * drop tables per application, check that they are in the db
first
+ *
+ * @param $setup_info array of application info from
setup.inc.php files, etc.
*/
function droptables($setup_info,$DEBUG=False)
{
@@ -231,11 +231,11 @@
return ($setup_info);
}
- /*!
- @function current
- @abstract process current table setup in each application/setup
dir
- @param $appinfo array of application info from setup.inc.php
files, etc.
- @discussion This duplicates the old newtables behavior, using
schema_proc
+ /**
+ * process current table setup in each application/setup dir
+ *
+ * @param $appinfo array of application info from
setup.inc.php files, etc.
+ * This duplicates the old newtables behavior, using schema_proc
*/
function current($setup_info, $DEBUG=False)
{
@@ -317,10 +317,10 @@
return ($setup_info);
}
- /*!
- @function default_records
- @abstract process default_records.inc.php in each
application/setup dir
- @param $setup_info array of application info from
setup.inc.php files, etc.
+ /**
+ * process default_records.inc.php in each application/setup dir
+ *
+ * @param $setup_info array of application info from
setup.inc.php files, etc.
*/
function default_records($setup_info,$DEBUG=False)
{
@@ -357,10 +357,10 @@
return ($setup_info);
}
- /*!
- @function add_langs
- @abstract process application lang files and uninstall
- @param $setup_info array of application info from
setup.inc.php files, etc.
+ /**
+ * process application lang files and uninstall
+ *
+ * @param $setup_info array of application info from
setup.inc.php files, etc.
*/
function add_langs($setup_info,$DEBUG=False,$force_en=False)
{
@@ -378,10 +378,10 @@
return ($setup_info);
}
- /*!
- @function drop_langs
- @abstract process application lang files and install
- @param $setup_info array of application info from
setup.inc.php files, etc.
+ /**
+ * process application lang files and install
+ *
+ * @param $setup_info array of application info from
setup.inc.php files, etc.
*/
function drop_langs($setup_info,$DEBUG=False)
{
@@ -399,10 +399,10 @@
return ($setup_info);
}
- /*!
- @function upgrade_langs
- @abstract process application lang files and reinstall
- @param $setup_info array of application info from
setup.inc.php files, etc.
+ /**
+ * process application lang files and reinstall
+ *
+ * @param $setup_info array of application info from
setup.inc.php files, etc.
*/
function upgrade_langs($setup_info,$DEBUG=False)
{
@@ -426,11 +426,11 @@
return ($setup_info);
}
- /*!
- @function test_data
- @abstract process test_data.inc.php in each application/setup
dir for developer tests
- This data should work with the baseline tables
- @param $setup_info array of application info from
setup.inc.php files, etc.
+ /**
+ * process test_data.inc.php in each application/setup dir for
developer tests
+ *
+ * This data should work with the baseline tables
+ * @param $setup_info array of application info from
setup.inc.php files, etc.
*/
function test_data($setup_info,$DEBUG=False)
{
@@ -465,10 +465,10 @@
return ($setup_info);
}
- /*!
- @function baseline
- @abstract process baseline table setup in each
application/setup dir
- @param $appinfo array of application info from setup.inc.php
files, etc.
+ /**
+ * process baseline table setup in each application/setup dir
+ *
+ * @param $appinfo array of application info from
setup.inc.php files, etc.
*/
function baseline($setup_info,$DEBUG=False)
{
@@ -513,10 +513,10 @@
return ($setup_info);
}
- /*!
- @function upgrade
- @abstract process available upgrades in each application/setup
dir
- @param $appinfo array of application info from setup.inc.php
files, etc.
+ /**
+ * process available upgrades in each application/setup dir
+ *
+ * @param $appinfo array of application info from
setup.inc.php files, etc.
*/
function upgrade($setup_info, $DEBUG = false)
{
@@ -759,9 +759,9 @@
return ($setup_info);
}
- /*!
- @function post_process
- @abstract commit above processing to the db
+ /**
+ * commit above processing to the db
+ *
*/
function post_process($tables,$DEBUG=False)
{
@@ -789,10 +789,10 @@
}
}
- /*!
- @function sql_to_array
- @abstract send this a table name, returns printable column spec
and keys for the table from schema_proc
- @param $tablename table whose array you want to see
+ /**
+ * send this a table name, returns printable column spec and
keys for the table from schema_proc
+ *
+ * @param $tablename table whose array you want to
see
*/
function sql_to_array($tablename='')
{
Index: class.setup_translation.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.setup_translation.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.setup_translation.inc.php 30 Dec 2004 06:47:31 -0000 1.6
+++ class.setup_translation.inc.php 3 Sep 2006 06:15:27 -0000 1.7
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.setup_translation.inc.php,v 1.6 2004/12/30
06:47:31 skwashd Exp $
+ * @version $Id: class.setup_translation.inc.php,v 1.7 2006/09/03
06:15:27 skwashd Exp $
*/
if (!defined('MAX_MESSAGE_ID_LENGTH'))
@@ -29,10 +29,10 @@
{
var $langarray;
- /*!
- @function setup_lang
- @abstract constructor for the class, loads all phrases into
langarray
- @param $lang user lang variable (defaults to en)
+ /**
+ * constructor for the class, loads all phrases into langarray
+ *
+ * @param $lang user lang variable (defaults to en)
*/
function setup_translation()
{
@@ -71,11 +71,11 @@
}
}
- /*!
- @function translate
- @abstract Translate phrase to user selected lang
- @param $key phrase to translate
- @param $vars vars sent to lang function, passed to us
+ /**
+ * Translate phrase to user selected lang
+ *
+ * @param $key phrase to translate
+ * @param $vars vars sent to lang function, passed to us
*/
function translate($key, $vars=False)
{
@@ -111,9 +111,9 @@
/* Following functions are called for app (un)install */
- /*!
- @function get_langs
- @abstract return array of installed languages, e.g.
array('de','en')
+ /**
+ * return array of installed languages, e.g. array('de','en')
+ *
*/
function get_langs($DEBUG=False)
{
@@ -135,10 +135,10 @@
return $langs;
}
- /*!
- @function drop_langs
- @abstract delete all lang entries for an application, return
True if langs were found
- @param $appname app_name whose translations you want to delete
+ /**
+ * delete all lang entries for an application, return True if
langs were found
+ *
+ * @param $appname app_name whose translations you want to
delete
*/
function drop_langs($appname,$DEBUG=False)
{
@@ -156,10 +156,10 @@
return False;
}
- /*!
- @function add_langs
- @abstract process an application's lang files, calling
get_langs() to see what langs the admin installed already
- @param $appname app_name of application to process
+ /**
+ * process an application's lang files, calling get_langs() to
see what langs the admin installed already
+ *
+ * @param $appname app_name of application to process
*/
function add_langs($appname,$DEBUG=False,$force_en=False)
{
Index: class.shm.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.shm.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.shm.inc.php 15 Aug 2006 01:22:51 -0000 1.5
+++ class.shm.inc.php 3 Sep 2006 06:15:27 -0000 1.6
@@ -63,7 +63,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package phpgwapi
* @subpackage application
- * @version $Id: class.shm.inc.php,v 1.5 2006/08/15 01:22:51 skwashd Exp
$
+ * @version $Id: class.shm.inc.php,v 1.6 2006/09/03 06:15:27 skwashd Exp
$
*/
class shm
@@ -74,7 +74,7 @@
var $hashid;
/**
- * @constructor
+ * Constructor
*/
function shm()
{
Index: class.soap_server.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.soap_server.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- class.soap_server.inc.php 30 Dec 2004 06:47:31 -0000 1.12
+++ class.soap_server.inc.php 3 Sep 2006 06:15:27 -0000 1.13
@@ -108,7 +108,7 @@
// NOTE:::: throw a fault for no/bad soapaction here?
// parse response, get soap parser obj
- $parser = CreateObject('phpgwapi.soap_parser',$data);
+ $parser = createObject('phpgwapi.soap_parser',$data);
// get/set methodname
$this->methodname = $parser->root_struct_name;
$this->debug("method name: $this->methodname");
@@ -129,12 +129,12 @@
$args = $class;
$class = 'service';
$app = 'phpgwapi';
- $obj =
CreateObject(sprintf('%s.%s',$app,$class),$args);
+ $obj =
createObject(sprintf('%s.%s',$app,$class),$args);
unset($args);
}
else
{
- $obj =
CreateObject(sprintf('%s.%s',$app,$class));
+ $obj =
createObject(sprintf('%s.%s',$app,$class));
}
$this->debug('app: ' . $app . ', class: ' .
$class . ', method: ' . $method);
/*
@@ -294,7 +294,7 @@
/* create soap_val object w/
return values from method, use method signature to determine type */
if(get_class($method_response)
!= 'soapval')
{
- $return_val =
CreateObject('phpgwapi.soapval',$method,$this->return_type,$method_response);
+ $return_val =
createObject('phpgwapi.soapval',$method,$this->return_type,$method_response);
}
else
{
Index: class.soapclient.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.soapclient.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- class.soapclient.inc.php 30 Dec 2004 06:47:31 -0000 1.9
+++ class.soapclient.inc.php 3 Sep 2006 06:15:27 -0000 1.10
@@ -10,7 +10,7 @@
* @copyright Portions Copyright (C) 2003,2004 Free Software Foundation,
Inc. http://www.fsf.org/
* @package phpgwapi
* @subpackage communication
- * @version $Id: class.soapclient.inc.php,v 1.9 2004/12/30 06:47:31
skwashd Exp $
+ * @version $Id: class.soapclient.inc.php,v 1.10 2006/09/03 06:15:27
skwashd Exp $
* @internal This project began based on code from the 2 projects below,
* @internal and still contains some original code. The licenses of both
must be respected.
* @internal XML-RPC for PHP; SOAP for PHP
@@ -61,7 +61,7 @@
if($this->endpointType == 'wsdl')
{
// instantiate wsdl class
- $this->wsdl =
CreateObject('phpgwapi.wsdl',$this->endpoint);
+ $this->wsdl =
createObject('phpgwapi.wsdl',$this->endpoint);
// get portName
if(!$this->portName)
{
@@ -103,12 +103,12 @@
$this->debug("namespace: $namespace");
// make message
- $soapmsg =
CreateObject('phpgwapi.soapmsg',$method,$params,$namespace);
+ $soapmsg =
createObject('phpgwapi.soapmsg',$method,$params,$namespace);
/* _debug_array($soapmsg); */
// instantiate client
$dbg = "calling server at '$this->endpoint'...";
- if($soap_client =
CreateObject('phpgwapi.soap_client',$this->endpoint))
+ if($soap_client =
createObject('phpgwapi.soap_client',$this->endpoint))
{
//$soap_client->debug_flag = true;
$this->debug($dbg.'instantiated client
successfully');
Index: class.soapmsg.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.soapmsg.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- class.soapmsg.inc.php 30 Dec 2004 06:47:31 -0000 1.10
+++ class.soapmsg.inc.php 3 Sep 2006 06:15:27 -0000 1.11
@@ -10,7 +10,7 @@
* @copyright Portions Copyright (C) 2003,2004 Free Software Foundation,
Inc. http://www.fsf.org/
* @package phpgwapi
* @subpackage communication
- * @version $Id: class.soapmsg.inc.php,v 1.10 2004/12/30 06:47:31
skwashd Exp $
+ * @version $Id: class.soapmsg.inc.php,v 1.11 2006/09/03 06:15:27
skwashd Exp $
* @internal This project began based on code from the 2 projects below,
* @internal and still contains some original code. The licenses of both
must be respected.
* @internal XML-RPC for PHP; SOAP for PHP
@@ -32,7 +32,7 @@
$namespaces = $GLOBALS['namespaces'];
// make method struct
- $this->value =
CreateObject('phpgwapi.soapval',$method,"struct",$params,$method_namespace);
+ $this->value =
createObject('phpgwapi.soapval',$method,"struct",$params,$method_namespace);
if(is_array($new_namespaces))
{
$i = count($namespaces);
@@ -139,7 +139,7 @@
*/
$this->debug("about to create parser instance w/ data:
$clean_data");
// parse response
- $response =
CreateObject('phpgwapi.soap_parser',$clean_data);
+ $response =
createObject('phpgwapi.soap_parser',$clean_data);
// return array of parameters
$ret = $response->get_response();
$this->debug($response->debug_str);
Index: class.soapval.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.soapval.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.soapval.inc.php 30 Dec 2004 06:47:31 -0000 1.11
+++ class.soapval.inc.php 3 Sep 2006 06:15:27 -0000 1.12
@@ -10,7 +10,7 @@
* @copyright Portions Copyright (C) 2003,2004 Free Software Foundation,
Inc. http://www.fsf.org/
* @package phpgwapi
* @subpackage communication
- * @version $Id: class.soapval.inc.php,v 1.11 2004/12/30 06:47:31
skwashd Exp $
+ * @version $Id: class.soapval.inc.php,v 1.12 2006/09/03 06:15:27
skwashd Exp $
* @internal This project began based on code from the 2 projects below,
* @internal and still contains some original code. The licenses of both
must be respected.
* @internal XML-RPC for PHP; SOAP for PHP
@@ -202,7 +202,7 @@
{
$type = gettype($v);
}
- $new_val =
CreateObject('phpgwapi.soapval','item',$type,$v);
+ $new_val =
createObject('phpgwapi.soapval','item',$type,$v);
$this->debug($new_val->debug_str);
$this->value[] = $new_val;
}
@@ -265,7 +265,7 @@
$type = gettype($v);
$this->debug("got type
'$type' for value '$v' from php gettype()!");
}
- $new_val =
CreateObject('phpgwapi.soapval',$k,$type,$v);
+ $new_val =
createObject('phpgwapi.soapval',$k,$type,$v);
$this->debug($new_val->debug_str);
$this->value[] = $new_val;
}
Index: class.sql_builder.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.sql_builder.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.sql_builder.inc.php 29 Aug 2006 10:12:08 -0000 1.5
+++ class.sql_builder.inc.php 3 Sep 2006 06:15:27 -0000 1.6
@@ -8,7 +8,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage database
- * @version $Id: class.sql_builder.inc.php,v 1.5 2006/08/29 10:12:08
skwashd Exp $
+ * @version $Id: class.sql_builder.inc.php,v 1.6 2006/09/03 06:15:27
skwashd Exp $
* @internal Development of this application was funded by
http://www.sogrp.com
* @link http://www.sogrp.com/
*/
@@ -102,8 +102,8 @@
* @param mixed $map The same $map that is set in one entity
class
* @param integer $distance To the `$entity' to central_entity
* <code>
- * $contact = CreateObject('phpgwapi.contacts');
- * $my_ent = CreateObject('my_app.my_entity');
+ * $contact = createObject('phpgwapi.contacts');
+ * $my_ent = createObject('my_app.my_entity');
* $contact->add_entity('my_entity', $my_ent->map, 20);
* </code>
*/
@@ -137,7 +137,7 @@
function instance_entity_by_field($field)
{
$entity_name = $this->ent_name($field);
- $entity = CreateObject($entity_name);
+ $entity = createObject($entity_name);
return array($entity_name, &$entity);
}
@@ -151,7 +151,7 @@
}
else
{
- $this->entities[$entity_name] =
CreateObject($entity_name);
+ $this->entities[$entity_name] =
createObject($entity_name);
$this->ldebug('instance_entity',
"Creating object $entity_name",
'msg');
}
@@ -463,7 +463,7 @@
}
else
{
- $entity = CreateObject($entity);
+ $entity = createObject($entity);
$fields = $entity->get_false_fields();
return $fields;
}
@@ -643,7 +643,7 @@
}
else
{
- $instance = CreateObject($entity);
+ $instance = createObject($entity);
if($permanent)
{
$this->entities[$entity] = $instance;
Index: class.sql_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.sql_entity.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.sql_entity.inc.php 6 Aug 2006 04:51:25 -0000 1.4
+++ class.sql_entity.inc.php 3 Sep 2006 06:15:27 -0000 1.5
@@ -8,7 +8,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage database
- * @version $Id: class.sql_entity.inc.php,v 1.4 2006/08/06 04:51:25
skwashd Exp $
+ * @version $Id: class.sql_entity.inc.php,v 1.5 2006/09/03 06:15:27
skwashd Exp $
* @internal Development of this application was funded by
http://www.sogrp.com
* @link http://www.sogrp.com/
*/
Index: class.translation_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.translation_sql.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.translation_sql.inc.php 6 Aug 2006 04:51:26 -0000 1.25
+++ class.translation_sql.inc.php 3 Sep 2006 06:15:27 -0000 1.26
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.translation_sql.inc.php,v 1.25 2006/08/06
04:51:26 skwashd Exp $
+ * @version $Id: class.translation_sql.inc.php,v 1.26 2006/09/03
06:15:27 skwashd Exp $
*/
/**
@@ -39,7 +39,7 @@
{
if ( !isset($GLOBALS['phpgw']->shm) ||
!is_object($GLOBALS['phpgw']->shm) )
{
- $GLOBALS['phpgw']->shm =
CreateObject('phpgwapi.shm');
+ $GLOBALS['phpgw']->shm =
createObject('phpgwapi.shm');
}
if(!$userlang = $this->userlang)
Index: class.uijsaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.uijsaddressbook.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- class.uijsaddressbook.inc.php 4 May 2005 06:44:37 -0000 1.3
+++ class.uijsaddressbook.inc.php 3 Sep 2006 06:15:27 -0000 1.4
@@ -9,7 +9,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.uijsaddressbook.inc.php,v 1.3 2005/05/04 06:44:37
powerstat Exp $
+ * @version $Id: class.uijsaddressbook.inc.php,v 1.4 2006/09/03 06:15:27
skwashd Exp $
* @internal Inherited some code from the addressbook.php file
*/
Index: class.utilities.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.utilities.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- class.utilities.inc.php 30 Dec 2004 06:47:31 -0000 1.10
+++ class.utilities.inc.php 3 Sep 2006 06:15:27 -0000 1.11
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage utilities
- * @version $Id: class.utilities.inc.php,v 1.10 2004/12/30 06:47:31
skwashd Exp $
+ * @version $Id: class.utilities.inc.php,v 1.11 2006/09/03 06:15:27
skwashd Exp $
*/
$d1 = strtolower(substr(PHPGW_API_INC,0,3));
@@ -35,12 +35,12 @@
function utilities_()
{
- // $GLOBALS['phpgw']->rssparser =
CreateObject("phpgwapi.rssparser");
- // $GLOBALS['phpgw']->clientsniffer =
CreateObject("phpgwapi.clientsniffer");
- // $GLOBALS['phpgw']->http =
CreateObject("phpgwapi.http");
- // $GLOBALS['phpgw']->matrixview =
CreateObject("phpgwapi.matrixview");
- // $GLOBALS['phpgw']->menutree =
CreateObject("phpgwapi.menutree");
- $GLOBALS['phpgw']->sbox =
CreateObject('phpgwapi.portalbox');
+ // $GLOBALS['phpgw']->rssparser =
createObject("phpgwapi.rssparser");
+ // $GLOBALS['phpgw']->clientsniffer =
createObject("phpgwapi.clientsniffer");
+ // $GLOBALS['phpgw']->http =
createObject("phpgwapi.http");
+ // $GLOBALS['phpgw']->matrixview =
createObject("phpgwapi.matrixview");
+ // $GLOBALS['phpgw']->menutree =
createObject("phpgwapi.menutree");
+ $GLOBALS['phpgw']->sbox =
createObject('phpgwapi.portalbox');
}
}
?>
Index: class.vcard.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.vcard.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.vcard.inc.php 30 Dec 2004 06:47:31 -0000 1.6
+++ class.vcard.inc.php 3 Sep 2006 06:15:27 -0000 1.7
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage network
- * @version $Id: class.vcard.inc.php,v 1.6 2004/12/30 06:47:31 skwashd
Exp $
+ * @version $Id: class.vcard.inc.php,v 1.7 2006/09/03 06:15:27 skwashd
Exp $
*/
/**
@@ -167,7 +167,7 @@
/*
Pass this an associative array of fieldnames and values
returns a clean array based on contacts class std fields
- This array can then be passed via
$phpgw->contacts->add($ownerid,$buffer)
+ This array can then be passed via
$GLOBALS['phpgw']->contacts->add($ownerid,$buffer)
*/
function _parse_in($buffer)
{
Index: class.xml.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.xml.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.xml.inc.php 4 May 2005 13:05:20 -0000 1.4
+++ class.xml.inc.php 3 Sep 2006 06:15:27 -0000 1.5
@@ -7,7 +7,7 @@
* @license http://www.mozilla.org/MPL/ Mozilla Public License Version
1.1
* @package phpgwapi
* @subpackage xml
- * @version $Id: class.xml.inc.php,v 1.4 2005/05/04 13:05:20 powerstat
Exp $
+ * @version $Id: class.xml.inc.php,v 1.5 2006/09/03 06:15:27 skwashd Exp
$
* @link http://www.phpxml.org/
* @link http://www.w3.org/TR/xpath
*/
Index: class.xmlrpc_client.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.xmlrpc_client.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.xmlrpc_client.inc.php 4 May 2005 13:05:20 -0000 1.11
+++ class.xmlrpc_client.inc.php 3 Sep 2006 06:15:27 -0000 1.12
@@ -6,7 +6,7 @@
* @copyright Portions Copyright (C) 2004 Free Software Foundation, Inc.
http://www.fsf.org/
* @package phpgwapi
* @subpackage xml
- * @version $Id: class.xmlrpc_client.inc.php,v 1.11 2005/05/04 13:05:20
powerstat Exp $
+ * @version $Id: class.xmlrpc_client.inc.php,v 1.12 2006/09/03 06:15:27
skwashd Exp $
*/
// Redistribution and use in source and binary forms, with or without
@@ -136,7 +136,7 @@
}
if (!$fp)
{
- $r = CreateObject(
+ $r = createObject(
'phpgwapi.xmlrpcresp',
'',
$GLOBALS['xmlrpcerr']['http_error'],
@@ -249,7 +249,7 @@
if (!$result)
{
$this->errstr = 'Write error';
- $resp = CreateObject(
+ $resp = createObject(
'phpgwapi.xmlrpcresp',
'',
$GLOBALS['xmlrpcerr']['curl_fail'],
Index: class.xmlrpc_server.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.xmlrpc_server.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- class.xmlrpc_server.inc.php 30 Dec 2004 06:47:31 -0000 1.27
+++ class.xmlrpc_server.inc.php 3 Sep 2006 06:15:27 -0000 1.28
@@ -6,7 +6,7 @@
* @copyright Portions Copyright (C) 2003,2004 Free Software Foundation,
Inc. http://www.fsf.org/
* @package phpgwapi
* @subpackage xml
- * @version $Id: class.xmlrpc_server.inc.php,v 1.27 2004/12/30 06:47:31
skwashd Exp $
+ * @version $Id: class.xmlrpc_server.inc.php,v 1.28 2006/09/03 06:15:27
skwashd Exp $
*/
@@ -212,7 +212,7 @@
{
$ele[$key] =
$this->build_resp($val,True);
}
- $this->resp_struct[] =
CreateObject('phpgwapi.xmlrpcval',$ele,'struct');
+ $this->resp_struct[] =
createObject('phpgwapi.xmlrpcval',$ele,'struct');
}
else
{
@@ -234,11 +234,11 @@
// Passing an integer of 0 to the
xmlrpcval constructor results in the value being lost. (jengo)
if ($_type == 'int' && $_res == 0)
{
- $this->resp_struct[] =
CreateObject('phpgwapi.xmlrpcval','0',$_type);
+ $this->resp_struct[] =
createObject('phpgwapi.xmlrpcval','0',$_type);
}
else
{
- $this->resp_struct[] =
CreateObject('phpgwapi.xmlrpcval',$_res,$_type);
+ $this->resp_struct[] =
createObject('phpgwapi.xmlrpcval',$_res,$_type);
}
}
}
@@ -267,7 +267,7 @@
if (!xml_parse($parser, $data, 1))
{
// return XML error as a faultCode
- $r = CreateObject('phpgwapi.xmlrpcresp','',
+ $r = createObject('phpgwapi.xmlrpcresp','',
$GLOBALS['xmlrpcerrxml'] +
xml_get_error_code($parser),
sprintf('XML error: %s at line %d',
xml_error_string(xml_get_error_code($parser)),
@@ -278,7 +278,7 @@
else
{
xml_parser_free($parser);
- $m =
CreateObject('phpgwapi.xmlrpcmsg',$GLOBALS['_xh'][$parser]['method']);
+ $m =
createObject('phpgwapi.xmlrpcmsg',$GLOBALS['_xh'][$parser]['method']);
// now add parameters in
$plist = '';
for($i=0;
$i<sizeof($GLOBALS['_xh'][$parser]['params']); $i++)
@@ -310,7 +310,7 @@
{
if($sysCall && $this->authed)
{
- $r =
CreateObject('phpgwapi.xmlrpcresp',
+ $r =
createObject('phpgwapi.xmlrpcresp',
'',
$GLOBALS['xmlrpcerr']['unknown_method'],
$GLOBALS['xmlrpcstr']['unknown_method'] . ': ' . $methName
@@ -344,7 +344,7 @@
}
else
{
- $r =
CreateObject('phpgwapi.xmlrpcresp',
+ $r =
createObject('phpgwapi.xmlrpcresp',
'',
$GLOBALS['xmlrpcerr']['no_access'],
$GLOBALS['xmlrpcstr']['no_access']
@@ -410,14 +410,14 @@
$this->build_resp($res);
/*_debug_array($this->resp_struct); */
@reset($this->resp_struct);
- $r =
CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',$this->resp_struct,'struct'));
+ $r =
createObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',$this->resp_struct,'struct'));
/*
_debug_array($r); */
}
}
}
else
{
- $r =
CreateObject('phpgwapi.xmlrpcresp',
+ $r =
createObject('phpgwapi.xmlrpcresp',
'',
$GLOBALS['xmlrpcerr']['incorrect_params'],
$GLOBALS['xmlrpcstr']['incorrect_params'] . ': ' . $sr[1]
@@ -429,7 +429,7 @@
// else prepare error response
if(!$this->authed)
{
- $r =
CreateObject('phpgwapi.xmlrpcresp',
+ $r =
createObject('phpgwapi.xmlrpcresp',
CreateObject('phpgwapi.xmlrpcval',
'UNAUTHORIZED',
'string'
@@ -438,7 +438,7 @@
}
else
{
- $r =
CreateObject('phpgwapi.xmlrpcresp',
+ $r =
createObject('phpgwapi.xmlrpcresp',
'',
$GLOBALS['xmlrpcerr']['unknown_method'],
$GLOBALS['xmlrpcstr']['unknown_method'] . ': ' . $methName
@@ -454,7 +454,7 @@
// a debugging routine: just echos back the input
// packet as a string value
- $r =
CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',"'Aha said
I: '" . $_SERVER['RAW_POST_DATA'],'string'));
+ $r =
createObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',"'Aha said
I: '" . $_SERVER['RAW_POST_DATA'],'string'));
//echo $r->serialize();
$fp = fopen('/tmp/xmlrpc_debug.in','w');
Index: class.xmlrpcmsg.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.xmlrpcmsg.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.xmlrpcmsg.inc.php 30 Dec 2004 06:47:31 -0000 1.15
+++ class.xmlrpcmsg.inc.php 3 Sep 2006 06:15:27 -0000 1.16
@@ -6,7 +6,7 @@
* @copyright Portions Copyright (C) 2004 Free Software Foundation, Inc.
http://www.fsf.org/
* @package phpgwapi
* @subpackage xml
- * @version $Id: class.xmlrpcmsg.inc.php,v 1.15 2004/12/30 06:47:31
skwashd Exp $
+ * @version $Id: class.xmlrpcmsg.inc.php,v 1.16 2006/09/03 06:15:27
skwashd Exp $
*/
// License is granted to use or modify this software ('XML-RPC for PHP')
@@ -136,7 +136,7 @@
xml_set_element_handler($parser, 'xmlrpc_se',
'xmlrpc_ee');
xml_set_character_data_handler($parser, 'xmlrpc_cd');
xml_set_default_handler($parser, 'xmlrpc_dh');
-// $xmlrpc_value = CreateObject('phpgwapi.xmlrpcval');
+// $xmlrpc_value = createObject('phpgwapi.xmlrpcval');
$hdrfnd = 0;
if ($this->debug)
@@ -146,7 +146,7 @@
if ($data == '')
{
error_log('No response received from server.');
- $r = CreateObject(
+ $r = createObject(
'phpgwapi.xmlrpcresp',
0,
$GLOBALS['xmlrpcerr']['no_data'],
@@ -162,7 +162,7 @@
{
$errstr = substr($data, 0, strpos($data,
"\n")-1);
error_log('HTTP error, got response: '
.$errstr);
- $r = CreateObject('phpgwapi.xmlrpcresp','',
$GLOBALS['xmlrpcerr']['http_error'],
+ $r = createObject('phpgwapi.xmlrpcresp','',
$GLOBALS['xmlrpcerr']['http_error'],
$GLOBALS['xmlrpcstr']['http_error'] . '
(' . $errstr . ')');
xml_parser_free($parser);
return $r;
@@ -210,7 +210,7 @@
xml_get_current_line_number($parser));
}
error_log($errstr);
- $r = CreateObject('phpgwapi.xmlrpcresp', '',
$GLOBALS['xmlrpcerr']['invalid_return'],$GLOBALS['xmlrpcstr']['invalid_return']);
+ $r = createObject('phpgwapi.xmlrpcresp', '',
$GLOBALS['xmlrpcerr']['invalid_return'],$GLOBALS['xmlrpcstr']['invalid_return']);
xml_parser_free($parser);
return $r;
}
@@ -226,7 +226,7 @@
// then something odd has happened
// and it's time to generate a client side error
// indicating something odd went on
- $r = CreateObject('phpgwapi.xmlrpcresp', '',
$GLOBALS['xmlrpcerr']['invalid_return'],$GLOBALS['xmlrpcstr']['invalid_return']);
+ $r = createObject('phpgwapi.xmlrpcresp', '',
$GLOBALS['xmlrpcerr']['invalid_return'],$GLOBALS['xmlrpcstr']['invalid_return']);
}
else
{
@@ -237,11 +237,11 @@
{
$f = $v->structmem('faultCode');
$fs = $v->structmem('faultString');
- $r =
CreateObject('phpgwapi.xmlrpcresp',$v, $f->scalarval(), $fs->scalarval());
+ $r =
createObject('phpgwapi.xmlrpcresp',$v, $f->scalarval(), $fs->scalarval());
}
else
{
- $r =
CreateObject('phpgwapi.xmlrpcresp',$v);
+ $r =
createObject('phpgwapi.xmlrpcresp',$v);
}
}
$r->hdrs = $GLOBALS['_xh'][$parser]['ha'];
//split("\r?\n", $GLOBALS['_xh'][$parser]['ha'][1]);
Index: class.xmlrpcresp.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.xmlrpcresp.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- class.xmlrpcresp.inc.php 30 Dec 2004 06:47:31 -0000 1.7
+++ class.xmlrpcresp.inc.php 3 Sep 2006 06:15:27 -0000 1.8
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage xml
- * @version $Id: class.xmlrpcresp.inc.php,v 1.7 2004/12/30 06:47:31
skwashd Exp $
+ * @version $Id: class.xmlrpcresp.inc.php,v 1.8 2006/09/03 06:15:27
skwashd Exp $
*/
// License is granted to use or modify this software ("XML-RPC for PHP")
Index: class.xmlrpcval.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.xmlrpcval.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- class.xmlrpcval.inc.php 30 Dec 2004 06:47:31 -0000 1.10
+++ class.xmlrpcval.inc.php 3 Sep 2006 06:15:27 -0000 1.11
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage xml
- * @version $Id: class.xmlrpcval.inc.php,v 1.10 2004/12/30 06:47:31
skwashd Exp $
+ * @version $Id: class.xmlrpcval.inc.php,v 1.11 2006/09/03 06:15:27
skwashd Exp $
*/
// License is granted to use or modify this software ("XML-RPC for PHP")
@@ -95,7 +95,7 @@
{
// we're adding to an array here
$ar=$this->me['array'];
- $ar[] = CreateObject('phpgwapi.xmlrpcval',$val,
$type);
+ $ar[] = createObject('phpgwapi.xmlrpcval',$val,
$type);
$this->me['array']=$ar;
}
else
Index: class.xslttemplates.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.xslttemplates.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- class.xslttemplates.inc.php 30 Aug 2006 05:12:16 -0000 1.30
+++ class.xslttemplates.inc.php 3 Sep 2006 06:15:27 -0000 1.31
@@ -8,7 +8,7 @@
* @license http://www.gnu.org/licenses/lpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.xslttemplates.inc.php,v 1.30 2006/08/30 05:12:16
skwashd Exp $
+ * @version $Id: class.xslttemplates.inc.php,v 1.31 2006/09/03 06:15:27
skwashd Exp $
*/
if( (floor(phpversion()) == 4 && !extension_loaded('xslt') )
Index: common_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/common_functions.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- common_functions.inc.php 29 Aug 2006 04:24:29 -0000 1.22
+++ common_functions.inc.php 3 Sep 2006 06:15:27 -0000 1.23
@@ -7,25 +7,25 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage utilities
- * @version $Id: common_functions.inc.php,v 1.22 2006/08/29 04:24:29
skwashd Exp $
+ * @version $Id: common_functions.inc.php,v 1.23 2006/09/03 06:15:27
skwashd Exp $
*/
/****************************************************************************\
* Direct functions which are not part of the API classes
*
* because they are required to be available at the lowest level.
*
\***************************************************************************/
- /*!
- @collection_start direct functions
- @abstract Direct functions which are not part of the API classes
because they are required to be available at the lowest level.
+ /**
+ * @collection_start direct functions
+ * Direct functions which are not part of the API classes because they
are required to be available at the lowest level.
+ *
*/
- /*!
- @function safe_args
- @abstract Allows for array and direct function params as well as
sanatization.
- @author seek3r
- @discussion This function is used to validate param data as well as
offer flexible function usage.
- @syntax safe_args($expected_args, $recieved_args,__LINE__,__FILE__);
- @example
+ /**
+ * Allows for array and direct function params as well as sanatization.
+ *
+ * @author seek3r
+ * This function is used to validate param data as well as offer
flexible function usage.
+ *
function somefunc()
{
$expected_args[0] =
Array('name'=>'fname','default'=>'joe', 'type'=>'string');
@@ -139,13 +139,12 @@
return $args;
}
- /*!
- @function sanitize
- @abstract Validate data.
- @author seek3r
- @discussion This function is used to validate input data.
- @syntax sanitize('type', 'match string');
- @example sanitize('number',$somestring);
+ /**
+ * Validate data.
+ *
+ * @author seek3r
+ * This function is used to validate input data.
+ * sanitize('number',$somestring);
*/
/*
@@ -443,33 +442,31 @@
return $result;
}
- /*!
- @function get_var
- @abstract retrieve a value from either a POST, GET, COOKIE, SERVER or
from a class variable.
- @author skeeter
- @discussion This function is used to retrieve a value from a user
defined order of methods.
- @syntax get_var('id',array('POST','GET','COOKIE','GLOBAL','DEFAULT'));
- @example $this->id =
get_var('id',array('POST','GET','COOKIE','GLOBAL','DEFAULT'));
- @param $variable name
- @param $method ordered array of methods to search for supplied variable
- @param $default_value (optional)
+ /**
+ * retrieve a value from either a POST, GET, COOKIE, SERVER or from a
class variable.
+ *
+ * @author skeeter
+ * This function is used to retrieve a value from a user defined order
of methods.
+ * $this->id =
get_var('id',array('POST','GET','COOKIE','GLOBAL','DEFAULT'));
+ * @param $variable name
+ * @param $method ordered array of methods to search for supplied
variable
+ * @param $default_value (optional)
*/
function get_var($variable,$method='any',$default_value='')
{
return reg_var($variable,$method,'any',$default_value,False);
}
- /*!
- @function include_class
- @abstract This will include an application class once and guarantee
that it is loaded only once. Similar to CreateObject, but does not instantiate
the class.
- @author dschaller
- @discussion This will include an application class once and guarantee
that it is loaded only once. Similar to CreateObject, but does not instantiate
the class.
- @syntax include_class('<appName>.<className>', '<classPath>');
- @example include_class('projects.ui_base');
- @param $appName name of application
- @param $className name of class
- @param $classPath path to the application class, default is 'inc/',
use this parameter i.e. if the class is located in a subdirectory like
'inc/base_classes/'
- @return boolean true if class is included, else false (false means
class could not included)
+ /**
+ * This will include an application class once and guarantee that it
is loaded only once. Similar to CreateObject, but does not instantiate the
class.
+ *
+ * @author dschaller
+ * This will include an application class once and guarantee that it
is loaded only once. Similar to CreateObject, but does not instantiate the
class.
+ * include_class('projects.ui_base');
+ * @param $appName name of application
+ * @param $className name of class
+ * @param $classPath path to the application class, default is 'inc/',
use this parameter i.e. if the class is located in a subdirectory like
'inc/base_classes/'
+ * @return boolean true if class is included, else false (false means
class could not included)
*/
function include_class($appName, $className, $classPath='inc/')
{
@@ -496,16 +493,15 @@
// include object factory base class once
include_once(PHPGW_SERVER_ROOT.'/phpgwapi/inc/class.object_factory.inc.php');
- /*!
- @function CreateObject
- @abstract delegate the object creation into the module.
- @author Dirk Schaller
- @author Phillip Kamps
- @discussion This function is used to create an instance of a class.
Its delegates the creation process into the called module and its factory
class. If a module has no factory class, then its use the old CreateObject
method. The old CreateObject method is moved into the base object factory class.
- @syntax CreateObject('app.class', 'constructor_params');
- @example $phpgw->acl = CreateObject('phpgwapi.acl');
- @param $classname name of class
- @param $p1-$p16 class parameters (all optional)
+ /**
+ * delegate the object creation into the module.
+ *
+ * @author Dirk Schaller
+ * @author Phillip Kamps
+ * This function is used to create an instance of a class. Its
delegates the creation process into the called module and its factory class. If
a module has no factory class, then its use the old CreateObject method. The
old CreateObject method is moved into the base object factory class.
+ * $GLOBALS['phpgw']->acl = createObject('phpgwapi.acl');
+ * @param $classname name of class
+ * @param $p1-$p16 class parameters (all optional)
*/
function CreateObject($class,
$p1='_UNDEF_',$p2='_UNDEF_',$p3='_UNDEF_',$p4='_UNDEF_',
@@ -533,17 +529,16 @@
return $of_class->createObject($class,
$p1,$p2,$p3,$p4,$p5,$p6,$p7,$p8,$p9,$p10,$p11,$p12,$p13,$p14,$p15,$p16);
}
- /*!
- @function ExecMethod
- @abstract Execute a function, and load a class and include the class
file if not done so already.
- @author seek3r
- @discussion This function is used to create an instance of a class,
and if the class file has not been included it will do so.
- @syntax ExecObject('app.class', 'constructor_params');
- @param $method to execute
- @param $functionparams function param should be an array
- @param $loglevel developers choice of logging level
- @param $classparams params to be sent to the contructor
- @example ExecObject('phpgwapi.acl.read');
+ /**
+ * Execute a function, and load a class and include the class file if
not done so already.
+ *
+ * @author seek3r
+ * This function is used to create an instance of a class, and if the
class file has not been included it will do so.
+ * @param $method to execute
+ * @param $functionparams function param should be an array
+ * @param $loglevel developers choice of logging level
+ * @param $classparams params to be sent to the contructor
+ * ExecObject('phpgwapi.acl.read');
*/
function ExecMethod($method, $functionparams = '_UNDEF_', $loglevel =
3, $classparams = '_UNDEF_')
{
@@ -556,11 +551,11 @@
{
if ($classparams != '_UNDEF_' && ($classparams
|| $classparams != 'True'))
{
- $GLOBALS[$classname] =
CreateObject($appname.'.'.$classname, $classparams);
+ $GLOBALS[$classname] =
createObject($appname.'.'.$classname, $classparams);
}
else
{
- $GLOBALS[$classname] =
CreateObject($appname.'.'.$classname);
+ $GLOBALS[$classname] =
createObject($appname.'.'.$classname);
}
}
@@ -606,11 +601,11 @@
{
if ($classparams != '_UNDEF_' && ($classparams
|| $classparams != 'True'))
{
- $$parentobject->$classname =
CreateObject($appname.'.'.$classname, $classparams);
+ $$parentobject->$classname =
createObject($appname.'.'.$classname, $classparams);
}
else
{
- $$parentobject->$classname =
CreateObject($appname.'.'.$classname);
+ $$parentobject->$classname =
createObject($appname.'.'.$classname);
}
}
@@ -629,15 +624,14 @@
}
}
- /*!
- @function get_account_id
- @abstract Return a properly formatted account_id.
- @author skeeter
- @discussion This function will return a properly formatted account_id.
This can take either a name or an account_id as paramters. If a name is
provided it will return the associated id.
- @syntax get_account_id($accountid);
- @example $account_id = get_account_id($accountid);
- @param $account_id either a name or an id
- @param $default_id either a name or an id
+ /**
+ * Return a properly formatted account_id.
+ *
+ * @author skeeter
+ * This function will return a properly formatted account_id. This can
take either a name or an account_id as paramters. If a name is provided it will
return the associated id.
+ * $account_id = get_account_id($accountid);
+ * @param $account_id either a name or an id
+ * @param $default_id either a name or an id
*/
function get_account_id($account_id = '', $default_id = '')
{
@@ -670,10 +664,10 @@
}
}
- /*!
- @function filesystem_separator
- @abstract sets the file system seperator depending on OS
- @result file system separator
+ /**
+ * sets the file system seperator depending on OS
+ *
+ * @return file system separator
*/
function filesystem_separator()
{
@@ -806,12 +800,12 @@
}
}
- /*!
- @function amorethanb
- @abstract phpgw version checking, is param 1 > param 2 in phpgw
versionspeak?
- @param $a phpgw version number to check if more than $b
- @param $b phpgw version number to check $a against
- #return True if $a < $b
+ /**
+ * phpgw version checking, is param 1 > param 2 in phpgw versionspeak?
+ *
+ * @param * $a * phpgw version number to check if more than $b
+ * @param * $b * phpgw version number to check $a against
+ * #return * True if $a < $b
*/
function amorethanb($a,$b,$DEBUG=False)
{
@@ -887,13 +881,13 @@
}
}
- /*!
- @function prepend_tables_prefix
- @abstract prepend a prefix to an array of table names
- @author Adam Hull (aka fixe) - No copyright claim
- @param $prefix the string to be prepended
- @param $tables and array of tables to have the prefix prepended to
- @return array of table names with the prefix prepended
+ /**
+ * prepend a prefix to an array of table names
+ *
+ * @author Adam Hull (aka fixe) - No copyright claim
+ * @param $prefix the string to be prepended
+ * @param $tables and array of tables to have the prefix
prepended to
+ * @return array of table names with the prefix prepended
*/
function prepend_tables_prefix($prefix,$tables)
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -b -r1.195 -r1.196
--- functions.inc.php 30 Aug 2006 15:23:14 -0000 1.195
+++ functions.inc.php 3 Sep 2006 06:15:27 -0000 1.196
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage utilities
- * @version $Id: functions.inc.php,v 1.195 2006/08/30 15:23:14 skwashd
Exp $
+ * @version $Id: functions.inc.php,v 1.196 2006/09/03 06:15:27 skwashd
Exp $
*/
@@ -82,9 +82,9 @@
include_once(PHPGW_API_INC.'/common_functions.inc.php');
- /*!
- @function lang
- @abstract function to handle multilanguage support
+ /**
+ * function to handle multilanguage support
+ *
*/
function
lang($key,$m1='',$m2='',$m3='',$m4='',$m5='',$m6='',$m7='',$m8='',$m9='',$m10='')
{
@@ -192,11 +192,11 @@
* These lines load up the API, fill up the $phpgw_info array, etc
*
\****************************************************************************/
/* Load main class */
- $GLOBALS['phpgw'] = CreateObject('phpgwapi.phpgw');
+ $GLOBALS['phpgw'] = createObject('phpgwapi.phpgw');
/************************************************************************\
* Load up the main instance of the db class.
*
\************************************************************************/
- $GLOBALS['phpgw']->db = CreateObject('phpgwapi.db');
+ $GLOBALS['phpgw']->db = createObject('phpgwapi.db');
$GLOBALS['phpgw']->db->Debug = $GLOBALS['phpgw']->debug ? 1 : 0;
$GLOBALS['phpgw']->db->Halt_On_Error = 'no';
$GLOBALS['phpgw']->adodb =& $GLOBALS['phpgw']->db->adodb;
//Reference
@@ -250,7 +250,7 @@
}
else
{
- $c = CreateObject('phpgwapi.config','phpgwapi');
+ $c = createObject('phpgwapi.config','phpgwapi');
$c->read_repository();
foreach ($c->config_data as $k => $v)
{
@@ -290,17 +290,17 @@
/************************************************************************\
* Required classes
*
\************************************************************************/
- $GLOBALS['phpgw']->log = CreateObject('phpgwapi.log');
+ $GLOBALS['phpgw']->log = createObject('phpgwapi.log');
include_once(PHPGW_API_INC . '/log_functions.inc.php');
- $GLOBALS['phpgw']->translation = CreateObject('phpgwapi.translation');
- $GLOBALS['phpgw']->common =
CreateObject('phpgwapi.common');
- $GLOBALS['phpgw']->hooks =
CreateObject('phpgwapi.hooks');
- $GLOBALS['phpgw']->auth = CreateObject('phpgwapi.auth');
- $GLOBALS['phpgw']->accounts =
CreateObject('phpgwapi.accounts');
- $GLOBALS['phpgw']->acl = CreateObject('phpgwapi.acl');
- $GLOBALS['phpgw']->session =
CreateObject('phpgwapi.sessions');
- $GLOBALS['phpgw']->preferences = CreateObject('phpgwapi.preferences');
- $GLOBALS['phpgw']->applications = CreateObject('phpgwapi.applications');
+ $GLOBALS['phpgw']->translation = createObject('phpgwapi.translation');
+ $GLOBALS['phpgw']->common =
createObject('phpgwapi.common');
+ $GLOBALS['phpgw']->hooks =
createObject('phpgwapi.hooks');
+ $GLOBALS['phpgw']->auth = createObject('phpgwapi.auth');
+ $GLOBALS['phpgw']->accounts =
createObject('phpgwapi.accounts');
+ $GLOBALS['phpgw']->acl = createObject('phpgwapi.acl');
+ $GLOBALS['phpgw']->session =
createObject('phpgwapi.sessions');
+ $GLOBALS['phpgw']->preferences = createObject('phpgwapi.preferences');
+ $GLOBALS['phpgw']->applications = createObject('phpgwapi.applications');
print_debug('main class loaded', 'messageonly','api');
// This include was here before for the old error class. I've left it
in for the
// new log_message class with replaced error. I'm not sure if it is
needed, though. -doug
@@ -345,7 +345,7 @@
print_debug('User ID',$login_id,'app');
$GLOBALS['phpgw']->accounts->accounts($login_id);
$GLOBALS['phpgw']->preferences->preferences($login_id);
- $GLOBALS['phpgw']->datetime =
CreateObject('phpgwapi.datetime');
+ $GLOBALS['phpgw']->datetime =
createObject('phpgwapi.datetime');
}
}
/**************************************************************************\
@@ -394,7 +394,7 @@
unset($redirect_data);
}
- $GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
+ $GLOBALS['phpgw']->datetime = createObject('phpgwapi.datetime');
/* A few hacker resistant constants that will be used throught
the program */
define('PHPGW_TEMPLATE_DIR',
ExecMethod('phpgwapi.phpgw.common.get_tpl_dir', 'phpgwapi'));
@@ -439,7 +439,7 @@
{
$enable_class = str_replace('enable_', '',
$phpgw_class_name[0]);
$enable_class = str_replace('_class', '',
$enable_class);
- $GLOBALS['phpgw']->$enable_class =
createobject("phpgwapi.{$enable_class}");
+ $GLOBALS['phpgw']->$enable_class =
createObject("phpgwapi.{$enable_class}");
}
}
unset($enable_class);
@@ -450,8 +450,8 @@
\*************************************************************************/
if(address@hidden'phpgw_info']['flags']['disable_Template_class'])
{
- $GLOBALS['phpgw']->template =
CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
- $GLOBALS['phpgw']->xslttpl =
CreateObject('phpgwapi.xslttemplates',PHPGW_APP_TPL);
+ $GLOBALS['phpgw']->template =
createObject('phpgwapi.Template',PHPGW_APP_TPL);
+ $GLOBALS['phpgw']->xslttpl =
createObject('phpgwapi.xslttemplates',PHPGW_APP_TPL);
}
/*************************************************************************\
@@ -482,7 +482,7 @@
if(!is_object($GLOBALS['phpgw']->datetime))
{
- $GLOBALS['phpgw']->datetime =
CreateObject('phpgwapi.datetime');
+ $GLOBALS['phpgw']->datetime =
createObject('phpgwapi.datetime');
}
$GLOBALS['phpgw']->applications->read_installed_apps(); // to
get translated app-titles
Index: xml_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/xml_functions.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- xml_functions.inc.php 30 Dec 2004 06:47:32 -0000 1.31
+++ xml_functions.inc.php 3 Sep 2006 06:15:27 -0000 1.32
@@ -6,7 +6,7 @@
* @copyright Portions Copyright (C) 2004 Free Software Foundation, Inc.
http://www.fsf.org/
* @package phpgwapi
* @subpackage communication
- * @version $Id: xml_functions.inc.php,v 1.31 2004/12/30 06:47:32
skwashd Exp $
+ * @version $Id: xml_functions.inc.php,v 1.32 2006/09/03 06:15:27
skwashd Exp $
*/
// License is granted to use or modify this software ("XML-RPC for PHP")
@@ -103,18 +103,18 @@
// formulate backslashes for escaping regexp
$GLOBALS['xmlrpc_backslash'] = chr(92) . chr(92);
- /*!
- @function xmlrpcfault
- @abstract Error reporting for XML-RPC
- @discussion Author: jengo <br>
- Returns XML-RPC fault and stops this execution of the application. <br>
- Syntax: void xmlrpcfault(string) <br>
- Example1: xmlrpcfault('Session could not be verifed'); <br>
- @param $string Error message to be returned.
+ /**
+ * Error reporting for XML-RPC
+ *
+ * Author: jengo <br>
+ * Returns XML-RPC fault and stops this execution of the application.
<br>
+ * Syntax: void xmlrpcfault(string) <br>
+ * Example1: xmlrpcfault('Session could not be verifed'); <br>
+ * @param $string Error message to be returned.
*/
function xmlrpcfault($string)
{
- $r = CreateObject('phpgwapi.xmlrpcresp',
+ $r = createObject('phpgwapi.xmlrpcresp',
CreateObject('phpgwapi.xmlrpcval'),
$GLOBALS['xmlrpcerr']['unknown_method'],
$string
@@ -523,7 +523,7 @@
function phpgw_xmlrpc_encode($php_val)
{
$type = gettype($php_val);
- $xmlrpc_val = CreateObject('phpgwapi.xmlrpcval');
+ $xmlrpc_val = createObject('phpgwapi.xmlrpcval');
switch($type)
{
@@ -569,12 +569,12 @@
$outAr = array();
for(reset($dmap); list($key, $val) = each($dmap); )
{
- $outAr[] = CreateObject('phpgwapi.xmlrpcval',$key,
'string');
+ $outAr[] = createObject('phpgwapi.xmlrpcval',$key,
'string');
}
$dmap = $GLOBALS['_xmlrpcs_dmap'];
for(reset($dmap); list($key, $val) = each($dmap); )
{
- $outAr[] = CreateObject('phpgwapi.xmlrpcval',$key,
'string');
+ $outAr[] = createObject('phpgwapi.xmlrpcval',$key,
'string');
}
$v->addArray($outAr);
return CreateObject('phpgwapi.xmlrpcresp',$v);
@@ -609,20 +609,20 @@
$inSig = $thesigs[$i];
for($j=0; $j<sizeof($inSig); $j++)
{
- $cursig[] =
CreateObject('phpgwapi.xmlrpcval',$inSig[$j], 'string');
+ $cursig[] =
createObject('phpgwapi.xmlrpcval',$inSig[$j], 'string');
}
- $sigs[] =
CreateObject('phpgwapi.xmlrpcval',$cursig, 'array');
+ $sigs[] =
createObject('phpgwapi.xmlrpcval',$cursig, 'array');
}
- $r =
CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',$sigs,
'array'));
+ $r =
createObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',$sigs,
'array'));
}
else
{
- $r = CreateObject('phpgwapi.xmlrpcresp',
CreateObject('phpgwapi.xmlrpcval','undef', 'string'));
+ $r = createObject('phpgwapi.xmlrpcresp',
CreateObject('phpgwapi.xmlrpcval','undef', 'string'));
}
}
else
{
- $r =
CreateObject('phpgwapi.xmlrpcresp',0,$GLOBALS['xmlrpcerr']['introspect_unknown'],$GLOBALS['xmlrpcstr']['introspect_unknown']);
+ $r =
createObject('phpgwapi.xmlrpcresp',0,$GLOBALS['xmlrpcerr']['introspect_unknown'],$GLOBALS['xmlrpcstr']['introspect_unknown']);
}
return $r;
}
@@ -648,16 +648,16 @@
{
if ($dmap[$methName]['docstring'])
{
- $r = CreateObject('phpgwapi.xmlrpcresp',
CreateObject('phpgwapi.xmlrpcval',$dmap[$methName]['docstring']),'string');
+ $r = createObject('phpgwapi.xmlrpcresp',
CreateObject('phpgwapi.xmlrpcval',$dmap[$methName]['docstring']),'string');
}
else
{
- $r = CreateObject('phpgwapi.xmlrpcresp',
CreateObject('phpgwapi.xmlrpcval'), 'string');
+ $r = createObject('phpgwapi.xmlrpcresp',
CreateObject('phpgwapi.xmlrpcval'), 'string');
}
}
else
{
- $r =
CreateObject('phpgwapi.xmlrpcresp',0,$GLOBALS['xmlrpcerr']['introspect_unknown'],$GLOBALS['xmlrpcstr']['introspect_unknown']);
+ $r =
createObject('phpgwapi.xmlrpcresp',0,$GLOBALS['xmlrpcerr']['introspect_unknown'],$GLOBALS['xmlrpcstr']['introspect_unknown']);
}
return $r;
}
@@ -677,7 +677,7 @@
$title = $GLOBALS['phpgw']->db->f('app_title');
$status =
$GLOBALS['phpgw']->db->f('app_enabled');
$version=
$GLOBALS['phpgw']->db->f('app_version');
- $apps[$name] =
CreateObject('phpgwapi.xmlrpcval',
+ $apps[$name] =
createObject('phpgwapi.xmlrpcval',
array(
'title' =>
CreateObject('phpgwapi.xmlrpcval',$title,'string'),
'name' =>
CreateObject('phpgwapi.xmlrpcval',$name,'string'),
@@ -731,13 +731,13 @@
if($sessionid && $kp3)
{
- $rtrn['domain'] =
CreateObject('phpgwapi.xmlrpcval',$domain,'string');
- $rtrn['sessionid'] =
CreateObject('phpgwapi.xmlrpcval',$sessionid,'string');
- $rtrn['kp3'] =
CreateObject('phpgwapi.xmlrpcval',$kp3,'string');
+ $rtrn['domain'] =
createObject('phpgwapi.xmlrpcval',$domain,'string');
+ $rtrn['sessionid'] =
createObject('phpgwapi.xmlrpcval',$sessionid,'string');
+ $rtrn['kp3'] =
createObject('phpgwapi.xmlrpcval',$kp3,'string');
}
else
{
- $rtrn['GOAWAY'] =
CreateObject('phpgwapi.xmlrpcval','XOXO','string');
+ $rtrn['GOAWAY'] =
createObject('phpgwapi.xmlrpcval','XOXO','string');
}
return
CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',$rtrn,'struct'));
}
@@ -766,12 +766,12 @@
if ($later)
{
- $rtrn['GOODBYE'] =
CreateObject('phpgwapi.xmlrpcval','XOXO','string');
+ $rtrn['GOODBYE'] =
createObject('phpgwapi.xmlrpcval','XOXO','string');
}
else
{
/* This never happens, yet */
- $rtrn['OOPS'] =
CreateObject('phpgwapi.xmlrpcval','WHAT?','string');
+ $rtrn['OOPS'] =
createObject('phpgwapi.xmlrpcval','WHAT?','string');
}
return
CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',$rtrn,'struct'));
}
Index: xmlrpc.interop.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/xmlrpc.interop.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- xmlrpc.interop.php 30 Dec 2004 06:47:32 -0000 1.6
+++ xmlrpc.interop.php 3 Sep 2006 06:15:27 -0000 1.7
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage communication
- * @version $Id: xmlrpc.interop.php,v 1.6 2004/12/30 06:47:32 skwashd
Exp $
+ * @version $Id: xmlrpc.interop.php,v 1.7 2006/09/03 06:15:27 skwashd
Exp $
*/
// a PHP version
@@ -141,7 +141,7 @@
{
$v = $m->getParam(0);
$sz = $v->arraysize();
- $rv = CreateObject('phpgwapi.xmlrpcval',array(), xmlrpcArray);
+ $rv = createObject('phpgwapi.xmlrpcval',array(), xmlrpcArray);
for($j=0; $j<$sz; $j++)
{
@@ -204,7 +204,7 @@
// error string for [if|when] things go wrong
$err = '';
// create the output value
- $v = CreateObject('phpgwapi.xmlrpcval');
+ $v = createObject('phpgwapi.xmlrpcval');
$agar = array();
if (isset($sno) && $sno->kindOf()=='array')
@@ -236,7 +236,7 @@
while (list($key,$val) =
each($GLOBALS['agesorter_arr']))
{
// recreate each struct element
- $outAr[] =
CreateObject('phpgwapi.xmlrpcval',array(
+ $outAr[] =
createObject('phpgwapi.xmlrpcval',array(
'name' =>
CreateObject('phpgwapi.xmlrpcval',$key),
'age' =>
CreateObject('phpgwapi.xmlrpcval',$val, 'int')
),
Index: accounts/class.accounts_.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/accounts/class.accounts_.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- accounts/class.accounts_.inc.php 6 Aug 2006 12:56:48 -0000 1.6
+++ accounts/class.accounts_.inc.php 3 Sep 2006 06:15:27 -0000 1.7
@@ -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.6 2006/08/06 12:56:48
skwashd Exp $
+ * @version $Id: class.accounts_.inc.php,v 1.7 2006/09/03 06:15:27
skwashd Exp $
*/
if (empty($GLOBALS['phpgw_info']['server']['account_repository']))
{
@@ -98,7 +98,7 @@
*/
function accounts($account_id = null, $account_type = null)
{
- $this->db = $GLOBALS['phpgw']->db;
+ $this->db =& $GLOBALS['phpgw']->db;
if($account_id != '')
{
@@ -130,7 +130,7 @@
if(is_array($accounts))
{
- $contacts = CreateObject('phpgwapi.contacts');
+ $contacts = createObject('phpgwapi.contacts');
foreach($accounts as $account)
{
@@ -156,7 +156,7 @@
function save_contact_for_account($userData)
{
$owner =
$GLOBALS['phpgw_info']['server']['addressmaster'];
- $contacts = CreateObject('phpgwapi.contacts');
+ $contacts = createObject('phpgwapi.contacts');
$type = $contacts->search_contact_type('Persons');
$comms=(is_array($userData['extra_contact']['comms']))
? $userData['extra_contact']['comms'] : false;
@@ -267,7 +267,7 @@
$account_id = get_account_id($accountid);
$security_equals = Array();
- $acl = CreateObject('phpgwapi.acl');
+ $acl = createObject('phpgwapi.acl');
$security_equals =
$acl->get_ids_for_location($account_id, 1, 'phpgw_group');
unset($acl);
@@ -446,7 +446,7 @@
$sort = 'ASC';
}
- $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
+ $this->nextmatchs = createObject('phpgwapi.nextmatchs');
$GLOBALS['phpgw']->template->set_root($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi'));
Index: accounts/class.accounts_contacts.inc.php
===================================================================
RCS file:
/cvsroot/phpgwapi/phpgwapi/inc/accounts/class.accounts_contacts.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- accounts/class.accounts_contacts.inc.php 30 Dec 2004 06:47:32 -0000
1.2
+++ accounts/class.accounts_contacts.inc.php 3 Sep 2006 06:15:27 -0000
1.3
@@ -7,7 +7,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.accounts_contacts.inc.php,v 1.2 2004/12/30
06:47:32 skwashd Exp $
+ * @version $Id: class.accounts_contacts.inc.php,v 1.3 2006/09/03
06:15:27 skwashd Exp $
*/
/**
@@ -69,7 +69,7 @@
{
if(!$this->contacts)
{
- $this->contacts =
CreateObject('phpgwapi.contacts','0');
+ $this->contacts =
createObject('phpgwapi.contacts','0');
}
}
@@ -295,7 +295,7 @@
{
$account_info['account_id'] =
$this->get_nextid();
}
- $owner = $phpgw_info['user']['account_id'];
+ $owner = $GLOBALS['phpgw_info']['user']['account_id'];
$entry['id'] = $account_info['account_id'];
$entry['lid'] = $account_info['account_lid'];
$entry['n_given'] = $account_info['account_firstname'];
Index: accounts/class.accounts_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/accounts/class.accounts_ldap.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- accounts/class.accounts_ldap.inc.php 11 Aug 2006 07:36:30 -0000
1.9
+++ accounts/class.accounts_ldap.inc.php 3 Sep 2006 06:15:27 -0000
1.10
@@ -11,7 +11,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.accounts_ldap.inc.php,v 1.9 2006/08/11 07:36:30
skwashd Exp $
+ * @version $Id: class.accounts_ldap.inc.php,v 1.10 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -224,7 +224,7 @@
//echo 'listentries <pre>' . print_r($listentries,
true) . '</pre>';
// sort the array
- $arrayFunctions =
CreateObject('phpgwapi.arrayfunctions');
+ $arrayFunctions =
createObject('phpgwapi.arrayfunctions');
if(empty($order))
{
$order = 'account_lid';
Index: accounts/class.accounts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/accounts/class.accounts_sql.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- accounts/class.accounts_sql.inc.php 29 Aug 2006 08:55:10 -0000 1.14
+++ accounts/class.accounts_sql.inc.php 3 Sep 2006 06:15:27 -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_sql.inc.php,v 1.14 2006/08/29 08:55:10
skwashd Exp $
+ * @version $Id: class.accounts_sql.inc.php,v 1.15 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -417,7 +417,7 @@
$lname = $account_name[$account_id]['lname'];
return;
}
- $db = $GLOBALS['phpgw']->db;
+ $db =& $GLOBALS['phpgw']->db;
$db->query('select
account_lid,account_firstname,account_lastname from phpgw_accounts where
account_id=' . intval($account_id),__LINE__,__FILE__);
$db->next_record();
$account_name[$account_id]['lid'] =
$db->f('account_lid');
Index: auth/class.auth_ads.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/auth/class.auth_ads.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- auth/class.auth_ads.inc.php 26 Apr 2005 07:50:36 -0000 1.2
+++ auth/class.auth_ads.inc.php 3 Sep 2006 06:15:27 -0000 1.3
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.auth_ads.inc.php,v 1.2 2005/04/26 07:50:36
powerstat Exp $
+ * @version $Id: class.auth_ads.inc.php,v 1.3 2006/09/03 06:15:27
skwashd Exp $
*/
/**
Index: auth/class.auth_exchange.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/auth/class.auth_exchange.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- auth/class.auth_exchange.inc.php 23 Mar 2005 13:12:52 -0000 1.2
+++ auth/class.auth_exchange.inc.php 3 Sep 2006 06:15:27 -0000 1.3
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.auth_exchange.inc.php,v 1.2 2005/03/23 13:12:52
fipsfuchs Exp $
+ * @version $Id: class.auth_exchange.inc.php,v 1.3 2006/09/03 06:15:27
skwashd Exp $
*/
/**
Index: auth/class.auth_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/auth/class.auth_ldap.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- auth/class.auth_ldap.inc.php 22 Mar 2005 14:53:43 -0000 1.1
+++ auth/class.auth_ldap.inc.php 3 Sep 2006 06:15:27 -0000 1.2
@@ -8,7 +8,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.auth_ldap.inc.php,v 1.1 2005/03/22 14:53:43
fipsfuchs Exp $
+ * @version $Id: class.auth_ldap.inc.php,v 1.2 2006/09/03 06:15:27
skwashd Exp $
*/
/**
Index: auth/class.auth_mail.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/auth/class.auth_mail.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- auth/class.auth_mail.inc.php 22 Mar 2005 14:53:43 -0000 1.1
+++ auth/class.auth_mail.inc.php 3 Sep 2006 06:15:27 -0000 1.2
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.auth_mail.inc.php,v 1.1 2005/03/22 14:53:43
fipsfuchs Exp $
+ * @version $Id: class.auth_mail.inc.php,v 1.2 2006/09/03 06:15:27
skwashd Exp $
*/
/**
Index: auth/class.auth_nis.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/auth/class.auth_nis.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- auth/class.auth_nis.inc.php 22 Mar 2005 14:53:43 -0000 1.1
+++ auth/class.auth_nis.inc.php 3 Sep 2006 06:15:27 -0000 1.2
@@ -7,7 +7,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.auth_nis.inc.php,v 1.1 2005/03/22 14:53:43
fipsfuchs Exp $
+ * @version $Id: class.auth_nis.inc.php,v 1.2 2006/09/03 06:15:27
skwashd Exp $
*/
/**
Index: auth/class.auth_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/auth/class.auth_sql.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- auth/class.auth_sql.inc.php 22 Mar 2005 14:53:43 -0000 1.1
+++ auth/class.auth_sql.inc.php 3 Sep 2006 06:15:27 -0000 1.2
@@ -7,7 +7,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.auth_sql.inc.php,v 1.1 2005/03/22 14:53:43
fipsfuchs Exp $
+ * @version $Id: class.auth_sql.inc.php,v 1.2 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -26,7 +26,7 @@
function authenticate($username, $passwd, $passwd_type)
{
- $db = $GLOBALS['phpgw']->db;
+ $db =& $GLOBALS['phpgw']->db;
if ($passwd_type == 'text')
{
Index: auth/class.auth_sqlssl.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/auth/class.auth_sqlssl.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- auth/class.auth_sqlssl.inc.php 22 Mar 2005 14:53:43 -0000 1.1
+++ auth/class.auth_sqlssl.inc.php 3 Sep 2006 06:15:27 -0000 1.2
@@ -7,7 +7,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.auth_sqlssl.inc.php,v 1.1 2005/03/22 14:53:43
fipsfuchs Exp $
+ * @version $Id: class.auth_sqlssl.inc.php,v 1.2 2006/09/03 06:15:27
skwashd Exp $
*/
/**
@@ -27,7 +27,7 @@
function authenticate($username, $passwd)
{
- $db = $GLOBALS['phpgw']->db;
+ $db =& $GLOBALS['phpgw']->db;
$local_debug = False;
Index: class.contacts_ldap.inc.php
===================================================================
RCS file: class.contacts_ldap.inc.php
diff -N class.contacts_ldap.inc.php
--- class.contacts_ldap.inc.php 2 May 2005 16:38:57 -0000 1.18
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,924 +0,0 @@
-<?php
- /**
- * View and manipulate contact records using LDAP
- * @author Miles Lott <address@hidden>
- * @author Joseph Engo <address@hidden>
- * @copyright Copyright (C) 2001 Miles Lott
- * @copyright Portions Copyright (C) 2001-2004 Free Software Foundation,
Inc. http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id: class.contacts_ldap.inc.php,v 1.18 2005/05/02 16:38:57
fipsfuchs Exp $
- */
-
- /**
- * View and manipulate contact records using LDAP
- *
- * @package phpgwapi
- * @subpackage contacts
- * This class provides a contact database scheme. It attempts to be
based on the vcard 2.1 standard,
- * with mods as needed to make for more reasonable sql storage. The LDAP
schema used here may require
- * installation of schema files available in the phpgwapi/doc/ldap dir.
Please see the README file there.
- * @internal Syntax: CreateObject('phpgwapi.contacts');
- * @internal Example: $contacts = CreateObject('phpgwapi.contacts');
- * @ignore
- */
- class contacts_
- {
- var $db = '';
- var $ldap = '';
- var $nextid = '';
- var $std_table = '';
- var $ext_table = 'phpgw_addressbook_extra';
-
- var $account_id;
- var $adr_types;
- var $total_records;
- var $grants;
-
- /* The left side are the array elements used throughout phpgw,
right side are the ldap attributes */
- var $stock_contact_fields = array(
- 'fn' => 'cn',
- 'n_given' => 'givenname',
- 'n_family' => 'sn',
- 'n_middle' => 'phpgwmiddlename',
- 'n_prefix' => 'phpgwprefix',
- 'n_suffix' => 'phpgwsuffix',
- 'sound' => 'phpgwaudio',
- 'bday' => 'phpgwbirthday',
- 'note' => 'description',
- 'tz' => 'phpgwtz',
- 'geo' => 'phpgwgeo',
- 'url' => 'phpgwurl',
- 'pubkey' => 'phpgwpublickey',
-
- 'org_name' => 'o',
- 'org_unit' => 'ou',
- 'title' => 'title',
-
- 'adr_one_street' => 'street',
- 'adr_one_locality' => 'l',
- 'adr_one_region' => 'st',
- 'adr_one_postalcode' => 'postalcode',
- 'adr_one_countryname' => 'co',
- 'adr_one_type' => 'phpgwadronetype',
- 'label' => 'phpgwaddresslabel',
-
- 'adr_two_street' => 'phpgwadrtwostreet',
- 'adr_two_locality' => 'phpgwadrtwolocality',
- 'adr_two_region' => 'phpgwadrtworegion',
- 'adr_two_postalcode' => 'phpgwadrtwopostalcode',
- 'adr_two_countryname' => 'phpgwadrtwocountryname',
- 'adr_two_type' => 'phpgwadrtwotype',
-
- 'tel_work' => 'telephonenumber',
- 'tel_home' => 'homephone',
- 'tel_voice' => 'phpgwvoicetelephonenumber',
- 'tel_fax' => 'facsimiletelephonenumber',
- 'tel_msg' => 'phpgwmsgtelephonenumber',
- 'tel_cell' => 'phpgwcelltelephonenumber',
- 'tel_pager' => 'phpgwpagertelephonenumber',
- 'tel_bbs' => 'phpgwbbstelephonenumber',
- 'tel_modem' => 'phpgwmodemtelephonenumber',
- 'tel_car' => 'phpgwmobiletelephonenumber',
- 'tel_isdn' => 'phpgwisdnphonenumber',
- 'tel_video' => 'phpgwvideophonenumber',
- 'tel_prefer' => 'phpgwpreferphone',
- 'email' => 'mail',
- 'email_type' => 'phpgwmailtype',
- 'email_home' => 'phpgwmailhome',
- 'email_home_type' => 'phpgwmailhometype'
- );
-
- var $non_contact_fields = array(
- 'id' => 'uidnumber',
- 'lid' => 'uid',
- 'tid' => 'phpgwcontacttypeid',
- 'cat_id' => 'phpgwcontactcatid',
- 'access' => 'phpgwcontactaccess',
- 'owner' => 'phpgwcontactowner'
- );
-
- /* Used to set preferphone field */
- var $tel_types = array(
- 'work' => 'work',
- 'home' => 'home',
- 'voice' => 'voice',
- 'fax' => 'fax',
- 'msg' => 'msg',
- 'cell' => 'cell',
- 'pager' => 'pager',
- 'bbs' => 'bbs',
- 'modem' => 'modem',
- 'car' => 'car',
- 'isdn' => 'isdn',
- 'video' => 'video'
- );
-
- /* Used to set mail_type fields */
- var $email_types = array(
- 'INTERNET' => 'INTERNET',
- 'CompuServe' => 'CompuServe',
- 'AOL' => 'AOL',
- 'Prodigy' => 'Prodigy',
- 'eWorld' => 'eWorld',
- 'AppleLink' => 'AppleLink',
- 'AppleTalk' => 'AppleTalk',
- 'PowerShare' => 'PowerShare',
- 'IBMMail' => 'IBMMail',
- 'ATTMail' => 'ATTMail',
- 'MCIMail' => 'MCIMail',
- 'X.400' => 'X.400',
- 'TLX' => 'TLX'
- );
-
- function contacts_()
- {
- $this->db = $GLOBALS['phpgw']->db;
- $this->ldap = $GLOBALS['phpgw']->common->ldapConnect(
-
$GLOBALS['phpgw_info']['server']['ldap_contact_host'],
-
$GLOBALS['phpgw_info']['server']['ldap_contact_dn'],
-
$GLOBALS['phpgw_info']['server']['ldap_contact_pw']
- );
- $this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants('addressbook');
-
- /* Used to flag an address as being:
- domestic OR international(default)
- parcel(default)
- postal(default)
- work(default) OR home
- */
- $this->adr_types = array(
- 'dom' => lang('Domestic'),
- 'intl' => lang('International'),
- 'parcel' => lang('Parcel'),
- 'postal' => lang('Postal')
- );
- print_debug('contacts_ldap:','Inside
contacts_ldap','api');
- }
-
- function read_single_entry($id,$fields = '')
- {
- if (!$fields || empty($fields)) { $fields =
$this->stock_contact_fields; }
- list($stock_fields,$stock_fieldnames,$extra_fields) =
- $this->split_stock_and_extras($fields);
-
- if (count($stock_fieldnames))
- {
- $t_fields = ',' .
implode(',',$stock_fieldnames);
- if ($t_fields == ',')
- {
- unset($t_fields);
- }
- }
-
- $sri = ldap_search($this->ldap,
$GLOBALS['phpgw_info']['server']['ldap_contact_context'], 'uidnumber='.$id);
- $ldap_fields = ldap_get_entries($this->ldap, $sri);
-
- $return_fields[0]['id'] =
$ldap_fields[0]['uidnumber'][0];
- $return_fields[0]['lid'] = $ldap_fields[0]['uid'][0];
- $return_fields[0]['tid'] =
$ldap_fields[0]['phpgwcontacttypeid'][0];
- $return_fields[0]['owner'] =
$ldap_fields[0]['phpgwcontactowner'][0];
- $return_fields[0]['access'] =
$ldap_fields[0]['phpgwcontactaccess'][0];
- $return_fields[0]['cat_id'] =
$ldap_fields[0]['phpgwcontactcatid'][0];
- if (is_array($stock_fieldnames))
- {
-
while(list($name,$value)=each($stock_fieldnames))
- {
- $return_fields[0][$name] =
utf8_decode($ldap_fields[0][$value][0]);
- }
- }
-
- /* Setup address type fields */
- if ($return_fields[0]['adr_one_type'])
- {
- $one_type = $return_fields[0]['adr_one_type'];
- reset($this->adr_types);
- while (list($name,$val) =
each($this->adr_types))
- {
- eval("if (strstr(\$one_type,\$name)) {
\$return_fields[0][\"one_\$name\"] = \"on\"; }");
- }
- }
- if ($return_fields[0]['adr_two_type'])
- {
- $two_type = $return_fields[0]['adr_two_type'];
- reset($this->adr_types);
- while (list($name,$val) =
each($this->adr_types))
- {
- eval("if (strstr(\$two_type,\$name)) {
\$return_fields[0][\"two_\$name\"] = \"on\"; }");
- }
- }
-
- $this->db->query("SELECT contact_name,contact_value
FROM $this->ext_table WHERE contact_id='" . $id . "'",__LINE__,__FILE__);
- while ($this->db->next_record())
- {
- if ($extra_fields[$this->db->f('contact_name')])
- {
-
$return_fields[0][$this->db->f('contact_name')] = $this->db->f('contact_value');
- }
- }
- return $return_fields;
- }
-
- function read_last_entry($fields = '')
- {
- if (!$fields || empty($fields)) { $fields =
$this->stock_contact_fields; }
- list($stock_fields,$stock_fieldnames,$extra_fields) =
- $this->split_stock_and_extras($fields);
-
- if (count($stock_fieldnames))
- {
- $t_fields = ',' .
implode(',',$stock_fieldnames);
- if ($t_fields == ',')
- {
- unset($t_fields);
- }
- }
-
- $id = $this->nextid;
- if ($id == -1) { $id = 1; }
-
- $sri = ldap_search($this->ldap,
$GLOBALS['phpgw_info']['server']['ldap_contact_context'], 'uidnumber='.$id);
- $ldap_fields = ldap_get_entries($this->ldap, $sri);
-
- $return_fields[0]['id'] =
$ldap_fields[0]['uidnumber'][0];
- $return_fields[0]['lid'] = $ldap_fields[0]['uid'][0];
- $return_fields[0]['tid'] =
$ldap_fields[0]['phpgwcontacttypeid'][0];
- $return_fields[0]['owner'] =
$ldap_fields[0]['phpgwcontactowner'][0];
- $return_fields[0]['access'] =
$ldap_fields[0]['phpgwcontactaccess'][0];
- $return_fields[0]['cat_id'] =
$ldap_fields[0]['phpgwcontactcatid'][0];
-
- if (is_array($stock_fieldnames))
- {
-
while(list($name,$value)=each($stock_fieldnames))
- {
- $return_fields[0][$name] =
utf8_decode($ldap_fields[0][$value][0]);
- }
- }
-
- /* Setup address type fields */
- if ($return_fields[0]['adr_one_type'])
- {
- $one_type = $return_fields[0]['adr_one_type'];
- reset($this->adr_types);
- while (list($name,$val) =
each($this->adr_types))
- {
- eval("if (strstr(\$one_type,\$name)) {
\$return_fields[0][\"one_\$name\"] = \"on\"; }");
- }
- }
- if ($return_fields[0]['adr_two_type'])
- {
- $two_type = $return_fields[0]['adr_two_type'];
- reset($this->adr_types);
- while (list($name,$val) =
each($this->adr_types))
- {
- eval("if (strstr(\$two_type,\$name)) {
\$return_fields[0][\"two_\$name\"] = \"on\"; }");
- }
- }
-
- $this->db->query("SELECT contact_name,contact_value
FROM $this->ext_table WHERE contact_id='" . $id . "'",__LINE__,__FILE__);
- while ($this->db->next_record())
- {
- if ($extra_fields[$this->db->f('contact_name')])
- {
-
$return_fields[0][$this->db->f('contact_name')] = $this->db->f('contact_value');
- }
- }
- return $return_fields;
- }
-
- function
read($start=0,$limit=0,$fields='',$query='',$filter='',$sort='',$order='',
$lastmod=-1)
- {
- if(!$start) { $start = 0; }
- if(!$limit) { $limit = 0; }
- if(!$filter) { $filter = 'tid=n'; }
-
- if (!$fields || empty($fields)) { $fields =
$this->stock_contact_fields; }
-
- list($stock_fields,$stock_fieldnames,$extra_fields) =
$this->split_stock_and_extras($fields);
-
- $filterfields = array();
- /* turn filter's a=b,c=d OR a=b into an array */
- if ($filter)
- {
- print_debug('contacts_ldap:','Inbound filter
is: #'.$filter.'#','api');
- $filterarray = split(',',$filter);
- if ($filterarray[1])
- {
- $i=0;
- for ($i=0;$i<count($filterarray);$i++)
- {
- list($name,$value) =
split('=',$filterarray[$i]);
- if ($name)
- {
-
print_debug('contacts_ldap:','Filter strings:
#'.$this->non_contact_fields[$name].'# => #'.$value.'#','api');
-
$filterfields[$this->non_contact_fields[$name]] = $value;
- }
- }
- }
- else
- {
- list($name,$value) = split('=',$filter);
- print_debug('contacts_ldap:','Filter
strings: #'.$this->non_contact_fields[$name].'# => #'.$value.'#','api');
- $filterfields =
array($this->non_contact_fields[$name] => $value);
- }
- }
- else
- {
- $filterfields += array('phpgwcontacttypeid' =>
'n');
- print_debug('contacts_ldap:','Filter strings:
#phpgwcontacttypeid=n#','api');
- }
-
-
- /*
- need some way of using the lastmod arg in the filter
like this:
- if($lastmod >= 0)
- {
- $filterfields += array('last_mod' =>
(int) $lastmod);
- }
- or maybe not like this - i am not sure what i am doing
:)
- */
-
-
- if (is_array($this->grants))
- {
- /* this was not listing private entries when
show all was selected */
- /* $filterfields += array('phpgwcontactaccess'
=> 'public'); */
- $grants = $this->grants;
- if ($DEBUG) { echo '<br>DEBUG - My user id is:
' . $this->account_id; }
- while (list($user) = each($grants))
- {
- if ($DEBUG) { echo '<br>DEBUG - Grant
from owner: '.$user; }
- /* I know this looks silly... */
- @$filterfields['phpgwcontactowner'][] =
array('phpgwcontactowner' => $user);
- }
- }
- /*
- if ($DEBUG)
- {
- while(list($name,$value) = each($filterfields))
- {
- echo "<br>DEBUG - Filter strings:
#".$name.",".$value."#";
- }
- }
- */
-
- if (!$sort) { $sort = 'ASC'; }
-
- if (!$order)
- {
- $order = 'n_family';
- }
-
- if ($DEBUG && $order)
- {
- echo "<br>DEBUG - ORDER by $order";
- }
-
- $ldap_fields = array();
- $myfilter = '';
-
- if($query)
- {
- reset($this->stock_contact_fields);
- $myfilter =
$this->makefilter($filterfields,$this->stock_contact_fields,$query,$DEBUG);
- }
- else
- {
- $myfilter =
$this->makefilter($filterfields,'','',$DEBUG);
- }
-
- $sri = ldap_search($this->ldap,
$GLOBALS['phpgw_info']['server']['ldap_contact_context'], $myfilter);
-
- $ldap_fields = ldap_get_entries($this->ldap, $sri);
- /* _debug_array($ldap_fields);exit; */
-
- $this->total_records = ldap_count_entries($this->ldap,
$sri);
- print_debug('Contacts_Ldap:','Query returned
"'.$this->total_records.'" records.','api');
-
- /* Use shared sorting routines, based on sort and order
*/
- @set_time_limit(0); /* Try not to die, this can take
some time on slow machines... */
- if ($sort == 'ASC')
- {
- $ldap_fields =
$this->asortbyindex($ldap_fields, $this->stock_contact_fields[$order]);
- }
- else
- {
- $ldap_fields =
$this->arsortbyindex($ldap_fields, $this->stock_contact_fields[$order]);
- }
-
- /*
- This logic allows you to limit rows, or not.
- The export feature, for example, does not limit rows.
- This way, it can retrieve all rows at once.
- */
- if ($start && $limit)
- {
- $limit = $start + $limit;
- }
- elseif ($start && !$limit)
- {
- $limit = $start;
- }
- elseif(!$start && !$limit)
- {
- $limit = $this->total_records;
- }
- else
- {
- $start = 0;
- $limit = $limit;
- }
- /* echo '('.$start.','.$limit.')'; */
-
- @reset($ldap_fields);
- $j=0;
- for ($i=$start;$i<$limit;$i++)
- {
- if ($i<$this->total_records &&
$ldap_fields[$i]['uid'][0])
- {
- $return_fields[$j]['id'] =
utf8_decode($ldap_fields[$i]['uidnumber'][0]);
- $return_fields[$j]['lid'] =
utf8_decode($ldap_fields[$i]['uid'][0]);
- $return_fields[$j]['tid'] =
utf8_decode($ldap_fields[$i]['phpgwcontacttypeid'][0]);
- $return_fields[$j]['owner'] =
utf8_decode($ldap_fields[$i]['phpgwcontactowner'][0]);
- $return_fields[$j]['access'] =
utf8_decode($ldap_fields[$i]['phpgwcontactaccess'][0]);
- $return_fields[$j]['cat_id'] =
utf8_decode($ldap_fields[$i]['phpgwcontactcatid'][0]);
-
- if (gettype($stock_fieldnames) ==
'array')
- {
- reset($stock_fieldnames);
- while (list($f_name,$f_value) =
each($stock_fieldnames))
- {
-
$return_fields[$j][$f_name] = utf8_decode($ldap_fields[$i][$f_value][0]);
- }
- reset($stock_fieldnames);
- }
- $this->db->query("SELECT
contact_name,contact_value FROM $this->ext_table WHERE contact_id='"
- . $ldap_fields[$i]['id'] .
"'",__LINE__,__FILE__);
- while ($this->db->next_record())
- {
- if
($extra_fields[$this->db->f('contact_name')])
- {
-
$return_fields[$j][$this->db->f('contact_name')] =
$this->db->f('contact_value');
- }
- }
- $j++;
- }
- }
- return $return_fields;
- }
-
- function makefilter($qarray,$extra='',$query='', $DEBUG=False)
- {
- if(!is_array($qarray))
- {
- return $qarray;
- }
-
- if(is_array($extra))
- {
- if($DEBUG) { echo '<br>Searching...'; }
- reset($extra);
- while(list($name,$value) = each($extra))
- {
- $qarray[] = array($value => $query);
- }
- }
- elseif($extra)
- {
- $tmp = split('=',$extra);
- $qarray[] = array($tmp[0] => $tmp[1]);
- }
-
- @ksort($qarray);
-
- $aquery = '(&';
- $oquery = '(|';
- $hasor = False;
-
- while(list($name,$value) = @each($qarray))
- {
- if(is_array($value))
- {
- while(list($x,$y) = each($value))
- {
- if($y == '*')
- {
- $oquery .= '(' . $x .
'=*)';
- $hasor = True;
- }
- elseif(is_array($y))
- {
- /* This was most likely
created from acl grants in read() above */
- while(list($a,$b) =
each($y))
- {
- $tmp .= '(' .
$a . '=' . $b . ')';
- }
- }
- else
- {
- $oquery .= '(' . $x .
'=*' . $y . '*)';
- $hasor = True;
- }
- }
- }
- elseif($value == $query)
- {
- /* searching */
- $oquery .= '(' . $name . '=*' . $value
. '*)';
- $hasor = True;
- }
- else
- {
- /* exact value (filtering based on tid,
etc...) */
- if ($name == 'phpgwcontactcatid')
- {
- $aquery .= '(|(' . $name .
'=*,' . $value . ',*)'.
- '(' . $name .
'=' . $value . '))';
- }
- else
- {
- $aquery .= '(' . $name . '=' .
$value . ')';
- }
- }
-
- if($tmp)
- {
- if(strstr($tmp,')('))
- {
- $aquery .= '(|' . $tmp . ')';
- }
- else
- {
- $aquery .= $tmp;
- }
- unset($tmp);
- }
- }
- $aquery .= ')';
- $oquery .= ')';
- if(!$hasor)
- {
- $oquery = '';
- $fquery = $aquery;
- }
- else
- {
- $fquery = '(&' . $aquery . $oquery . ')';
- }
-
- if($DEBUG)
- {
- echo '<br>AND query: "' . $aquery . '"';
- echo '<br>OR query: "' . $oquery . '"';
- echo '<br>Full query: "' . $fquery . '"';
- echo '<br>Will search in "' .
$GLOBALS['phpgw_info']['server']['ldap_contact_context'] . '"';
- }
-
- return $fquery;
- }
-
- function
add($owner,$fields,$access='private',$cat_id='0',$tid='n')
- {
- $tid = $fields['tid'] ? trim($fields['tid']) : $tid;
- unset($fields['tid']);
- if(empty($tid))
- {
- $tid = 'n';
- }
-
- if
(!$GLOBALS['phpgw_info']['server']['ldap_contact_context'])
- {
- return False;
- }
-
- list($stock_fields,$stock_fieldnames,$extra_fields) =
$this->split_stock_and_extras($fields);
-
- $free = 0;
- $this->nextid =
$GLOBALS['phpgw']->common->last_id('contacts');
- /* Loop until we find a free id */
- while (!$free)
- {
- $ldap_fields = '';
- $sri = ldap_search($this->ldap,
$GLOBALS['phpgw_info']['server']['ldap_contact_context'],
'uidnumber='.$this->nextid);
- $ldap_fields = ldap_get_entries($this->ldap,
$sri);
- if ($ldap_fields[0]['dn'][0])
- {
- $this->nextid =
$GLOBALS['phpgw']->common->next_id('contacts');
- }
- else
- {
- $free = True;
- }
- }
-
- $ldap_fields = '';
- if (gettype($stock_fieldnames) == 'array')
- {
-
while(list($name,$value)=each($stock_fieldnames))
- {
- if ($stock_fields[$name] != '')
- {
- $ldap_fields[$value] =
utf8_encode($stock_fields[$name]);
- }
- }
- }
-
- $time = gettimeofday();
- $ldap_fields['uid'] =
time().$time['usec'].':'.$ldap_fields['givenname'];
-
- $dn = 'uid=' . $ldap_fields['uid'].',' .
$GLOBALS['phpgw_info']['server']['ldap_contact_context'];
- $ldap_fields['phpgwcontacttypeid'] = $tid;
- $ldap_fields['phpgwcontactowner'] = $owner;
- if (!isset($access)) { $access = 'private'; }
- $ldap_fields['phpgwcontactaccess'] = $access;
- $ldap_fields['phpgwcontactcatid'] = $cat_id ?
$cat_id : '0';
- $ldap_fields['uidnumber'] = $this->nextid;
- /* $ldap_fields['objectclass'][0] = 'person'; */
- $ldap_fields['objectclass'][0] = 'organizationalPerson';
- $ldap_fields['objectclass'][1] = 'inetOrgPerson';
- $ldap_fields['objectclass'][2] = 'phpgwContact';
- //$ldap_fields['last_mod'] =
$GLOBALS['phpgw']->datetime->gmtnow;
-
- /* _debug_array($ldap_fields); */
- $err = ldap_add($this->ldap, $dn, $ldap_fields);
-
- if (count($extra_fields))
- {
- while (list($name,$value) = each($extra_fields))
- {
- $this->db->query("INSERT INTO
$this->ext_table VALUES ('".$this->nextid."','" . $this->account_id . "','"
- .
$this->db->db_addslashes($name) . "','" . $this->db->db_addslashes($value) .
"')",__LINE__,__FILE__);
- }
- }
- return $this->nextid;
- }
-
- function field_exists($id,$field_name)
- {
- $this->db->query("select count(*) from $this->ext_table
where contact_id='$id' and contact_name='"
- . $this->db->db_addslashes($field_name) .
"'",__LINE__,__FILE__);
- $this->db->next_record();
- return $this->db->f(0);
- }
-
- function
add_single_extra_field($id,$owner,$field_name,$field_value)
- {
- $this->db->query("insert into $this->ext_table values
($id,'$owner','" . $this->db->db_addslashes($field_name)
- . "','" . $this->db->db_addslashes($field_value) .
"')",__LINE__,__FILE__);
- }
-
- function delete_single_extra_field($id,$field_name)
- {
- $this->db->query("delete from $this->ext_table where
contact_id='$id' and contact_name='"
- . $this->db->db_addslashes($field_name) .
"'",__LINE__,__FILE__);
- }
-
- function
update($id,$owner,$fields,$access='private',$cat_id='0',$tid='n')
- {
- $nonfields = $this->non_contact_fields;
-
- if
(!$GLOBALS['phpgw_info']['server']['ldap_contact_context'])
- {
- return False;
- }
-
- /* First make sure that id number exists */
- $sri = ldap_search($this->ldap,
$GLOBALS['phpgw_info']['server']['ldap_contact_context'], 'uidnumber='.$id);
- $ldap_fields = ldap_get_entries($this->ldap, $sri);
-
- if ($ldap_fields[0]['dn'])
- {
- $dn = utf8_decode($ldap_fields[0]['dn']);
-
list($stock_fields,$stock_fieldnames,$extra_fields) =
$this->split_stock_and_extras($fields);
- if (gettype($stock_fieldnames) == 'array')
- {
- /*
- Check each value, add our extra
attributes if they are missing, and
- otherwise fix the entry while we can.
- */
- /* Verify uidnumber */
- $stock_fields['id'] = $id;
- if (empty($ldap_fields[0]['uidnumber']))
- {
- $err =
ldap_modify($this->ldap,$dn,array('uidnumber' => $stock_fields['uidnumber']));
- }
- elseif (!$ldap_fields[0]['uidnumber'])
- {
- $err =
ldap_mod_add($this->ldap,$dn,array('uidnumber' => $stock_fields['uidnumber']));
- }
-
- /* Verify uid */
- $uids = split(',',$dn);
- $stock_fields['lid'] = $uids[0];
- if (empty($ldap_fields[0]['uid']))
- {
- $err =
ldap_modify($this->ldap,$dn,array('uid' => $stock_fields['lid']));
- }
- elseif (!$ldap_fields[0]['uid'])
- {
- $err =
ldap_mod_add($this->ldap,$dn,array('uid' => $stock_fields['lid']));
- }
-
- /* Verify objectclasses are there */
- if
(empty($ldap_fields[0]['objectclass']))
- {
- /*
$stock_fields['objectclass'][0] = 'person'; */
- $stock_fields['objectclass'][0]
= 'organizationalPerson';
- $stock_fields['objectclass'][1]
= 'inetOrgPerson';
- $stock_fields['objectclass'][2]
= 'phpgwContact';
- $err =
ldap_modify($this->ldap,$dn,array('objectclass' =>
$stock_fields['objectclass']));
- }
- elseif (!$ldap_fields[0]['objectclass'])
- {
- /*
$stock_fields['objectclass'][0] = 'person'; */
- $stock_fields['objectclass'][0]
= 'organizationalPerson';
- $stock_fields['objectclass'][1]
= 'inetOrgPerson';
- $stock_fields['objectclass'][2]
= 'phpgwContact';
- $err =
ldap_mod_add($this->ldap,$dn,array('objectclass' =>
$stock_fields['objectclass']));
- }
-
- /* Verify owner */
- $stock_fields['owner'] = $owner;
- if
(empty($ldap_fields[0]['phpgwcontactowner']))
- {
- $err =
ldap_modify($this->ldap,$dn,array('phpgwcontactowner' =>
$stock_fields['owner']));
- }
- elseif
(!$ldap_fields[0]['phpgwcontactowner'])
- {
- $err =
ldap_mod_add($this->ldap,$dn,array('phpgwcontactowner' =>
$stock_fields['owner']));
- }
-
- /* Verify access */
- $stock_fields['access'] = $access;
- if
(empty($ldap_fields[0]['phpgwcontactaccess']))
- {
- $err =
ldap_modify($this->ldap,$dn,array('phpgwcontactaccess' =>
$stock_fields['access']));
- }
- elseif
(!$ldap_fields[0]['phpgwcontactaccess'])
- {
- $err =
ldap_mod_add($this->ldap,$dn,array('phpgwcontactaccess' =>
$stock_fields['access']));
- }
-
- /* Verify cat_id */
- $stock_fields['cat_id'] = $cat_id ?
$cat_id : ' ';
- if
(empty($ldap_fields[0]['phpgwcontactcatid']))
- {
- $err =
ldap_modify($this->ldap,$dn,array('phpgwcontactcatid' =>
$stock_fields['cat_id']));
- }
- elseif
(!$ldap_fields[0]['phpgwcontactcatid'])
- {
- $err =
ldap_mod_add($this->ldap,$dn,array('phpgwcontactcatid' =>
$stock_fields['cat_id']));
- }
-
- /* Verify tid */
- $stock_fields['tid'] = $tid;
- if
(empty($ldap_fields[0]['phpgwcontacttypeid']))
- {
- $err =
ldap_modify($this->ldap,$dn,array('phpgwcontacttypeid' =>
$stock_fields['tid']));
- }
- elseif
(!$ldap_fields[0]['phpgwcontacttypeid'])
- {
- $err =
ldap_mod_add($this->ldap,$dn,array('phpgwcontacttypeid' =>
$stock_fields['tid']));
- }
-
- /* OK, just mod the data already */
- $allfields = $stock_fieldnames +
$nonfields;
- while ( list($fname,$fvalue) =
each($allfields) )
- {
- /* if
($ldap_fields[0][$fvalue]) */
- if ($ldap_fields[0][$fvalue] &&
$stock_fields[$fname] && $ldap_fields[0][$fvalue][0] != $stock_fields[$fname] )
- {
- /* echo "<br>".$fname."
=> ".$fvalue." was there"; */
- $err =
ldap_modify($this->ldap,$dn,array($fvalue =>
utf8_encode($stock_fields[$fname])));
- }
- elseif
(!$ldap_fields[0][$fvalue] && $stock_fields[$fname])
- {
- /* echo "<br>".$fname."
not there - '".$fvalue."'"; */
- $err =
ldap_mod_add($this->ldap,$dn,array($fvalue =>
utf8_encode($stock_fields[$fname])));
- }
- elseif
($ldap_fields[0][$fvalue] && !$stock_fields[$fname])
- {
- /*
- echo "<br>".$fname."
gone... deleting - '".$fvalue."'";
- NOTE: we use the
ldap_fields because we need to send the
- _ORIGINAL_ contents as
the value. see:
-
http://www.php.net/manual/en/function.ldap-mod-del.php
- */
- $err =
ldap_mod_del($this->ldap,$dn,array($fvalue => $ldap_fields[0][$fvalue][0]));
- }
- /* Else we have nothing to do.
*/
- }
- }
-
- //something here to update the last_mod from
$GLOBALS['phpgw']->datetime->gmtnow
-
- while (list($x_name,$x_value) =
each($extra_fields))
- {
- if ($this->field_exists($id,$x_name))
- {
- if (! $x_value)
- {
-
$this->delete_single_extra_field($id,$x_name);
- }
- else
- {
-
$this->db->query("UPDATE $this->ext_table SET contact_value='" .
$this->db->db_addslashes($x_value)
- .
"',contact_owner='$owner' WHERE contact_name='" .
$this->db->db_addslashes($x_name)
- . "' AND
contact_id='$id'",__LINE__,__FILE__);
- }
- }
- else
- {
-
$this->add_single_extra_field($id,$owner,$x_name,$x_value);
- }
- }
- }
- else
- {
- return False;
- }
- }
-
- function change_owner($old_owner='',$new_owner='')
- {
- if (!($new_owner && $old_owner))
- {
- return False;
- }
-
- $sri = ldap_search($this->ldap,
$GLOBALS['phpgw_info']['server']['ldap_contact_context'],
'phpgwcontactowner='.$old_owner);
- $ldap_fields = ldap_get_entries($this->ldap, $sri);
-
- $entry = '';
- while (list($null,$entry) = each($ldap_fields))
- {
- $err =
ldap_modify($this->ldap,$dn,array('phpgwcontactowner' => $new_owner));
- }
-
- $this->db->query("UPDATE $this->ext_table SET
contact_owner='$new_owner' WHERE contact_owner=$owner",__LINE__,__FILE__);
- return;
- }
-
- function delete_($id)
- {
- $response= $GLOBALS['phpgw']->hooks->process(array(
- 'location' =>
'delete_addressbook',
- 'contact_id' =>
$cid )
- );
-
- if( $response )
- {
- $return_value = $response;
- }
- else
- {
- if
(!$GLOBALS['phpgw_info']['server']['ldap_contact_context'])
- {
- return False;
- }
-
- $sri = ldap_search($this->ldap,
$GLOBALS['phpgw_info']['server']['ldap_contact_context'], 'uidnumber='.$id);
- $ldap_fields = ldap_get_entries($this->ldap,
$sri);
-
- if ($ldap_fields[0]['dn'])
- {
- $err =
ldap_delete($this->ldap,$ldap_fields[0]['dn']);
-
- $this->db->query("DELETE FROM
$this->ext_table WHERE contact_id='$id' AND contact_owner='"
- . $this->account_id .
"'",__LINE__,__FILE__);
- $return_value = False;
- }
- else
- {
- return False;
- }
- }
- return $return_value;
- }
-
- function delete_all($owner=0)
- {
- if
(!$GLOBALS['phpgw_info']['server']['ldap_contact_context'])
- {
- return False;
- }
-
- if ($owner)
- {
- $sri = ldap_search($this->ldap,
$GLOBALS['phpgw_info']['server']['ldap_contact_context'],
'phpgwcontactowner='.$owner);
- $ldap_fields = ldap_get_entries($this->ldap,
$sri);
-
- $entry = '';
- while (list($null,$entry) = each($ldap_fields))
- {
- $err =
ldap_delete($this->ldap,$entry['dn']);
- }
-
- $this->db->query("DELETE FROM $this->ext_table
WHERE contact_owner=$owner",__LINE__,__FILE__);
- }
- return;
- }
- }
-?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc class.acl.inc.php class.applicatio...,
Dave Hall <=