EGroupware / egroupware

timesheet/setup/setup.inc.php

Spacing +3 added lines, -3 removed lines

@@ -13,13 +13,13 @@ 
 
 if (!defined('TIMESHEET_APP'))
 {
-	define('TIMESHEET_APP','timesheet');
+	define('TIMESHEET_APP', 'timesheet');
 }
 
 $setup_info[TIMESHEET_APP]['name']      = TIMESHEET_APP;
 $setup_info[TIMESHEET_APP]['version']   = '17.1.001';
 $setup_info[TIMESHEET_APP]['app_order'] = 5;
-$setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet','egw_timesheet_extra');
+$setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet', 'egw_timesheet_extra');
 $setup_info[TIMESHEET_APP]['enable']    = 1;
 $setup_info[TIMESHEET_APP]['index']     = 'timesheet.timesheet_ui.index&ajax=true';
 
@@ -28,7 +28,7 @@ 
 	'name'  => 'Ralf Becker',
 	'email' => 'RalfBecker@outdoor-training.de'
 );
-$setup_info[TIMESHEET_APP]['license']  = 'GPL';
+$setup_info[TIMESHEET_APP]['license'] = 'GPL';
 $setup_info[TIMESHEET_APP]['description'] =
 'Tracking times and other activities for the Projectmanager.';
 $setup_info[TIMESHEET_APP]['note'] =

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

@@ -49,5 +49,5 @@
 /* Dependencies for this app to work */
 $setup_info[TIMESHEET_APP]['depends'][] = array(
 	 'appname' => 'api',
-	 'versions' => Array('17.1')
+	 'versions' => array('17.1')
 );

filemanager/inc/class.filemanager_select.inc.php

Braces +35 added lines, -8 removed lines

@@ -169,7 +169,10 @@ 
 								$files[] = Vfs::concat($content['path'],$name);
 							}
 							//Add an uploaded file to the files result array2string
-							if ($copy_result === true) $files[] = $to_path;
+							if ($copy_result === true)
+							{
+								$files[] = $to_path;
+							}
 							break;
 
 						case 'select-dir':
