EGroupware / egroupware

api/src/Vfs.php

Indentation +33 added lines, -33 removed lines

@@ -672,7 +672,7 @@ 
 			return;	// not found, should not happen
 		}
 		if ($type && (($type == 'd') == !($stat['mode'] & Vfs\Sqlfs\StreamWrapper::MODE_DIR) ||	// != is_dir() which can be true for symlinks
-		    $type == 'F' && is_dir($path)))	// symlink to a directory
+			$type == 'F' && is_dir($path)))	// symlink to a directory
 		{
 			return;	// wrong type
 		}
@@ -1621,13 +1621,13 @@ 
 		{
 			return false;
 		}
-    	// remove the lock info evtl. set in the cache
-    	unset(self::$lock_cache[$path]);
+		// remove the lock info evtl. set in the cache
+		unset(self::$lock_cache[$path]);
 
-    	if ($timeout < 1000000)	// < 1000000 is a relative timestamp, so we add the current time
-    	{
-    		$timeout += time();
-    	}
+		if ($timeout < 1000000)	// < 1000000 is a relative timestamp, so we add the current time
+		{
+			$timeout += time();
+		}
 
 		if ($update)	// Lock Update
 		{
@@ -1688,32 +1688,32 @@ 
 		return $ret;
 	}
 
