EGroupware / egroupware

api/src/Etemplate/Widget/Link.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
 	/**
 	 * Create links
 	 */
-	public static function ajax_link($app, $id, Array $links)
+	public static function ajax_link($app, $id, array $links)
 	{
 		// Files need to know full path in tmp directory
 		foreach($links as $key => $link) {

Braces +36 added lines, -11 removed lines

@@ -37,7 +37,8 @@ 
 	 */
 	public function __construct($xml = '')
 	{
-		if($xml) {
+		if($xml)
+		{
 			parent::__construct($xml);
 		}
 	}
@@ -85,14 +86,18 @@ 
 
 
 		// ToDo: implement on client-side
-		if (!$attrs['help']) self::setElementAttribute($form_name, 'help', 'view this linked entry in its application');
+		if (!$attrs['help'])
+		{
+			self::setElementAttribute($form_name, 'help', 'view this linked entry in its application');
+		}
 
 		if($attrs['type'] == 'link-list')
 		{
 			$app = $value['to_app'];
 			$id  = $value['to_id'];
 			$links = Api\Link::get_links($app,$id,'','link_lastmod DESC',true, $value['show_deleted']);
-			foreach($links as $link) {
+			foreach($links as $link)
+			{
 				$value[] = $link;
 			}
 		}
@@ -104,7 +109,10 @@ 
 	public static function ajax_link_search($app, $type, $pattern, $options=array())
 	{
 		$options['type'] = $type ? $type : $options['type'];
-		if(!$options['num_rows']) $options['num_rows'] = 1000;
+		if(!$options['num_rows'])
+		{
+			$options['num_rows'] = 1000;
+		}
 
 		$links = Api\Link::query($app, $pattern, $options);
 
@@ -162,8 +170,10 @@ 
 	public static function ajax_link($app, $id, Array $links)
 	{
 		// Files need to know full path in tmp directory
-		foreach($links as $key => $link) {
-			if($link['app'] == Api\Link::VFS_APPNAME) {
+		foreach($links as $key => $link)
+		{
+			if($link['app'] == Api\Link::VFS_APPNAME)
+			{
 				if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 				{
 					$path = $GLOBALS['egw_info']['server']['temp_dir'] . '/' . $link['id'];
@@ -267,7 +277,10 @@ 
 			$id .= "/$dest_file";
 		}
 
-		if(!is_array($files)) $files = array($files);
+		if(!is_array($files))
+		{
+			$files = array($files);
+		}
 
 		if ($action == "copy")
 		{
@@ -343,9 +356,12 @@ 
 			// keep values added into request by other ajax-functions, eg. files draged into htmlarea (Vfs)
 			if ((!$value || is_array($value) && !$value['to_id']) && is_array($expand['cont'][$this->id]) && !empty($expand['cont'][$this->id]['to_id']))
 			{
-				if (!is_array($value)) $value = array(
+				if (!is_array($value))
+				{
+					$value = array(
 					'to_app' => $expand['cont'][$this->id]['to_app'],
 				);
+				}
 				$value['to_id'] = $expand['cont'][$this->id]['to_id'];
 			}
 
@@ -367,7 +383,10 @@ 
 				else
 				{
 					// Not enough information, leave it to the application
-					if(!is_array($value['to_id'])) $value['to_id'] = array();
+					if(!is_array($value['to_id']))
+					{
+						$value['to_id'] = array();
+					}
 					$value['to_id'][] = $link;
 				}
 			}
@@ -387,7 +406,10 @@ 
 				}
 				foreach($files as $name => $attrs)
 				{
-					if(!is_array($value['to_id'])) $value['to_id'] = array();
+					if(!is_array($value['to_id']))
+					{
+						$value['to_id'] = array();
+					}
 					$value['to_id'][] = array(
 						'app'	=> Api\Link::VFS_APPNAME,
 						'id'	=> array(
@@ -399,7 +421,10 @@ 
 				}
 			}
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 			//error_log($this);
 			//error_log("   " . array2string($valid));
 		}

Spacing +49 added lines, -49 removed lines

@@ -37,7 +37,7 @@ 
 	 */
 	public function __construct($xml = '')
 	{
-		if($xml) {
+		if ($xml) {
 			parent::__construct($xml);
 		}
 	}
@@ -62,20 +62,20 @@ 
 	 * @param string $cname
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function beforeSendToClient($cname, array $expand=null)
+	public function beforeSendToClient($cname, array $expand = null)
 	{
 		$attrs = $this->attrs;
 		$form_name = self::form_name($cname, $this->id, $expand);
-		$value =& self::get_array(self::$request->content, $form_name, true);
+		$value = & self::get_array(self::$request->content, $form_name, true);
 
-		if($value && !is_array($value) && !$this->attrs['only_app'])
+		if ($value && !is_array($value) && !$this->attrs['only_app'])
 		{
 			// Try to explode
-			if(count(explode(':',$value)) < 2)
+			if (count(explode(':', $value)) < 2)
 			{
 				throw new Api\Exception\WrongParameter("Wrong value sent to $this, needs to be an array. ".array2string($value));
 			}
-			list($app, $id) = explode(':', $value,2);
+			list($app, $id) = explode(':', $value, 2);
 			$value = array('app' => $app, 'id' => $id);
 		}
 		elseif (!$value)
@@ -87,12 +87,12 @@ 
 		// ToDo: implement on client-side
 		if (!$attrs['help']) self::setElementAttribute($form_name, 'help', 'view this linked entry in its application');
 
-		if($attrs['type'] == 'link-list')
+		if ($attrs['type'] == 'link-list')
 		{
 			$app = $value['to_app'];
 			$id  = $value['to_id'];
-			$links = Api\Link::get_links($app,$id,'','link_lastmod DESC',true, $value['show_deleted']);
-			foreach($links as $link) {
+			$links = Api\Link::get_links($app, $id, '', 'link_lastmod DESC', true, $value['show_deleted']);
+			foreach ($links as $link) {
 				$value[] = $link;
 			}
 		}
@@ -101,10 +101,10 @@ 
 	/**
 	 * Find links that match the given parameters
 	 */
-	public static function ajax_link_search($app, $type, $pattern, $options=array())
+	public static function ajax_link_search($app, $type, $pattern, $options = array())
 	{
 		$options['type'] = $type ? $type : $options['type'];
-		if(!$options['num_rows']) $options['num_rows'] = 1000;
+		if (!$options['num_rows']) $options['num_rows'] = 1000;
 
 		$links = Api\Link::query($app, $pattern, $options);
 
@@ -126,7 +126,7 @@ 
 	 * @param string|int $id
 	 * @return string|boolean string with title, boolean false of permission denied or null if not found
 	 */
-	public static function ajax_link_title($app,$id)
+	public static function ajax_link_title($app, $id)
 	{
 		$title = Api\Link::title($app, $id);
 		//error_log(__METHOD__."('$app', '$id') = ".array2string($title));
@@ -142,15 +142,15 @@ 
 	public static function ajax_link_titles(array $app_ids)
 	{
 		$response = array();
-		foreach($app_ids as $app => $ids)
+		foreach ($app_ids as $app => $ids)
 		{
-			if(count($ids))
+			if (count($ids))
 			{
 				$response[$app] = Api\Link::titles($app, $ids);
 			}
 			else
 			{
-				error_log(__METHOD__."(".array2string($app_ids).") got invalid title request: app=$app, ids=" . array2string($ids));
+				error_log(__METHOD__."(".array2string($app_ids).") got invalid title request: app=$app, ids=".array2string($ids));
 			}
 		}
 		Api\Json\Response::get()->data($response);
@@ -162,11 +162,11 @@ 
 	public static function ajax_link($app, $id, Array $links)
 	{
 		// Files need to know full path in tmp directory
-		foreach($links as $key => $link) {
-			if($link['app'] == Api\Link::VFS_APPNAME) {
+		foreach ($links as $key => $link) {
+			if ($link['app'] == Api\Link::VFS_APPNAME) {
 				if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 				{
-					$path = $GLOBALS['egw_info']['server']['temp_dir'] . '/' . $link['id'];
+					$path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.$link['id'];
 				}
 				else
 				{
@@ -187,20 +187,20 @@ 
 		$app = $value['to_app'];
 		$id  = $value['to_id'];
 
-		$links = Api\Link::get_links($app,$id,$value['only_app'],'link_lastmod DESC',true, $value['show_deleted']);
-		foreach($links as &$link)
+		$links = Api\Link::get_links($app, $id, $value['only_app'], 'link_lastmod DESC', true, $value['show_deleted']);
+		foreach ($links as &$link)
 		{
-			$link['title'] = Api\Link::title($link['app'],$link['id'],$link);
+			$link['title'] = Api\Link::title($link['app'], $link['id'], $link);
 			if ($link['app'] == Api\Link::VFS_APPNAME)
 			{
 				$link['target'] = '_blank';
 				$link['label'] = 'Delete';
 				$link['help'] = lang('Delete this file');
 				$link['title'] = Api\Vfs::decodePath($link['title']);
-				$link['icon'] = Api\Link::vfs_path($link['app2'],$link['id2'],$link['id'],true);
+				$link['icon'] = Api\Link::vfs_path($link['app2'], $link['id2'], $link['id'], true);
 				$link['download_url'] = Api\Vfs::download_url($link['icon']);
 				// Make links to directories load in filemanager
-				if($link['type'] == Api\Vfs::DIR_MIME_TYPE)
+				if ($link['type'] == Api\Vfs::DIR_MIME_TYPE)
 				{
 					$link['target'] = 'filemanager';
 				}
@@ -224,7 +224,7 @@ 
 	public static function ajax_link_comment($link_id, $comment)
 	{
 		$result = false;
-		if((int)$link_id > 0)
+		if ((int)$link_id > 0)
 		{
 			Api\Link::update_remark((int)$link_id, $comment);
 			$result = true;
@@ -232,11 +232,11 @@ 
 		else
 		{
 			$link = Api\Link::get_link((int)$link_id);
-			if($link && $link['app'] == Api\Link::VFS_APPNAME)
+			if ($link && $link['app'] == Api\Link::VFS_APPNAME)
 			{
-				$files = Api\Link::list_attached($link['app2'],$link['id2']);
+				$files = Api\Link::list_attached($link['app2'], $link['id2']);
 				$file = $files[(int)$link_id];
-				$path = Api\Link::vfs_path($link['app2'],$link['id2'],$file['id']);
+				$path = Api\Link::vfs_path($link['app2'], $link['id2'], $file['id']);
 				$result = Api\Vfs::proppatch($path, array(array('name' => 'comment', 'val' => $comment)));
 			}
 		}
@@ -260,14 +260,14 @@ 
 
 		if (empty($app_id) || empty($id))
 		{
-			return;	// cant do anything
+			return; // cant do anything
 		}
-		if($id && $dest_file && trim($dest_file) !== '')
+		if ($id && $dest_file && trim($dest_file) !== '')
 		{
 			$id .= "/$dest_file";
 		}
 
-		if(!is_array($files)) $files = array($files);
+		if (!is_array($files)) $files = array($files);
 
 		if ($action == "copy")
 		{
@@ -279,7 +279,7 @@ 
 		}
 		else
 		{
-			foreach($files as $target)
+			foreach ($files as $target)
 			{
 				Api\Link::link_file($app, $id, $target);
 			}
@@ -304,13 +304,13 @@ 
 	{
 		$app = $_GET['app'];
 		$id = $_GET['id'];
-		if(Api\Link::file_access($app, $id))
+		if (Api\Link::file_access($app, $id))
 		{
-			$app_path = Api\Link::vfs_path($app,$id,'',true);
+			$app_path = Api\Link::vfs_path($app, $id, '', true);
 
 			// Pass the files linked, not the entry path
 			$files = Api\Vfs::find($app_path);
-			if($files[0] == $app_path)
+			if ($files[0] == $app_path)
 			{
 				array_shift($files);
 			}
@@ -334,13 +334,13 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
 		if (!$this->is_readonly($cname, $form_name))
 		{
-			$value = $value_in =& self::get_array($content, $form_name);
+			$value = $value_in = & self::get_array($content, $form_name);
 
 			// keep values added into request by other ajax-functions, eg. files draged into htmlarea (Vfs)
 			if ((!$value || is_array($value) && !$value['to_id']) && is_array($expand['cont'][$this->id]) && !empty($expand['cont'][$this->id]['to_id']))
@@ -352,44 +352,44 @@ 
 			}
 
 			// Link widgets can share IDs, make sure to preserve values from others
-			$already = self::get_array($validated,$form_name);
-			if($already != null)
+			$already = self::get_array($validated, $form_name);
+			if ($already != null)
 			{
-				$value = array_merge($value,$already);
+				$value = array_merge($value, $already);
 			}
 			// Automatically do link if user selected entry but didn't click 'Link' button
-			$link = self::get_array($content, self::form_name($cname, $this->id . '_link_entry'));
-			if($this->type =='link-to' && is_array($link) && $link['app'] && $link['id'] )
+			$link = self::get_array($content, self::form_name($cname, $this->id.'_link_entry'));
+			if ($this->type == 'link-to' && is_array($link) && $link['app'] && $link['id'])
 			{
 				// Do we have enough information to link automatically?
-				if(is_array($value) && $value['to_id'])
+				if (is_array($value) && $value['to_id'])
 				{
 					Api\Link::link($value['to_app'], $value['to_id'], $link['app'], $link['id']);
 				}
 				else
 				{
 					// Not enough information, leave it to the application
-					if(!is_array($value['to_id'])) $value['to_id'] = array();
+					if (!is_array($value['to_id'])) $value['to_id'] = array();
 					$value['to_id'][] = $link;
 				}
 			}
 
 			// Look for files - normally handled by ajax
-			$files = self::get_array($content, self::form_name($cname, $this->id . '_file'));
-			if(is_array($files) && !(is_array($value) && $value['to_id']))
+			$files = self::get_array($content, self::form_name($cname, $this->id.'_file'));
+			if (is_array($files) && !(is_array($value) && $value['to_id']))
 			{
 				$value = array();
 				if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 				{
-					$path = $GLOBALS['egw_info']['server']['temp_dir'] . '/';
+					$path = $GLOBALS['egw_info']['server']['temp_dir'].'/';
 				}
 				else
 				{
 					$path = '';
 				}
-				foreach($files as $name => $attrs)
+				foreach ($files as $name => $attrs)
 				{
-					if(!is_array($value['to_id'])) $value['to_id'] = array();
+					if (!is_array($value['to_id'])) $value['to_id'] = array();
 					$value['to_id'][] = array(
 						'app'	=> Api\Link::VFS_APPNAME,
 						'id'	=> array(
@@ -400,7 +400,7 @@ 
 					);
 				}
 			}
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 			//error_log($this);
 			//error_log("   " . array2string($valid));

api/src/Etemplate/KeyManager.php

Braces +2 added lines, -1 removed lines

@@ -101,7 +101,8 @@
 		}
 
 		// Special keys
-		switch ($keyCode) {
+		switch ($keyCode)
+		{
 			case self::BACKSPACE:
 				return lang("Back");
 			case self::TAB:

api/src/Etemplate/Request/Session.php

Braces +22 added lines, -5 removed lines

@@ -63,12 +63,18 @@ 
 	 */
 	private function __construct($id=null)
 	{
-		if (!$id) $id = self::request_id();
+		if (!$id)
+		{
+			$id = self::request_id();
+		}
 
 		$this->id = $id;
 
 		// hack to quiten IDE Warning for not calling parent::__construct, which we can not!
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 	}
 
 	/**
@@ -162,7 +168,11 @@ 
 		}
 		$this->garbage_collection_done = true;
 
-		if (count($appsessions) < 20) return;	// we dont need to care
+		if (count($appsessions) < 20)
+		{
+			return;
+		}
+		// we dont need to care
 
 		$now = (int) (100 * microtime(true));	// gives precision of 1/100 sec
 
@@ -170,15 +180,22 @@ 
 		{
 			list(,$time) = explode(':',$id);
 
-			if (!$time) continue;	// other data, no session
+			if (!$time)
+			{
+				continue;
+			}
+			// other data, no session
 
 			//echo ++$n.') '.$id.': '.(($now-$time)/100.0)."secs old, used=".$session_used[$id].", size=".strlen($appsessions[$id])."<br>\n";
 
 			if ($session_used[$id] == 1 && $time < $now - 10*6000 || // session used and older then 10min
-				$time < $now - 30*6000)	// session not used and older then 30min
+				$time < $now - 30*6000)
+			{
+				// session not used and older then 30min
 			{
 				//echo "<p>boetemplate::php4_session_garbage_collection('$id_used'): unsetting session '$id' (now=$now)</p>\n";
 				unset($appsessions[$id]);
+			}
 				unset($session_used[$id]);
 			}
 		}

Spacing +13 added lines, -13 removed lines

@@ -61,7 +61,7 @@ 
 	 *
 	 * @param string|null $id =null
 	 */
-	private function __construct($id=null)
+	private function __construct($id = null)
 	{
 		if (!$id) $id = self::request_id();
 
@@ -88,7 +88,7 @@ 
 	 * @param string $id =null
 	 * @return etemplate_request|boolean the object or false if $id is not found
 	 */
-	static function read($id=null)
+	static function read($id = null)
 	{
 		$request = new Session($id);
 
@@ -96,7 +96,7 @@ 
 		{
 			if (!($data = Api\Cache::getSession('etemplate', $id)))
 			{
-				return false;	// request not found
+				return false; // request not found
 			}
 			$request->data = $data;
 		}
@@ -139,30 +139,30 @@ 
 	protected function _php4_request_garbage_collection()
 	{
 		// now we are on php4 sessions and do a bit of garbage collection
-		$appsessions =& $_SESSION[Api\Session::EGW_APPSESSION_VAR]['etemplate'];
-		$session_used =& $appsessions['session_used'];
+		$appsessions = & $_SESSION[Api\Session::EGW_APPSESSION_VAR]['etemplate'];
+		$session_used = & $appsessions['session_used'];
 
 		if ($this->id)
 		{
 			//echo "session_used[$id_used]='".$session_used[$id_used]."'<br/>\n";
-			++$session_used[$this->id];	// count the number of times a session got used
+			++$session_used[$this->id]; // count the number of times a session got used
 		}
 		$this->garbage_collection_done = true;
 
-		if (count($appsessions) < 20) return;	// we dont need to care
+		if (count($appsessions) < 20) return; // we dont need to care
 
-		$now = (int) (100 * microtime(true));	// gives precision of 1/100 sec
+		$now = (int)(100 * microtime(true)); // gives precision of 1/100 sec
 
-		foreach(array_keys($appsessions) as $id)
+		foreach (array_keys($appsessions) as $id)
 		{
-			list(,$time) = explode(':',$id);
+			list(,$time) = explode(':', $id);
 
-			if (!$time) continue;	// other data, no session
+			if (!$time) continue; // other data, no session
 
 			//echo ++$n.') '.$id.': '.(($now-$time)/100.0)."secs old, used=".$session_used[$id].", size=".strlen($appsessions[$id])."<br>\n";
 
-			if ($session_used[$id] == 1 && $time < $now - 10*6000 || // session used and older then 10min
-				$time < $now - 30*6000)	// session not used and older then 30min
+			if ($session_used[$id] == 1 && $time < $now - 10 * 6000 || // session used and older then 10min
+				$time < $now - 30 * 6000)	// session not used and older then 30min
 			{
 				//echo "<p>boetemplate::php4_session_garbage_collection('$id_used'): unsetting session '$id' (now=$now)</p>\n";
 				unset($appsessions[$id]);

api/src/Etemplate/Request/Files.php

Braces +12 added lines, -3 removed lines

@@ -77,12 +77,18 @@ 
 		{
 			self::$directory = $GLOBALS['egw_info']['server']['temp_dir'];
 		}
-		if (!$id) $id = self::request_id();
+		if (!$id)
+		{
+			$id = self::request_id();
+		}
 
 		$this->id = $id;
 
 		// hack to quiten IDE Warning for not calling parent::__construct, which we can not!
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 	}
 
 	/**
@@ -114,7 +120,10 @@ 
 				return false;
 			}
 			$request->data = unserialize(file_get_contents($filename));
-			if ($request->data === false) error_log("Error unserializing '$filename' to read the etemplate request data!");
+			if ($request->data === false)
+			{
+				error_log("Error unserializing '$filename' to read the etemplate request data!");
+			}
 		}
 		//error_log(__METHOD__."(id=$id");
 		return $request;

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 	 *
 	 * @param string|null $id =null
 	 */
-	private function __construct($id=null)
+	private function __construct($id = null)
 	{
 		if (is_null(self::$directory))
 		{
@@ -102,7 +102,7 @@ 
 	 * @param string $id =null
 	 * @return etemplate_request|boolean the object or false if $id is not found
 	 */
-	static function read($id=null)
+	static function read($id = null)
 	{
 		$request = new Files($id);
 
@@ -155,7 +155,7 @@ 
 		{
 			$this->cleanup();
 
-			if (!file_put_contents($filename = self::$directory.'/'.$this->id,serialize($this->data)))
+			if (!file_put_contents($filename = self::$directory.'/'.$this->id, serialize($this->data)))
 			{
 				error_log("Error opening '$filename' to store the etemplate request data!");
 			}

api/src/Etemplate/Request/Cache.php

Braces +4 added lines, -1 removed lines

@@ -78,7 +78,10 @@
 		//error_log(__METHOD__."($_id) this->id=$this->id");
 
 		// hack to quiten IDE Warning for not calling parent::__construct, which we can not!
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 	}
 
 	/**

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 	 *
 	 * @param string $_id
 	 */
-	private function __construct($_id=null)
+	private function __construct($_id = null)
 	{
 		$this->id = $_id ? $_id : self::request_id();
 		//error_log(__METHOD__."($_id) this->id=$this->id");
@@ -98,7 +98,7 @@ 
 	 * @param string $id =null
 	 * @return Request|boolean the object or false if $id is not found
 	 */
-	static function read($id=null)
+	static function read($id = null)
 	{
 		$request = new Cache($id);
 
@@ -132,7 +132,7 @@ 
 		}
 		elseif (($this->data_modified ||
 			// if half of expiration time is over, save it anyway, to restart expiration time
-			isset($this->data['last_saved']) && (time()-$this->data['last_saved']) > self::EXPIRATION/2))
+			isset($this->data['last_saved']) && (time() - $this->data['last_saved']) > self::EXPIRATION / 2))
 		{
 			//error_log(__METHOD__."() saving $this->id".($this->data_modified?'':' data NOT modified, just keeping session alife'));
 			$this->cleanup();

api/src/Accounts/Sql.php

Braces +94 added lines, -23 removed lines

@@ -122,7 +122,10 @@ 
 	 */
 	function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id > 0)
 		{
@@ -152,11 +155,14 @@ 
 			unset($e);
 		}
 
-		if (!$rs)	// handle not (yet) existing mailaccounts table
+		if (!$rs)
+		{
+			// handle not (yet) existing mailaccounts table
 		{
 			$rs = $this->db->select($this->table, $this->table.'.*',
 				$this->table.'.account_id='.abs($account_id), __LINE__, __FILE__);
 		}
+		}
 		if (!$rs || !($data = $rs->fetch()))
 		{
 			return false;
@@ -166,7 +172,10 @@ 
 			$data['account_id'] = -$data['account_id'];
 			$data['mailAllowed'] = true;
 		}
-		if (!$data['account_firstname']) $data['account_firstname'] = $data['account_lid'];
+		if (!$data['account_firstname'])
+		{
+			$data['account_firstname'] = $data['account_lid'];
+		}
 		if (!$data['account_lastname'])
 		{
 			$data['account_lastname'] = $data['account_type'] == 'g' ? 'Group' : 'User';
@@ -177,7 +186,10 @@ 
 				$data['account_lastname'] = lang($data['account_lastname']);
 			}
 		}
-		if (!$data['account_fullname']) $data['account_fullname'] = $data['account_firstname'].' '.$data['account_lastname'];
+		if (!$data['account_fullname'])
+		{
+			$data['account_fullname'] = $data['account_firstname'].' '.$data['account_lastname'];
+		}
 
 		return $data;
 	}
@@ -199,31 +211,57 @@ 
 		{
 			// if password it's not already entcrypted, do so now
 			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']) &&
-				!preg_match('/^[0-9a-f]{32}$/',$data['account_passwd']))	// md5 hash
+				!preg_match('/^[0-9a-f]{32}$/',$data['account_passwd']))
+			{
+				// md5 hash
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_sql($data['account_passwd']);
 			}
+			}
 			$to_write['account_pwd'] = $data['account_passwd'];
 			$to_write['account_lastpwd_change'] = time();
 		}
-		if ($data['mustchangepassword'] == 1) $to_write['account_lastpwd_change']=0;
+		if ($data['mustchangepassword'] == 1)
+		{
+			$to_write['account_lastpwd_change']=0;
+		}
 		if (!(int)$data['account_id'] || !$this->id2name($data['account_id']))
 		{
-			if ($to_write['account_id'] < 0) $to_write['account_id'] *= -1;
+			if ($to_write['account_id'] < 0)
+			{
+				$to_write['account_id'] *= -1;
+			}
 
-			if (!isset($to_write['account_pwd'])) $to_write['account_pwd'] = '';	// is NOT NULL!
-			if (!isset($to_write['account_status'])) $to_write['account_status'] = '';	// is NOT NULL!
+			if (!isset($to_write['account_pwd']))
+			{
+				$to_write['account_pwd'] = '';
+			}
+			// is NOT NULL!
+			if (!isset($to_write['account_status']))
+			{
+				$to_write['account_status'] = '';
+			}
+			// is NOT NULL!
 
 			// postgres requires the auto-id field to be unset!
-			if (isset($to_write['account_id']) && !$to_write['account_id']) unset($to_write['account_id']);
+			if (isset($to_write['account_id']) && !$to_write['account_id'])
+			{
+				unset($to_write['account_id']);
+			}
 
 			if (!in_array($to_write['account_type'],array('u','g')) ||
-				!$this->db->insert($this->table,$to_write,false,__LINE__,__FILE__)) return false;
+				!$this->db->insert($this->table,$to_write,false,__LINE__,__FILE__))
+			{
+				return false;
+			}
 
 			if (!(int)$data['account_id'])
 			{
 				$data['account_id'] = $this->db->get_last_insert_id($this->table,'account_id');
-				if ($data['account_type'] == 'g') $data['account_id'] *= -1;
+				if ($data['account_type'] == 'g')
+				{
+					$data['account_id'] *= -1;
+				}
 			}
 		}
 		else	// update of existing account
@@ -276,7 +314,10 @@ 
 	 */
 	function delete($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		$contact_id = $this->id2name($account_id,'person_id');
 
@@ -286,7 +327,10 @@ 
 		}
 		if ($contact_id)
 		{
-			if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
+			if (!isset($this->contacts))
+			{
+				$this->contacts = new Api\Contacts();
+			}
 			$this->contacts->delete($contact_id,false);	// false = allow to delete accounts (!)
 		}
 		return true;
@@ -300,7 +344,10 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		$memberships = array();
 		if(($gids = $GLOBALS['egw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id)))
@@ -321,7 +368,10 @@ 
 	 */
 	function set_memberships($groups,$account_id)
 	{
-		if (!(int)$account_id) return;
+		if (!(int)$account_id)
+		{
+			return;
+		}
 
 		$acl = new Api\Acl($account_id);
 		$acl->read_repository();
@@ -342,7 +392,10 @@ 
 	 */
 	function members($account_id)
 	{
-		if (!is_numeric($account_id)) $account_id = $this->name2id($account_id);
+		if (!is_numeric($account_id))
+		{
+			$account_id = $this->name2id($account_id);
+		}
 
 		$members = array();
 		foreach($this->db->select($this->table, 'account_id,account_lid',
@@ -418,7 +471,10 @@ 
 		{
 			$order .= ($order?',':'').'account_lid';
 		}
-		if ($param['sort']) $order = implode(' '.$param['sort'].',', explode(',', $order)).' '.$param['sort'];
+		if ($param['sort'])
+		{
+			$order = implode(' '.$param['sort'].',', explode(',', $order)).' '.$param['sort'];
+		}
 
 		$search_cols = array('account_lid','n_family','n_given','email');
 		$join = $this->contacts_join;
@@ -455,7 +511,10 @@ 
 				{
 					unset($name);
 					$members = array_unique(array_merge($members, array_keys((array)$this->members($grp))));
-					if ($param['type'] == 'groupmembers+memberships') $members[] = abs($grp);
+					if ($param['type'] == 'groupmembers+memberships')
+					{
+						$members[] = abs($grp);
+					}
 				}
 				$filter['account_id'] = $members;
 				break;
@@ -474,9 +533,12 @@ 
 		// fix ambigous account_id (used in accounts and contacts table)
 		if (array_key_exists('account_id', $filter))
 		{
-			if (!$filter['account_id'])	// eg. group without members (would give SQL error)
+			if (!$filter['account_id'])
+			{
+				// eg. group without members (would give SQL error)
 			{
 				$this->total = 0;
+			}
 				return array();
 			}
 			$filter[] = $this->db->expression($this->table, $this->table.'.', array(
@@ -528,7 +590,10 @@ 
 					break;
 			}
 		}
-		if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
+		if (!isset($this->contacts))
+		{
+			$this->contacts = new Api\Contacts();
+		}
 
 		$accounts = array();
 		foreach((array) $this->contacts->search($criteria,
@@ -578,7 +643,10 @@ 
 	 */
 	function name2id($name,$which='account_lid',$account_type=null)
 	{
-		if ($account_type === 'g' && $which != 'account_lid') return false;
+		if ($account_type === 'g' && $which != 'account_lid')
+		{
+			return false;
+		}
 
 		$where = array();
 		$cols = 'account_id';
@@ -601,9 +669,12 @@ 
 				$cols .= ',account_type';
 				$where[$which] = $name;
 				// check if we need to treat username case-insensitive
-				if ($which == 'account_lid' && !$GLOBALS['egw_info']['server']['case_sensitive_username'])	// = is case sensitiv eg. on postgres, but not on mysql!
+				if ($which == 'account_lid' && !$GLOBALS['egw_info']['server']['case_sensitive_username'])
+				{
+					// = is case sensitiv eg. on postgres, but not on mysql!
 				{
 					$where[] = 'account_lid '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($where['account_lid']);
+				}
 					unset($where['account_lid']);
 				}
 		}

Spacing +51 added lines, -51 removed lines

@@ -198,38 +198,38 @@ 
 		if ($data['account_passwd'])
 		{
 			// if password it's not already entcrypted, do so now
-			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']) &&
-				!preg_match('/^[0-9a-f]{32}$/',$data['account_passwd']))	// md5 hash
+			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i', $data['account_passwd']) &&
+				!preg_match('/^[0-9a-f]{32}$/', $data['account_passwd']))	// md5 hash
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_sql($data['account_passwd']);
 			}
 			$to_write['account_pwd'] = $data['account_passwd'];
 			$to_write['account_lastpwd_change'] = time();
 		}
-		if ($data['mustchangepassword'] == 1) $to_write['account_lastpwd_change']=0;
+		if ($data['mustchangepassword'] == 1) $to_write['account_lastpwd_change'] = 0;
 		if (!(int)$data['account_id'] || !$this->id2name($data['account_id']))
 		{
 			if ($to_write['account_id'] < 0) $to_write['account_id'] *= -1;
 
-			if (!isset($to_write['account_pwd'])) $to_write['account_pwd'] = '';	// is NOT NULL!
-			if (!isset($to_write['account_status'])) $to_write['account_status'] = '';	// is NOT NULL!
+			if (!isset($to_write['account_pwd'])) $to_write['account_pwd'] = ''; // is NOT NULL!
+			if (!isset($to_write['account_status'])) $to_write['account_status'] = ''; // is NOT NULL!
 
 			// postgres requires the auto-id field to be unset!
 			if (isset($to_write['account_id']) && !$to_write['account_id']) unset($to_write['account_id']);
 
-			if (!in_array($to_write['account_type'],array('u','g')) ||
-				!$this->db->insert($this->table,$to_write,false,__LINE__,__FILE__)) return false;
+			if (!in_array($to_write['account_type'], array('u', 'g')) ||
+				!$this->db->insert($this->table, $to_write, false, __LINE__, __FILE__)) return false;
 
 			if (!(int)$data['account_id'])
 			{
-				$data['account_id'] = $this->db->get_last_insert_id($this->table,'account_id');
+				$data['account_id'] = $this->db->get_last_insert_id($this->table, 'account_id');
 				if ($data['account_type'] == 'g') $data['account_id'] *= -1;
 			}
 		}
 		else	// update of existing account
 		{
 			unset($to_write['account_id']);
-			if (!$this->db->update($this->table,$to_write,array('account_id' => abs($data['account_id'])),__LINE__,__FILE__))
+			if (!$this->db->update($this->table, $to_write, array('account_id' => abs($data['account_id'])), __LINE__, __FILE__))
 			{
 				return false;
 			}
@@ -277,16 +277,16 @@ 
 	{
 		if (!(int)$account_id) return false;
 
-		$contact_id = $this->id2name($account_id,'person_id');
+		$contact_id = $this->id2name($account_id, 'person_id');
 
-		if (!$this->db->delete($this->table,array('account_id' => abs($account_id)),__LINE__,__FILE__))
+		if (!$this->db->delete($this->table, array('account_id' => abs($account_id)), __LINE__, __FILE__))
 		{
 			return false;
 		}
 		if ($contact_id)
 		{
 			if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
-			$this->contacts->delete($contact_id,false);	// false = allow to delete accounts (!)
+			$this->contacts->delete($contact_id, false); // false = allow to delete accounts (!)
 		}
 		return true;
 	}
@@ -302,11 +302,11 @@ 
 		if (!(int)$account_id) return false;
 
 		$memberships = array();
-		if(($gids = $GLOBALS['egw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id)))
+		if (($gids = $GLOBALS['egw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id)))
 		{
-			foreach($gids as $gid)
+			foreach ($gids as $gid)
 			{
-				$memberships[(string) $gid] = $this->id2name($gid);
+				$memberships[(string)$gid] = $this->id2name($gid);
 			}
 		}
 		return $memberships;
@@ -318,17 +318,17 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id numerical account-id
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		if (!(int)$account_id) return;
 
 		$acl = new Api\Acl($account_id);
 		$acl->read_repository();
-		$acl->delete('phpgw_group',false);
+		$acl->delete('phpgw_group', false);
 
-		foreach($groups as $group)
+		foreach ($groups as $group)
 		{
-			$acl->add('phpgw_group',$group,1);
+			$acl->add('phpgw_group', $group, 1);
 		}
 		$acl->save_repository();
 	}
@@ -344,7 +344,7 @@ 
 		if (!is_numeric($account_id)) $account_id = $this->name2id($account_id);
 
 		$members = array();
-		foreach($this->db->select($this->table, 'account_id,account_lid',
+		foreach ($this->db->select($this->table, 'account_id,account_lid',
 			$this->db->expression(Api\Acl::TABLE, array(
 				'acl_appname'  => 'phpgw_group',
 				'acl_location' => $account_id,
@@ -363,15 +363,15 @@ 
 	 * @param array $members array with uidnumber or uid's
 	 * @param int $gid gidnumber of group to set
 	 */
-	function set_members($members,$gid)
+	function set_members($members, $gid)
 	{
-		$GLOBALS['egw']->acl->delete_repository('phpgw_group',$gid,false);
+		$GLOBALS['egw']->acl->delete_repository('phpgw_group', $gid, false);
 
 		if (is_array($members))
 		{
-			foreach($members as $id)
+			foreach ($members as $id)
 			{
-				$GLOBALS['egw']->acl->add_repository('phpgw_group',$gid,$id,1);
+				$GLOBALS['egw']->acl->add_repository('phpgw_group', $gid, $id, 1);
 			}
 		}
 	}
@@ -406,21 +406,21 @@ 
 		);
 
 		// fetch order of account_fullname from Api\Accounts::format_username
-		if (strpos($param['order'],'account_fullname') !== false)
+		if (strpos($param['order'], 'account_fullname') !== false)
 		{
-			$param['order'] = str_replace('account_fullname', preg_replace('/[ ,]+/',',',str_replace(array('[',']'),'',
-				Api\Accounts::format_username('account_lid','account_firstname','account_lastname'))), $param['order']);
+			$param['order'] = str_replace('account_fullname', preg_replace('/[ ,]+/', ',', str_replace(array('[', ']'), '',
+				Api\Accounts::format_username('account_lid', 'account_firstname', 'account_lastname'))), $param['order']);
 		}
-		$order = str_replace(array_keys($order2contact),array_values($order2contact),$param['order']);
+		$order = str_replace(array_keys($order2contact), array_values($order2contact), $param['order']);
 
 		// allways add 'account_lid'
 		if (strpos($order, 'account_lid') === false)
 		{
-			$order .= ($order?',':'').'account_lid';
+			$order .= ($order ? ',' : '').'account_lid';
 		}
 		if ($param['sort']) $order = implode(' '.$param['sort'].',', explode(',', $order)).' '.$param['sort'];
 
-		$search_cols = array('account_lid','n_family','n_given','email');
+		$search_cols = array('account_lid', 'n_family', 'n_given', 'email');
 		$join = $this->contacts_join;
 		$email_cols = array('email');
 
@@ -436,7 +436,7 @@ 
 		}
 
 		$filter = array();
-		switch($param['type'])
+		switch ($param['type'])
 		{
 			case 'accounts':
 				$filter['owner'] = 0;
@@ -451,7 +451,7 @@ 
 			case 'groupmembers':
 			case 'groupmembers+memberships':
 				$members = array();
-				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp => $name)
+				foreach ((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp => $name)
 				{
 					unset($name);
 					$members = array_unique(array_merge($members, array_keys((array)$this->members($grp))));
@@ -486,13 +486,13 @@ 
 		}
 		if ($param['active'])
 		{
-			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),Api\Contacts\Sql::ACOUNT_ACTIVE_FILTER);
+			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())', time(), Api\Contacts\Sql::ACOUNT_ACTIVE_FILTER);
 		}
 		$criteria = array();
 		$wildcard = $param['query_type'] == 'start' || $param['query_type'] == 'exact' ? '' : '%';
 		if (($query = $param['query']))
 		{
-			switch($param['query_type'])
+			switch ($param['query_type'])
 			{
 				case 'start':
 					$query .= '*';
@@ -500,7 +500,7 @@ 
 				case 'all':
 				default:
 				case 'exact':
-					foreach($search_cols as $col)
+					foreach ($search_cols as $col)
 					{
 						$criteria[$col] = $query;
 					}
@@ -521,7 +521,7 @@ 
 				case 'email':
 					$criteria['email'] = $query;
 					// Group email
-					if(in_array(Api\Mail\Smtp\Sql::TABLE, $this->db->table_names(true)))
+					if (in_array(Api\Mail\Smtp\Sql::TABLE, $this->db->table_names(true)))
 					{
 						$criteria[Api\Mail\Smtp\Sql::TABLE.'.mail_value'] = $query;
 					}
@@ -531,13 +531,13 @@ 
 		if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
 
 		$accounts = array();
-		foreach((array) $this->contacts->search($criteria,
-			array_merge(array(1,'n_given','n_family','id','created','modified',$this->table.'.account_id AS account_id'),$email_cols),
+		foreach ((array)$this->contacts->search($criteria,
+			array_merge(array(1, 'n_given', 'n_family', 'id', 'created', 'modified', $this->table.'.account_id AS account_id'), $email_cols),
 			$order, "account_lid,account_type,account_status,account_expires,account_primary_group,account_description".
 			",account_lastlogin,account_lastloginfrom,account_lastpwd_change",
-			$wildcard,false,$query[0] == '!' ? 'AND' : 'OR',
+			$wildcard, false, $query[0] == '!' ? 'AND' : 'OR',
 			$param['offset'] ? array($param['start'], $param['offset']) : (is_null($param['start']) ? false : $param['start']),
-			$filter,$join) as $contact)
+			$filter, $join) as $contact)
 		{
 			if ($contact)
 			{
@@ -582,13 +582,13 @@ 
 	 * @param string $account_type u = user, g = group, default null = try both
 	 * @return int/false numeric account_id or false on error ($name not found)
 	 */
-	function name2id($name,$which='account_lid',$account_type=null)
+	function name2id($name, $which = 'account_lid', $account_type = null)
 	{
 		if ($account_type === 'g' && $which != 'account_lid') return false;
 
 		$where = array();
 		$cols = 'account_id';
-		switch($which)
+		switch ($which)
 		{
 			case 'account_fullname':
 				$table = $this->contacts_table;
@@ -619,11 +619,11 @@ 
 		}
 		else
 		{
-			$where[] = 'account_id IS NOT NULL'.	// otherwise contacts with eg. the same email hide the accounts!
-				($table == $this->contacts_table ? " AND contact_tid != 'D'" : '');	// ignore deleted accounts contact-data
+			$where[] = 'account_id IS NOT NULL'.// otherwise contacts with eg. the same email hide the accounts!
+				($table == $this->contacts_table ? " AND contact_tid != 'D'" : ''); // ignore deleted accounts contact-data
 
 		}
-		if (!($rs = $this->db->select($table,$cols,$where,__LINE__,__FILE__)) || !($row = $rs->fetch()))
+		if (!($rs = $this->db->select($table, $cols, $where, __LINE__, __FILE__)) || !($row = $rs->fetch()))
 		{
 			//error_log(__METHOD__."('$name', '$which', ".array2string($account_type).") db->select('$table', '$cols', ".array2string($where).") returned ".array2string($rs).' '.function_backtrace());
 			return false;
@@ -640,9 +640,9 @@ 
 	 * @param string $which ='account_lid' type to convert to: account_lid (default), account_email, ...
 	 * @return string/false converted value or false on error ($account_id not found)
 	 */
-	function id2name($account_id,$which='account_lid')
+	function id2name($account_id, $which = 'account_lid')
 	{
-		return $this->frontend->id2name($account_id,$which);
+		return $this->frontend->id2name($account_id, $which);
 	}
 
 	/**
@@ -654,14 +654,14 @@ 
 	 */
 	function update_lastlogin($account_id, $ip)
 	{
-		$previous_login = $this->db->select($this->table,'account_lastlogin',array('account_id'=>abs($account_id)),__LINE__,__FILE__)->fetchColumn();
+		$previous_login = $this->db->select($this->table, 'account_lastlogin', array('account_id'=>abs($account_id)), __LINE__, __FILE__)->fetchColumn();
 
-		$this->db->update($this->table,array(
+		$this->db->update($this->table, array(
 			'account_lastloginfrom' => $ip,
 			'account_lastlogin'     => time(),
-		),array(
+		), array(
 			'account_id' => abs($account_id),
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		return $previous_login;
 	}

api/src/Cache/Files.php

Braces +24 added lines, -6 removed lines

@@ -50,7 +50,10 @@ 
 		else
 		{
 			$this->base_path = Api\Cache::get_system_config('temp_dir', false);
-			if (isset($this->base_path)) $this->base_path .= '/egw_cache';
+			if (isset($this->base_path))
+			{
+				$this->base_path .= '/egw_cache';
+			}
 		}
 		if (!isset($this->base_path) || !file_exists($this->base_path) && !mkdir($this->base_path,0700,true))
 		{
@@ -86,7 +89,10 @@ 
 		{
 			flock($ret, LOCK_EX);
 			$ok = fwrite($ret, serialize($data));
-			if ((int)$expiration > 0) file_put_contents($fname.self::EXPIRATION_EXTENSION,(string)$expiration);
+			if ((int)$expiration > 0)
+			{
+				file_put_contents($fname.self::EXPIRATION_EXTENSION,(string)$expiration);
+			}
 			flock($ret, LOCK_UN);
 			fclose($ret);
 			$ret = $ok !== false;
@@ -106,7 +112,10 @@ 
 	{
 		if (($ret = @file_put_contents($fname=$this->filename($keys,true),serialize($data),LOCK_EX) > 0))
 		{
-			if ((int)$expiration > 0) file_put_contents($fname.self::EXPIRATION_EXTENSION,(string)$expiration);
+			if ((int)$expiration > 0)
+			{
+				file_put_contents($fname.self::EXPIRATION_EXTENSION,(string)$expiration);
+			}
 		}
 		return $ret;
 	}
@@ -182,17 +191,26 @@ 
 		}
 		foreach(scandir($path) as $file)
 		{
-			if ($file == '.' || $file == '..') continue;
+			if ($file == '.' || $file == '..')
+			{
+				continue;
+			}
 
 			$file = $path.'/'.$file;
 
 			if (is_dir($file))
 			{
-				if (!self::rm_recursive($file)) return false;
+				if (!self::rm_recursive($file))
+				{
+					return false;
+				}
 			}
 			else
 			{
-				if (!unlink($file)) return false;
+				if (!unlink($file))
+				{
+					return false;
+				}
 			}
 		}
 		return rmdir($path);

Spacing +18 added lines, -18 removed lines

@@ -52,9 +52,9 @@ 
 			$this->base_path = Api\Cache::get_system_config('temp_dir', false);
 			if (isset($this->base_path)) $this->base_path .= '/egw_cache';
 		}
-		if (!isset($this->base_path) || !file_exists($this->base_path) && !mkdir($this->base_path,0700,true))
+		if (!isset($this->base_path) || !file_exists($this->base_path) && !mkdir($this->base_path, 0700, true))
 		{
-			throw new Exception (__METHOD__."() can't create basepath $this->base_path!");
+			throw new Exception(__METHOD__."() can't create basepath $this->base_path!");
 		}
 	}
 
@@ -66,15 +66,15 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error, incl. key already exists in cache
 	 */
-	function add(array $keys,$data,$expiration=0)
+	function add(array $keys, $data, $expiration = 0)
 	{
 		// open only if file does NOT exist
-		if (!($ret = @fopen($fname=$this->filename($keys,true), 'x')))
+		if (!($ret = @fopen($fname = $this->filename($keys, true), 'x')))
 		{
 			// if file exists, check if it is expired
-			if (file_exists($fname_expiration=$fname.self::EXPIRATION_EXTENSION) &&
+			if (file_exists($fname_expiration = $fname.self::EXPIRATION_EXTENSION) &&
 				($expiration = (int)file_get_contents($fname_expiration)) &&
-				filemtime($fname) < time()-$expiration)
+				filemtime($fname) < time() - $expiration)
 			{
 				// open and truncate it
 				$ret = fopen($fname, 'w');
@@ -86,7 +86,7 @@ 
 		{
 			flock($ret, LOCK_EX);
 			$ok = fwrite($ret, serialize($data));
-			if ((int)$expiration > 0) file_put_contents($fname.self::EXPIRATION_EXTENSION,(string)$expiration);
+			if ((int)$expiration > 0) file_put_contents($fname.self::EXPIRATION_EXTENSION, (string)$expiration);
 			flock($ret, LOCK_UN);
 			fclose($ret);
 			$ret = $ok !== false;
@@ -102,11 +102,11 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error
 	 */
-	function set(array $keys,$data,$expiration=0)
+	function set(array $keys, $data, $expiration = 0)
 	{
-		if (($ret = @file_put_contents($fname=$this->filename($keys,true),serialize($data),LOCK_EX) > 0))
+		if (($ret = @file_put_contents($fname = $this->filename($keys, true), serialize($data), LOCK_EX) > 0))
 		{
-			if ((int)$expiration > 0) file_put_contents($fname.self::EXPIRATION_EXTENSION,(string)$expiration);
+			if ((int)$expiration > 0) file_put_contents($fname.self::EXPIRATION_EXTENSION, (string)$expiration);
 		}
 		return $ret;
 	}
@@ -123,9 +123,9 @@ 
 		{
 			return null;
 		}
-		if (file_exists($fname_expiration=$fname.self::EXPIRATION_EXTENSION) &&
+		if (file_exists($fname_expiration = $fname.self::EXPIRATION_EXTENSION) &&
 			($expiration = (int)file_get_contents($fname_expiration)) &&
-			filemtime($fname) < time()-$expiration)
+			filemtime($fname) < time() - $expiration)
 		{
 			unlink($fname);
 			unlink($fname_expiration);
@@ -147,7 +147,7 @@ 
 			//error_log(__METHOD__.'('.array2string($keys).") file_exists('$fname') == FALSE!");
 			return false;
 		}
-		if (file_exists($fname_expiration=$fname.self::EXPIRATION_EXTENSION))
+		if (file_exists($fname_expiration = $fname.self::EXPIRATION_EXTENSION))
 		{
 			unlink($fname_expiration);
 		}
@@ -180,7 +180,7 @@ 
 		{
 			return unlink($path);
 		}
-		foreach(scandir($path) as $file)
+		foreach (scandir($path) as $file)
 		{
 			if ($file == '.' || $file == '..') continue;
 
@@ -205,13 +205,13 @@ 
 	 * @param boolean $mkdir =false should we create the directory
 	 * @return string
 	 */
-	function filename(array $keys,$mkdir=false)
+	function filename(array $keys, $mkdir = false)
 	{
-		$fname = $this->base_path.'/'.str_replace(array(':','*','\\'),'-',implode('/',$keys));
+		$fname = $this->base_path.'/'.str_replace(array(':', '*', '\\'), '-', implode('/', $keys));
 
-		if ($mkdir && !file_exists($dirname=dirname($fname)))
+		if ($mkdir && !file_exists($dirname = dirname($fname)))
 		{
-			@mkdir($dirname,0700,true);
+			@mkdir($dirname, 0700, true);
 		}
 		return $fname;
 	}

api/src/Cache/Exception.php

Braces +3 added lines, -1 removed lines

@@ -18,4 +18,6 @@
 /**
  * Exception thrown by Cache classes
  */
-class Exception extends Api\Exception {}
+class Exception extends Api\Exception
+{
+}

api/src/Auth/Ads.php

Braces +16 added lines, -4 removed lines

@@ -90,7 +90,10 @@ 
 			if (($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')))
 			{
 				$ret = $GLOBALS['egw']->accounts->id2name($id,'account_status') == 'A';
-				if (!$ret) error_log(__METHOD__."('$username') account_status check returning ".array2string($ret));
+				if (!$ret)
+				{
+					error_log(__METHOD__."('$username') account_status check returning ".array2string($ret));
+				}
 				return $ret;
 			}
 			// store homedirectory for egw_session->read_repositories
@@ -158,7 +161,10 @@ 
 	static function setLastPwdChange($account_id=0, $passwd=NULL, $lastpwdchange=NULL, $return_mod=false)
 	{
 		unset($passwd);	// not used but required by function signature
-		if (!($adldap = Api\Accounts\Ads::get_adldap())) return false;
+		if (!($adldap = Api\Accounts\Ads::get_adldap()))
+		{
+			return false;
+		}
 
 		if ($lastpwdchange)
 		{
@@ -166,7 +172,10 @@ 
 			$ldapServerInfo = Api\Ldap\ServerInfo::get($adldap->getLdapConnection(), $GLOBALS['egw_info']['server']['ads_host']);
 			if ($ldapServerInfo->serverType == Api\Ldap\ServerInfo::SAMBA4)
 			{
-				if ($lastpwdchange == -1) $lastpwdchange = time();
+				if ($lastpwdchange == -1)
+				{
+					$lastpwdchange = time();
+				}
 			}
 			// while Windows only allows to set -1 for current time (or 0 to force user to change password)
 			else
@@ -179,7 +188,10 @@ 
 			$lastpwdchange = Api\Accounts\Ads::convertUnixTimeToWindowsTime($lastpwdchange);
 		}
 		$mod = array('pwdlastset' => $lastpwdchange);
-		if ($return_mod) return $mod;
+		if ($return_mod)
+		{
+			return $mod;
+		}
 
 		$ret = false;
 		if ($account_id && ($username = Api\Accounts::id2name($account_id, 'account_lid')) &&

Spacing +17 added lines, -18 removed lines

@@ -38,10 +38,10 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $_passwd, $passwd_type='text')
+	function authenticate($username, $_passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used by required in function signature
-		if (preg_match('/[()|&=*,<>!~]/',$username))
+		unset($passwd_type); // not used by required in function signature
+		if (preg_match('/[()|&=*,<>!~]/', $username))
 		{
 			return False;
 		}
@@ -50,7 +50,7 @@ 
 
 		$adldap = Api\Accounts\Ads::get_adldap();
 		// bind with username@ads_domain, only if a non-empty password given, in case anonymous search is enabled
-		if(empty($passwd) || !$adldap->authenticate($username, $passwd))
+		if (empty($passwd) || !$adldap->authenticate($username, $passwd))
 		{
 			$authenticated = false;
 			// check if password need to be set on next login (AD will not authenticate user!)
@@ -70,7 +70,7 @@ 
 			}
 		}
 
-		$attributes	= array('samaccountname','givenName','sn','mail','homeDirectory');
+		$attributes = array('samaccountname', 'givenName', 'sn', 'mail', 'homeDirectory');
 		if (($allValues = $adldap->user()->info($username, $attributes)))
 		{
 			$allValues[0]['objectsid'][0] = $adldap->utilities()->getTextSID($allValues[0]['objectsid'][0]);
@@ -79,17 +79,17 @@ 
 
 		if ($allValues && $allValues['count'] > 0)
 		{
-			if($GLOBALS['egw_info']['server']['case_sensitive_username'] == true)
+			if ($GLOBALS['egw_info']['server']['case_sensitive_username'] == true)
 			{
-				if($allValues[0]['samaccountname'][0] != $username)
+				if ($allValues[0]['samaccountname'][0] != $username)
 				{
 					error_log(__METHOD__."('$username') username has wrong case!");
 					return false;
 				}
 			}
-			if (($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')))
+			if (($id = $GLOBALS['egw']->accounts->name2id($username, 'account_lid', 'u')))
 			{
-				$ret = $GLOBALS['egw']->accounts->id2name($id,'account_status') == 'A';
+				$ret = $GLOBALS['egw']->accounts->id2name($id, 'account_status') == 'A';
 				if (!$ret) error_log(__METHOD__."('$username') account_status check returning ".array2string($ret));
 				return $ret;
 			}
@@ -104,14 +104,14 @@ 
 				$GLOBALS['auto_create_acct']['account_id'] = Api\Accounts\Ads::sid2account_id($allValues[0]['objectsid'][0]);
 
 				// create a global array with all availible info about that account
-				foreach(array(
+				foreach (array(
 					'givenname' => 'firstname',
 					'sn'        => 'lastname',
 					'mail'      => 'email',
 				) as $ldap_name => $acct_name)
 				{
 					$GLOBALS['auto_create_acct'][$acct_name] =
-						Api\Translation::convert($allValues[0][$ldap_name][0],'utf-8');
+						Api\Translation::convert($allValues[0][$ldap_name][0], 'utf-8');
 				}
 				//error_log(__METHOD__."() \$GLOBALS[auto_create_acct]=".array2string($GLOBALS['auto_create_acct']));
 				return True;
@@ -137,8 +137,7 @@ 
 		if (($adldap = Api\Accounts\Ads::get_adldap()) &&
 			($data = $adldap->user()->info($username, array('pwdlastset'))))
 		{
-			$ret = !$data[0]['pwdlastset'][0] ? $data[0]['pwdlastset'][0] :
-				$adldap->utilities()->convertWindowsTimeToUnixTime($data[0]['pwdlastset'][0]);
+			$ret = !$data[0]['pwdlastset'][0] ? $data[0]['pwdlastset'][0] : $adldap->utilities()->convertWindowsTimeToUnixTime($data[0]['pwdlastset'][0]);
 		}
 		//error_log(__METHOD__."('$username') pwdlastset=".array2string($data[0]['pwdlastset'][0])." returned ".array2string($ret));
 		return $ret;
@@ -155,9 +154,9 @@ 
 	 * @param boolean $return_mod =false true return ldap modification instead of executing it
 	 * @return boolean|array true if account_lastpwd_change successful changed, false otherwise or array if $return_mod
 	 */
-	static function setLastPwdChange($account_id=0, $passwd=NULL, $lastpwdchange=NULL, $return_mod=false)
+	static function setLastPwdChange($account_id = 0, $passwd = NULL, $lastpwdchange = NULL, $return_mod = false)
 	{
-		unset($passwd);	// not used but required by function signature
+		unset($passwd); // not used but required by function signature
 		if (!($adldap = Api\Accounts\Ads::get_adldap())) return false;
 
 		if ($lastpwdchange)
@@ -200,7 +199,7 @@ 
 	 * @return boolean true if password successful changed, false otherwise
 	 * @throws Api\Exception_wrong_userinput
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
 		if (!($adldap = Api\Accounts\Ads::get_adldap()))
 		{
@@ -213,7 +212,7 @@ 
 			throw new Api\Exception(lang('Failed to change password.').' '.lang('Active directory requires SSL or TLS to change passwords!'));
 		}
 
-		if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
+		if (!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
 		{
 			$admin = false;
 			if (!empty($GLOBALS['egw_info']['user']['account_id']) && $GLOBALS['egw_info']['user']['account_id'] > 0)
@@ -249,7 +248,7 @@ 
 				// if admin has nothing configured use windows default of 3 char classes, 7 chars min and name-part-check
 				$GLOBALS['egw_info']['server']['force_pwd_strength'] ? $GLOBALS['egw_info']['server']['force_pwd_strength'] : 3,
 				$GLOBALS['egw_info']['server']['force_pwd_length'] ? $GLOBALS['egw_info']['server']['force_pwd_length'] : 7,
-				'yes',	// always check with "passwd_forbid_name" enabled
+				'yes', // always check with "passwd_forbid_name" enabled
 				$account_id);
 			$msg = strtr($e->getMessage(), array(		// translate possible adLDAP and LDAP error
 				'Error' => lang('Error'),