@@ -193,7 +196,10 @@ 
 					else if ($content['method'] == 'ckeditor_return')
 					{
 						$download_url = Vfs::download_url(Vfs::concat($content['path'],$content['name']));
-						if ($download_url[0] == '/') $download_url = Egw::link($download_url);
+						if ($download_url[0] == '/')
+						{
+							$download_url = Egw::link($download_url);
+						}
 
 						$response = Api\Json\Response::get();
 						$response->apply('window.opener.CKEDITOR.tools.callFunction', array(
@@ -228,7 +234,10 @@ 
 		elseif(isset($content['apps']))
 		{
 			list($app) = each($content['apps']);
-			if ($app == 'home') $content['path'] = filemanager_ui::get_home_dir();
+			if ($app == 'home')
+			{
+				$content['path'] = filemanager_ui::get_home_dir();
+			}
 		}
 
 		//Deactivate the opload field if the current directory is not writeable or
@@ -262,8 +271,15 @@ 
 			{
 				$path = $favorite['state']['path'];
 				// Just directories
-				if(!$path) continue;
-				if ($path == $content['path']) continue;	// remove directory itself
+				if(!$path)
+				{
+					continue;
+				}
+				if ($path == $content['path'])
+				{
+					continue;
+				}
+				// remove directory itself
 
 				$mime = Vfs::mime_content_type($path);
 				$content['dir'][$n] = array(
@@ -294,7 +310,11 @@ 
 			$content['dir'] = array('mode' => $content['mode']);
 			foreach($files as $path)
 			{
-				if ($path == $content['path']) continue;	// remove directory itself
+				if ($path == $content['path'])
+				{
+					continue;
+				}
+				// remove directory itself
 
 				$name = Vfs::basename($path);
 				$is_dir = Vfs::is_dir($path);
@@ -315,7 +335,11 @@ 
 				}
 				++$n;
 			}
-			if (!$n) $readonlys['selected[]'] = true;	// remove checkbox from empty line
+			if (!$n)
+			{
+				$readonlys['selected[]'] = true;
+			}
+			// remove checkbox from empty line
 		}
 		$readonlys['button[createdir]'] = !Vfs::is_writable($content['path']);
 
@@ -353,7 +377,10 @@ 
 	static function get_apps()
 	{
 		$apps = array(false);	// index starting from 1
-		if (isset($GLOBALS['egw_info']['apps']['stylite'])) $apps = array('favorites' => lang('Favorites'));
+		if (isset($GLOBALS['egw_info']['apps']['stylite']))
+		{
+			$apps = array('favorites' => lang('Favorites'));
+		}
 		$apps += Link::app_list('query');
 
 		unset($apps['mydms']);	// they do NOT support adding files to VFS

Spacing +36 added lines, -36 removed lines

@@ -72,7 +72,7 @@ 
 	 *
 	 * @deprecated Please use et2_vfsSelect widget in client side instead
 	 */
-	function select(array $content=null)
+	function select(array $content = null)
 	{
 		if (!is_array($content))
 		{
@@ -83,10 +83,10 @@ 
 				$content['msg'] = $_GET['msg'];
 				$_GET['mode'] = 'open';
 				$_GET['method'] = 'ckeditor_return';
-				$_GET['CKEditorFuncNum'] = Api\Cache::getSession('filemanager','ckeditorfuncnum');
+				$_GET['CKEditorFuncNum'] = Api\Cache::getSession('filemanager', 'ckeditorfuncnum');
 			}
 			$content['mode'] = $_GET['mode'];
-			if (!in_array($content['mode'],array('open','open-multiple','saveas','select-dir')))
+			if (!in_array($content['mode'], array('open', 'open-multiple', 'saveas', 'select-dir')))
 			{
 				throw new Api\Exception\WrongParameter("Wrong or unset required mode parameter!");
 			}
@@ -101,7 +101,7 @@ 
 			{
 				if (isset($_GET['CKEditorFuncNum']) && is_numeric($_GET['CKEditorFuncNum']))
 				{
-					Api\Cache::setSession('filemanager','ckeditorfuncnum',
+					Api\Cache::setSession('filemanager', 'ckeditorfuncnum',
 						$content['ckeditorfuncnum'] = $_GET['CKEditorFuncNum']);
 				}
 				else
@@ -109,20 +109,20 @@ 
 					throw new Api\Exception\WrongParameter("chkeditor_return has been specified as a method but some parameters are missing or invalid.");
 				}
 			}
-			$content['id']     = $_GET['id'];
+			$content['id'] = $_GET['id'];
 			$content['label'] = isset($_GET['label']) ? $_GET['label'] : lang('Open');
 			if (($content['options-mime'] = isset($_GET['mime'])))
 			{
 				$sel_options['mime'] = array();
-				foreach((array)$_GET['mime'] as $key => $value)
+				foreach ((array)$_GET['mime'] as $key => $value)
 				{
 					if (is_numeric($key))
 					{
-						$sel_options['mime'][$value] = lang('%1 files',strtoupper(Api\MimeMagic::mime2ext($value))).' ('.$value.')';
+						$sel_options['mime'][$value] = lang('%1 files', strtoupper(Api\MimeMagic::mime2ext($value))).' ('.$value.')';
 					}
 					else
 					{
-						$sel_options['mime'][$key] = lang('%1 files',strtoupper($value)).' ('.$key.')';
+						$sel_options['mime'][$key] = lang('%1 files', strtoupper($value)).' ('.$key.')';
 					}
 				}
 
@@ -130,11 +130,11 @@ 
 				error_log(array2string($content['options-mime']));
 			}
 		}
-		elseif(isset($content['button']))
+		elseif (isset($content['button']))
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'home':
 					$content['path'] = filemanager_ui::get_home_dir();
@@ -146,10 +146,10 @@ 
 						//Set the "content" name filed accordingly to the uploaded file
 						// encode chars which special meaning in url/vfs (some like / get removed!)
 						$content['name'] = Vfs::encodePathComponent($content['file_upload']['name']);
-						$to_path = Vfs::concat($content['path'],$content['name']);
+						$to_path = Vfs::concat($content['path'], $content['name']);
 
 						$copy_result = (Vfs::is_writable($content['path']) || Vfs::is_writable($to_path)) &&
-							copy($content['file_upload']['tmp_name'],Vfs::PREFIX.$to_path);
+							copy($content['file_upload']['tmp_name'], Vfs::PREFIX.$to_path);
 					}
 
 					//Break on an error condition
@@ -168,12 +168,12 @@ 
 						break;
 					}
 
-					switch($content['mode'])
+					switch ($content['mode'])
 					{
 						case 'open-multiple':
-							foreach((array)$content['dir']['selected'] as $name)
+							foreach ((array)$content['dir']['selected'] as $name)
 							{
-								$files[] = Vfs::concat($content['path'],$name);
+								$files[] = Vfs::concat($content['path'], $name);
 							}
 							//Add an uploaded file to the files result array2string
 							if ($copy_result === true) $files[] = $to_path;
@@ -189,17 +189,17 @@ 
 							// Fall through
 
 						default:
-							$files = Vfs::concat($content['path'],$content['name']);
+							$files = Vfs::concat($content['path'], $content['name']);
 							break;
 					}
 
 					if ($content['method'] && $content['method'] != 'ckeditor_return')
 					{
-						$js = ExecMethod2($content['method'],$content['id'],$files);
+						$js = ExecMethod2($content['method'], $content['id'], $files);
 					}
 					else if ($content['method'] == 'ckeditor_return')
 					{
-						$download_url = Vfs::download_url(Vfs::concat($content['path'],$content['name']));
+						$download_url = Vfs::download_url(Vfs::concat($content['path'], $content['name']));
 						if ($download_url[0] == '/') $download_url = Egw::link($download_url);
 
 						$response = Api\Json\Response::get();
@@ -210,16 +210,16 @@ 
 						Framework::window_close();
 						exit();
 					}
-					if(Api\Json\Response::isJSONResponse())
+					if (Api\Json\Response::isJSONResponse())
 					{
 						$response = Api\Json\Response::get();
-						if($js)
+						if ($js)
 						{
 							$response->script($js);
 						}
 						// Ahh!
 						// The vfs-select widget looks for this
-						$response->script('this.selected_files = '.json_encode($files) . ';');
+						$response->script('this.selected_files = '.json_encode($files).';');
 						Framework::window_close();
 					}
 					else
@@ -232,7 +232,7 @@ 
 
 			$sel_options['mime'] = $content['options-mime'];
 		}
-		elseif(isset($content['apps']))
+		elseif (isset($content['apps']))
 		{
 			list($app) = each($content['apps']);
 			if ($app == 'home') $content['path'] = filemanager_ui::get_home_dir();
@@ -241,7 +241,7 @@ 
 		//Deactivate the opload field if the current directory is not writeable or
 		//we're currently not in the single file open mode.
 		$content['no_upload'] = !Vfs::is_writable($content['path']) ||
-			!in_array($content['mode'],array('open'));
+			!in_array($content['mode'], array('open'));
 
 		$content['apps'] = array_keys(self::get_apps());
 
@@ -251,7 +251,7 @@ 
 		}
 
 		// Set a flag for easy detection as we go
-		$favorites_flag = substr($content['path'],0,strlen('/apps/favorites')) == '/apps/favorites';
+		$favorites_flag = substr($content['path'], 0, strlen('/apps/favorites')) == '/apps/favorites';
 
 		if (!$favorites_flag && (!$content['path'] || !Vfs::is_dir($content['path'])))
 		{
@@ -265,12 +265,12 @@ 
 			$files = array();
 			$favorites = Framework\Favorites::get_favorites('filemanager');
 			$n = 0;
-			foreach($favorites as $favorite)
+			foreach ($favorites as $favorite)
 			{
 				$path = $favorite['state']['path'];
 				// Just directories
-				if(!$path) continue;
-				if ($path == $content['path']) continue;	// remove directory itself
+				if (!$path) continue;
+				if ($path == $content['path']) continue; // remove directory itself
 
 				$mime = Vfs::mime_content_type($path);
 				$content['dir'][$n] = array(
@@ -286,29 +286,29 @@ 
 				++$n;
 			}
 		}
-		else if (!($files = Vfs::find($content['path'],array(
+		else if (!($files = Vfs::find($content['path'], array(
 			'dirsontop' => true,
 			'order' => 'name',
 			'sort' => 'ASC',
 			'maxdepth' => 1,
 		))))
 		{
-			$content['msg'] = lang("Can't open directory %1!",$content['path']);
+			$content['msg'] = lang("Can't open directory %1!", $content['path']);
 		}
 		else
 		{
 			$n = 0;
 			$content['dir'] = array('mode' => $content['mode']);
-			foreach($files as $path)
+			foreach ($files as $path)
 			{
-				if ($path == $content['path']) continue;	// remove directory itself
+				if ($path == $content['path']) continue; // remove directory itself
 
 				$name = Vfs::basename($path);
 				$is_dir = Vfs::is_dir($path);
 				$mime = Vfs::mime_content_type($path);
 				if ($content['mime'] && !$is_dir && $mime != $content['mime'])
 				{
-					continue;	// does not match mime-filter --> ignore
+					continue; // does not match mime-filter --> ignore
 				}
 				$content['dir'][$n] = array(
 					'name' => $name,
@@ -322,7 +322,7 @@ 
 				}
 				++$n;
 			}
-			if (!$n) $readonlys['selected[]'] = true;	// remove checkbox from empty line
+			if (!$n) $readonlys['selected[]'] = true; // remove checkbox from empty line
 		}
 		$readonlys['button[createdir]'] = !Vfs::is_writable($content['path']);
 
@@ -349,7 +349,7 @@ 
 		{
 			Api\Header\ContentSecurityPolicy::add('script-src', 'unsafe-inline');
 		}
-		$tpl->exec('filemanager.filemanager_select.select',$content,$sel_options,$readonlys,$preserve,2);
+		$tpl->exec('filemanager.filemanager_select.select', $content, $sel_options, $readonlys, $preserve, 2);
 	}
 
 	/**
@@ -359,11 +359,11 @@ 
 	 */
 	static function get_apps()
 	{
-		$apps = array(false);	// index starting from 1
+		$apps = array(false); // index starting from 1
 		if (isset($GLOBALS['egw_info']['apps']['stylite'])) $apps = array('favorites' => lang('Favorites'));
 		$apps += Link::app_list('query');
 
-		unset($apps['mydms']);	// they do NOT support adding files to VFS
+		unset($apps['mydms']); // they do NOT support adding files to VFS
 		unset($apps['wiki']);
 		unset($apps['api-accounts']);
 		unset($apps['addressbook-email']);

setup/inc/class.setup_cmd_database.inc.php

Braces +5 added lines, -1 removed lines

@@ -95,7 +95,11 @@
 		{
 			throw new Api\Exception\WrongUserinput(lang("'%1' is no valid domain name!",$this->domain));
 		}
-		if ($this->remote_id && $check_only) return true;	// further checks can only done locally
+		if ($this->remote_id && $check_only)
+		{
+			return true;
+		}
+		// further checks can only done locally
 
 		$this->_merge_defaults();
 		//_debug_array($this->as_array());

Spacing +36 added lines, -36 removed lines

@@ -53,8 +53,8 @@ 
 	 * @param boolean $make_db_name_unique =false true: if create fails because db exists,
 	 * 	try creating a unique name by shortening the name and adding a number to it
 	 */
-	function __construct($domain,$db_type=null,$db_host=null,$db_port=null,$db_name=null,$db_user=null,$db_pass=null,
-		$db_root=null,$db_root_pw=null,$sub_command='create_db',$db_grant_host='localhost',$make_db_name_unique=false)
+	function __construct($domain, $db_type = null, $db_host = null, $db_port = null, $db_name = null, $db_user = null, $db_pass = null,
+		$db_root = null, $db_root_pw = null, $sub_command = 'create_db', $db_grant_host = 'localhost', $make_db_name_unique = false)
 	{
 		if (!is_array($domain))
 		{
@@ -89,22 +89,22 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
-		if (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i',$this->domain))
+		if (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i', $this->domain))
 		{
-			throw new Api\Exception\WrongUserinput(lang("'%1' is no valid domain name!",$this->domain));
+			throw new Api\Exception\WrongUserinput(lang("'%1' is no valid domain name!", $this->domain));
 		}
-		if ($this->remote_id && $check_only) return true;	// further checks can only done locally
+		if ($this->remote_id && $check_only) return true; // further checks can only done locally
 
 		$this->_merge_defaults();
 		//_debug_array($this->as_array());
 
 		try {
-			switch($this->sub_command)
+			switch ($this->sub_command)
 			{
 				case 'test_db_root':
-					$msg = $this->connect($this->db_root,$this->db_root_pw,$this->db_meta);
+					$msg = $this->connect($this->db_root, $this->db_root_pw, $this->db_meta);
 					break;
 				case 'test_db':
 					$msg = $this->connect();
@@ -138,13 +138,13 @@ 
 	 * @param string $name =null default $this->db_name
 	 * @throws Api\Exception\WrongUserinput Can not connect to database ...
 	 */
-	private function connect($user=null,$pass=null,$name=null)
+	private function connect($user = null, $pass = null, $name = null)
 	{
 		// propagate all db_* vars
 		$this->test_db = new Api\Db($this->data);
 
 		$error_rep = error_reporting();
-		error_reporting($error_rep & ~E_WARNING);	// switch warnings off, in case they are on
+		error_reporting($error_rep&~E_WARNING); // switch warnings off, in case they are on
 		try {
 			$this->test_db->connect($name, null, null, $user, $pass);
 		}
@@ -156,10 +156,10 @@ 
 		if ($e)
 		{
 			throw new Api\Exception\WrongUserinput(lang('Can not connect to %1 database %2 on host %3 using user %4!',
-				$this->db_type,$name,$this->db_host.($this->db_port?':'.$this->db_port:''),$user).' ('.$e->getMessage().')');
+				$this->db_type, $name, $this->db_host.($this->db_port ? ':'.$this->db_port : ''), $user).' ('.$e->getMessage().')');
 		}
 		return lang('Successful connected to %1 database %2 on %3 using user %4.',
-				$this->db_type,$name,$this->db_host.($this->db_port?':'.$this->db_port:''),$user);
+				$this->db_type, $name, $this->db_host.($this->db_port ? ':'.$this->db_port : ''), $user);
 	}
 
 	/**
@@ -175,14 +175,14 @@ 
 	 */
 	private function create()
 	{
-		static $try_make_unique = 0;	// to limit trials to create a unique name
+		static $try_make_unique = 0; // to limit trials to create a unique name
 
 		// shorten db-name/-user to self::MAX_DB_NAME_LEN chars
 		if ($this->make_db_name_unique && strlen($this->db_name) > self::MAX_DB_NAME_LEN)
 		{
 			$this->set_defaults['db_name'] = $this->db_name =
 			$this->set_defaults['db_user'] = $this->db_user = // change user too (otherwise existing user/db could not connect any more!)
-				substr(str_replace(array('.', '-'), '_', $this->db_name),0,self::MAX_DB_NAME_LEN);
+				substr(str_replace(array('.', '-'), '_', $this->db_name), 0, self::MAX_DB_NAME_LEN);
 		}
 		try {
 			$msg = $this->connect();
@@ -190,22 +190,22 @@ 
 		catch (Api\Exception\WrongUserinput $e) {
 			// db or user not working --> connect as root and create it
 			try {
-				$this->test_db->create_database($this->db_root,$this->db_root_pw,$this->db_charset,$this->db_grant_host);
+				$this->test_db->create_database($this->db_root, $this->db_root_pw, $this->db_charset, $this->db_grant_host);
 				$this->connect();
 			}
-			catch(Api\Db\Exception $e) {	// catches failed to create database
+			catch (Api\Db\Exception $e) {	// catches failed to create database
 				// try connect as root to check if wrong root/root_pw is the problem
-				$this->connect($this->db_root,$this->db_root_pw,$this->db_meta);
+				$this->connect($this->db_root, $this->db_root_pw, $this->db_meta);
 
 				// if we should create a db with a unique name (try it only N times, not endless!)
 				if ($this->make_db_name_unique && $try_make_unique++ < 20)
 				{
 					// check if we can connect as root to the db to create --> db exists already
 					try {
-						$this->connect($this->db_root,$this->db_root_pw);
+						$this->connect($this->db_root, $this->db_root_pw);
 						// create new db_name by incrementing an existing numeric postfix
 						$matches = null;
-						if (preg_match('/([0-9]+)$/',$this->db_name,$matches))
+						if (preg_match('/([0-9]+)$/', $this->db_name, $matches))
 						{
 							$num = (string)(++$matches[1]);
 						}
@@ -215,7 +215,7 @@ 
 						}
 						$this->set_defaults['db_name'] = $this->db_name =
 						$this->set_defaults['db_user'] = $this->db_user = // change user too (otherwise existing user/db could not connect any more!)
-							substr($this->db_name,0,self::MAX_DB_NAME_LEN-strlen($num)).$num;
+							substr($this->db_name, 0, self::MAX_DB_NAME_LEN - strlen($num)).$num;
 
 						return $this->create();
 					}
@@ -226,21 +226,21 @@ 
 				}
 				// if not give general error
 				throw new Api\Exception\WrongUserinput(lang('Can not create %1 database %2 on %3 for user %4!',
-					$this->db_type,$this->db_name,$this->db_host.($this->db_port?':'.$this->db_port:''),$this->db_user));
+					$this->db_type, $this->db_name, $this->db_host.($this->db_port ? ':'.$this->db_port : ''), $this->db_user));
 			}
 			$msg = lang('Successful connected to %1 on %3 and created database %2 for user %4.',
-					$this->db_type,$this->db_name,$this->db_host.($this->db_port?':'.$this->db_port:''),$this->db_user);
+					$this->db_type, $this->db_name, $this->db_host.($this->db_port ? ':'.$this->db_port : ''), $this->db_user);
 		}
 		// check if it already contains tables
 		if (($tables = $this->test_db->table_names()))
 		{
-			foreach($tables as &$table)
+			foreach ($tables as &$table)
 			{
 				$table = $table['table_name'];
 			}
 			throw new Api\Exception\WrongUserinput(lang('%1 database %2 on %3 already contains the following tables:',
-				$this->db_type,$this->db_name,$this->db_host.($this->db_port?':'.$this->db_port:'')).' '.
-				implode(', ',$tables));
+				$this->db_type, $this->db_name, $this->db_host.($this->db_port ? ':'.$this->db_port : '')).' '.
+				implode(', ', $tables));
 		}
 		return $msg;
 	}
@@ -254,12 +254,12 @@ 
 	 */
 	private function drop()
 	{
-		$this->connect($this->db_root,$this->db_root_pw,$this->db_meta);
-		$this->test_db->query('DROP DATABASE '.$this->test_db->name_quote($this->db_name),__LINE__,__FILE__);
-		$msg = lang('Datebase %1 droped.',$this->db_name);
+		$this->connect($this->db_root, $this->db_root_pw, $this->db_meta);
+		$this->test_db->query('DROP DATABASE '.$this->test_db->name_quote($this->db_name), __LINE__, __FILE__);
+		$msg = lang('Datebase %1 droped.', $this->db_name);
 		try {
 			$this->test_db->query('DROP USER '.$this->test_db->quote($this->db_user).'@'.
-				$this->test_db->quote($this->db_grant_host?$this->db_grant_host:'%'),__LINE__,__FILE__);
+				$this->test_db->quote($this->db_grant_host ? $this->db_grant_host : '%'), __LINE__, __FILE__);
 		}
 		catch (Api\Db\Exception $e) {
 			unset($e);
@@ -275,9 +275,9 @@ 
 	 * @param string $db_type ='mysqli'
 	 * @return array
 	 */
-	static function defaults($db_type='mysqli')
+	static function defaults($db_type = 'mysqli')
 	{
-		switch($db_type)
+		switch ($db_type)
 		{
 			case 'mysql':
 			default:
@@ -295,7 +295,7 @@ 
 			'db_user' => 'egw_$domain',
 			'db_pass' => self::randomstring(),
 			'db_root' => 'root',
-			'db_root_pw' => '',	// not really a default
+			'db_root_pw' => '', // not really a default
 			'db_meta' => $meta_db,
 			'db_charset' => 'utf-8',
 			'db_grant_host' => 'localhost',
@@ -307,19 +307,19 @@ 
 	 */
 	private function _merge_defaults()
 	{
-		foreach(self::defaults() as $name => $default)
+		foreach (self::defaults() as $name => $default)
 		{
 			if (!$this->$name)
 			{
 				//echo "<p>setting $name='{$this->$name}' to it's default='$default'</p>\n";
 				$this->set_defaults[$name] = $this->$name = $default;
 			}
-			if (strpos($this->$name,'$domain') !== false)
+			if (strpos($this->$name, '$domain') !== false)
 			{
 				// limit names to 16 chars (16 char is user-name limit in MySQL)
 				$this->set_defaults[$name] = $this->$name =
-					substr(str_replace(array('$domain','.','-'),array($this->domain,'_','_'),$this->$name),
-					0,self::MAX_DB_NAME_LEN);
+					substr(str_replace(array('$domain', '.', '-'), array($this->domain, '_', '_'), $this->$name),
+					0, self::MAX_DB_NAME_LEN);
 			}
 		}
 	}

api/src/Egw/Applications.php

Spacing +4 added lines, -4 removed lines

@@ -58,11 +58,11 @@ 
 	 */
 	function read_repository()
 	{
-		if (!isset($GLOBALS['egw_info']['apps']) ||	!is_array($GLOBALS['egw_info']['apps']))
+		if (!isset($GLOBALS['egw_info']['apps']) || !is_array($GLOBALS['egw_info']['apps']))
 		{
 			$this->read_installed_apps();
 		}
-		if(!$this->account_id)
+		if (!$this->account_id)
 		{
 			return False;
 		}
@@ -79,7 +79,7 @@ 
 		$GLOBALS['egw_info']['apps'] = Api\Cache::getInstance(__CLASS__, 'apps', function()
 		{
 			$apps = array();
-			foreach($this->db->select($this->table_name,'*',false,__LINE__,__FILE__,false,'ORDER BY app_order ASC') as $row)
+			foreach ($this->db->select($this->table_name, '*', false, __LINE__, __FILE__, false, 'ORDER BY app_order ASC') as $row)
 			{
 				$apps[$row['app_name']] = Array(
 					'title'   => $row['app_name'],
@@ -99,7 +99,7 @@ 
 
 		if (!empty($GLOBALS['egw_info']['user']['preferences']['common']['lang']))
 		{
-			foreach($GLOBALS['egw_info']['apps'] as &$app)
+			foreach ($GLOBALS['egw_info']['apps'] as &$app)
 			{
 				$app['title'] = lang($app['title']);
 			}

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

@@ -81,7 +81,7 @@
 			$apps = array();
 			foreach($this->db->select($this->table_name,'*',false,__LINE__,__FILE__,false,'ORDER BY app_order ASC') as $row)
 			{
-				$apps[$row['app_name']] = Array(
+				$apps[$row['app_name']] = array(
 					'title'   => $row['app_name'],
 					'name'    => $row['app_name'],
 					'enabled' => True,

api/src/Etemplate/Widget/Vfs.php

Doc Comments +1 added lines

@@ -249,6 +249,7 @@
 	* If the entry is not yet created, the file information is stored into the widget's value.
 	* When the form is submitted, the information for all files uploaded is available in the returned
 	* $content array and the application should deal with the file.
+	* @return string
 	*/
 	public static function store_file($path, &$file)
 	{

Indentation +7 added lines, -7 removed lines

@@ -243,13 +243,13 @@
 	}
 
 	/**
-	* Ajax callback to receive an incoming file
-	*
-	* The incoming file is automatically placed into the appropriate VFS location.
-	* If the entry is not yet created, the file information is stored into the widget's value.
-	* When the form is submitted, the information for all files uploaded is available in the returned
-	* $content array and the application should deal with the file.
-	*/
+	 * Ajax callback to receive an incoming file
+	 *
+	 * The incoming file is automatically placed into the appropriate VFS location.
+	 * If the entry is not yet created, the file information is stored into the widget's value.
+	 * When the form is submitted, the information for all files uploaded is available in the returned
+	 * $content array and the application should deal with the file.
+	 */
 	public static function store_file($path, &$file)
 	{
 		$name = $_REQUEST['widget_id'];

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

@@ -124,7 +124,7 @@
 	 *
 	 * Overriden from the parent to see if we can safely show the thumbnail immediately
 	 */
-	protected static function process_uploaded_file($field, Array &$file, $mime, Array &$file_data)
+	protected static function process_uploaded_file($field, array &$file, $mime, array &$file_data)
 	{
 		parent::process_uploaded_file($field, $file, $mime, $file_data);
 		$path = self::store_file($_REQUEST['path'] ? $_REQUEST['path'] : $_REQUEST['widget_id'], $file);

Braces +67 added lines, -16 removed lines

@@ -29,7 +29,10 @@ 
 
 	public function __construct($xml='')
 	{
-		if($xml) parent::__construct($xml);
+		if($xml)
+		{
+			parent::__construct($xml);
+		}
 	}
 
 	/**
@@ -70,9 +73,15 @@ 
 				}
 				$value =& self::get_array(self::$request->content, $form_name, true);
 				$path = Api\Link::vfs_path($app,$id,'',true);
-				if (!empty($relpath)) $path .= '/'.$relpath;
+				if (!empty($relpath))
+				{
+					$path .= '/'.$relpath;
+				}
 
-				if (true) $value = array();
+				if (true)
+				{
+					$value = array();
+				}
 
 				// Single file, already existing
 				if (substr($path,-1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
@@ -215,7 +224,10 @@ 
 				$replace[substr($link['id']['tmp_name'], strlen(Api\Vfs::PREFIX))] =
 					Api\Link::vfs_path($app, $id, Api\Vfs::basename($link['id']['tmp_name']), true);
 
-				if (!in_array($matches[1], $remove_dir)) $remove_dir[] = $matches[1];
+				if (!in_array($matches[1], $remove_dir))
+				{
+					$remove_dir[] = $matches[1];
+				}
 			}
 		}
 		if ($replace)
@@ -239,7 +251,10 @@ 
 	 */
 	static function get_temp_dir($app, $postfix=null)
 	{
-		if (!isset($postfix)) $postfix = md5(time().session_id());
+		if (!isset($postfix))
+		{
+			$postfix = md5(time().session_id());
+		}
 
 		return '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.tmp/'.$app.'_'.$postfix;
 	}
@@ -269,16 +284,22 @@ 
 			// check if path already contains a valid extension --> dont add an other one
 			$path_parts = explode('.', $path);
 			if (count($path_parts) > 2 && (!($extension = array_pop($path_parts)) || !Api\MimeMagic::ext2mime($extension)) &&
-				($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))       // really an extension --> add it to path
+				($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))
+			{
+				// really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
 			}
+			}
 			$file['name'] = Api\Vfs::basename($path);
 		}
-		else if ($path)   // multiple upload with dir given (trailing slash)
+		else if ($path)
+		{
+			// multiple upload with dir given (trailing slash)
 		{
 			$path .= Api\Vfs::encodePathComponent($filename);
 		}
+		}
 		if (!($dir = Api\Vfs::dirname($path)))
 		{
 			self::set_validation_error($name,lang('Error create parent directory %1!', "dirname('$path') === false"));
@@ -324,7 +345,10 @@ 
 		switch($this->type)
 		{
 			case 'vfs-upload':
-				if(!is_array($value)) $value = array();
+				if(!is_array($value))
+				{
+					$value = array();
+				}
 				/* Check & skip files that made it asyncronously
 				list($app,$id,$relpath) = explode(':',$this->id,3);
 				//...
@@ -335,7 +359,10 @@ 
 				parent::validate($cname, $content, $validated);
 				break;
 		}
-		if (true) $valid = $value;
+		if (true)
+		{
+			$valid = $value;
+		}
 	}
 
 	/**
@@ -347,7 +374,10 @@ 
 		if (empty($id) || $id == 'undefined')
 		{
 			static $tmppath = array();      // static var, so all vfs-uploads get created in the same temporary dir
-			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir ($app);
+			if (!isset($tmppath[$app]))
+			{
+				$tmppath[$app] = self::get_temp_dir ($app);
+			}
 			$path = $tmppath[$app];
 		}
 		else
@@ -367,7 +397,10 @@ 
 			}
 			$path = Api\Link::vfs_path($app,$id,'',true);
 		}
-		if (!empty($relpath)) $path .= '/'.$relpath;
+		if (!empty($relpath))
+		{
+			$path .= '/'.$relpath;
+		}
 		return $path;
 	}
 
@@ -459,8 +492,15 @@ 
 			{
 				$path = $favorite['state']['path'];
 				// Just directories
-				if(!$path) continue;
-				if ($path == $content['path']) continue;	// remove directory itself
+				if(!$path)
+				{
+					continue;
+				}
+				if ($path == $content['path'])
+				{
+					continue;
+				}
+				// remove directory itself
 
 				$mime = \EGroupware\Api\Vfs::mime_content_type($path);
 				$content['dir'][$n] = array(
@@ -491,7 +531,11 @@ 
 			$content['dir'] = array('mode' => $content['mode']);
 			foreach($files as $path)
 			{
-				if ($path == $content['path']) continue;	// remove directory itself
+				if ($path == $content['path'])
+				{
+					continue;
+				}
+				// remove directory itself
 
 				$name = \EGroupware\Api\Vfs::basename($path);
 				$is_dir = \EGroupware\Api\Vfs::is_dir($path);
@@ -512,7 +556,11 @@ 
 				}
 				++$n;
 			}
-			if (!$n) $readonlys['selected[]'] = true;	// remove checkbox from empty line
+			if (!$n)
+			{
+				$readonlys['selected[]'] = true;
+			}
+			// remove checkbox from empty line
 		}
 		$readonlys = array_merge($readonlys, array(
 			'createdir' => !\EGroupware\Api\Vfs::is_writable($content['path']),
@@ -528,7 +576,10 @@ 
 		if ($content['method'] === 'ckeditor')
 		{
 			$download_baseUrl = \EGroupware\Api\Vfs::download_url($content['path']);
-			if ($download_baseUrl[0] == '/') $download_baseUrl = \EGroupware\Api\Egw::link($download_baseUrl);
+			if ($download_baseUrl[0] == '/')
+			{
+				$download_baseUrl = \EGroupware\Api\Egw::link($download_baseUrl);
+			}
 			$content['download_baseUrl'] = $download_baseUrl;
 		}
 

Spacing +68 added lines, -70 removed lines

@@ -27,9 +27,9 @@ 
 	// Legacy option for vfs-upload
 	protected $legacy_options = "mime";
 
-	public function __construct($xml='')
+	public function __construct($xml = '')
 	{
-		if($xml) parent::__construct($xml);
+		if ($xml) parent::__construct($xml);
 	}
 
 	/**
@@ -38,10 +38,10 @@ 
 	 */
 	public function beforeSendToClient($cname, $expand = array())
 	{
-		if($this->type == 'vfs-upload' || $this->attrs['type'] == 'vfs-upload')
+		if ($this->type == 'vfs-upload' || $this->attrs['type'] == 'vfs-upload')
 		{
 			$form_name = self::form_name($cname, $this->id, $expand ? $expand : array('cont'=>self::$request->content));
-			if($this->attrs['path'])
+			if ($this->attrs['path'])
 			{
 				$path = $this->attrs['path'];
 			}
@@ -52,13 +52,13 @@ 
 
 			$this->setElementAttribute($form_name, 'path', $path);
 			// ID maps to path - check there for any existing files
-			list($app,$id,$relpath) = explode(':',$path,3);
-			if($app && $id)
+			list($app, $id, $relpath) = explode(':', $path, 3);
+			if ($app && $id)
 			{
-				if(!is_numeric($id))
+				if (!is_numeric($id))
 				{
-					$_id = self::expand_name($id,0,0,0,0,self::$request->content);
-					if($_id != $id && $_id)
+					$_id = self::expand_name($id, 0, 0, 0, 0, self::$request->content);
+					if ($_id != $id && $_id)
 					{
 						$id = $_id;
 						$form_name = "$app:$id:$relpath";
@@ -68,14 +68,14 @@ 
 						return;
 					}
 				}
-				$value =& self::get_array(self::$request->content, $form_name, true);
-				$path = Api\Link::vfs_path($app,$id,'',true);
+				$value = & self::get_array(self::$request->content, $form_name, true);
+				$path = Api\Link::vfs_path($app, $id, '', true);
 				if (!empty($relpath)) $path .= '/'.$relpath;
 
 				if (true) $value = array();
 
 				// Single file, already existing
-				if (substr($path,-1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
+				if (substr($path, -1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
 				{
 					$file = Api\Vfs::stat($path);
 					$file['path'] = $path;
@@ -84,14 +84,14 @@ 
 					$value = array($file);
 				}
 				// Single file, missing extension in path
-				else if (substr($path, -1) != '/' && !Api\Vfs::file_exists($path) && $relpath && substr($relpath,-4,1) !== '.')
+				else if (substr($path, -1) != '/' && !Api\Vfs::file_exists($path) && $relpath && substr($relpath, -4, 1) !== '.')
 				{
 					$find = Api\Vfs::find(Api\Vfs::dirname($path), array(
 						'type' => 'f',
 						'maxdepth' => 1,
 						'name' => Api\Vfs::basename($path).'.*',
 					));
-					foreach($find as $file)
+					foreach ($find as $file)
 					{
 						$file_info = Api\Vfs::stat($file);
 						$file_info['path'] = $file;
@@ -103,7 +103,7 @@ 
 				else if (substr($path, -1) == '/' && Api\Vfs::is_dir($path))
 				{
 					$scan = Api\Vfs::scandir($path);
-					foreach($scan as $file)
+					foreach ($scan as $file)
 					{
 						$file_info = Api\Vfs::stat("$path$file");
 						$file_info['path'] = "$path$file";
@@ -130,7 +130,7 @@ 
 	{
 		parent::process_uploaded_file($field, $file, $mime, $file_data);
 		$path = self::store_file($_REQUEST['path'] ? $_REQUEST['path'] : $_REQUEST['widget_id'], $file);
-		if($path)
+		if ($path)
 		{
 			$file_data[basename($file['tmp_name'])]['name'] = $file['name'];
 			$file_data[basename($file['tmp_name'])]['path'] = $path;
@@ -146,7 +146,7 @@ 
 	{
 		$request_id = urldecode($_REQUEST['request_id']);
 		$widget_id = $_REQUEST['widget_id'];
-		if(!self::$request = Etemplate\Request::read($request_id))
+		if (!self::$request = Etemplate\Request::read($request_id))
 		{
 			$error = lang("Could not read session");
 		}
@@ -163,8 +163,7 @@ 
 		else
 		{
 			$data = self::$request->content[$widget_id];
-			$path = self::store_file($path = (!is_array($data) && $data[0] == '/' ? $data :
-				self::get_vfs_path($data['to_app'].':'.$data['to_id'])).'/', $_FILES['upload']);
+			$path = self::store_file($path = (!is_array($data) && $data[0] == '/' ? $data : self::get_vfs_path($data['to_app'].':'.$data['to_id'])).'/', $_FILES['upload']);
 
 			// store temp. vfs-path like links to be able to move it to correct location after entry is stored
 			if (!$data['to_id'] || is_array($data['to_id']))
@@ -207,10 +206,10 @@ 
 	static function fix_html_dragins($app, $id, array $links, &$html)
 	{
 		$replace = $remove_dir = array();
-		foreach($links as $link)
+		foreach ($links as $link)
 		{
 			$matches = null;
-			if (is_array($link) && preg_match('|^'.preg_quote(Api\Vfs::PREFIX,'|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
+			if (is_array($link) && preg_match('|^'.preg_quote(Api\Vfs::PREFIX, '|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
 			{
 				$replace[substr($link['id']['tmp_name'], strlen(Api\Vfs::PREFIX))] =
 					Api\Link::vfs_path($app, $id, Api\Vfs::basename($link['id']['tmp_name']), true);
@@ -222,7 +221,7 @@ 
 		{
 			$html = strtr($old = $html, $replace);
 			// remove all dirs
-			foreach($remove_dir as $dir)
+			foreach ($remove_dir as $dir)
 			{
 				Api\Vfs::remove($dir);
 			}
@@ -237,7 +236,7 @@ 
 	 * @param string $postfix =null default random id
 	 * @return string vfs path
 	 */
-	static function get_temp_dir($app, $postfix=null)
+	static function get_temp_dir($app, $postfix = null)
 	{
 		if (!isset($postfix)) $postfix = md5(time().session_id());
 
@@ -257,15 +256,15 @@ 
 		$name = $_REQUEST['widget_id'];
 
 		// Find real path
-		if($path[0] != '/')
+		if ($path[0] != '/')
 		{
 			$path = self::get_vfs_path($path);
 		}
 		$filename = $file['name'];
-		if ($path && substr($path,-1) != '/')
+		if ($path && substr($path, -1) != '/')
 		{
 			// add extension to path
-			$parts = explode('.',$filename);
+			$parts = explode('.', $filename);
 			// check if path already contains a valid extension --> dont add an other one
 			$path_parts = explode('.', $path);
 			if (count($path_parts) > 2 && (!($extension = array_pop($path_parts)) || !Api\MimeMagic::ext2mime($extension)) &&
@@ -281,17 +280,17 @@ 
 		}
 		if (!($dir = Api\Vfs::dirname($path)))
 		{
-			self::set_validation_error($name,lang('Error create parent directory %1!', "dirname('$path') === false"));
+			self::set_validation_error($name, lang('Error create parent directory %1!', "dirname('$path') === false"));
 			return false;
 		}
-		if (!Api\Vfs::file_exists($dir) && !Api\Vfs::mkdir($dir,null,STREAM_MKDIR_RECURSIVE))
+		if (!Api\Vfs::file_exists($dir) && !Api\Vfs::mkdir($dir, null, STREAM_MKDIR_RECURSIVE))
 		{
-			self::set_validation_error($name,lang('Error create parent directory %1!',Api\Vfs::decodePath($dir)));
+			self::set_validation_error($name, lang('Error create parent directory %1!', Api\Vfs::decodePath($dir)));
 			return false;
 		}
-		if (!copy($file['tmp_name'],Api\Vfs::PREFIX.$path))
+		if (!copy($file['tmp_name'], Api\Vfs::PREFIX.$path))
 		{
-			self::set_validation_error($name,lang('Error copying uploaded file to vfs!'));
+			self::set_validation_error($name, lang('Error copying uploaded file to vfs!'));
 			return false;
 		}
 
@@ -310,7 +309,7 @@ 
 	 * @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())
 	{
 		// do not validate, as it would overwrite preserved values with null!
 		if (in_array($this->type, array('vfs-size', 'vfs-uid', 'vfs-gid', 'vfs', 'vfs-mime')))
@@ -319,12 +318,12 @@ 
 		}
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value = $value_in = self::get_array($content, $form_name);
-		$valid =& self::get_array($validated, $form_name, true);
+		$valid = & self::get_array($validated, $form_name, true);
 
-		switch($this->type)
+		switch ($this->type)
 		{
 			case 'vfs-upload':
-				if(!is_array($value)) $value = array();
+				if (!is_array($value)) $value = array();
 				/* Check & skip files that made it asyncronously
 				list($app,$id,$relpath) = explode(':',$this->id,3);
 				//...
@@ -343,19 +342,19 @@ 
 	 */
 	public static function get_vfs_path($path)
 	{
-		list($app,$id,$relpath) = explode(':',$path,3);
+		list($app, $id, $relpath) = explode(':', $path, 3);
 		if (empty($id) || $id == 'undefined')
 		{
-			static $tmppath = array();      // static var, so all vfs-uploads get created in the same temporary dir
-			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir ($app);
+			static $tmppath = array(); // static var, so all vfs-uploads get created in the same temporary dir
+			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir($app);
 			$path = $tmppath[$app];
 		}
 		else
 		{
-			if(!is_numeric($id))
+			if (!is_numeric($id))
 			{
-				$_id = self::expand_name($id,0,0,0,0,self::$request->content);
-				if($_id != $id && $_id)
+				$_id = self::expand_name($id, 0, 0, 0, 0, self::$request->content);
+				if ($_id != $id && $_id)
 				{
 					$id = $_id;
 				}
@@ -365,7 +364,7 @@ 
 					return static::get_vfs_path("$app::$relpath");
 				}
 			}
-			$path = Api\Link::vfs_path($app,$id,'',true);
+			$path = Api\Link::vfs_path($app, $id, '', true);
 		}
 		if (!empty($relpath)) $path .= '/'.$relpath;
 		return $path;
@@ -388,22 +387,22 @@ 
 	 * @param array $params
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public static function ajax_vfsSelect_content (array $content=null, $params = null)
+	public static function ajax_vfsSelect_content(array $content = null, $params = null)
 	{
 		$response = Json\Response::get();
 		$readonlys = $sel_options = array();
 
 		if (isset($params['mime']))
 		{
-			foreach((array)$params['mime'] as $key => $value)
+			foreach ((array)$params['mime'] as $key => $value)
 			{
 				if (is_numeric($key))
 				{
-					$sel_options['mime'][$value] = lang('%1 files',strtoupper(Api\MimeMagic::mime2ext($value))).' ('.$value.')';
+					$sel_options['mime'][$value] = lang('%1 files', strtoupper(Api\MimeMagic::mime2ext($value))).' ('.$value.')';
 				}
 				else
 				{
-					$sel_options['mime'][$key] = lang('%1 files',strtoupper($value)).' ('.$key.')';
+					$sel_options['mime'][$key] = lang('%1 files', strtoupper($value)).' ('.$key.')';
 				}
 			}
 		}
@@ -413,10 +412,10 @@ 
 			$content = array_merge($params, array(
 				'name'	=> (string)$params['name'],
 				'path'	=> empty($params['path']) ?
-				Api\Cache::getSession('filemanger', 'select_path'): $params['path']
+				Api\Cache::getSession('filemanger', 'select_path') : $params['path']
 			));
 			unset($content['mime']);
-			if (!in_array($content['mode'],array('open','open-multiple','saveas','select-dir')))
+			if (!in_array($content['mode'], array('open', 'open-multiple', 'saveas', 'select-dir')))
 			{
 				throw new Api\Exception\WrongParameter("Wrong or unset required mode parameter!");
 			}
@@ -426,11 +425,11 @@ 
 				list($content['mime']) = each($sel_options['mime']);
 			}
 		}
-		elseif(isset($content['action']))
+		elseif (isset($content['action']))
 		{
 			$action = $content['action'];
 			unset($content['action']);
-			switch($action)
+			switch ($action)
 			{
 				case 'home':
 					$content['path'] = \EGroupware\Api\Vfs::get_home_dir();
@@ -439,11 +438,10 @@ 
 		}
 		if (!empty($content['app']) && $content['old_app'] != $content['app'])
 		{
-			$content['path'] = $content['app'] == 'home'? \EGroupware\Api\Vfs::get_home_dir():
-				'/apps/'.$content['app'];
+			$content['path'] = $content['app'] == 'home' ? \EGroupware\Api\Vfs::get_home_dir() : '/apps/'.$content['app'];
 		}
 
-		$favorites_flag = substr($content['path'],0,strlen('/apps/favorites')) == '/apps/favorites';
+		$favorites_flag = substr($content['path'], 0, strlen('/apps/favorites')) == '/apps/favorites';
 		if (!$favorites_flag && (!$content['path'] || !\EGroupware\Api\Vfs::is_dir($content['path'])))
 		{
 			$content['path'] = \EGroupware\Api\Vfs::get_home_dir();
@@ -456,12 +454,12 @@ 
 			$favorites = \EGroupware\Api\Framework\Favorites::get_favorites('filemanager');
 			$n = 0;
 			$content['dir'] = array();
-			foreach($favorites as $favorite)
+			foreach ($favorites as $favorite)
 			{
 				$path = $favorite['state']['path'];
 				// Just directories
-				if(!$path) continue;
-				if ($path == $content['path']) continue;	// remove directory itself
+				if (!$path) continue;
+				if ($path == $content['path']) continue; // remove directory itself
 
 				$mime = \EGroupware\Api\Vfs::mime_content_type($path);
 				$content['dir'][$n] = array(
@@ -477,29 +475,29 @@ 
 				++$n;
 			}
 		}
-		else if (!($files = \EGroupware\Api\Vfs::find($content['path'],array(
+		else if (!($files = \EGroupware\Api\Vfs::find($content['path'], array(
 			'dirsontop' => true,
 			'order' => 'name',
 			'sort' => 'ASC',
 			'maxdepth' => 1,
 		))))
 		{
-			$content['msg'] = lang("Can't open directory %1!",$content['path']);
+			$content['msg'] = lang("Can't open directory %1!", $content['path']);
 		}
 		else
 		{
 			$n = 0;
 			$content['dir'] = array('mode' => $content['mode']);
-			foreach($files as $path)
+			foreach ($files as $path)
 			{
-				if ($path == $content['path']) continue;	// remove directory itself
+				if ($path == $content['path']) continue; // remove directory itself
 
 				$name = \EGroupware\Api\Vfs::basename($path);
 				$is_dir = \EGroupware\Api\Vfs::is_dir($path);
 				$mime = \EGroupware\Api\Vfs::mime_content_type($path);
 				if ($content['mime'] && !$is_dir && $mime != $content['mime'])
 				{
-					continue;	// does not match mime-filter --> ignore
+					continue; // does not match mime-filter --> ignore
 				}
 				$content['dir'][$n] = array(
 					'name' => $name,
@@ -513,12 +511,12 @@ 
 				}
 				++$n;
 			}
-			if (!$n) $readonlys['selected[]'] = true;	// remove checkbox from empty line
+			if (!$n) $readonlys['selected[]'] = true; // remove checkbox from empty line
 		}
 		$readonlys = array_merge($readonlys, array(
 			'createdir' => !\EGroupware\Api\Vfs::is_writable($content['path']),
 			'upload_file' => !\EGroupware\Api\Vfs::is_writable($content['path']) ||
-			!in_array($content['mode'],array('open', 'open-multiple')),
+			!in_array($content['mode'], array('open', 'open-multiple')),
 			'favorites' => !isset($GLOBALS['egw_info']['apps']['stylite'])
 		));
 
@@ -539,7 +537,7 @@ 
 			'content'		=> $content,
 			'sel_options'	=> $sel_options,
 			'readonlys'		=> $readonlys,
-			'modifications'	=> array (
+			'modifications'	=> array(
 				'mode'   => $content['mode'],
 				'method' => $content['method'],
 				'id'     => $content['id'],
@@ -557,7 +555,7 @@ 
 	 * @param type $dir name of the directory
 	 * @param type $path path to create directory in it
 	 */
-	public static function ajax_create_dir ($dir, $path)
+	public static function ajax_create_dir($dir, $path)
 	{
 		$response = Json\Response::get();
 		$msg = '';
@@ -579,20 +577,20 @@ 
 	 * @param array $files temp files
 	 * @param string $dir vfs path to store the file
 	 */
-	static function ajax_vfsSelect_storeFile ($files, $dir)
+	static function ajax_vfsSelect_storeFile($files, $dir)
 	{
 		$response = Api\Json\Response::get();
-		$result = array (
+		$result = array(
 			'errs' => 0,
 			'msg' => '',
 			'files' => 0,
 		);
 		$script_error = 0;
-		foreach($files as $tmp_name => &$data)
+		foreach ($files as $tmp_name => &$data)
 		{
 			$path = \EGroupware\Api\Vfs::concat($dir, \EGroupware\Api\Vfs::encodePathComponent($data['name']));
 
-			if(\EGroupware\Api\Vfs::deny_script($path))
+			if (\EGroupware\Api\Vfs::deny_script($path))
 			{
 				if (!isset($script_error))
 				{
@@ -614,7 +612,7 @@ 
 			{
 				if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 				{
-					$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'] . '/' . basename($tmp_name);
+					$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.basename($tmp_name);
 				}
 				else
 				{

api/src/Etemplate/Widget/Taglist.php

Braces +7 added lines, -4 removed lines

@@ -44,7 +44,8 @@ 
 	{
 		$this->attrs['allowFreeEntries'] = true;
 
-		if($xml) {
+		if($xml)
+		{
 			parent::__construct($xml);
 		}
 	}
@@ -142,8 +143,7 @@ 
 						!($this->attrs['domainOptional'] && preg_match (Taglist::EMAIL_PREG_NO_DOMAIN, $val)) &&
 					// Allow merge placeholders.  Might be a better way to do this though.
 					!preg_match('/{{.+}}|\$\$.+\$\$/',$val)
-				)
-				{
+				) {
 					self::set_validation_error($form_name,lang("'%1' has an invalid format",$val),'');
 				}
 			}
@@ -158,7 +158,10 @@ 
 			$valid =& self::get_array($validated, $form_name, true);
 			// returning null instead of array(), as array() will be overwritten by etemplate_new::complete_array_merge()
 			// with preserved old content and therefore user can not empty a taglist
-			if (true) $valid = $value ? $value : null;
+			if (true)
+			{
+				$valid = $value ? $value : null;
+			}
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value).', allowed='.array2string($allowed));
 		}
 	}

Spacing +17 added lines, -17 removed lines

@@ -44,7 +44,7 @@ 
 	{
 		$this->attrs['allowFreeEntries'] = true;
 
-		if($xml) {
+		if ($xml) {
 			parent::__construct($xml);
 		}
 	}
@@ -64,7 +64,7 @@ 
 		if ($type == "account")
 		{
 			// Only search if a query was provided - don't search for all accounts
-			if($query)
+			if ($query)
 			{
 				$options['account_type'] = $_REQUEST['account_type'];
 				$links = Api\Accounts::link_query($query, $options);
@@ -75,7 +75,7 @@ 
 			$links = Api\Link::query($app, $query, $options);
 		}
 		$results = array();
-		foreach($links as $id => $name)
+		foreach ($links as $id => $name)
 		{
 			$results[] = array('id' => $id, 'label' => $name);
 		}
@@ -95,7 +95,7 @@ 
 	public static function ajax_email()
 	{
 		// If no mail app access, use link system -> addressbook
-		if(!$GLOBALS['egw_info']['apps']['mail'])
+		if (!$GLOBALS['egw_info']['apps']['mail'])
 		{
 			$_REQUEST['app'] = 'addressbook-email';
 			return self::ajax_search();
@@ -113,7 +113,7 @@ 
 	 * @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);
 
@@ -123,39 +123,39 @@ 
 			$value = $value_in = self::get_array($content, $form_name);
 			$allowed = Select::selOptions($form_name);
 
-			foreach((array) $value as $key => $val)
+			foreach ((array)$value as $key => $val)
 			{
-				if(count($allowed) && !$this->attrs['allowFreeEntries'] && !array_key_exists($val,$allowed))
+				if (count($allowed) && !$this->attrs['allowFreeEntries'] && !array_key_exists($val, $allowed))
 				{
-					self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",array_keys($allowed))),'');
+					self::set_validation_error($form_name, lang("'%1' is NOT allowed ('%2')!", $val, implode("','", array_keys($allowed))), '');
 					unset($value[$key]);
 				}
-				if($this->type == 'taglist-email' && $this->attrs['include_lists'] && is_numeric($val))
+				if ($this->type == 'taglist-email' && $this->attrs['include_lists'] && is_numeric($val))
 				{
 					$lists = $GLOBALS['egw']->contacts->get_lists(Api\Acl::READ);
-					if(!array_key_exists($val, $lists))
+					if (!array_key_exists($val, $lists))
 					{
-						self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",array_keys($lists))),'');
+						self::set_validation_error($form_name, lang("'%1' is NOT allowed ('%2')!", $val, implode("','", array_keys($lists))), '');
 					}
 				}
-				else if($this->type == 'taglist-email' && !preg_match(Url::EMAIL_PREG, $val) &&
-						!($this->attrs['domainOptional'] && preg_match (Taglist::EMAIL_PREG_NO_DOMAIN, $val)) &&
+				else if ($this->type == 'taglist-email' && !preg_match(Url::EMAIL_PREG, $val) &&
+						!($this->attrs['domainOptional'] && preg_match(Taglist::EMAIL_PREG_NO_DOMAIN, $val)) &&
 					// Allow merge placeholders.  Might be a better way to do this though.
-					!preg_match('/{{.+}}|\$\$.+\$\$/',$val)
+					!preg_match('/{{.+}}|\$\$.+\$\$/', $val)
 				)
 				{
-					self::set_validation_error($form_name,lang("'%1' has an invalid format",$val),'');
+					self::set_validation_error($form_name, lang("'%1' has an invalid format", $val), '');
 				}
 			}
 			if ($ok && $value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!', $value), '');
 			}
 			if (array_key_exists('multiple', $this->attrs) && (!$this->attrs['multiple'] || $this->attrs['multiple'] === 'false') && is_array($value))
 			{
 				$value = array_shift($value);
 			}
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			// returning null instead of array(), as array() will be overwritten by etemplate_new::complete_array_merge()
 			// with preserved old content and therefore user can not empty a taglist
 			if (true) $valid = $value ? $value : null;

api/anon_images.php

Spacing +3 added lines, -3 removed lines

@@ -24,8 +24,8 @@ 
 $path = $GLOBALS['egw_info']['server']['files_dir'].'/anon-images';
 
 if (!file_exists($path) || empty($_GET['src']) ||
-	basename($_GET['src']) !== $_GET['src'] ||	// make sure no directory traversal
-	!preg_match('/^[a-z 0-9._-]+\.(jpe?g|png|gif|svg|ico)$/i', $_GET['src']) ||	// only allow images, not eg. Javascript!
+	basename($_GET['src']) !== $_GET['src'] || // make sure no directory traversal
+	!preg_match('/^[a-z 0-9._-]+\.(jpe?g|png|gif|svg|ico)$/i', $_GET['src']) || // only allow images, not eg. Javascript!
 	!file_exists($path .= '/'.$_GET['src']) ||
 	!($fp = fopen($path, 'r')))
 {
@@ -34,7 +34,7 @@ 
 }
 else
 {
-	Api\Session::cache_control(864000);	// 10 days
+	Api\Session::cache_control(864000); // 10 days
 	$size = filesize($path);
 	header('ETag: "'.md5($_GET['src'].$size.filemtime($path)).'"');
 	header('Content-Type: '.Api\MimeMagic::filename2mime($_GET['src']));

infolog/inc/class.infolog_hooks.inc.php

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

@@ -108,7 +108,7 @@
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && !Api\Header\UserAgent::mobile())
 		{
-			$file = Array(
+			$file = array(
 				'Site configuration' => Egw::link('/index.php',array(
 					'menuaction' => 'infolog.infolog_ui.admin',
 					// As long as CKEditor needs CSP exceptions, this needs to

Spacing +43 added lines, -43 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	static function not_enum_group_acls($location)
 	{
-		unset($location);	// not used, but part of hook signature
+		unset($location); // not used, but part of hook signature
 		$config = Api\Config::read('infolog');
 
 		return $config['group_owners'];
@@ -43,7 +43,7 @@ 
 	 */
 	static function search_link($location)
 	{
-		unset($location);	// not used, but part of hook signature
+		unset($location); // not used, but part of hook signature
 
 		return array(
 			'query'      => 'infolog.infolog_bo.link_query',
@@ -66,7 +66,7 @@ 
 			'add_id'     => 'action_id',
 			'add_popup'  => '760x570',
 			'file_access'=> 'infolog.infolog_bo.file_access',
-			'file_access_user' => true,	// file_access supports 4th parameter $user
+			'file_access_user' => true, // file_access supports 4th parameter $user
 			'edit'       => array(
 				'menuaction' => 'infolog.infolog_ui.edit',
 			),
@@ -93,46 +93,46 @@ 
 			display_sidebox($appname, lang('Favorites'), Framework\Favorites::list_favorites($appname));
 
 			$file = array(
-				'infolog list' => Egw::link('/index.php',array(
+				'infolog list' => Egw::link('/index.php', array(
 					'menuaction' => 'infolog.infolog_ui.index',
 					'ajax' => 'true')),
 				array(
-					'text' => lang('Add %1',lang(Link::get_registry($appname, 'entry'))),
+					'text' => lang('Add %1', lang(Link::get_registry($appname, 'entry'))),
 					'no_lang' => true,
 					'link' => "javascript:app.infolog.add_link_sidemenu();"
 				),
-				'Placeholders' => Egw::link('/index.php','menuaction=infolog.infolog_merge.show_replacements')
+				'Placeholders' => Egw::link('/index.php', 'menuaction=infolog.infolog_merge.show_replacements')
 			);
-			display_sidebox($appname,$GLOBALS['egw_info']['apps']['infolog']['title'].' '.lang('Menu'),$file);
+			display_sidebox($appname, $GLOBALS['egw_info']['apps']['infolog']['title'].' '.lang('Menu'), $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && !Api\Header\UserAgent::mobile())
 		{
 			$file = Array(
-				'Site configuration' => Egw::link('/index.php',array(
+				'Site configuration' => Egw::link('/index.php', array(
 					'menuaction' => 'infolog.infolog_ui.admin',
 					// As long as CKEditor needs CSP exceptions, this needs to
 					// load in an iframe
 					'ajax' => 'false',
 				)),
-				'Global Categories'  => Egw::link('/index.php',array(
+				'Global Categories'  => Egw::link('/index.php', array(
 					'menuaction' => 'admin.admin_categories.index',
 					'appname'    => $appname,
 					'global_cats'=> True,
 					'ajax' => 'true',
 				)),
-				'Custom fields, type and status' => Egw::link('/index.php',array(
+				'Custom fields, type and status' => Egw::link('/index.php', array(
 					'menuaction' => 'infolog.infolog_customfields.index',
 					'ajax' => 'true',
 				)),
 			);
 			if ($location == 'admin')
 			{
-				display_section($appname,$file);
+				display_section($appname, $file);
 			}
 			else
 			{
-				display_sidebox($appname,lang('Admin'),$file);
+				display_sidebox($appname, lang('Admin'), $file);
 			}
 		}
 	}
@@ -145,19 +145,19 @@ 
 	static function settings()
 	{
 		/* Setup some values to fill the array of this app's settings below */
-		$info = new infolog_bo();	// need some labels from
+		$info = new infolog_bo(); // need some labels from
 		$filters = $show_home = array();
 		$show_home[] = lang("DON'T show InfoLog");
 		$filters['none'] = $info->filters[''];
-		foreach($info->filters as $key => $label)
+		foreach ($info->filters as $key => $label)
 		{
 			$show_home[$key] = $filters[$key] = lang($label);
 		}
 
 		// migrage old filter-pref 1,2 to the filter one 'own-open-today'
-		if (isset($GLOBALS['type']) && in_array($GLOBALS['egw']->preferences->{$GLOBALS['type']}['homeShowEvents'],array('1','2')))
+		if (isset($GLOBALS['type']) && in_array($GLOBALS['egw']->preferences->{$GLOBALS['type']}['homeShowEvents'], array('1', '2')))
 		{
-			$GLOBALS['egw']->preferences->add('infolog','homeShowEvents','own-open-today',$GLOBALS['type']);
+			$GLOBALS['egw']->preferences->add('infolog', 'homeShowEvents', 'own-open-today', $GLOBALS['type']);
 			$GLOBALS['egw']->preferences->save_repository();
 		}
 		$show_links = array(
@@ -234,7 +234,7 @@ 
 				'help'   => 'Should the Infolog list show a unique numerical Id, which can be used eg. as ticket Id.',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'default'=> '1',	// Yes
+				'default'=> '1', // Yes
 			),
 			'listNoSubs' => array(
 				'type'   => 'select',
@@ -248,7 +248,7 @@ 
 				'help'   => 'Should InfoLog show Subtasks, -calls or -notes in the normal view or not. You can always view the Subs via there parent.',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'default'=> '0',	// Allways show them
+				'default'=> '0', // Allways show them
 			),
 			'show_links' => array(
 				'type'   => 'select',
@@ -268,7 +268,7 @@ 
 				'help'   => 'Should the Infolog list show the percent done only for status ongoing or two separate icons.',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'default'=> 1,	// Yes
+				'default'=> 1, // Yes
 			),
 			'limit_des_lines' => array(
 				'type'   => 'input',
@@ -297,7 +297,7 @@ 
 			'help'   => 'Do you want a notification, if items you created get updated?',
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '1',	// Yes
+			'default'=> '1', // Yes
 		);
 		$settings['notify_assigned'] = array(
 			'type'   => 'select',
@@ -311,7 +311,7 @@ 
 			),
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '1',	// Yes
+			'default'=> '1', // Yes
 		);
 
 		// to add options for more then 3 days back or in advance, you need to update soinfolog::users_with_open_entries()!
@@ -320,8 +320,8 @@ 
 			'-1d' => lang('one day after'),
 			'0d'  => lang('same day'),
 			'1d'  => lang('one day in advance'),
-			'2d'  => lang('%1 days in advance',2),
-			'3d'  => lang('%1 days in advance',3),
+			'2d'  => lang('%1 days in advance', 2),
+			'3d'  => lang('%1 days in advance', 3),
 		);
 		$settings['notify_due_delegated'] = array(
 			'type'   => 'select',
@@ -331,7 +331,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0',	// No
+			'default'=> '0', // No
 		);
 		$settings['notify_due_responsible'] = array(
 			'type'   => 'select',
@@ -341,7 +341,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0d',	// Same day
+			'default'=> '0d', // Same day
 		);
 		$settings['notify_start_delegated'] = array(
 			'type'   => 'select',
@@ -351,7 +351,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0',	// No
+			'default'=> '0', // No
 		);
 		$settings['notify_start_responsible'] = array(
 			'type'   => 'select',
@@ -361,7 +361,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0d',	// Same day
+			'default'=> '0d', // Same day
 		);
 
 		// receive notification for items owned by groups you are part of
@@ -372,7 +372,7 @@ 
 			'help'   => 'Do you want a notification if items owned by groups you are part of get updated ?',
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0',	// No
+			'default'=> '0', // No
 		);
 		// Notify for types (default)
 		$settings['no_notification_types'] = array(
@@ -381,7 +381,7 @@ 
 			'name'   => 'no_notification_types',
 			'help'   => "Automatically check 'Do not notify' for these types",
 			'values' => $info->enums['type'],
-			'default'=> array(),	// None
+			'default'=> array(), // None
 		);
 
 		$settings[] = array(
@@ -400,8 +400,8 @@ 
 				'size'   => 60,
 				'label'  => 'Default document to insert entries',
 				'name'   => 'default_document',
-				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.',lang('infolog')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','info_subject').' '.
+				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang('infolog')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'info_subject').' '.
 					lang('The following document-types are supported:').'*.rtf, *.txt',
 				'run_lang' => false,
 				'xmlrpc' => True,
@@ -412,8 +412,8 @@ 
 				'size'   => 60,
 				'label'  => 'Directory with documents to insert entries',
 				'name'   => 'document_dir',
-				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.',lang('infolog')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','info_subject').' '.
+				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.', lang('infolog')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'info_subject').' '.
 					lang('The following document-types are supported:').'*.rtf, *.txt',
 				'run_lang' => false,
 				'xmlrpc' => True,
@@ -502,12 +502,12 @@ 
 	 */
 	private static function all_cats()
 	{
-		$categories = new Api\Categories('','infolog');
+		$categories = new Api\Categories('', 'infolog');
 		$accountId = $GLOBALS['egw_info']['user']['account_id'];
 
-		foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat)
+		foreach ((array)$categories->return_sorted_array(0, False, '', '', '', true) as $cat)
 		{
-			$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
+			$s = str_repeat(' ', $cat['level']).stripslashes($cat['name']);
 
 			if ($cat['app_name'] == 'phpgw' || $cat['owner'] == '-1')
 			{
@@ -515,13 +515,13 @@ 
 			}
 			elseif ($cat['owner'] != $accountId)
 			{
-				$s .= '<' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
+				$s .= '<'.$GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname').'>';
 			}
 			elseif ($cat['access'] == 'private')
 			{
 				$s .= ' ♥';
 			}
-			$sel_options[$cat['id']] = $s;	// 0.9.14 only
+			$sel_options[$cat['id']] = $s; // 0.9.14 only
 		}
 		return $sel_options;
 	}
@@ -542,7 +542,7 @@ 
 
 			if (!$async->read('infolog-async-notification'))
 			{
-				$async->set_timer(array('hour' => 2),'infolog-async-notification','infolog.infolog_bo.async_notification',null);
+				$async->set_timer(array('hour' => 2), 'infolog-async-notification', 'infolog.infolog_bo.async_notification', null);
 			}
 		}
 	}
@@ -555,7 +555,7 @@ 
 	 */
 	public static function acl_rights($params)
 	{
-		unset($params);	// not used, but default function signature for hooks
+		unset($params); // not used, but default function signature for hooks
 		return array(
 			Acl::READ    => 'read',
 			Acl::ADD     => 'add',
@@ -573,7 +573,7 @@ 
 	 */
 	public static function categories($location)
 	{
-		unset($location);	// not used, but part of hook signature
+		unset($location); // not used, but part of hook signature
 		return true;
 	}
 
@@ -584,9 +584,9 @@ 
 	 */
 	public static function mail_import($args)
 	{
-		unset($args);	// not used, but required by function signature
+		unset($args); // not used, but required by function signature
 
-		return array (
+		return array(
 			'menuaction' => 'infolog.infolog_ui.mail_import',
 			'popup' => Link::get_registry('infolog', 'edit_popup')
 		);

api/src/Etemplate/Widget/Description.php

Spacing +2 added lines, -2 removed lines

@@ -40,12 +40,12 @@
 	 * @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)
 	{
 		if ($this->attrs['activate_links'])
 		{
 			$form_name = self::form_name($cname, $this->id, $expand);
-			$value =& self::get_array(self::$request->content, $form_name);
+			$value = & self::get_array(self::$request->content, $form_name);
 			if (!empty($value))
 			{
 				$value = htmlspecialchars($value);