-    /**
-     * unlock a ressource/path
-     *
-     * @param string $path path to unlock
-     * @param string $token locktoken
+	/**
+	 * unlock a ressource/path
+	 *
+	 * @param string $path path to unlock
+	 * @param string $token locktoken
 	 * @param boolean $check_writable =true should we check if the ressource is writable, before granting locks, default yes
-     * @return boolean true on success
-     */
-    static function unlock($path,$token,$check_writable=true)
-    {
+	 * @return boolean true on success
+	 */
+	static function unlock($path,$token,$check_writable=true)
+	{
 		// we require write rights to lock/unlock a resource
 		if ($check_writable && !self::is_writable($path))
 		{
 			return false;
 		}
-        if (($ret = self::$db->delete(self::LOCK_TABLE,array(
-        	'lock_path' => $path,
-        	'lock_token' => $token,
-        ),__LINE__,__FILE__) && self::$db->affected_rows()))
-        {
-        	// remove the lock from the cache too
-        	unset(self::$lock_cache[$path]);
-        }
+		if (($ret = self::$db->delete(self::LOCK_TABLE,array(
+			'lock_path' => $path,
+			'lock_token' => $token,
+		),__LINE__,__FILE__) && self::$db->affected_rows()))
+		{
+			// remove the lock from the cache too
+			unset(self::$lock_cache[$path]);
+		}
 		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$check_writable) returns ".($ret ? 'true' : 'false'));
 		return $ret;
-    }
+	}
 
 	/**
 	 * checkLock() helper
@@ -1741,13 +1741,13 @@ 
 		}
 		if ($result && $result['expires'] < time())	// lock is expired --> remove it
 		{
-	        self::$db->delete(self::LOCK_TABLE,array(
-	        	'lock_path' => $result['path'],
-	        	'lock_token' => $result['token'],
-	        ),__LINE__,__FILE__);
+			self::$db->delete(self::LOCK_TABLE,array(
+				'lock_path' => $result['path'],
+				'lock_token' => $result['token'],
+			),__LINE__,__FILE__);
 
 			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
-	        $result = false;
+			$result = false;
 		}
 		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
 		return self::$lock_cache[$path] = $result;
@@ -1887,9 +1887,9 @@ 
 			$image = Image::find($mime_sub, 'navbar');
 		}
 		else if ($file && $mime_main == 'image' && in_array($mime_sub, array('png','jpeg','jpg','gif','bmp')) &&
-		         (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
-		         (string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
-		         ($stat = self::stat($file)) && $stat['size'] < 1500000)
+				 (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
+				 (string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
+				 ($stat = self::stat($file)) && $stat['size'] < 1500000)
 		{
 			if (substr($file, 0, 6) == '/apps/')
 			{

api/src/Link/Storage.php

Indentation +9 added lines, -9 removed lines

@@ -66,7 +66,7 @@ 
 			echo "<p>solink.link('$app1',$id1,'$app2',$id2,'$remark',$owner)</p>\n";
 		}
 		if ($app1 == $app2 && $id1 == $id2 ||
-		    $id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
+			$id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
 		{
 			return False;	// dont link to self or other nosense
 		}
@@ -412,26 +412,26 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'c.*,b.link_app1 AS app3,b.link_id1 AS id3,b.link_id AS link3',
 				'where'=>'a.link_app1='.self::$db->quote($app).' AND c.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
-                        	'join'=>" a
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
+							'join'=>" a
                         		JOIN $table b ON a.link_id2=b.link_id1 AND a.link_app2=b.link_app1
                        			JOIN $table c ON a.link_id1=c.link_id1 AND a.link_app1=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app2 AND c.link_id2=b.link_id2",
 			),
 			// retrieve the type of links, where the relation is realized as timesheet->infolog/tracker and projectmanager->timesheet
 			array('table'=>self::TABLE,
 				'cols'=>'b.link_id, b.link_app2 as app1, b.link_id2 as id1, b.link_app1 as app2, b.link_id1 as id2, b.link_remark,b.link_lastmod,b.link_owner,b.deleted,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
-                       		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
-                        	'join'=>" a
+					   		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
+							'join'=>" a
                         		JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id1 AND a.link_app2=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app1 AND c.link_id2=b.link_id1",
 			),
 			// retrieve the type of links, where the relation is realized as timesheet->projectmanager and infolog->timesheet
 			array('table'=>self::TABLE,
 				'cols'=>'a.*,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
-                     		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
-                       		'join'=>" a
+					 		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
+					   		'join'=>" a
                        			JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id2 AND a.link_app2=c.link_app2 AND a.link_id!=c.link_id AND c.link_app1=b.link_app1 AND c.link_id1=b.link_id1",
 			),

api/src/Storage/Base.php

Indentation +8 added lines, -8 removed lines

@@ -1367,14 +1367,14 @@
 	}
 
 	/**
-	* Get a default list of columns to search
-	* This is to be used as a fallback, for when the extending class does not define
-	* $this->columns_to_search.  All the columns are considered, and any with $skip_columns_with in
-	* their name are discarded because these columns are expected to be foreign keys or other numeric
-	* values with no meaning to the user.
-	*
-	* @return array of column names
-	*/
+	 * Get a default list of columns to search
+	 * This is to be used as a fallback, for when the extending class does not define
+	 * $this->columns_to_search.  All the columns are considered, and any with $skip_columns_with in
+	 * their name are discarded because these columns are expected to be foreign keys or other numeric
+	 * values with no meaning to the user.
+	 *
+	 * @return array of column names
+	 */
 	protected function get_default_search_columns()
 	{
 		$skip_columns_with = array('_id', 'modified', 'modifier', 'status', 'cat_id', 'owner');

api/src/Db/Backup.php

Indentation +5 added lines, -5 removed lines

@@ -381,7 +381,7 @@ 
 		$zip = NULL;
 		$_f = NULL;
 		if($type == 'zip')
-	    {
+		{
 			// has already been verified to be available in fopen_backup
 			$zip = new ZipArchive;
 			if(($zip->open($filename)) !== TRUE)
@@ -719,9 +719,9 @@ 
 		while($file = $list[0])
 		{
 			if(is_dir($file) && $file != '.' && $file != '..')
-			    self::remove_dir_content($dir.'/'.$file);
+				self::remove_dir_content($dir.'/'.$file);
 			if(is_file($file) && $file != '.' && $file != '..')
-			    unlink($dir.'/'.$file);
+				unlink($dir.'/'.$file);
 			array_shift($list);
 		}
 		//rmdir($dir);  // dont remove own dir
@@ -967,8 +967,8 @@ 
 				echo '<center>'.lang("Cant open %1, needs ZipArchive", $name)."<br>\n".'</center>';
 			}
 
-		    fclose($f);
-		    if (file_exists($name)) unlink($name);
+			fclose($f);
+			if (file_exists($name)) unlink($name);
 			return TRUE;
 		}
 		// save files ....

api/src/Db/Schema.php

Indentation +50 added lines, -50 removed lines

@@ -101,19 +101,19 @@ 
 	 */
 	function __construct($dbms=False, Api\Db $db=null)
 	{
-	    if(is_object($db))
+		if(is_object($db))
 		{
 			$this->m_odb = $db;
-	    }
-	    else
-	    {
+		}
+		else
+		{
 			$this->m_odb = isset($GLOBALS['egw']->db) && is_object($GLOBALS['egw']->db) ? $GLOBALS['egw']->db : $GLOBALS['egw_setup']->db;
-	    }
-	    if (!($this->m_odb instanceof Api\Db))
-	    {
-	    	throw new Api\Exception\AssertionFailed('no EGroupware\Api\Db object!');
-	    }
-	    $this->m_odb->connect();
+		}
+		if (!($this->m_odb instanceof Api\Db))
+		{
+			throw new Api\Exception\AssertionFailed('no EGroupware\Api\Db object!');
+		}
+		$this->m_odb->connect();
 		$this->capabilities =& $this->m_odb->capabilities;
 
 		$this->sType = $dbms ? $dbms : $this->m_odb->Type;
@@ -828,79 +828,79 @@ 
 	}
 
 	/**
-	* Return the value of a column
-	*
-	* @param string|integer $value name of field or positional index starting from 0
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	* @deprecated use result-set returned by query/select
-	* @return string the field value
-	*/
+	 * Return the value of a column
+	 *
+	 * @param string|integer $value name of field or positional index starting from 0
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 * @deprecated use result-set returned by query/select
+	 * @return string the field value
+	 */
 	function f($value,$strip_slashes=False)
 	{
 		if (!($this->m_odb instanceof Deprecated))
 		{
-	    	throw new Api\Exception\AssertionFailed(__METHOD__.' requires an EGroupware\Api\Db\Deprecated object!');
+			throw new Api\Exception\AssertionFailed(__METHOD__.' requires an EGroupware\Api\Db\Deprecated object!');
 		}
 		return $this->m_odb->f($value,$strip_slashes);
 	}
 
 	/**
-	* Number of rows in current result set
-	*
-	* @deprecated use result-set returned by query/select
-	* @return int number of rows
-	*/
+	 * Number of rows in current result set
+	 *
+	 * @deprecated use result-set returned by query/select
+	 * @return int number of rows
+	 */
 	function num_rows()
 	{
 		if (!($this->m_odb instanceof Deprecated))
 		{
-	    	throw new Api\Exception\AssertionFailed(__METHOD__.' requires an EGroupware\Api\Db\Deprecated object!');
+			throw new Api\Exception\AssertionFailed(__METHOD__.' requires an EGroupware\Api\Db\Deprecated object!');
 		}
 		return $this->m_odb->num_rows();
 	}
 
 	/**
-	* Move to the next row in the results set
-	*
-	* @deprecated use result-set returned by query/select
-	* @return bool was another row found?
-	*/
+	 * Move to the next row in the results set
+	 *
+	 * @deprecated use result-set returned by query/select
+	 * @return bool was another row found?
+	 */
 	function next_record()
 	{
 		if (!($this->m_odb instanceof Deprecated))
 		{
-	    	throw new Api\Exception\AssertionFailed(__METHOD__.' requires an EGroupware\Api\Db\Deprecated object!');
+			throw new Api\Exception\AssertionFailed(__METHOD__.' requires an EGroupware\Api\Db\Deprecated object!');
 		}
 		return $this->m_odb->next_record();
 	}
 
 	/**
-	* Execute a query
-	*
-	* @param string $Query_String the query to be executed
-	* @param mixed $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
-	* @param int $num_rows number of rows to return (optional), if unset will use $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Execute a query
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param mixed $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
+	 * @param int $num_rows number of rows to return (optional), if unset will use $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function query($sQuery, $line='', $file='')
 	{
 		return $this->m_odb->query($sQuery, $line, $file);
 	}
 
 	/**
-	* Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
-	*
-	* @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 $app=false string with name of app, this need to be set in setup anyway!!!
-	* @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
+	 *
+	 * @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 $app=false string with name of app, this need to be set in setup anyway!!!
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false)
 	{
 		return $this->m_odb->insert($table,$data,$where,$line,$file,$app,$use_prepared_statement);

api/src/Db/Deprecated.php

Indentation +81 added lines, -81 removed lines

@@ -41,19 +41,19 @@ 
 	var $Query_ID = 0;
 
 	/**
-	* 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 EGroupware\Api\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 EGroupware\Api\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)
 	{
 		// New query, discard previous result.
@@ -76,12 +76,12 @@ 
 	}
 
 	/**
-	* Escape strings before sending them to the database
-	*
-	* @deprecated use quote($value,$type='') instead
-	* @param string $str the string to be escaped
-	* @return string escaped sting
-	*/
+	 * Escape strings before sending them to the database
+	 *
+	 * @deprecated use quote($value,$type='') instead
+	 * @param string $str the string to be escaped
+	 * @return string escaped sting
+	 */
 	function db_addslashes($str)
 	{
 		if (!isset($str) || $str == '')
@@ -107,14 +107,14 @@ 
 	}
 
 	/**
-	* Move to the next row in the results set
-	*
-	* Specifying a fetch_mode only works for newly fetched rows, the first row always gets fetched by query!!!
-	*
-	* @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
-	* @param int $fetch_mode self::FETCH_BOTH = numerical+assoc keys (eGW default), self::FETCH_ASSOC or self::FETCH_NUM
-	* @return bool was another row found?
-	*/
+	 * Move to the next row in the results set
+	 *
+	 * Specifying a fetch_mode only works for newly fetched rows, the first row always gets fetched by query!!!
+	 *
+	 * @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
+	 * @param int $fetch_mode self::FETCH_BOTH = numerical+assoc keys (eGW default), self::FETCH_ASSOC or self::FETCH_NUM
+	 * @return bool was another row found?
+	 */
 	function next_record($fetch_mode=self::FETCH_BOTH)
 	{
 		if (!$this->Query_ID)
@@ -164,12 +164,12 @@ 
 	}
 
 	/**
-	* Move to position in result set
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param int $pos required row (optional), default first row
-	* @return boolean true if sucessful or false if not found
-	*/
+	 * Move to position in result set
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param int $pos required row (optional), default first row
+	 * @return boolean true if sucessful or false if not found
+	 */
 	function seek($pos = 0)
 	{
 		if (!$this->Query_ID  || !$this->Query_ID->Move($this->Row = $pos))
@@ -180,74 +180,74 @@ 
 	}
 
 	/**
-	* Lock a table
-	*
-	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @param string $table name of table to lock
-	* @param string $mode type of lock required (optional), default write
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Lock a table
+	 *
+	 * @deprecated not used anymore as it costs to much performance, use transactions if needed
+	 * @param string $table name of table to lock
+	 * @param string $mode type of lock required (optional), default write
+	 * @return bool True if sucessful, False if fails
+	 */
 	function lock($table, $mode='write')
 	{
 		unset($table, $mode);	// not used anymore
 	}
 
 	/**
-	* Unlock a table
-	*
-	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Unlock a table
+	 *
+	 * @deprecated not used anymore as it costs to much performance, use transactions if needed
+	 * @return bool True if sucessful, False if fails
+	 */
 	function unlock()
 	{}
 
 	/**
-	* Number of rows in current result set
-	*
-	* @deprecated use the result-object returned by query/select()->NumRows(), so you can use the global db-object and not a clone
-	* @return int number of rows
-	*/
+	 * Number of rows in current result set
+	 *
+	 * @deprecated use the result-object returned by query/select()->NumRows(), so you can use the global db-object and not a clone
+	 * @return int number of rows
+	 */
 	function num_rows()
 	{
 		return $this->Query_ID ? $this->Query_ID->RecordCount() : False;
 	}
 
 	/**
-	* Number of fields in current row
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @return int number of fields
-	*/
+	 * Number of fields in current row
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @return int number of fields
+	 */
 	function num_fields()
 	{
 		return $this->Query_ID ? $this->Query_ID->FieldCount() : False;
 	}
 
 	/**
-	* @deprecated use num_rows()
-	*/
+	 * @deprecated use num_rows()
+	 */
 	function nf()
 	{
 		return $this->num_rows();
 	}
 
 	/**
-	* @deprecated use print num_rows()
-	*/
+	 * @deprecated use print num_rows()
+	 */
 	function np()
 	{
 		print $this->num_rows();
 	}
 
 	/**
-	* Return the value of a column
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param string|integer $Name name of field or positional index starting from 0
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	*	depricated param, as correctly quoted values dont need any stripslashes!
-	* @return string the field value
-	*/
+	 * Return the value of a column
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param string|integer $Name name of field or positional index starting from 0
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 *	depricated param, as correctly quoted values dont need any stripslashes!
+	 * @return string the field value
+	 */
 	function f($Name, $strip_slashes = False)
 	{
 		if ($strip_slashes)
@@ -258,26 +258,26 @@ 
 	}
 
 	/**
-	* Print the value of a field
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param string $Name name of field to print
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	*	depricated param, as correctly quoted values dont need any stripslashes!
-	*/
+	 * Print the value of a field
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param string $Name name of field to print
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 *	depricated param, as correctly quoted values dont need any stripslashes!
+	 */
 	function p($Name, $strip_slashes = True)
 	{
 		print $this->f($Name, $strip_slashes);
 	}
 
 	/**
-	* Returns a query-result-row as an associative array (no numerical keys !!!)
-	*
-	* @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
-	* @param bool $do_next_record should next_record() be called or not (default not)
-	* @param string $strip ='' string to strip of the column-name, default ''
-	* @return array/bool the associative array or False if no (more) result-row is availible
-	*/
+	 * Returns a query-result-row as an associative array (no numerical keys !!!)
+	 *
+	 * @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
+	 * @param bool $do_next_record should next_record() be called or not (default not)
+	 * @param string $strip ='' string to strip of the column-name, default ''
+	 * @return array/bool the associative array or False if no (more) result-row is availible
+	 */
 	function row($do_next_record=False,$strip='')
 	{
 		if ($do_next_record && !$this->next_record(self::FETCH_ASSOC) || !is_array($this->Record))

api/src/Contacts/Ads.php

Indentation +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 	 *
 	 * @param string/array $_contact_id contact_id or array with values for id or account_id
 	 * @return array/boolean data if row could be retrived else False
-	*/
+	 */
 	function read($_contact_id)
 	{
 		if (is_array($_contact_id) && isset($_contact_id['account_id']) ||

api/src/Contacts/Ldap.php

Indentation +17 added lines, -17 removed lines

@@ -41,33 +41,33 @@ 
 	var $contacts_id='id';
 
 	/**
-	* @var string $accountName holds the accountname of the current user
-	*/
+	 * @var string $accountName holds the accountname of the current user
+	 */
 	var $accountName;
 
 	/**
-	* @var object $ldapServerInfo holds the information about the current used ldap server
-	*/
+	 * @var object $ldapServerInfo holds the information about the current used ldap server
+	 */
 	var $ldapServerInfo;
 
 	/**
-	* @var int $ldapLimit how many rows to fetch from ldap server
-	*/
+	 * @var int $ldapLimit how many rows to fetch from ldap server
+	 */
 	var $ldapLimit = 2000;
 
 	/**
-	* @var string $personalContactsDN holds the base DN for the personal addressbooks
-	*/
+	 * @var string $personalContactsDN holds the base DN for the personal addressbooks
+	 */
 	var $personalContactsDN;
 
 	/**
-	* @var string $sharedContactsDN holds the base DN for the shared addressbooks
-	*/
+	 * @var string $sharedContactsDN holds the base DN for the shared addressbooks
+	 */
 	var $sharedContactsDN;
 
 	/**
-	* @var string $accountContactsDN holds the base DN for accounts addressbook
-	*/
+	 * @var string $accountContactsDN holds the base DN for accounts addressbook
+	 */
 	var $accountContactsDN;
 
 	/**
@@ -77,8 +77,8 @@ 
 	var $accountsFilter = '(objectclass=posixaccount)';
 
 	/**
-	* @var string $allContactsDN holds the base DN of all addressbook
-	*/
+	 * @var string $allContactsDN holds the base DN of all addressbook
+	 */
 	var $allContactsDN;
 
 	/**
@@ -96,8 +96,8 @@ 
 	var $never_change_dn = false;
 
 	/**
-	* @var int $total holds the total count of found rows
-	*/
+	 * @var int $total holds the total count of found rows
+	 */
 	var $total;
 
 	/**
@@ -403,7 +403,7 @@ 
 	 *
 	 * @param string|array $contact_id contact_id or array with values for id or account_id
 	 * @return array/boolean data if row could be retrived else False
-	*/
+	 */
 	function read($contact_id)
 	{
 		if (is_array($contact_id) && isset($contact_id['account_id']) ||

api/src/Contacts/Sql.php

Indentation +3 added lines, -3 removed lines

@@ -858,9 +858,9 @@
 	}
 
 	/**
-	* Deletes custom field data
-	* Implemented to deal with LDAP backend, which saves CFs in SQL, but the account record is in LDAP
-	*/
+	 * Deletes custom field data
+	 * Implemented to deal with LDAP backend, which saves CFs in SQL, but the account record is in LDAP
+	 */
 	function delete_customfields($data)
 	{
 		$this->db->delete($this->extra_table,$data,__LINE__,__FILE__);