EGroupware / egroupware

api/src/Ldap/ServerInfo.php

Indentation +40 added lines, -40 removed lines

@@ -32,33 +32,33 @@ 
 	const SAMBA4 = 2;
 
 	/**
-	* @var array $namingContext holds the supported namingcontexts
-	*/
+	 * @var array $namingContext holds the supported namingcontexts
+	 */
 	var $namingContext = array();
 
 	/**
-	* @var string $version holds the LDAP server version
-	*/
+	 * @var string $version holds the LDAP server version
+	 */
 	var $version = 2;
 
 	/**
-	* @var integer $serverType holds the type of LDAP server(OpenLDAP, ADS, NDS, ...)
-	*/
+	 * @var integer $serverType holds the type of LDAP server(OpenLDAP, ADS, NDS, ...)
+	 */
 	var $serverType = 0;
 
 	/**
-	* @var string $_subSchemaEntry the subschema entry DN
-	*/
+	 * @var string $_subSchemaEntry the subschema entry DN
+	 */
 	var $subSchemaEntry = '';
 
 	/**
-	* @var array $supportedObjectClasses the supported objectclasses
-	*/
+	 * @var array $supportedObjectClasses the supported objectclasses
+	 */
 	var $supportedObjectClasses = array();
 
 	/**
-	* @var array $supportedOIDs the supported OIDs
-	*/
+	 * @var array $supportedOIDs the supported OIDs
+	 */
 	var $supportedOIDs = array();
 
 	/**
@@ -79,50 +79,50 @@ 
 	}
 
 	/**
-	* gets the version
-	*
-	* @return integer the supported ldap version
-	*/
+	 * gets the version
+	 *
+	 * @return integer the supported ldap version
+	 */
 	function getVersion()
 	{
 		return $this->version;
 	}
 
 	/**
-	* sets the namingcontexts
-	*
-	* @param array $_namingContext the supported namingcontexts
-	*/
+	 * sets the namingcontexts
+	 *
+	 * @param array $_namingContext the supported namingcontexts
+	 */
 	function setNamingContexts($_namingContext)
 	{
 		$this->namingContext = $_namingContext;
 	}
 
 	/**
-	* sets the type of the ldap server(OpenLDAP, ADS, NDS, ...)
-	*
-	* @param integer $_serverType the type of ldap server
-	*/
+	 * sets the type of the ldap server(OpenLDAP, ADS, NDS, ...)
+	 *
+	 * @param integer $_serverType the type of ldap server
+	 */
 	function setServerType($_serverType)
 	{
 		$this->serverType = $_serverType;
 	}
 
 	/**
-	* sets the DN for the subschema entry
-	*
-	* @param string $_subSchemaEntry the subschema entry DN
-	*/
+	 * sets the DN for the subschema entry
+	 *
+	 * @param string $_subSchemaEntry the subschema entry DN
+	 */
 	function setSubSchemaEntry($_subSchemaEntry)
 	{
 		$this->subSchemaEntry = $_subSchemaEntry;
 	}
 
 	/**
-	* sets the supported objectclasses
-	*
-	* @param array $_supportedObjectClasses the supported objectclasses
-	*/
+	 * sets the supported objectclasses
+	 *
+	 * @param array $_supportedObjectClasses the supported objectclasses
+	 */
 	function setSupportedObjectClasses($_supportedObjectClasses)
 	{
 		$this->supportedOIDs = $_supportedObjectClasses;
@@ -130,20 +130,20 @@ 
 	}
 
 	/**
-	* sets the version
-	*
-	* @param integer $_version the supported ldap version
-	*/
+	 * sets the version
+	 *
+	 * @param integer $_version the supported ldap version
+	 */
 	function setVersion($_version)
 	{
 		$this->version = $_version;
 	}
 
 	/**
-	* checks for supported objectclasses
-	*
-	* @return bool returns true if the ldap server supports this objectclass
-	*/
+	 * checks for supported objectclasses
+	 *
+	 * @return bool returns true if the ldap server supports this objectclass
+	 */
 	function supportsObjectClass($_objectClass)
 	{
 		if($this->supportedObjectClasses[strtolower($_objectClass)])

api/src/Storage.php

Indentation +6 added lines, -6 removed lines

@@ -210,12 +210,12 @@
 	}
 
 	/**
-	* saves custom field data
-	*
-	* @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
-	* @param array $extra_cols =array() extra-data to be saved
-	* @return bool false on success, errornumber on failure
-	*/
+	 * saves custom field data
+	 *
+	 * @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
+	 * @param array $extra_cols =array() extra-data to be saved
+	 * @return bool false on success, errornumber on failure
+	 */
 	function save_customfields($data, array $extra_cols=array())
 	{
 		foreach (array_keys((array)$this->customfields) as $name)

api/src/Json/Response.php

Indentation +7 added lines, -7 removed lines

@@ -242,13 +242,13 @@
 		if ($ret === false && ($err = json_last_error()))
 		{
 			static $json_err2str = array(
-	        	JSON_ERROR_NONE => 'No errors',
-	        	JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
-	        	JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch',
-	        	JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
-	        	JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
-	        	JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded',
-	        );
+				JSON_ERROR_NONE => 'No errors',
+				JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
+				JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch',
+				JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
+				JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
+				JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded',
+			);
 			error_log(__METHOD__.'('.array2string($var).') json_last_error()='.$err.'='.$json_err2str[$err]);
 
 			if (($var = self::fix_content($var)))

api/src/CalDAV/IcalIterator.php

Indentation +6 added lines, -6 removed lines

@@ -249,12 +249,12 @@
 
 		$this->component = Horde_Icalendar::newComponent($type, $this);
 		//error_log(__METHOD__."() this->component = Horde_Icalendar::newComponent('$type', \$this) = ".array2string($this->component));
-        if ($this->component === false)
-        {
-        	error_log(__METHOD__."() Horde_Icalendar::newComponent('$type', \$this) returned FALSE");
-        	return;
-            //return PEAR::raiseError("Unable to create object for type $type");
-        }
+		if ($this->component === false)
+		{
+			error_log(__METHOD__."() Horde_Icalendar::newComponent('$type', \$this) returned FALSE");
+			return;
+			//return PEAR::raiseError("Unable to create object for type $type");
+		}
 		if ($this->charset && $this->charset != 'utf-8')
 		{
 			$data = Api\Translation::convert($data, $this->charset, 'utf-8');

api/src/Mailer.php

Indentation +21 added lines, -21 removed lines

@@ -481,10 +481,10 @@ 
 	 * Log mails to log file specified in $GLOBALS['egw_info']['server']['log_mail']
 	 * or regular error_log for true (can be set either in DB or header.inc.php).
 	 *
-     * @param Horde_Mail_Transport $transport =null using transport from mail-account
+	 * @param Horde_Mail_Transport $transport =null using transport from mail-account
 	 *		specified in construct, or default one, if not specified
-     * @param boolean $resend =true allways true in EGroupware!
-     * @param boolean $flowed =null send message in flowed text format,
+	 * @param boolean $resend =true allways true in EGroupware!
+	 * @param boolean $flowed =null send message in flowed text format,
 	 *		default null used flowed by default for everything but multipart/encrypted,
 	 *		unless disabled in site configuration ("disable_rfc3676_flowed")
 	 *
@@ -642,15 +642,15 @@ 
 	}
 
 	/**
-     * Get the raw email data sent by this object.
-     *
+	 * Get the raw email data sent by this object.
+	 *
 	 * Reimplement to be able to call it for saveAsDraft by calling
 	 * $this->send(new Horde_Mail_Transport_Null()),
 	 * if no base-part is set, because send is not called before.
 	 *
-     * @param  boolean $stream  If true, return a stream resource, otherwise
-     * @return stream|string  The raw email data.
-     */
+	 * @param  boolean $stream  If true, return a stream resource, otherwise
+	 * @return stream|string  The raw email data.
+	 */
 	function getRaw($stream=true)
 	{
 		try {
@@ -663,20 +663,20 @@ 
 		}
 		// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
 		// _headers->toString(), which is required to encode headers containing non-ascii chars correct
-        if ($stream) {
-            $hdr = new Horde_Stream();
-            $hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
-            return Horde_Stream_Wrapper_Combine::getStream(
-                array($hdr->stream,
-                      $this->getBasePart()->toString(
-                        array('stream' => true, 'canonical' => true, 'encode' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY))
-                )
-            );
-        }
-
-        return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
+		if ($stream) {
+			$hdr = new Horde_Stream();
+			$hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
+			return Horde_Stream_Wrapper_Combine::getStream(
+				array($hdr->stream,
+					  $this->getBasePart()->toString(
+						array('stream' => true, 'canonical' => true, 'encode' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY))
+				)
+			);
+		}
+
+		return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
 			$this->getBasePart()->toString(array('canonical' => true));
-    }
+	}
 
 	/**
 	 * Convert charset of text-parts of message to utf-8

api/src/Translation.php

Indentation +13 added lines, -13 removed lines

@@ -738,12 +738,12 @@ 
 	}
 
  	/**
-	 * provides centralization and compatibility to locate the lang files
-	 *
-	 * @param string $app application name
-	 * @param string $lang language code
-	 * @return the full path of the filename for the requested app and language
-	 */
+ 	 * provides centralization and compatibility to locate the lang files
+ 	 *
+ 	 * @param string $app application name
+ 	 * @param string $lang language code
+ 	 * @return the full path of the filename for the requested app and language
+ 	 */
 	static function get_lang_file($app,$lang)
 	{
 		if ($app == 'common') $app = 'phpgwapi';
@@ -1074,13 +1074,13 @@ 
 	}
 
  	/**
-	 * detect_encoding - try to detect the encoding
-	 *    only to be used if the string in question has no structure that determines his encoding
-	 *
-	 * @param string - to be evaluated
-	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
-	 * @return string - encoding
-	 */
+ 	 * detect_encoding - try to detect the encoding
+ 	 *    only to be used if the string in question has no structure that determines his encoding
+ 	 *
+ 	 * @param string - to be evaluated
+ 	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
+ 	 * @return string - encoding
+ 	 */
 	static function detect_encoding($string, $verify=null)
 	{
 		if (function_exists('iconv'))

api/src/Session.php

Indentation +53 added lines, -53 removed lines

@@ -80,60 +80,60 @@ 
 	const MCRYPT_MODE = MCRYPT_MODE_ECB;
 
 	/**
-	* current user login (account_lid@domain)
-	*
-	* @var string
-	*/
+	 * current user login (account_lid@domain)
+	 *
+	 * @var string
+	 */
 	var $login;
 
 	/**
-	* current user password
-	*
-	* @var string
-	*/
+	 * current user password
+	 *
+	 * @var string
+	 */
 	var $passwd;
 
 	/**
-	* current user db/ldap account id
-	*
-	* @var int
-	*/
+	 * current user db/ldap account id
+	 *
+	 * @var int
+	 */
 	var $account_id;
 
 	/**
-	* current user account login id (without the eGW-domain/-instance part
-	*
-	* @var string
-	*/
+	 * current user account login id (without the eGW-domain/-instance part
+	 *
+	 * @var string
+	 */
 	var $account_lid;
 
 	/**
-	* domain for current user
-	*
-	* @var string
-	*/
+	 * domain for current user
+	 *
+	 * @var string
+	 */
 	var $account_domain;
 
 	/**
-	* type flag, A - anonymous session, N - None, normal session
-	*
-	* @var string
-	*/
+	 * type flag, A - anonymous session, N - None, normal session
+	 *
+	 * @var string
+	 */
 	var $session_flags;
 
 	/**
-	* current user session id
-	*
-	* @var string
-	*/
+	 * current user session id
+	 *
+	 * @var string
+	 */
 	var $sessionid;
 
 	/**
-	* an other session specific id (md5 from a random string),
-	* used together with the sessionid for xmlrpc basic auth and the encryption of session-data (if that's enabled)
-	*
-	* @var string
-	*/
+	 * an other session specific id (md5 from a random string),
+	 * used together with the sessionid for xmlrpc basic auth and the encryption of session-data (if that's enabled)
+	 *
+	 * @var string
+	 */
 	var $kp3;
 
 	/**
@@ -144,17 +144,17 @@ 
 	var $sessionid_access_log;
 
 	/**
-	* name of XML-RPC/SOAP method called
-	*
-	* @var string
-	*/
+	 * name of XML-RPC/SOAP method called
+	 *
+	 * @var string
+	 */
 	var $xmlrpc_method_called;
 
 	/**
-	* Array with the name of the system domains
-	*
-	* @var array
-	*/
+	 * Array with the name of the system domains
+	 *
+	 * @var array
+	 */
 	private $egw_domains;
 
 	/**
@@ -248,9 +248,9 @@ 
 
 		// set session_timeout from global php.ini and default to 14400=4h, if not set
 		if (!($GLOBALS['egw_info']['server']['sessions_timeout'] = ini_get('session.gc_maxlifetime')))
-      	{
-      		ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout']=14400);
-      	}
+	  	{
+	  		ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout']=14400);
+	  	}
 	}
 
 	/**
@@ -661,14 +661,14 @@ 
 	const ACCESS_LOG_TABLE = 'egw_access_log';
 
 	/**
-    * Write or update (for logout) the access_log
-	*
-	* @param string|int $sessionid nummeric or PHP session id or 0 for unsuccessful logins
-	* @param string $login ='' account_lid (evtl. with domain) or '' for setting the logout-time
-	* @param string $user_ip ='' ip to log
-	* @param int $account_id =0 numerical account_id
-	* @return int $sessionid primary key of egw_access_log for login, null otherwise
-	*/
+	 * Write or update (for logout) the access_log
+	 *
+	 * @param string|int $sessionid nummeric or PHP session id or 0 for unsuccessful logins
+	 * @param string $login ='' account_lid (evtl. with domain) or '' for setting the logout-time
+	 * @param string $user_ip ='' ip to log
+	 * @param int $account_id =0 numerical account_id
+	 * @return int $sessionid primary key of egw_access_log for login, null otherwise
+	 */
 	private function log_access($sessionid,$login='',$user_ip='',$account_id=0)
 	{
 		$now = time();
@@ -716,7 +716,7 @@ 
 
 	/**
 	 * Protect against brute force attacks, block login if too many unsuccessful login attmepts
-     *
+	 *
 	 * @param string $login account_lid (evtl. with domain)
 	 * @param string $ip ip of the user
 	 * @returns bool login blocked?

api/src/Categories.php

Indentation +7 added lines, -7 removed lines

@@ -1044,13 +1044,13 @@
 	}
 
 	/**
-	* Get the color of a category
-	*
-	* For multiple cats, the first with a color is used
-	*
-	* @param int|string $_cats multiple comma-separated cat_id's
-	* @return string
-	*/
+	 * Get the color of a category
+	 *
+	 * For multiple cats, the first with a color is used
+	 *
+	 * @param int|string $_cats multiple comma-separated cat_id's
+	 * @return string
+	 */
 	static function cats2color($_cats)
 	{
 		static $cat2color = array();

api/src/Db.php

Indentation +241 added lines, -241 removed lines

@@ -67,43 +67,43 @@ 
 	 */
 	const FETCH_BOTH = ADODB_FETCH_BOTH;
 	/**
-	* @var string $type translated database type: mysqlt+mysqli ==> mysql, same for odbc-types
-	*/
+	 * @var string $type translated database type: mysqlt+mysqli ==> mysql, same for odbc-types
+	 */
 	var $Type     = '';
 
 	/**
-	* @var string $type database type as defined in the header.inc.php, eg. mysqlt
-	*/
+	 * @var string $type database type as defined in the header.inc.php, eg. mysqlt
+	 */
 	var $setupType     = '';
 
 	/**
-	* @var string $Host database host to connect to
-	*/
+	 * @var string $Host database host to connect to
+	 */
 	var $Host     = '';
 
 	/**
-	* @var string $Port port number of database to connect to
-	*/
+	 * @var string $Port port number of database to connect to
+	 */
 	var $Port     = '';
 
 	/**
-	* @var string $Database name of database to use
-	*/
+	 * @var string $Database name of database to use
+	 */
 	var $Database = '';
 
 	/**
-	* @var string $User name of database user
-	*/
+	 * @var string $User name of database user
+	 */
 	var $User     = '';
 
 	/**
-	* @var string $Password password for database user
-	*/
+	 * @var string $Password password for database user
+	 */
 	var $Password = '';
 
 	/**
-	* @var int $Debug enable debuging - 0 no, 1 yes
-	*/
+	 * @var int $Debug enable debuging - 0 no, 1 yes
+	 */
 	var $Debug         = 0;
 
 	/**
@@ -114,23 +114,23 @@ 
 	var $log_updates = false;
 
 	/**
-	* @var array $Record current record
-	*/
+	 * @var array $Record current record
+	 */
 	var $Record   = array();
 
 	/**
-	* @var int row number for current record
-	*/
+	 * @var int row number for current record
+	 */
 	var $Row;
 
 	/**
-	* @var int $Errno internal rdms error number for last error
-	*/
+	 * @var int $Errno internal rdms error number for last error
+	 */
 	var $Errno    = 0;
 
 	/**
-	* @var string descriptive text from last error
-	*/
+	 * @var string descriptive text from last error
+	 */
 	var $Error    = '';
 
 	/**
@@ -270,8 +270,8 @@ 
 	}
 
 	/**
-	* @param string $query query to be executed (optional)
-	*/
+	 * @param string $query query to be executed (optional)
+	 */
 
 	function db($query = '')
 	{
@@ -279,8 +279,8 @@ 
 	}
 
 	/**
-	* @return int current connection id
-	*/
+	 * @return int current connection id
+	 */
 	function link_id()
 	{
 		return $this->Link_ID;
@@ -652,8 +652,8 @@ 
 	}
 
 	/**
-	* Close a connection to a database
-	*/
+	 * Close a connection to a database
+	 */
 	function disconnect()
 	{
 		if (!$this->privat_Link_ID)
@@ -667,11 +667,11 @@ 
 	}
 
 	/**
-	* Convert a unix timestamp to a rdms specific timestamp
-	*
-	* @param int unix timestamp
-	* @return string rdms specific timestamp
-	*/
+	 * Convert a unix timestamp to a rdms specific timestamp
+	 *
+	 * @param int unix timestamp
+	 * @return string rdms specific timestamp
+	 */
 	function to_timestamp($epoch)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -683,11 +683,11 @@ 
 	}
 
 	/**
-	* Convert a rdms specific timestamp to a unix timestamp
-	*
-	* @param string rdms specific timestamp
-	* @return int unix timestamp
-	*/
+	 * Convert a rdms specific timestamp to a unix timestamp
+	 *
+	 * @param string rdms specific timestamp
+	 * @return int unix timestamp
+	 */
 	function from_timestamp($timestamp)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -709,19 +709,19 @@ 
 	}
 
 	/**
-	* Execute a query
-	*
-	* @param string $Query_String the query to be executed
-	* @param int $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $offset row to start from, default 0
-	* @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
-	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
-	* @param int $fetchmode =self::FETCH_BOTH self::FETCH_BOTH (default), self::FETCH_ASSOC or self::FETCH_NUM
-	* @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
-	* @return ADORecordSet or false, if the query fails
-	* @throws Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
-	*/
+	 * Execute a query
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param int $line the line method was called from - use __LINE__
+	 * @param string $file the file method was called from - use __FILE__
+	 * @param int $offset row to start from, default 0
+	 * @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
+	 * @param array|boolean $inputarr array for binding variables to parameters or false (default)
+	 * @param int $fetchmode =self::FETCH_BOTH self::FETCH_BOTH (default), self::FETCH_ASSOC or self::FETCH_NUM
+	 * @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
+	 * @return ADORecordSet or false, if the query fails
+	 * @throws Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
+	 */
 	function query($Query_String, $line = '', $file = '', $offset=0, $num_rows=-1, $inputarr=false, $fetchmode=self::FETCH_BOTH, $reconnect=true)
 	{
 		unset($line, $file);	// not used anymore
@@ -786,26 +786,26 @@ 
 	}
 
 	/**
-	* Execute a query with limited result set
-	*
-	* @param string $Query_String the query to be executed
-	* @param int $offset row to start from, default 0
-	* @param int $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
-	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Execute a query with limited result set
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param int $offset row to start from, default 0
+	 * @param int $line the line method was called from - use __LINE__
+	 * @param string $file the file method was called from - use __FILE__
+	 * @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
+	 * @param array|boolean $inputarr array for binding variables to parameters or false (default)
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function limit_query($Query_String, $offset, $line = '', $file = '', $num_rows = '',$inputarr=false)
 	{
 		return $this->query($Query_String,$line,$file,$offset,$num_rows,$inputarr);
 	}
 
 	/**
-	* Begin Transaction
-	*
-	* @return int/boolean current transaction-id, of false if no connection
-	*/
+	 * Begin Transaction
+	 *
+	 * @return int/boolean current transaction-id, of false if no connection
+	 */
 	function transaction_begin()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -817,10 +817,10 @@ 
 	}
 
 	/**
-	* Complete the transaction
-	*
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Complete the transaction
+	 *
+	 * @return bool True if sucessful, False if fails
+	 */
 	function transaction_commit()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -832,10 +832,10 @@ 
 	}
 
 	/**
-	* Rollback the current transaction
-	*
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Rollback the current transaction
+	 *
+	 * @return bool True if sucessful, False if fails
+	 */
 	function transaction_abort()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -847,12 +847,12 @@ 
 	}
 
 	/**
-	* Find the primary key of the last insertion on the current db connection
-	*
-	* @param string $table name of table the insert was performed on
-	* @param string $field the autoincrement primary key of the table
-	* @return int the id, -1 if fails
-	*/
+	 * Find the primary key of the last insertion on the current db connection
+	 *
+	 * @param string $table name of table the insert was performed on
+	 * @param string $field the autoincrement primary key of the table
+	 * @return int the id, -1 if fails
+	 */
 	function get_last_insert_id($table, $field)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -875,10 +875,10 @@ 
 	}
 
 	/**
-	* Get the number of rows affected by last update or delete
-	*
-	* @return int number of rows
-	*/
+	 * Get the number of rows affected by last update or delete
+	 *
+	 * @return int number of rows
+	 */
 	function affected_rows()
 	{
 		if ($this->log_updates) return 0;
@@ -891,14 +891,14 @@ 
 	}
 
 	/**
-	* Get description of a table
-	*
-	* Beside the column-name all other data depends on the db-type !!!
-	*
-	* @param string $table name of table to describe
-	* @param bool $full optional, default False summary information, True full information
-	* @return array table meta data
-	*/
+	 * Get description of a table
+	 *
+	 * Beside the column-name all other data depends on the db-type !!!
+	 *
+	 * @param string $table name of table to describe
+	 * @param bool $full optional, default False summary information, True full information
+	 * @return array table meta data
+	 */
 	function metadata($table='',$full=false)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -980,10 +980,10 @@ 
 	}
 
 	/**
-	* Return a list of indexes in current database
-	*
-	* @return array list of indexes
-	*/
+	 * Return a list of indexes in current database
+	 *
+	 * @return array list of indexes
+	 */
 	function index_names()
 	{
 		$indices = array();
@@ -1004,10 +1004,10 @@ 
 	}
 
 	/**
-	* Returns an array containing column names that are the primary keys of $tablename.
-	*
-	* @return array of columns
-	*/
+	 * Returns an array containing column names that are the primary keys of $tablename.
+	 *
+	 * @return array of columns
+	 */
 	function pkey_columns($tablename)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -1018,13 +1018,13 @@ 
 	}
 
 	/**
-	* Create a new database
-	*
-	* @param string $adminname name of database administrator user (optional)
-	* @param string $adminpasswd password for the database administrator user (optional)
-	* @param string $charset default charset for the database
-	* @param string $grant_host ='localhost' host/ip of the webserver
-	*/
+	 * Create a new database
+	 *
+	 * @param string $adminname name of database administrator user (optional)
+	 * @param string $adminpasswd password for the database administrator user (optional)
+	 * @param string $charset default charset for the database
+	 * @param string $grant_host ='localhost' host/ip of the webserver
+	 */
 	function create_database($adminname = '', $adminpasswd = '', $charset='', $grant_host='localhost')
 	{
 		$currentUser = $this->User;
@@ -1280,12 +1280,12 @@ 
 	}
 
 	/**
-	* Correctly Quote Identifiers like table- or colmnnames for use in SQL-statements
-	*
-	* This is mostly copy & paste from adodb's datadict class
-	* @param string $_name
-	* @return string quoted string
-	*/
+	 * Correctly Quote Identifiers like table- or colmnnames for use in SQL-statements
+	 *
+	 * This is mostly copy & paste from adodb's datadict class
+	 * @param string $_name
+	 * @return string quoted string
+	 */
 	function name_quote($_name = NULL)
 	{
 		if (!is_string($_name))
@@ -1324,19 +1324,19 @@ 
 	}
 
 	/**
-	* Escape values before sending them to the database - prevents SQL injection and SQL errors ;-)
-	*
-	* Please note that the quote function already returns necessary quotes: quote('Hello') === "'Hello'".
-	* Int and Auto types are casted to int: quote('1','int') === 1, quote('','int') === 0, quote('Hello','int') === 0
-	* Arrays of id's stored in strings: quote(array(1,2,3),'string') === "'1,2,3'"
-	*
-	* @param mixed $value the value to be escaped
-	* @param string|boolean $type =false string the type of the db-column, default False === varchar
-	* @param boolean $not_null =true is column NOT NULL, default true, else php null values are written as SQL NULL
-	* @param int $length =null length of the varchar column, to truncate it if the database requires it (eg. Postgres)
-	* @param string $glue =',' used to glue array values together for the string type
-	* @return string escaped sting
-	*/
+	 * Escape values before sending them to the database - prevents SQL injection and SQL errors ;-)
+	 *
+	 * Please note that the quote function already returns necessary quotes: quote('Hello') === "'Hello'".
+	 * Int and Auto types are casted to int: quote('1','int') === 1, quote('','int') === 0, quote('Hello','int') === 0
+	 * Arrays of id's stored in strings: quote(array(1,2,3),'string') === "'1,2,3'"
+	 *
+	 * @param mixed $value the value to be escaped
+	 * @param string|boolean $type =false string the type of the db-column, default False === varchar
+	 * @param boolean $not_null =true is column NOT NULL, default true, else php null values are written as SQL NULL
+	 * @param int $length =null length of the varchar column, to truncate it if the database requires it (eg. Postgres)
+	 * @param string $glue =',' used to glue array values together for the string type
+	 * @return string escaped sting
+	 */
 	function quote($value,$type=False,$not_null=true,$length=null,$glue=',')
 	{
 		if ($this->Debug) echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
@@ -1417,27 +1417,27 @@ 
 	}
 
 	/**
-	* Implodes an array of column-value pairs for the use in sql-querys.
-	* All data is run through quote (does either addslashes() or (int)) - prevents SQL injunction and SQL errors ;-).
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $glue in most cases this will be either ',' or ' AND ', depending you your query
-	* @param array $array column-name / value pairs, if the value is an array all its array-values will be quoted
-	*	according to the type of the column, and the whole array with be formatted like (val1,val2,...)
-	*	If $use_key == True, an ' IN ' instead a '=' is used. Good for category- or user-lists.
-	*	If the key is numerical (no key given in the array-definition) the value is used as is, eg.
-	*	array('visits=visits+1') gives just "visits=visits+1" (no quoting at all !!!)
-	* @param boolean|string $use_key If $use_key===True a "$key=" prefix each value (default), typically set to False
-	*	or 'VALUES' for insert querys, on 'VALUES' "(key1,key2,...) VALUES (val1,val2,...)" is returned
-	* @param array|boolean $only if set to an array only colums which are set (as data !!!) are written
-	*	typicaly used to form a WHERE-clause from the primary keys.
-	*	If set to True, only columns from the colum_definitons are written.
-	* @param array|boolean $column_definitions this can be set to the column-definitions-array
-	*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
-	*	If its set, the column-type-data determinates if (int) or addslashes is used.
-	* @return string SQL
-	*/
+	 * Implodes an array of column-value pairs for the use in sql-querys.
+	 * All data is run through quote (does either addslashes() or (int)) - prevents SQL injunction and SQL errors ;-).
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $glue in most cases this will be either ',' or ' AND ', depending you your query
+	 * @param array $array column-name / value pairs, if the value is an array all its array-values will be quoted
+	 *	according to the type of the column, and the whole array with be formatted like (val1,val2,...)
+	 *	If $use_key == True, an ' IN ' instead a '=' is used. Good for category- or user-lists.
+	 *	If the key is numerical (no key given in the array-definition) the value is used as is, eg.
+	 *	array('visits=visits+1') gives just "visits=visits+1" (no quoting at all !!!)
+	 * @param boolean|string $use_key If $use_key===True a "$key=" prefix each value (default), typically set to False
+	 *	or 'VALUES' for insert querys, on 'VALUES' "(key1,key2,...) VALUES (val1,val2,...)" is returned
+	 * @param array|boolean $only if set to an array only colums which are set (as data !!!) are written
+	 *	typicaly used to form a WHERE-clause from the primary keys.
+	 *	If set to True, only columns from the colum_definitons are written.
+	 * @param array|boolean $column_definitions this can be set to the column-definitions-array
+	 *	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
+	 *	If its set, the column-type-data determinates if (int) or addslashes is used.
+	 * @return string SQL
+	 */
 	function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False)
 	{
 		if (!is_array($array))	// this allows to give an SQL-string for delete or update
@@ -1523,14 +1523,14 @@ 
 	}
 
 	/**
-	* Sets the default column-definitions for use with column_data_implode()
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param array|boolean $column_definitions this can be set to the column-definitions-array
-	*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
-	*	If its set, the column-type-data determinates if (int) or addslashes is used.
-	*/
+	 * Sets the default column-definitions for use with column_data_implode()
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param array|boolean $column_definitions this can be set to the column-definitions-array
+	 *	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
+	 *	If its set, the column-type-data determinates if (int) or addslashes is used.
+	 */
 	function set_column_definitions($column_definitions=False)
 	{
 		$this->column_definitions=$column_definitions;
@@ -1570,17 +1570,17 @@ 
 	}
 
 	/**
-	* reads the table-definitions from the app's setup/tables_current.inc.php file
-	*
-	* The already read table-definitions are shared between all db-instances via a static var.
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param bool|string $app name of the app or default False to use the app set by db::set_app or the current app,
-	*	true to search the already loaded table-definitions for $table and then search all existing apps for it
-	* @param bool|string $table if set return only defintions of that table, else return all defintions
-	* @return mixed array with table-defintions or False if file not found
-	*/
+	 * reads the table-definitions from the app's setup/tables_current.inc.php file
+	 *
+	 * The already read table-definitions are shared between all db-instances via a static var.
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param bool|string $app name of the app or default False to use the app set by db::set_app or the current app,
+	 *	true to search the already loaded table-definitions for $table and then search all existing apps for it
+	 * @param bool|string $table if set return only defintions of that table, else return all defintions
+	 * @return mixed array with table-defintions or False if file not found
+	 */
 	function get_table_definitions($app=False,$table=False)
 	{
 		// ease the transition to api
@@ -1676,21 +1676,21 @@ 
 	}
 
 	/**
-	* Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $data with column-name / value pairs
-	* @param mixed $where string with where clause or array with column-name / values pairs to check if a row with that keys already exists, or false for an unconditional insert
-	*	if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence)
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param bool $use_prepared_statement use a prepared statement
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $data with column-name / value pairs
+	 * @param mixed $where string with where clause or array with column-name / values pairs to check if a row with that keys already exists, or false for an unconditional insert
+	 *	if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence)
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param bool $use_prepared_statement use a prepared statement
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
 		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
@@ -1786,20 +1786,20 @@ 
 	}
 
 	/**
-	* Updates the data of one or more rows in a table, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $data with column-name / value pairs
-	* @param array $where column-name / values pairs and'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param bool $use_prepared_statement use a prepared statement
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Updates the data of one or more rows in a table, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $data with column-name / value pairs
+	 * @param array $where column-name / values pairs and'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param bool $use_prepared_statement use a prepared statement
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function update($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
 		if ($this->Debug) echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
@@ -1876,18 +1876,18 @@ 
 	}
 
 	/**
-	* Deletes one or more rows in table, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $where column-name / values pairs and'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Deletes one or more rows in table, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $where column-name / values pairs and'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function delete($table,$where,$line,$file,$app=False,$table_def=False)
 	{
 		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
@@ -1953,25 +1953,25 @@ 
 	}
 
 	/**
-	* Selects one or more rows in table depending on where, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array|string $cols string or array of column-names / select-expressions
-	* @param array|string $where string or array with column-name / values pairs AND'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param int|bool $offset offset for a limited query or False (default)
-	* @param string $append string to append to the end of the query, eg. ORDER BY ...
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
-	* @param string $join =null sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
-	*	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Selects one or more rows in table depending on where, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array|string $cols string or array of column-names / select-expressions
+	 * @param array|string $where string or array with column-name / values pairs AND'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param int|bool $offset offset for a limited query or False (default)
+	 * @param string $append string to append to the end of the query, eg. ORDER BY ...
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
+	 * @param string $join =null sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
+	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function select($table,$cols,$where,$line,$file,$offset=False,$append='',$app=False,$num_rows=0,$join='',$table_def=False,$fetchmode=self::FETCH_ASSOC)
 	{
 		if ($this->Debug) echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
@@ -2006,20 +2006,20 @@ 
 	}
 
 	/**
-	* Does a union over multiple selects
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param array $selects array of selects, each select is an array with the possible keys/parameters: table, cols, where, append, app, join, table_def
-	*	For further info about parameters see the definition of the select function, beside table, cols and where all other params are optional
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string $order_by ORDER BY statement for the union
-	* @param int|bool $offset offset for a limited query or False (default)
-	* @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
-	* @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Does a union over multiple selects
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param array $selects array of selects, each select is an array with the possible keys/parameters: table, cols, where, append, app, join, table_def
+	 *	For further info about parameters see the definition of the select function, beside table, cols and where all other params are optional
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string $order_by ORDER BY statement for the union
+	 * @param int|bool $offset offset for a limited query or False (default)
+	 * @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
+	 * @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function union($selects,$line,$file,$order_by='',$offset=false,$num_rows=0,$fetchmode=self::FETCH_ASSOC)
 	{
 		if ($this->Debug) echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";