EGroupware / egroupware

api/src/Exception/NotFound.php

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
 	 * @param string $msg =null message, default "Entry not found!"
 	 * @param int $code =99 numerical code, default 2
 	 */
-	function __construct($msg=null,$code=2)
+	function __construct($msg = null, $code = 2)
 	{
 		if (is_null($msg)) $msg = lang('Entry not found!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

api/src/Exception/Redirect.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * @param string $msg
 	 * @param int $code
 	 */
-	function __construct($url,$app=null,$msg=null,$code=301)
+	function __construct($url, $app = null, $msg = null, $code = 301)
 	{
 		$this->url = $url;
 		$this->app = $app;

api/src/Exception/NoPermission.php

Spacing +2 added lines, -2 removed lines

@@ -27,10 +27,10 @@
 	 * @param string $msg =null message, default "Permission denied!"
 	 * @param int $code =100 numerical code, default 100
 	 */
-	function __construct($msg=null,$code=100)
+	function __construct($msg = null, $code = 100)
 	{
 		if (is_null($msg)) $msg = lang('Permisson denied!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

api/src/Db/CallbackIterator.php

Spacing +9 added lines, -10 removed lines

@@ -99,13 +99,13 @@ 
 	 * @param array $params =array() additional parameters, row is always first parameter
 	 * @param $key_callback =null optional callback, if you want different keys
 	 */
-	public function __construct(\Traversable $rs, $callback, $params=array(), $key_callback=null)
+	public function __construct(\Traversable $rs, $callback, $params = array(), $key_callback = null)
 	{
 		$this->callback = $callback;
 		$this->params = $params;
 		$this->key_callback = $key_callback;
 
-		if (is_a($rs,'IteratorAggregate'))
+		if (is_a($rs, 'IteratorAggregate'))
 		{
 			$this->rs = $rs->getIterator();
 		}
@@ -122,7 +122,7 @@ 
 	 */
 	public function current()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			$params = $this->params;
 			array_unshift($params, $this->rs->current());
@@ -138,11 +138,10 @@ 
 	 */
 	public function key()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->key_callback ?
-				call_user_func($this->key_callback, $this->rs->current()) :
-				$this->rs->key();
+				call_user_func($this->key_callback, $this->rs->current()) : $this->rs->key();
 		}
 		return 0;
 	}
@@ -152,7 +151,7 @@ 
 	 */
 	public function next()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->next();
 		}
@@ -163,7 +162,7 @@ 
 	 */
 	public function rewind()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->rewind();
 		}
@@ -174,9 +173,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->valid();
 		}

api/src/Db/Exception.php

Spacing +2 added lines, -2 removed lines

@@ -27,10 +27,10 @@
 	 * @param string $msg =null message, default "Database error!"
 	 * @param int $code =100
 	 */
-	function __construct($msg=null,$code=100)
+	function __construct($msg = null, $code = 100)
 	{
 		if (is_null($msg)) $msg = lang('Database error!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

api/src/Db/Deprecated.php

Spacing +11 added lines, -11 removed lines

@@ -54,7 +54,7 @@ 
 	* @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)
+	function query($Query_String, $line = '', $file = '', $offset = 0, $num_rows = -1, $inputarr = false, $fetchmode = self::FETCH_BOTH, $reconnect = true)
 	{
 		// New query, discard previous result.
 		if ($this->Query_ID)
@@ -102,7 +102,7 @@ 
 	 */
 	function free()
 	{
-		unset($this->Query_ID);	// else copying of the db-object does not work
+		unset($this->Query_ID); // else copying of the db-object does not work
 		$this->Query_ID = 0;
 	}
 
@@ -115,7 +115,7 @@ 
 	* @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)
+	function next_record($fetch_mode = self::FETCH_BOTH)
 	{
 		if (!$this->Query_ID)
 		{
@@ -135,7 +135,7 @@ 
 		}
 		if ($this->capabilities[self::CAPABILITY_NAME_CASE] == 'upper')	// maxdb, oracle, ...
 		{
-			switch($fetch_mode)
+			switch ($fetch_mode)
 			{
 				case self::FETCH_ASSOC:
 					$this->Record = array_change_key_case($this->Record);
@@ -172,9 +172,9 @@ 
 	*/
 	function seek($pos = 0)
 	{
-		if (!$this->Query_ID  || !$this->Query_ID->Move($this->Row = $pos))
+		if (!$this->Query_ID || !$this->Query_ID->Move($this->Row = $pos))
 		{
-			throw new Exception("seek($pos) failed: resultset has " . $this->num_rows() . " rows");
+			throw new Exception("seek($pos) failed: resultset has ".$this->num_rows()." rows");
 		}
 		return True;
 	}
@@ -187,9 +187,9 @@ 
 	* @param string $mode type of lock required (optional), default write
 	* @return bool True if sucessful, False if fails
 	*/
-	function lock($table, $mode='write')
+	function lock($table, $mode = 'write')
 	{
-		unset($table, $mode);	// not used anymore
+		unset($table, $mode); // not used anymore
 	}
 
 	/**
@@ -278,18 +278,18 @@ 
 	* @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='')
+	function row($do_next_record = False, $strip = '')
 	{
 		if ($do_next_record && !$this->next_record(self::FETCH_ASSOC) || !is_array($this->Record))
 		{
 			return False;
 		}
 		$result = array();
-		foreach($this->Record as $column => $value)
+		foreach ($this->Record as $column => $value)
 		{
 			if (!is_numeric($column))
 			{
-				if ($strip) $column = str_replace($strip,'',$column);
+				if ($strip) $column = str_replace($strip, '', $column);
 
 				$result[$column] = $value;
 			}

api/src/Egw/Base.php

Spacing +4 added lines, -4 removed lines

@@ -64,12 +64,12 @@ 
 	 */
 	static $sub_objects = array(
 		'log' => 'errorlog',
-		'link' => 'bolink',		// depricated use static egw_link methods
+		'link' => 'bolink', // depricated use static egw_link methods
 		'datetime' => 'egw_datetime',
 		// classes moved to new api dir
 		'template' => true,
 		'applications' => 'EGroupware\\Api\\Egw\\Applications',
-		'framework' => true,	// special handling in __get()
+		'framework' => true, // special handling in __get()
 		'ldap' => true,
 	);
 
@@ -95,7 +95,7 @@ 
 	{
 		//error_log(__METHOD__."($name)".function_backtrace());
 
-		if ($name == 'js') $name = 'framework';	// javascript class is integrated now into framework
+		if ($name == 'js') $name = 'framework'; // javascript class is integrated now into framework
 
 		if (isset($this->$name))
 		{
@@ -107,7 +107,7 @@ 
 			if ($name != 'ADOdb') error_log(__METHOD__.": There's NO $name object! ".function_backtrace());
 			return null;
 		}
-		switch($name)
+		switch ($name)
 		{
 			case 'framework':
 				return $this->framework = Api\Framework::factory();

api/src/Contacts/Tracking.php

Spacing +22 added lines, -22 removed lines

@@ -106,17 +106,17 @@ 
 	 * @param array $old =null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	function get_config($name,$data,$old=null)
+	function get_config($name, $data, $old = null)
 	{
-		unset($old);	// not used, but required by function signature
+		unset($old); // not used, but required by function signature
 
-		switch($name)
+		switch ($name)
 		{
 			case 'copy':
 				if ($data['is_contactform'])
 				{
-					$copy = preg_split('/, ?/',$data['email_contactform']);
-					if  ($data['email_copytoreceiver']) $copy[] = $data['email'];
+					$copy = preg_split('/, ?/', $data['email_contactform']);
+					if ($data['email_copytoreceiver']) $copy[] = $data['email'];
 					return $copy;
 				}
 				break;
@@ -144,27 +144,27 @@ 
 	 * @param array $changed_fields =null changed fields from ealier call to $this->changed_fields($data,$old), to not compute it again
 	 * @return int number of log-entries made
 	 */
-	protected function save_history(array $data,array $old=null,$deleted=null,array $changed_fields=null)
+	protected function save_history(array $data, array $old = null, $deleted = null, array $changed_fields = null)
 	{
 		if (is_null($changed_fields))
 		{
-			$changed_fields = self::changed_fields($data,$old);
+			$changed_fields = self::changed_fields($data, $old);
 		}
 		if (!$changed_fields) return 0;
 
-		foreach(array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
+		foreach (array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
 		{
 			// Only codes involved, but old text name is automatically added when loaded
-			if($old[$code] && $data[$code] && ($key = array_search($name, $changed_fields)) !== false)
+			if ($old[$code] && $data[$code] && ($key = array_search($name, $changed_fields)) !== false)
 			{
 				unset($changed_fields[$key]);
 				continue;
 			}
 
 			// Code and a text name
-			if(in_array($name, $changed_fields) && in_array($code, $changed_fields))
+			if (in_array($name, $changed_fields) && in_array($code, $changed_fields))
 			{
-				if($data[$code])
+				if ($data[$code])
 				{
 					$data[$name] = Api\Country::get_full_name($data[$code], true);
 				}
@@ -172,7 +172,7 @@ 
 			}
 		}
 		//error_log(__METHOD__.__LINE__.' ChangedFields:'.array2string($changed_fields));
-		return parent::save_history($data,$old,$deleted,$changed_fields);
+		return parent::save_history($data, $old, $deleted, $changed_fields);
 	}
 
 	/**
@@ -183,9 +183,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_message($data,$old,$receiver=null)
+	protected function get_message($data, $old, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
 		if (!$data['modified'] || !$old)
 		{
@@ -207,9 +207,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_subject($data,$old,$deleted=null,$receiver=null)
+	protected function get_subject($data, $old, $deleted = null, $receiver = null)
 	{
-		unset($old, $deleted, $receiver);	// not used, but required by function signature
+		unset($old, $deleted, $receiver); // not used, but required by function signature
 
 		if ($data['is_contactform'])
 		{
@@ -225,15 +225,15 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data,$receiver=null)
+	function get_details($data, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		foreach($this->contacts->contact_fields as $name => $label)
+		foreach ($this->contacts->contact_fields as $name => $label)
 		{
 			if (!$data[$name] && $name != 'owner') continue;
 
-			switch($name)
+			switch ($name)
 			{
 				case 'n_prefix': case 'n_given': case 'n_middle': case 'n_family': case 'n_suffix':	// already in n_fn
 				case 'n_fileas': case 'id': case 'tid':
@@ -263,13 +263,13 @@ 
 					if ($data[$name])
 					{
 						$cats = array();
-						foreach(is_array($data[$name]) ? $data[$name] : explode(',',$data[$name]) as $cat_id)
+						foreach (is_array($data[$name]) ? $data[$name] : explode(',', $data[$name]) as $cat_id)
 						{
 							$cats[] = $GLOBALS['egw']->cats->id2name($cat_id);
 						}
 						$details[$name] = array(
 							'label' => $label,
-							'value' => explode(', ',$cats),
+							'value' => explode(', ', $cats),
 						);
 					}
 				case 'note':

api/src/Contacts/Ads.php

Spacing +17 added lines, -18 removed lines

@@ -35,8 +35,8 @@ 
 	 * minimum: $this->columns_to_search = array('n_family','n_given','org_name','email');
 	 */
 	var $search_attributes = array(
-		'n_family','n_middle','n_given','org_name','org_unit',
-		'adr_one_location','note','email','samaccountname',
+		'n_family', 'n_middle', 'n_given', 'org_name', 'org_unit',
+		'adr_one_location', 'note', 'email', 'samaccountname',
 	);
 
 	/**
@@ -50,7 +50,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $dn_attribute='cn';
+	var $dn_attribute = 'cn';
 
 	/**
 	 * Do NOT attempt to change DN (dn-attribute can NOT be part of schemas used in addressbook!)
@@ -82,11 +82,11 @@ 
 	 * @param array $ldap_config =null default use from $GLOBALS['egw_info']['server']
 	 * @param resource $ds =null ldap connection to use
 	 */
-	function __construct(array $ldap_config=null, $ds=null)
+	function __construct(array $ldap_config = null, $ds = null)
 	{
-		if (false) parent::__construct ();	// quiten IDE warning, we are explicitly NOT calling parrent constructor!
+		if (false) parent::__construct(); // quiten IDE warning, we are explicitly NOT calling parrent constructor!
 
-		$this->accountName 		= $GLOBALS['egw_info']['user']['account_lid'];
+		$this->accountName = $GLOBALS['egw_info']['user']['account_lid'];
 
 		if ($ldap_config)
 		{
@@ -94,7 +94,7 @@ 
 		}
 		else
 		{
-			$this->ldap_config =& $GLOBALS['egw_info']['server'];
+			$this->ldap_config = & $GLOBALS['egw_info']['server'];
 		}
 
 		$this->accounts_ads = $GLOBALS['egw']->accounts->backend;
@@ -119,15 +119,15 @@ 
 			'account_id'	=> 'objectsid',
 			'id'            => 'objectguid',
 			'uid'			=> 'objectguid',
-			'n_fn'          => 'displayname',	// leave CN used in DN untouched
-			'accountexpires', 'useraccountcontrol',	// needed to exclude deactivated or expired accounts
+			'n_fn'          => 'displayname', // leave CN used in DN untouched
+			'accountexpires', 'useraccountcontrol', // needed to exclude deactivated or expired accounts
 		));
 		unset($this->schema2egw['user']['n_fileas']);
 		unset($this->schema2egw['inetorgperson']);
 
-		foreach($this->schema2egw as $attributes)
+		foreach ($this->schema2egw as $attributes)
 		{
-			$this->all_attributes = array_merge($this->all_attributes,array_values($attributes));
+			$this->all_attributes = array_merge($this->all_attributes, array_values($attributes));
 		}
 		$this->all_attributes = array_values(array_unique($this->all_attributes));
 
@@ -139,9 +139,9 @@ 
 	 *
 	 * @param boolean $admin =false true (re-)connect with admin not user credentials, eg. to modify accounts
 	 */
-	function connect($admin=false)
+	function connect($admin = false)
 	{
-		unset($admin);	// not used, but required by function signature
+		unset($admin); // not used, but required by function signature
 
 		$this->ds = $this->accounts_ads->ldap_connection();
 	}
@@ -174,15 +174,14 @@ 
 	function read($_contact_id)
 	{
 		if (is_array($_contact_id) && isset($_contact_id['account_id']) ||
-			!is_array($_contact_id) && substr($_contact_id,0,8) == 'account:')
+			!is_array($_contact_id) && substr($_contact_id, 0, 8) == 'account:')
 		{
-			$account_id = (int)(is_array($_contact_id) ? $_contact_id['account_id'] : substr($_contact_id,8));
+			$account_id = (int)(is_array($_contact_id) ? $_contact_id['account_id'] : substr($_contact_id, 8));
 			$_contact_id = $GLOBALS['egw']->accounts->id2name($account_id, 'person_id');
 		}
-		$contact_id = !is_array($_contact_id) ? $_contact_id :
-			(isset ($_contact_id['id']) ? $_contact_id['id'] : $_contact_id['uid']);
+		$contact_id = !is_array($_contact_id) ? $_contact_id : (isset ($_contact_id['id']) ? $_contact_id['id'] : $_contact_id['uid']);
 
-		$rows = $this->_searchLDAP($this->allContactsDN, $filter=$this->id_filter($contact_id), $this->all_attributes, Ldap::ALL);
+		$rows = $this->_searchLDAP($this->allContactsDN, $filter = $this->id_filter($contact_id), $this->all_attributes, Ldap::ALL);
 		//error_log(__METHOD__."('$contact_id') _searchLDAP($this->allContactsDN, '$filter',...)=".array2string($rows));
 		return $rows ? $rows[0] : false;
 	}