EGroupware / egroupware

pixelegg/inc/class.pixelegg_framework.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	 * Overwritten to load our slider.js
 	 *
 	 * @param array $extra
-	 * @return type
+	 * @return string|null
 	 */
 	function header(array $extra=array())
 	{

Spacing +10 added lines, -10 removed lines

@@ -41,12 +41,12 @@ 
 	 *
 	 * @param string $template ='pixelegg' name of the template
 	 */
-	function __construct($template=self::APP)
+	function __construct($template = self::APP)
 	{
-		parent::__construct($template);		// call the constructor of the extended class
+		parent::__construct($template); // call the constructor of the extended class
 
 		// search 'mobile' dirs first
-		if (Api\Header\UserAgent::mobile()) array_unshift ($this->template_dirs, 'mobile');
+		if (Api\Header\UserAgent::mobile()) array_unshift($this->template_dirs, 'mobile');
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 	 * @param array $extra
 	 * @return type
 	 */
-	function header(array $extra=array())
+	function header(array $extra = array())
 	{
 		// load our slider.js, but only if framework requested
 		if (!self::$header_done && $_GET['cd'] === 'yes' &&
@@ -79,9 +79,9 @@ 
 	{
 		if ($color[0] == '#') $color = ltrim($color, '#');
 
-		$R = hexdec(substr($color,0,2));
-		$G = hexdec(substr($color,2,2));
-		$B = hexdec(substr($color,4,2));
+		$R = hexdec(substr($color, 0, 2));
+		$G = hexdec(substr($color, 2, 2));
+		$B = hexdec(substr($color, 4, 2));
 
 		$Rs = round($R * (100 + $percent) / 100);
 		$Gs = round($G * (100 + $percent) / 100);
@@ -104,7 +104,7 @@ 
 	{
 		$ret = parent::_get_css();
 		// color to use
-		$color = str_replace('custom',$GLOBALS['egw_info']['user']['preferences']['common']['template_custom_color'],
+		$color = str_replace('custom', $GLOBALS['egw_info']['user']['preferences']['common']['template_custom_color'],
 			$GLOBALS['egw_info']['user']['preferences']['common']['template_color']);
 
 		// Create a dark variant of the color
@@ -129,7 +129,7 @@ 
 			$loginbox_color = $color_darker;
 		}
 
-		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i',$color))	// a little xss check
+		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i', $color))	// a little xss check
 		{
 			if (!Api\Header\UserAgent::mobile())
 			{
@@ -206,7 +206,7 @@ 
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
 	 */
-	function login_screen($extra_vars, $change_passwd=null)
+	function login_screen($extra_vars, $change_passwd = null)
 	{
 		if (empty($GLOBALS['loginscreenmessage']))
 		{

Braces +24 added lines, -6 removed lines

@@ -46,7 +46,10 @@ 
 		parent::__construct($template);		// call the constructor of the extended class
 
 		// search 'mobile' dirs first
-		if (Api\Header\UserAgent::mobile()) array_unshift ($this->template_dirs, 'mobile');
+		if (Api\Header\UserAgent::mobile())
+		{
+			array_unshift ($this->template_dirs, 'mobile');
+		}
 	}
 
 	/**
@@ -77,7 +80,10 @@ 
 	 */
 	function _color_shader($color, $percent)
 	{
-		if ($color[0] == '#') $color = ltrim($color, '#');
+		if ($color[0] == '#')
+		{
+			$color = ltrim($color, '#');
+		}
 
 		$R = hexdec(substr($color,0,2));
 		$G = hexdec(substr($color,2,2));
@@ -87,9 +93,18 @@ 
 		$Gs = round($G * (100 + $percent) / 100);
 		$Bs = round($B * (100 + $percent) / 100);
 
-		if ($Rs > 255) $Rs = 255;
-		if ($Gs > 255) $Gs = 255;
-		if ($Bs > 255) $Bs = 255;
+		if ($Rs > 255)
+		{
+			$Rs = 255;
+		}
+		if ($Gs > 255)
+		{
+			$Gs = 255;
+		}
+		if ($Bs > 255)
+		{
+			$Bs = 255;
+		}
 
 		return '#'.sprintf('%02X%02X%02X', $Rs, $Gs, $Bs);
 	}
@@ -129,7 +144,9 @@ 
 			$loginbox_color = $color_darker;
 		}
 
-		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i',$color))	// a little xss check
+		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i',$color))
+		{
+			// a little xss check
 		{
 			if (!Api\Header\UserAgent::mobile())
 			{
@@ -168,6 +185,7 @@ 
 
 
 ";
+		}
 				if ($GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'traditional')
 				{
 					$ret['app_css'] .= ".dialogFooterToolbar {background-color: $color !important;}";

preferences/inc/class.preferences_settings.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -292,7 +292,7 @@
 	 * @param array &$sel_options
 	 * @param array &$readonlys
 	 * @param array &$types on return setting-name => setting-type
-	 * @param etemplate $tpl
+	 * @param Etemplate $tpl
 	 * @throws Api\Exception\WrongParameter
 	 * @return array content
 	 */

Braces +67 added lines, -16 removed lines

@@ -164,9 +164,15 @@ 
 		$data = $this->get_content($appname, $type, $sel_options, $readonlys, $preserve['types'], $tpl);
 		$preserve['appname'] = $preserve['old_appname'] = $data['appname'];
 		$preserve['type'] = $preserve['old_type'] = $data['type'];
-		if (isset($old_tab)) $data['tabs'] = $old_tab;
+		if (isset($old_tab))
+		{
+			$data['tabs'] = $old_tab;
+		}
 
-		if ($msg) Framework::message($msg, $msg_type ? $msg_type : 'error');
+		if ($msg)
+		{
+			Framework::message($msg, $msg_type ? $msg_type : 'error');
+		}
 
 		$tpl->exec('preferences.preferences_settings.index', $data, $sel_options, $readonlys, $preserve, 2);
 	}
@@ -201,7 +207,10 @@ 
 			switch((string)$types[$var])
 			{
 				case 'password':	// dont write empty password-fields
-					if (empty($value)) continue 2;
+					if (empty($value))
+					{
+						continue 2;
+					}
 					break;
 				case 'vfs_file':
 				case 'vfs_dir':
@@ -215,7 +224,10 @@ 
 						{
 							unset($prefs[$var]);
 							// need to call preferences::delete, to also set affective prefs!
-							if (!$only_verify) $GLOBALS['egw']->preferences->delete($appname, $var, $type);
+							if (!$only_verify)
+							{
+								$GLOBALS['egw']->preferences->delete($appname, $var, $type);
+							}
 							continue 2;
 						}
 					}
@@ -232,7 +244,11 @@ 
 						// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 						foreach($types[$var] == 'vfs_dir' ? array($value) : preg_split('/[,\s]+\//', $value) as $n => $dir)
 						{
-							if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+							if ($n)
+							{
+								$dir = '/'.$dir;
+							}
+							// re-adding trailing slash removed by split
 							if ($dir[0] != '/' || !Vfs::stat($dir) || !Vfs::is_dir($dir))
 							{
 								$error .= ($error ? ' ' : '').lang('%1 is no existing vfs directory!',$dir);
@@ -249,19 +265,29 @@ 
 
 			if (isset($value) && $value !== '' && $value !== '**NULL**' && $value !== array())
 			{
-				if (is_array($value) && !$settings[$var]['no_sel_options']) $value = implode(',',$value);	// multiselect
+				if (is_array($value) && !$settings[$var]['no_sel_options'])
+				{
+					$value = implode(',',$value);
+				}
+				// multiselect
 
 				$prefs[$var] = $value;
 
 				// need to call preferences::add, to also set affective prefs!
-				if (!$only_verify) $GLOBALS['egw']->preferences->add($appname, $var, $prefs[$var], $type);
+				if (!$only_verify)
+				{
+					$GLOBALS['egw']->preferences->add($appname, $var, $prefs[$var], $type);
+				}
 			}
 			else
 			{
 				unset($prefs[$var]);
 
 				// need to call preferences::delete, to also set affective prefs!
-				if (!$only_verify) $GLOBALS['egw']->preferences->delete($appname, $var, $type);
+				if (!$only_verify)
+				{
+					$GLOBALS['egw']->preferences->delete($appname, $var, $type);
+				}
 			}
 		}
 
@@ -281,7 +307,10 @@ 
 			return $error;
 		}
 
-		if (!$only_verify) $GLOBALS['egw']->preferences->save_repository(True,$type);
+		if (!$only_verify)
+		{
+			$GLOBALS['egw']->preferences->save_repository(True,$type);
+		}
 
 		// certain common prefs (language, template, ...) require the session to be re-created
 		if ($appname == 'common' && !$only_verify)
@@ -319,7 +348,10 @@ 
 		$tab = 'tab1';
 		foreach($this->settings as $setting)
 		{
-			if (!is_array($setting)) continue;
+			if (!is_array($setting))
+			{
+				continue;
+			}
 			if ($type != 'forced' && (string)$GLOBALS['egw']->preferences->forced[$appname][$setting['name']] !== '')
 			{
 				continue;	// forced preferences are not displayed, unless we edit them
@@ -341,7 +373,10 @@ 
 
 				case 'notify':
 					$vars = $GLOBALS['egw']->preferences->vars;
-					if (is_array($setting['values'])) $vars += $setting['values'];
+					if (is_array($setting['values']))
+					{
+						$vars += $setting['values'];
+					}
 					$GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']] =
 						$GLOBALS['egw']->preferences->lang_notify($GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']], $vars);
 					$types[$setting['name']] = $vars;	// store vars for re-translation, instead type "notify"
@@ -383,17 +418,27 @@ 
 				case 'multiselect':
 					$setting['type'] = 'select';
 					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'rows', 5);
-					if (!isset($setting['size'])) $setting['size'] = '5';	// old eT
+					if (!isset($setting['size']))
+					{
+						$setting['size'] = '5';
+					}
+					// old eT
 					break;
 				case 'color':
 					$setting['type'] = 'colorpicker';
 					break;
 				case 'date-duration':
-					if (!isset($setting['size'])) $setting['size'] = 'm,dhm,24,1';
+					if (!isset($setting['size']))
+					{
+						$setting['size'] = 'm,dhm,24,1';
+					}
 					$attrs = explode(',', $setting['size']);
 					foreach(array("data_format","display_format", "hours_per_day", "empty_not_0", "short_labels") as $n => $name)
 					{
-						if ((string)$attrs[$n] !== '') $tpl->setElementAttribute($tab.'['.$setting['name'].']', $name, $attrs[$n]);
+						if ((string)$attrs[$n] !== '')
+						{
+							$tpl->setElementAttribute($tab.'['.$setting['name'].']', $name, $attrs[$n]);
+						}
 					}
 					break;
 				case 'taglist':
@@ -435,10 +480,13 @@ 
 				{
 					$default = self::get_default_label($default, $setting['values']);
 				}
-				if (is_array($types[$setting['name']]))	// translate the substitution names
+				if (is_array($types[$setting['name']]))
+				{
+					// translate the substitution names
 				{
 					$default = $GLOBALS['egw']->preferences->lang_notify($default, $types[$setting['name']]);
 				}
+				}
 			}
 			if ($setting['help'] && ($setting['run_lang'] || !isset($setting['run_lang'])))
 			{
@@ -550,7 +598,10 @@ 
 					}
 				}
 			}
-			if ($lang) $def = lang($def);
+			if ($lang)
+			{
+				$def = lang($def);
+			}
 		}
 		$label = implode(', ', $labels);
 		//error_log(__METHOD__."(".array2string($default).', '.array2string($values).") returning $label");

Spacing +56 added lines, -57 removed lines

@@ -45,7 +45,7 @@ 
 	 * @param array $content =null
 	 * @param string $msg =''
 	 */
-	function index(array $content=null, $msg='')
+	function index(array $content = null, $msg = '')
 	{
 		$tpl = new Etemplate('preferences.settings');
 		if (!is_array($content))
@@ -70,7 +70,7 @@ 
 			{
 				list($button) = each($content['button']);
 				$appname = $content['old_appname'] ? $content['old_appname'] : 'common';
-				switch($button)
+				switch ($button)
 				{
 					case 'save':
 					case 'apply':
@@ -79,10 +79,10 @@ 
 						{
 							throw new Api\Exception\NoPermission\Admin;
 						}
-						list($type,$account_id) = explode(':', $content['old_type']);
+						list($type, $account_id) = explode(':', $content['old_type']);
 						// merge prefs of all tabs together again
 						$prefs = array();
-						foreach($content as $name => $val)
+						foreach ($content as $name => $val)
 						{
 							if (is_array($val) && strpos($name, 'tab') === 0)
 							{
@@ -100,7 +100,7 @@ 
 						$old_values = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'], array_flip($require_reload));
 
 						$attribute = $type == 'group' ? 'user' : $type;
-						if (!($msg=$this->process_array($GLOBALS['egw']->preferences->$attribute, $prefs, $content['types'], $appname, $attribute)))
+						if (!($msg = $this->process_array($GLOBALS['egw']->preferences->$attribute, $prefs, $content['types'], $appname, $attribute)))
 						{
 							$msg_type = 'success';
 							$msg = lang('Preferences saved.');
@@ -124,14 +124,14 @@ 
 						// update client-side Api\Preferences in response
 						Framework::ajax_get_preference($appname);
 				}
-				if (in_array($button, array('save','cancel')))
+				if (in_array($button, array('save', 'cancel')))
 				{
 					Api\Json\Response::get()->call('egw.message', $msg, $msg_type);
 					Framework::window_close();
 				}
 			}
 			$appname = $content['appname'] ? $content['appname'] : 'common';
-			list($type,$account_id) = explode(':', $content['type']);
+			list($type, $account_id) = explode(':', $content['type']);
 			//_debug_array($prefs);
 		}
 		if ($account_id && $account_id != $GLOBALS['egw']->preferences->get_account_id())
@@ -150,7 +150,7 @@ 
 		$preserve['current_app'] = $content['current_app'];
 		$GLOBALS['egw_info']['flags']['currentapp'] = $content['current_app'] == 'common' ?
 			'preferences' : $content['current_app'];
-		Framework::includeCSS('preferences','app');
+		Framework::includeCSS('preferences', 'app');
 
 		// if not just saved, call validation before, to be able to show failed validation of current prefs
 		if (!isset($button))
@@ -182,7 +182,7 @@ 
 	 * @param boolean $only_verify =false
 	 * @return string with verification error or null on success
 	 */
-	function process_array(array &$repository, array $values, array $types, $appname, $type, $only_verify=false)
+	function process_array(array &$repository, array $values, array $types, $appname, $type, $only_verify = false)
 	{
 		//fetch application specific settings from a hook
 		$settings = Api\Hooks::single(array(
@@ -195,10 +195,10 @@ 
 
 		unset($prefs['']);
 		//_debug_array($values);exit;
-		foreach($values as $var => $value)
+		foreach ($values as $var => $value)
 		{
 			// type specific validation
-			switch((string)$types[$var])
+			switch ((string)$types[$var])
 			{
 				case 'password':	// dont write empty password-fields
 					if (empty($value)) continue 2;
@@ -211,7 +211,7 @@ 
 						// empty is always allowed
 
 						// If forced, empty == not set
-						if($type == 'forced')
+						if ($type == 'forced')
 						{
 							unset($prefs[$var]);
 							// need to call preferences::delete, to also set affective prefs!
@@ -223,19 +223,19 @@ 
 					{
 						if ($value[0] != '/' || !Vfs::stat($value) || Vfs::is_dir($value))
 						{
-							$error = lang('%1 is no existing vfs file!',htmlspecialchars($value));
+							$error = lang('%1 is no existing vfs file!', htmlspecialchars($value));
 						}
 					}
 					else
 					{
 						// split multiple comma or whitespace separated directories
 						// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
-						foreach($types[$var] == 'vfs_dir' ? array($value) : preg_split('/[,\s]+\//', $value) as $n => $dir)
+						foreach ($types[$var] == 'vfs_dir' ? array($value) : preg_split('/[,\s]+\//', $value) as $n => $dir)
 						{
-							if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+							if ($n) $dir = '/'.$dir; // re-adding trailing slash removed by split
 							if ($dir[0] != '/' || !Vfs::stat($dir) || !Vfs::is_dir($dir))
 							{
-								$error .= ($error ? ' ' : '').lang('%1 is no existing vfs directory!',$dir);
+								$error .= ($error ? ' ' : '').lang('%1 is no existing vfs directory!', $dir);
 							}
 						}
 					}
@@ -249,7 +249,7 @@ 
 
 			if (isset($value) && $value !== '' && $value !== '**NULL**' && $value !== array())
 			{
-				if (is_array($value) && !$settings[$var]['no_sel_options']) $value = implode(',',$value);	// multiselect
+				if (is_array($value) && !$settings[$var]['no_sel_options']) $value = implode(',', $value); // multiselect
 
 				$prefs[$var] = $value;
 
@@ -269,7 +269,7 @@ 
 		// if you return something else than False, it is treated as an error-msg and
 		// displayed to the user (the prefs are not saved)
 		//
-		if(($error .= Api\Hooks::single(array(
+		if (($error .= Api\Hooks::single(array(
 				'location' => 'verify_settings',
 				'prefs'    => &$repository[$appname],
 				'type'     => $type,
@@ -281,7 +281,7 @@ 
 			return $error;
 		}
 
-		if (!$only_verify) $GLOBALS['egw']->preferences->save_repository(True,$type);
+		if (!$only_verify) $GLOBALS['egw']->preferences->save_repository(True, $type);
 
 		// certain common prefs (language, template, ...) require the session to be re-created
 		if ($appname == 'common' && !$only_verify)
@@ -317,19 +317,19 @@ 
 		$sel_options = $readonlys = $content = $tabs = array();
 		// disable all but first tab and name current tab "tab1", for apps not using sections
 		$tab = 'tab1';
-		foreach($this->settings as $setting)
+		foreach ($this->settings as $setting)
 		{
 			if (!is_array($setting)) continue;
 			if ($type != 'forced' && (string)$GLOBALS['egw']->preferences->forced[$appname][$setting['name']] !== '')
 			{
-				continue;	// forced preferences are not displayed, unless we edit them
+				continue; // forced preferences are not displayed, unless we edit them
 			}
 			$types[$setting['name']] = $old_type = $setting['type'];
 
-			switch($old_type)
+			switch ($old_type)
 			{
 				case 'section':
-					$tab = 'tab'.(1+count($tabs));
+					$tab = 'tab'.(1 + count($tabs));
 					$tabs[] = array(
 						'id' => $tab,
 						'template' => 'preferences.settings.tab1',
@@ -344,24 +344,24 @@ 
 					if (is_array($setting['values'])) $vars += $setting['values'];
 					$GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']] =
 						$GLOBALS['egw']->preferences->lang_notify($GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']], $vars);
-					$types[$setting['name']] = $vars;	// store vars for re-translation, instead type "notify"
+					$types[$setting['name']] = $vars; // store vars for re-translation, instead type "notify"
 					if ($setting['help'] && ($setting['run_lang'] || !isset($setting['run_lang'])))
 					{
 						$setting['help'] = lang($setting['help']);
 					}
 					$setting['help'] .= '<p><b>'.lang('Substitutions and their meanings:').'</b>';
-					foreach($vars as $var => $var_help)
+					foreach ($vars as $var => $var_help)
 					{
 						$lname = ($lname = lang($var)) == $var.'*' ? $var : $lname;
 						$setting['help'] .= "<br>\n".'<b>$$'.$lname.'$$</b>: '.$var_help;
 					}
 					$setting['help'] .= "</p>\n";
-					$setting['run_lang'] = false;	// already done now
+					$setting['run_lang'] = false; // already done now
 					// handle as textarea
 				case 'textarea':
 					$setting['type'] = is_a($tpl, 'etemplate') ? 'textarea' : 'textbox';
 					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'multiline', 'true');
-					$tpl->setElementAttribute($tab. '[' . $setting['name'] . ']','width', '99%' );
+					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'width', '99%');
 					// anyway setting via css: width: 99%, height: 5em
 					// for old eT use size attribute
 					if (is_a($tpl, 'etemplate') && (!empty($setting['cols']) || !empty($setting['rows'])))
@@ -383,7 +383,7 @@ 
 				case 'multiselect':
 					$setting['type'] = 'select';
 					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'rows', 5);
-					if (!isset($setting['size'])) $setting['size'] = '5';	// old eT
+					if (!isset($setting['size'])) $setting['size'] = '5'; // old eT
 					break;
 				case 'color':
 					$setting['type'] = 'colorpicker';
@@ -391,7 +391,7 @@ 
 				case 'date-duration':
 					if (!isset($setting['size'])) $setting['size'] = 'm,dhm,24,1';
 					$attrs = explode(',', $setting['size']);
-					foreach(array("data_format","display_format", "hours_per_day", "empty_not_0", "short_labels") as $n => $name)
+					foreach (array("data_format", "display_format", "hours_per_day", "empty_not_0", "short_labels") as $n => $name)
 					{
 						if ((string)$attrs[$n] !== '') $tpl->setElementAttribute($tab.'['.$setting['name'].']', $name, $attrs[$n]);
 					}
@@ -399,7 +399,7 @@ 
 				case 'taglist':
 					if ($setting['no_sel_options'])
 					{
-						$tpl->setElementAttribute ($tab.'['.$setting['name'].']', 'autocomplete_url', '');
+						$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'autocomplete_url', '');
 					}
 					break;
 			}
@@ -408,17 +408,17 @@ 
 			{
 				if ($old_type != 'multiselect' && $old_type != 'notify')
 				{
-					switch($type)
+					switch ($type)
 					{
 						case 'user':
-							$setting['values'] = array('' => lang('Use default'))+$setting['values'];
+							$setting['values'] = array('' => lang('Use default')) + $setting['values'];
 							break;
 						case 'default':
 						case 'group':
-							$setting['values'] = array('' => lang('No default'))+$setting['values'];
+							$setting['values'] = array('' => lang('No default')) + $setting['values'];
 							break;
 						case 'forced';
-							$setting['values'] = array('**NULL**' => lang('Users choice'))+$setting['values'];
+							$setting['values'] = array('**NULL**' => lang('Users choice')) + $setting['values'];
 							break;
 					}
 				}
@@ -427,8 +427,7 @@ 
 			if ($type == 'user')
 			{
 				$default = $GLOBALS['egw']->preferences->group[$appname][$setting['name']] ?
-					$GLOBALS['egw']->preferences->group[$appname][$setting['name']] :
-					$GLOBALS['egw']->preferences->default[$appname][$setting['name']];
+					$GLOBALS['egw']->preferences->group[$appname][$setting['name']] : $GLOBALS['egw']->preferences->default[$appname][$setting['name']];
 
 				// replace default value(s) for selectboxes with selectbox labels
 				if (isset($setting['values']) && is_array($setting['values']))
@@ -448,7 +447,7 @@ 
 				'name' => $setting['name'],
 				'type' => $setting['type'],
 				'label' => preg_replace('|<br[ /]*>|i', "\n", $setting['label']),
-				'help' => lang($setting['help']),	// is html
+				'help' => lang($setting['help']), // is html
 				'default' => (string)$default !== '' ? lang('Default').': '.$default : null,
 				'onchange' => $setting['onchange'],
 			);
@@ -473,7 +472,7 @@ 
 
 		$content['appname'] = $appname;
 		$sel_options['appname'] = array();
-		foreach(Api\Hooks::implemented('settings') as $app)
+		foreach (Api\Hooks::implemented('settings') as $app)
 		{
 			if ($app != 'preferences' && $GLOBALS['egw_info']['user']['apps'][$app])
 			{
@@ -499,7 +498,7 @@ 
 				$user_apps = $GLOBALS['egw']->acl->get_user_applications($id);
 				$sel_options['appname'] = array_intersect_key($sel_options['appname'], $user_apps);
 			}
-			foreach($GLOBALS['egw']->accounts->search(array('type' => 'groups', 'order' => 'account_lid')) as $account_id => $group)
+			foreach ($GLOBALS['egw']->accounts->search(array('type' => 'groups', 'order' => 'account_lid')) as $account_id => $group)
 			{
 				$sel_options['type']['group:'.$account_id] = lang('Preferences').' '.Api\Accounts::format_username($group['account_lid'], '', '', $account_id);
 			}
@@ -522,7 +521,7 @@ 
 	 * @param boolean $lang =true
 	 * @return string comma-separated and translated labels
 	 */
-	protected static function get_default_label($default, array $values, $lang=true)
+	protected static function get_default_label($default, array $values, $lang = true)
 	{
 		// explode comma-separated multiple default values
 		if (!is_array($default) && !isset($values[$default]) && strpos($default, ',') !== false)
@@ -533,7 +532,7 @@ 
 		{
 			$labels = (array)$default;
 		}
-		foreach($labels as &$def)
+		foreach ($labels as &$def)
 		{
 			if (isset($values[$def]))
 			{
@@ -541,7 +540,7 @@ 
 			}
 			else	// value could be in an optgroup
 			{
-				foreach($values as $value)
+				foreach ($values as $value)
 				{
 					if (is_array($value) && !isset($value['label']) && isset($value[$def]))
 					{
@@ -567,16 +566,16 @@ 
 	 * @param int|string $account_id =null account_id for user or group prefs, or "forced" or "default"
 	 * @return boolean
 	 */
-	protected function call_hook($appname, $type='user', $account_id=null)
+	protected function call_hook($appname, $type = 'user', $account_id = null)
 	{
 		$this->appname = $appname == 'common' ? 'preferences' : $appname;
 
 		// Set framework here to make sure we get the right settings for user's [newly] selected template
 		$GLOBALS['egw_info']['server']['template_set'] = $GLOBALS['egw']->preferences->data['common']['template_set'];
 		Api\Translation::add_app($this->appname);
-		if($this->appname != 'preferences')
+		if ($this->appname != 'preferences')
 		{
-			Api\Translation::add_app('preferences');	// we need the prefs translations too
+			Api\Translation::add_app('preferences'); // we need the prefs translations too
 		}
 
 		// make type available, to hooks from Egw\Applications can use it, eg. activesync
@@ -585,7 +584,7 @@ 
 			'type' => $type,
 			'account_id' => $account_id,
 		);
-		$GLOBALS['type'] = $type;	// old global variable
+		$GLOBALS['type'] = $type; // old global variable
 
 		// calling app specific settings hook
 		$settings = Api\Hooks::single($hook_data, $this->appname);
@@ -594,30 +593,30 @@ 
 		{
 			$this->settings = array_merge($this->settings, $settings);
 		}
-		elseif(isset($GLOBALS['settings']) && is_array($GLOBALS['settings']) && $GLOBALS['settings'])
+		elseif (isset($GLOBALS['settings']) && is_array($GLOBALS['settings']) && $GLOBALS['settings'])
 		{
 			$this->settings = array_merge($this->settings, $GLOBALS['settings']);
 		}
 		else
 		{
-			return False;	// no settings returned
+			return False; // no settings returned
 		}
 
 		// calling settings hook all apps can answer (for a specific app)
 		$hook_data['location'] = 'settings_'.$this->appname;
-		foreach(Api\Hooks::process($hook_data, $this->appname,true) as $settings)
+		foreach (Api\Hooks::process($hook_data, $this->appname, true) as $settings)
 		{
 			if (isset($settings) && is_array($settings) && $settings)
 			{
-				$this->settings = array_merge($this->settings,$settings);
+				$this->settings = array_merge($this->settings, $settings);
 			}
 		}
 		/* Remove ui-only settings */
-		if($this->xmlrpc)
+		if ($this->xmlrpc)
 		{
-			foreach($this->settings as $key => $valarray)
+			foreach ($this->settings as $key => $valarray)
 			{
-				if(!$valarray['xmlrpc'])
+				if (!$valarray['xmlrpc'])
 				{
 					unset($this->settings[$key]);
 				}
@@ -629,10 +628,10 @@ 
 			 This is not handled by the hooks class and is only valid if not using xml-rpc.
 			*/
 			$tmpl_settings = EGW_SERVER_ROOT.$GLOBALS['egw']->framework->template_dir.'/hook_settings.inc.php';
-			if($this->appname == 'preferences' && file_exists($tmpl_settings))
+			if ($this->appname == 'preferences' && file_exists($tmpl_settings))
 			{
 				include($tmpl_settings);
-				$this->settings = array_merge($this->settings,$GLOBALS['settings']);
+				$this->settings = array_merge($this->settings, $GLOBALS['settings']);
 			}
 		}
 		// check if we have a default/forced value from the settings hook,
@@ -653,9 +652,9 @@ 
 		}
 		if ($need_update)
 		{
-			$GLOBALS['egw']->preferences->save_repository(false,'default',true);
+			$GLOBALS['egw']->preferences->save_repository(false, 'default', true);
 		}
-		if($this->debug)
+		if ($this->debug)
 		{
 			_debug_array($this->settings);
 		}

redirect.php

Doc Comments +4 added lines

@@ -24,6 +24,10 @@
 
 	if(!function_exists('html_entity_decode'))
 	{
+
+		/**
+		 * @param integer $quote_style
+		 */
 		function html_entity_decode($given_html, $quote_style = ENT_QUOTES)
 		{
 			$trans_table = array_flip(get_html_translation_table( HTML_SPECIALCHARS, $quote_style));

Spacing +9 added lines, -9 removed lines

@@ -22,11 +22,11 @@ 
 	  "<a href=\"$webserverURL/redirect.php?go=".htmlentities(urlencode('http://www.egroupware.org')).'">'
 	*/
 
-	if(!function_exists('html_entity_decode'))
+	if (!function_exists('html_entity_decode'))
 	{
 		function html_entity_decode($given_html, $quote_style = ENT_QUOTES)
 		{
-			$trans_table = array_flip(get_html_translation_table( HTML_SPECIALCHARS, $quote_style));
+			$trans_table = array_flip(get_html_translation_table(HTML_SPECIALCHARS, $quote_style));
 			$trans_table['&#39;'] = "'";
 			return(strtr($given_html, $trans_table));
 		}
@@ -45,17 +45,17 @@ 
 
 	/* Only allow redirects from inside this eGroupware installation. */
 	$valid_referer = array();
-	$path = preg_replace('/\/[^\/]*$/','',$_SERVER['PHP_SELF']) . '/';
+	$path = preg_replace('/\/[^\/]*$/', '', $_SERVER['PHP_SELF']).'/';
 	array_push($valid_referer, $path);
-	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_ADDR'] . $path);
-	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . $path);
+	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_ADDR'].$path);
+	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].$path);
 
 	$referrer = trim($_SERVER['HTTP_REFERER']);
 	if ((!isset($_SERVER['HTTP_REFERER'])) || (empty($referrer)))
 	{
 		echo "Only usable from within eGroupware.\n";
 	}
-	else if($_GET['go'])
+	else if ($_GET['go'])
 	{
 		$allow = false;
 		foreach ($valid_referer as $urlRoot)
@@ -69,15 +69,15 @@ 
 		}
 		if ($allow)
 		{
-			$url= html_entity_decode(urldecode($_GET['go']));
+			$url = html_entity_decode(urldecode($_GET['go']));
 			unset($_GET['go']);
 			/* Only add "&" if there is something to append. */
 			if (!empty($_GET))
 			{
-				$url=$url."&".http_build_query($_GET);
+				$url = $url."&".http_build_query($_GET);
 			}
 
-			Header('Location: ' . html_entity_decode(urldecode($url)));
+			Header('Location: '.html_entity_decode(urldecode($url)));
 			exit;
 		}
 		else

remote.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
  * Create a session or if the user has no account return authenticate header and 401 Unauthorized
  *
  * @param array &$account
- * @return int session-id
+ * @return string session-id
  */
 function check_access(&$account)
 {

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 {
 	if (isset($_GET['auth']))
 	{
-		list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) = explode(':',base64_decode($_GET['auth']),2);
+		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode($_GET['auth']), 2);
 	}
 	return Api\Header\Authenticate::autocreate_session_callback($account);
 }
@@ -45,8 +45,8 @@ 
 		'noheader'  => True,
 		'currentapp' => preg_match('|/remote.php/webdav/apps/([A-Za-z0-9_-]+)/|', $_SERVER['REQUEST_URI'], $matches) ? $matches[1] : 'filemanager',
 		'autocreate_session_callback' => 'check_access',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
-		'auth_realm' => 'EGroupware WebDAV server',	// cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
+		'auth_realm' => 'EGroupware WebDAV server', // cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
 	)
 );
 
@@ -74,12 +74,12 @@ 
 
 // temporary mount ownCloud default /clientsync as /home/$user, if not explicitly mounted
 // so ownCloud dir contains users home-dir by default
-if (strpos($_SERVER['REQUEST_URI'],'/remote.php/webdav/clientsync') !== false &&
-	($fstab=Vfs::mount()) && !isset($fstab['/clientsync']))
+if (strpos($_SERVER['REQUEST_URI'], '/remote.php/webdav/clientsync') !== false &&
+	($fstab = Vfs::mount()) && !isset($fstab['/clientsync']))
 {
 	$is_root_backup = Vfs::$is_root;
 	Vfs::$is_root = true;
-	$ok = Vfs::mount($url='vfs://default/home/$user', $clientsync='/clientsync', null, false);
+	$ok = Vfs::mount($url = 'vfs://default/home/$user', $clientsync = '/clientsync', null, false);
 	Vfs::$is_root = $is_root_backup;
 	//error_log("mounting ownCloud default '$clientsync' as '$url' ".($ok ? 'successful' : 'failed!'));
 }

resources/inc/class.resources_acl_bo.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -43,7 +43,6 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param int $user=null account_id of user whos rights to return, or null for current user
 	 * @param boolean $session
 	 */
 	function __construct($session=False, $user=null)
@@ -77,7 +76,7 @@ 
 	*
 	* @author Cornelius Weiss <egw@von-und-zu-weiss.de>
 	* @param int $perm_type one of Acl::READ, Acl::ADD, Acl::EDIT, Acl::DELETE, self::DIRECT_BOOKING
-	* @param int $parent_id=0 cat_id of parent to return only children of that category
+	* @param int $parent_id cat_id of parent to return only children of that category
 	* @return array cat_id => cat_name
 	* TODO mark subcats and so on!
 	*/

Indentation +25 added lines, -25 removed lines

@@ -73,14 +73,14 @@ 
 	}
 
 	/**
-	* get list of cats where current user has given rights
-	*
-	* @author Cornelius Weiss <egw@von-und-zu-weiss.de>
-	* @param int $perm_type one of Acl::READ, Acl::ADD, Acl::EDIT, Acl::DELETE, self::DIRECT_BOOKING
-	* @param int $parent_id=0 cat_id of parent to return only children of that category
-	* @return array cat_id => cat_name
-	* TODO mark subcats and so on!
-	*/
+	 * get list of cats where current user has given rights
+	 *
+	 * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
+	 * @param int $perm_type one of Acl::READ, Acl::ADD, Acl::EDIT, Acl::DELETE, self::DIRECT_BOOKING
+	 * @param int $parent_id=0 cat_id of parent to return only children of that category
+	 * @return array cat_id => cat_name
+	 * TODO mark subcats and so on!
+	 */
 	function get_cats($perm_type,$parent_id=0)
 	{
 		$cats = $this->egw_cats->return_sorted_array(0,false,'','','',true,$parent_id);
@@ -105,24 +105,24 @@ 
 
 
 	/**
-	* gets name of category
-	*
-	* @author Lukas Weiss <wnz.gh05t@users.sourceforge.net>
-	* @param int $cat_id
-	* @return mixed name of category
-	*/
+	 * gets name of category
+	 *
+	 * @author Lukas Weiss <wnz.gh05t@users.sourceforge.net>
+	 * @param int $cat_id
+	 * @return mixed name of category
+	 */
 	static public function get_cat_name($cat_id)
 	{
 		return $GLOBALS['egw']->categories->id2name($cat_id);
 	}
 
 	/**
-	* gets userid of admin for given category
-	*
-	* @author Cornelius Weiss <egw@von-und-zu-weiss.de>
-	* @param int $cat_id
-	* @return int userid of cat admin
-	*/
+	 * gets userid of admin for given category
+	 *
+	 * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
+	 * @param int $cat_id
+	 * @return int userid of cat admin
+	 */
 	static public function get_cat_admin($cat_id)
 	{
 		$cat_rights = self::get_rights($cat_id);
@@ -194,11 +194,11 @@ 
 	}
 
 	/**
-	* gets all rights from all user for given cat
-	*
-	* @param int $cat_id
-	* @return array userid => right
-	*/
+	 * gets all rights from all user for given cat
+	 *
+	 * @param int $cat_id
+	 * @return array userid => right
+	 */
 	static public function get_rights($cat_id)
 	{
 		return $GLOBALS['egw']->acl->get_all_rights('L'.$cat_id,'resources');

Braces +12 added lines, -4 removed lines

@@ -85,9 +85,13 @@ 
 	{
 		$cats = $this->egw_cats->return_sorted_array(0,false,'','','',true,$parent_id);
 		#_debug_array($cats);
-		if (!is_array($cats)) $cats = array();
+		if (!is_array($cats))
+		{
+			$cats = array();
+		}
 		$perm_cats = array();
-		foreach($cats as $key=>$cat) {
+		foreach($cats as $key=>$cat)
+		{
 			#echo "key:$key"._debug_array($value)."<br>";
 			#_debug_array($cat)."hier<br>";
 			if($this->is_permitted($cat['id'],$perm_type))
@@ -215,14 +219,18 @@ 
 			'order' => $this->order,
 			'limit' => $this->limit,
 		);
-		if($this->debug) { echo '<br>Read:'; _debug_array($data); }
+		if($this->debug)
+		{
+echo '<br>Read:'; _debug_array($data); }
 		Api\Cache::setSession('resources_acl', 'session_data', $data);
 	}
 
 	function read_sessiondata()
 	{
 		$data = Api\Cache::getSession('resources_acl', 'session_data');
-		if($this->debug) { echo '<br>Read:'; _debug_array($data); }
+		if($this->debug)
+		{
+echo '<br>Read:'; _debug_array($data); }
 
 		$this->start  = $data['start'];
 		$this->query  = $data['query'];

Spacing +28 added lines, -28 removed lines

@@ -46,17 +46,17 @@ 
 	 * @param int $user=null account_id of user whos rights to return, or null for current user
 	 * @param boolean $session
 	 */
-	function __construct($session=False, $user=null)
+	function __construct($session = False, $user = null)
 	{
 		$this->egw_cats = new Api\Categories($user, 'resources');
 		$this->debug = False;
 
 		//all this is only needed when called from uiacl.
-		if($session)
+		if ($session)
 		{
 			$this->read_sessiondata();
 			$this->use_session = True;
-			foreach(array('start','query','sort','order') as $var)
+			foreach (array('start', 'query', 'sort', 'order') as $var)
 			{
 				if (isset($_POST[$var]))
 				{
@@ -68,7 +68,7 @@ 
 				}
 			}
 			$this->save_sessiondata();
-			$this->cats = $this->egw_cats->return_sorted_array(0,false,'','','',true);
+			$this->cats = $this->egw_cats->return_sorted_array(0, false, '', '', '', true);
 		}
 	}
 
@@ -81,18 +81,18 @@ 
 	* @return array cat_id => cat_name
 	* TODO mark subcats and so on!
 	*/
-	function get_cats($perm_type,$parent_id=0)
+	function get_cats($perm_type, $parent_id = 0)
 	{
-		$cats = $this->egw_cats->return_sorted_array(0,false,'','','',true,$parent_id);
+		$cats = $this->egw_cats->return_sorted_array(0, false, '', '', '', true, $parent_id);
 		#_debug_array($cats);
 		if (!is_array($cats)) $cats = array();
 		$perm_cats = array();
-		foreach($cats as $key=>$cat) {
+		foreach ($cats as $key=>$cat) {
 			#echo "key:$key"._debug_array($value)."<br>";
 			#_debug_array($cat)."hier<br>";
-			if($this->is_permitted($cat['id'],$perm_type))
+			if ($this->is_permitted($cat['id'], $perm_type))
 			{
-				$s = str_repeat('&nbsp; ',$cat['level']) . stripslashes($cat['name']);
+				$s = str_repeat('&nbsp; ', $cat['level']).stripslashes($cat['name']);
 				if ($cat['app_name'] == 'phpgw' || $cat['owner'] == '-1')
 				{
 					$s .= ' &#9830;';
@@ -100,7 +100,7 @@ 
 				$perm_cats[$cat['id']] = $s;
 			}
 		}
-		return isset($perm_cats)?$perm_cats:array();
+		return isset($perm_cats) ? $perm_cats : array();
 	}
 
 
@@ -128,13 +128,13 @@ 
 		$cat_rights = self::get_rights($cat_id);
 		foreach ($cat_rights as $userid => $right)
 		{
-			if ($right & self::CAT_ADMIN)
+			if ($right&self::CAT_ADMIN)
 			{
 				return $userid;
 			}
 		}
 		// check for an inherited cat admin
-		if (($parent = $GLOBALS['egw']->categories->id2name($cat_id,'parent')))
+		if (($parent = $GLOBALS['egw']->categories->id2name($cat_id, 'parent')))
 		{
 			return self::get_cat_admin($parent);
 		}
@@ -161,10 +161,10 @@ 
 		{
 			if (is_null(self::$resource_acl))
 			{
-				self::$resource_acl = $GLOBALS['egw']->acl->get_all_location_rights($GLOBALS['egw_info']['user']['account_id'],'resources',true);
+				self::$resource_acl = $GLOBALS['egw']->acl->get_all_location_rights($GLOBALS['egw_info']['user']['account_id'], 'resources', true);
 			}
 			self::$permissions[$cat_id] = (int)self::$resource_acl['L'.$cat_id];
-			if (($parent = $GLOBALS['egw']->categories->id2name($cat_id,'parent')))
+			if (($parent = $GLOBALS['egw']->categories->id2name($cat_id, 'parent')))
 			{
 				self::$permissions[$cat_id] |= self::get_permissions($parent);
 			}
@@ -182,7 +182,7 @@ 
 	 * @param int $right
 	 * @return boolean user is permitted or not for right
 	 */
-	static public function is_permitted($cat_id,$right)
+	static public function is_permitted($cat_id, $right)
 	{
 		if (!isset(self::$permissions[$cat_id]))
 		{
@@ -190,7 +190,7 @@ 
 		}
 		//echo "<p>".__METHOD__."($cat_id,$right) = ".self::$permissions[$cat_id]." & $right = ".(self::$permissions[$cat_id] & $right)."</p>\n";
 
-		return (boolean) (self::$permissions[$cat_id] & $right);
+		return (boolean)(self::$permissions[$cat_id]&$right);
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	*/
 	static public function get_rights($cat_id)
 	{
-		return $GLOBALS['egw']->acl->get_all_rights('L'.$cat_id,'resources');
+		return $GLOBALS['egw']->acl->get_all_rights('L'.$cat_id, 'resources');
 	}
 
 
@@ -215,14 +215,14 @@ 
 			'order' => $this->order,
 			'limit' => $this->limit,
 		);
-		if($this->debug) { echo '<br>Read:'; _debug_array($data); }
+		if ($this->debug) { echo '<br>Read:'; _debug_array($data); }
 		Api\Cache::setSession('resources_acl', 'session_data', $data);
 	}
 
 	function read_sessiondata()
 	{
 		$data = Api\Cache::getSession('resources_acl', 'session_data');
-		if($this->debug) { echo '<br>Read:'; _debug_array($data); }
+		if ($this->debug) { echo '<br>Read:'; _debug_array($data); }
 
 		$this->start  = $data['start'];
 		$this->query  = $data['query'];
@@ -231,7 +231,7 @@ 
 		$this->limit = $data['limit'];
 	}
 
-	public static function set_rights($cat_id,$read,$write,$calread,$calbook,$admin)
+	public static function set_rights($cat_id, $read, $write, $calread, $calbook, $admin)
 	{
 		// Clear cache
 		unset(self::$permissions[$cat_id]);
@@ -242,19 +242,19 @@ 
 		$calbookcat = $calbook ? $calbook : array();
 		$admincat = $admin ? $admin : array();
 
-		$GLOBALS['egw']->acl->delete_repository('resources','L' . $cat_id,false);
+		$GLOBALS['egw']->acl->delete_repository('resources', 'L'.$cat_id, false);
 
-		foreach(array_unique(array_merge($readcat, $writecat, $calreadcat, $calbookcat, $admincat)) as $account_id)
+		foreach (array_unique(array_merge($readcat, $writecat, $calreadcat, $calbookcat, $admincat)) as $account_id)
 		{
 			$rights = false;
-			$rights = in_array($account_id,$readcat) ? ($rights | Acl::READ) : false;
-			$rights = in_array($account_id,$writecat) ? ($rights | Acl::READ | Acl::ADD | Acl::EDIT | Acl::DELETE): $rights;
-			$rights = in_array($account_id,$calreadcat) ? ($rights | self::CAL_READ) : $rights;
-			$rights = in_array($account_id,$calbookcat) ? ($rights | self::DIRECT_BOOKING | self::CAL_READ) : $rights;
-			$rights = in_array($account_id,$admincat) ? ($rights = 511) : $rights;
+			$rights = in_array($account_id, $readcat) ? ($rights|Acl::READ) : false;
+			$rights = in_array($account_id, $writecat) ? ($rights|Acl::READ|Acl::ADD|Acl::EDIT|Acl::DELETE) : $rights;
+			$rights = in_array($account_id, $calreadcat) ? ($rights|self::CAL_READ) : $rights;
+			$rights = in_array($account_id, $calbookcat) ? ($rights|self::DIRECT_BOOKING|self::CAL_READ) : $rights;
+			$rights = in_array($account_id, $admincat) ? ($rights = 511) : $rights;
 			if ($rights)
 			{
-				$GLOBALS['egw']->acl->add_repository('resources','L'.$cat_id,$account_id,$rights);
+				$GLOBALS['egw']->acl->add_repository('resources', 'L'.$cat_id, $account_id, $rights);
 			}
 		}
 	}

resources/inc/class.resources_import_csv.inc.php

Doc Comments +2 added lines, -4 removed lines

@@ -28,9 +28,7 @@ 
 
 	/**
 	 * imports entries according to given definition object.
-	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function init(importexport_definition $_definition ) {
 
@@ -52,7 +50,7 @@ 
 	*
 	* Updates the count of actions taken
 	*
-	* @return boolean success
+	* @return null|boolean success
 	*/
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{

Indentation +17 added lines, -17 removed lines

@@ -45,15 +45,15 @@ 
 	}
 
 	/**
-	* Import a single record
-	*
-	* You don't need to worry about mappings or translations, they've been done already.
-	* You do need to handle the conditions and the actions taken.
-	*
-	* Updates the count of actions taken
-	*
-	* @return boolean success
-	*/
+	 * Import a single record
+	 *
+	 * You don't need to worry about mappings or translations, they've been done already.
+	 * You do need to handle the conditions and the actions taken.
+	 *
+	 * Updates the count of actions taken
+	 *
+	 * @return boolean success
+	 */
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
 		// Check for an un-matched accessory of, try again on just name
@@ -250,14 +250,14 @@ 
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 }

Braces +70 added lines, -29 removed lines

@@ -16,7 +16,8 @@ 
 /**
  * class to import resources from CSV
  */
-class resources_import_csv extends importexport_basic_import_csv  {
+class resources_import_csv extends importexport_basic_import_csv
+{
 
 
 	/**
@@ -32,7 +33,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition $_definition ) {
+	public function init(importexport_definition $_definition )
+	{
 
 		// fetch the resource bo
 		$this->bo = new resources_bo();
@@ -92,7 +94,8 @@ 
 		// Check for a new category, it needs permissions set
 		$category = $GLOBALS['egw']->categories->read($record->cat_id);
 
-		if($category['last_mod'] >= $this->start_time) {
+		if($category['last_mod'] >= $this->start_time)
+		{
 			// New category.  Give read & write permissions to the current user's default group
 			$this->acl_bo->set_rights($record['cat_id'],
 				array($GLOBALS['egw_info']['user']['account_primary_group']),
@@ -104,35 +107,53 @@ 
 			// Refresh ACL
 			//$GLOBALS['egw']->acl->read_repository();
 		}
-		if(!$record->accessory_of) $record->accessory_of = -1;
+		if(!$record->accessory_of)
+		{
+			$record->accessory_of = -1;
+		}
 		//error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions']));
-		if ($this->definition->plugin_options['conditions']) {
+		if ($this->definition->plugin_options['conditions'])
+		{
 
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+			foreach ( $this->definition->plugin_options['conditions'] as $condition )
+			{
 				$results = array();
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
-						if($record->{$condition['string']}) {
+						if($record->{$condition['string']})
+						{
 							$results = $this->bo->so->search(
 								array( $condition['string'] => $record->{$condition['string']}),
 								False
 							);
 						}
 
-						if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+						if ( is_array( $results ) && count( array_keys( $results )) >= 1)
+						{
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$results as $resource ) {
+							foreach ( (array)$results as $resource )
+							{
 								$record->res_id = $resource['res_id'];
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $resource['cat_id'] ) ) $resource['cat_id'] = explode( ',', $resource['cat_id'] );
-									if ( !is_array( $record->cat_id ) ) $record->cat_id = explode( ',', $record->cat_id );
+								if ( $_definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $resource['cat_id'] ) )
+									{
+										$resource['cat_id'] = explode( ',', $resource['cat_id'] );
+									}
+									if ( !is_array( $record->cat_id ) )
+									{
+										$record->cat_id = explode( ',', $record->cat_id );
+									}
 									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $resource['cat_id'] ) ) );
 								}
 								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 							}
-						} else {
+						}
+						else
+						{
 							$action = $condition['false'];
 							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 						}
@@ -143,9 +164,14 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if ($action['last']) break;
+				if ($action['last'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -159,9 +185,11 @@ 
 	 * @param importexport_iface_egw_record $record Entry record
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	{
 		$_data = $record->get_record_array();
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
@@ -173,20 +201,27 @@ 
 
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if($_action == 'insert')
+				{
 					// Backend doesn't like inserting with ID specified, it can overwrite
 					unset($_data['res_id']);
 				}
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$result = $this->bo->save( $_data );
-					if($result && !is_numeric($result)) {
+					if($result && !is_numeric($result))
+					{
 						$this->errors[$record_num] = $result;
 						return false;
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 						return true;
 					}
@@ -202,7 +237,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Resources CSV import');
 	}
 
@@ -211,7 +247,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports a list of resources from a CSV file.");
 	}
 
@@ -220,7 +257,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -236,7 +274,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -245,7 +284,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -257,7 +297,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 }

Spacing +31 added lines, -31 removed lines

@@ -16,7 +16,7 @@ 
 /**
  * class to import resources from CSV
  */
-class resources_import_csv extends importexport_basic_import_csv  {
+class resources_import_csv extends importexport_basic_import_csv {
 
 
 	/**
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * imports entries according to given definition object.
@@ -32,7 +32,7 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition $_definition ) {
+	public function init(importexport_definition $_definition) {
 
 		// fetch the resource bo
 		$this->bo = new resources_bo();
@@ -57,30 +57,30 @@ 
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
 		// Check for an un-matched accessory of, try again on just name
-		if(!is_numeric($record->accessory_of))
+		if (!is_numeric($record->accessory_of))
 		{
 			$accessory_of = $record->accessory_of;
 
 			// Look for exact match in just name
-			$results = $this->bo->so->search(array('name' => $record->accessory_of),array('res_id','name'));
-			if(count($results) >= 1)
+			$results = $this->bo->so->search(array('name' => $record->accessory_of), array('res_id', 'name'));
+			if (count($results) >= 1)
 			{
 				// More than 1 result?  Bad names.  Pick one.
-				foreach($results as $result)
+				foreach ($results as $result)
 				{
-					if($result['name'] == $record->accessory_of)
+					if ($result['name'] == $record->accessory_of)
 					{
 						$record->accessory_of = $result['res_id'];
 						break;
 					}
 				}
-				if(is_numeric($record->accessory_of))
+				if (is_numeric($record->accessory_of))
 				{
 					// Import/Export conversion gave a warning, so cancel it
-					$pattern = lang('Unable to link to %1 "%2"',lang('resources'),$accessory_of) . ' - ('.lang('too many matches') . '|'.lang('no matches') . ')';
+					$pattern = lang('Unable to link to %1 "%2"', lang('resources'), $accessory_of).' - ('.lang('too many matches').'|'.lang('no matches').')';
 					$this->warnings[$import_csv->get_current_position()] = preg_replace($pattern, '', $this->warnings[$import_csv->get_current_position()], 1);
 					// If that was the only warning, clear it for this row
-					if(trim($this->warnings[$import_csv->get_current_position()]) == '')
+					if (trim($this->warnings[$import_csv->get_current_position()]) == '')
 					{
 						unset($this->warnings[$import_csv->get_current_position()]);
 					}
@@ -92,7 +92,7 @@ 
 		// Check for a new category, it needs permissions set
 		$category = $GLOBALS['egw']->categories->read($record->cat_id);
 
-		if($category['last_mod'] >= $this->start_time) {
+		if ($category['last_mod'] >= $this->start_time) {
 			// New category.  Give read & write permissions to the current user's default group
 			$this->acl_bo->set_rights($record['cat_id'],
 				array($GLOBALS['egw_info']['user']['account_primary_group']),
@@ -104,37 +104,37 @@ 
 			// Refresh ACL
 			//$GLOBALS['egw']->acl->read_repository();
 		}
-		if(!$record->accessory_of) $record->accessory_of = -1;
+		if (!$record->accessory_of) $record->accessory_of = -1;
 		//error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions']));
 		if ($this->definition->plugin_options['conditions']) {
 
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+			foreach ($this->definition->plugin_options['conditions'] as $condition) {
 				$results = array();
-				switch ( $condition['type'] ) {
+				switch ($condition['type']) {
 					// exists
 					case 'exists' :
-						if($record->{$condition['string']}) {
+						if ($record->{$condition['string']}) {
 							$results = $this->bo->so->search(
-								array( $condition['string'] => $record->{$condition['string']}),
+								array($condition['string'] => $record->{$condition['string']}),
 								False
 							);
 						}
 
-						if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+						if (is_array($results) && count(array_keys($results)) >= 1) {
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$results as $resource ) {
+							foreach ((array)$results as $resource) {
 								$record->res_id = $resource['res_id'];
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $resource['cat_id'] ) ) $resource['cat_id'] = explode( ',', $resource['cat_id'] );
-									if ( !is_array( $record->cat_id ) ) $record->cat_id = explode( ',', $record->cat_id );
-									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $resource['cat_id'] ) ) );
+								if ($_definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($resource['cat_id'])) $resource['cat_id'] = explode(',', $resource['cat_id']);
+									if (!is_array($record->cat_id)) $record->cat_id = explode(',', $record->cat_id);
+									$record->cat_id = implode(',', array_unique(array_merge($record->cat_id, $resource['cat_id'])));
 								}
-								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+								$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 							}
 						} else {
 							$action = $condition['false'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						break;
 
@@ -147,7 +147,7 @@ 
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 		return $success;
 	}
@@ -159,7 +159,7 @@ 
 	 * @param importexport_iface_egw_record $record Entry record
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action($_action, importexport_iface_egw_record &$record, $record_num = 0) {
 		$_data = $record->get_record_array();
 		switch ($_action) {
 			case 'none' :
@@ -173,17 +173,17 @@ 
 
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if ($_action == 'insert') {
 					// Backend doesn't like inserting with ID specified, it can overwrite
 					unset($_data['res_id']);
 				}
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
 				} else {
-					$result = $this->bo->save( $_data );
-					if($result && !is_numeric($result)) {
+					$result = $this->bo->save($_data);
+					if ($result && !is_numeric($result)) {
 						$this->errors[$record_num] = $result;
 						return false;
 					} else {

resources/inc/class.resources_so.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 *
 	 * @param string $key key of value to get
 	 * @param int $res_id resource id
-	 * @return mixed value of key and resource, false if key or id not found.
+	 * @return integer value of key and resource, false if key or id not found.
 	 */
 	function get_value($key,$res_id)
 	{

Spacing +6 added lines, -7 removed lines

@@ -22,10 +22,10 @@ 
 {
 	function __construct()
 	{
-		parent::__construct('resources','egw_resources', 'egw_resources_extra', '',
-			'extra_name', 'extra_value', 'extra_id' );
+		parent::__construct('resources', 'egw_resources', 'egw_resources_extra', '',
+			'extra_name', 'extra_value', 'extra_id');
 
-		$this->columns_to_search = array('name','short_description','inventory_number','long_description','location');
+		$this->columns_to_search = array('name', 'short_description', 'inventory_number', 'long_description', 'location');
 	}
 
 	/**
@@ -35,10 +35,9 @@ 
 	 * @param int $res_id resource id
 	 * @return mixed value of key and resource, false if key or id not found.
 	 */
-	function get_value($key,$res_id)
+	function get_value($key, $res_id)
 	{
-		return $res_id == $this->data['res_id'] ? $this->data[$key] :
-			$this->db->select($this->table_name,$key,array('res_id' => $res_id),__LINE__,__FILE__)->fetchColumn();
+		return $res_id == $this->data['res_id'] ? $this->data[$key] : $this->db->select($this->table_name, $key, array('res_id' => $res_id), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -90,7 +89,7 @@ 
 	function save($resource)
 	{
 		$this->data = $resource;
-		if(parent::save() != 0) return false;
+		if (parent::save() != 0) return false;
 		$res_id = $this->data['res_id'];
 
 		return $res_id;

Braces +8 added lines, -2 removed lines

@@ -51,7 +51,10 @@ 
 	 */
 	function read($res_id)
 	{
-		if (is_array($res_id) && count($res_id) == 1 && isset($res_id['res_id'])) $res_id = $res_id['res_id'];
+		if (is_array($res_id) && count($res_id) == 1 && isset($res_id['res_id']))
+		{
+			$res_id = $res_id['res_id'];
+		}
 
 		/*if (!is_array($res_id) && $res_id == $this->data['res_id'])
 		{
@@ -90,7 +93,10 @@ 
 	function save($resource)
 	{
 		$this->data = $resource;
-		if(parent::save() != 0) return false;
+		if(parent::save() != 0)
+		{
+			return false;
+		}
 		$res_id = $this->data['res_id'];
 
 		return $res_id;

resources/inc/class.resources_ui.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
 	 * @param int &$success number of succeded actions
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 timesheets 'deleted'
-	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
+	 * @param string $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)

Braces +57 added lines, -16 removed lines

@@ -105,7 +105,9 @@ 
 					}
 				}
 			}
-		} else {
+		}
+		else
+		{
 			$msg = $content;
 		}
 		$content = array();
@@ -140,7 +142,8 @@ 
 			$content['nm']['options-filter2'][resources_bo::DELETED] = lang('Deleted');
 		}
 
-		if($_GET['search']) {
+		if($_GET['search'])
+		{
 			$content['nm']['search'] = $_GET['search'];
 		}
 		if($_GET['view_accs_of'])
@@ -305,7 +308,10 @@ 
 				foreach($checked as $n=>$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if(!$id)
+					{
+						continue;
+					}
 					$resource = $this->bo->read($id);
 					$resource['deleted'] = null;
 					if($resource['accessory_of'] > 0)
@@ -337,7 +343,10 @@ 
 					}
 					$success++;
 				}
-				if($restored_accessories) $action_msg .= ", " . lang('%1 accessories restored',$restored_accessories);
+				if($restored_accessories)
+				{
+					$action_msg .= ", " . lang('%1 accessories restored',$restored_accessories);
+				}
 				break;
 			case 'delete':
 				$action_msg = lang('deleted');
@@ -345,7 +354,10 @@ 
 				foreach($checked as $n => &$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if(!$id)
+					{
+						continue;
+					}
 					$resource = $this->bo->read($id);
 					if($settings == 'promote')
 					{
@@ -371,7 +383,10 @@ 
 
 							// Don't need to process these ones now
 							$checked_key = array_search($acc_id, $checked);
-							if($checked_key !== false) unset($checked[$checked_key]);
+							if($checked_key !== false)
+							{
+								unset($checked[$checked_key]);
+							}
 						}
 					}
 					else
@@ -401,7 +416,10 @@ 
 						$failed++;
 					}
 				}
-				if($promoted_accessories) $action_msg .= ", " . lang('%1 accessories now resources',$promoted_accessories);
+				if($promoted_accessories)
+				{
+					$action_msg .= ", " . lang('%1 accessories now resources',$promoted_accessories);
+				}
 				break;
 		}
 		return $failed == 0;
@@ -443,7 +461,10 @@ 
 						if($acc_count && $content['accessory_of'] != -1)
 						{
 							// Resource with accessories changed into accessory
-							if($acc_count) $msg = lang('%1 accessories now resources',$acc_count);
+							if($acc_count)
+							{
+								$msg = lang('%1 accessories now resources',$acc_count);
+							}
 						}
 					}
 					else
@@ -475,9 +496,18 @@ 
 
 		$nm_session_data = Api\Cache::getSession('resources', 'index_nm');
 		$res_id = is_numeric($content) ? (int)$content : $content['res_id'];
-		if (isset($_GET['res_id'])) $res_id = $_GET['res_id'];
-		if (isset($nm_session_data['filter2']) && $nm_session_data['filter2'] > 0) $accessory_of = $nm_session_data['filter2'];
-		if (isset($_GET['accessory_of'])) $accessory_of = $_GET['accessory_of'];
+		if (isset($_GET['res_id']))
+		{
+			$res_id = $_GET['res_id'];
+		}
+		if (isset($nm_session_data['filter2']) && $nm_session_data['filter2'] > 0)
+		{
+			$accessory_of = $nm_session_data['filter2'];
+		}
+		if (isset($_GET['accessory_of']))
+		{
+			$accessory_of = $_GET['accessory_of'];
+		}
 		$content = array('res_id' => $res_id);
 		if ($res_id > 0)
 		{
@@ -487,7 +517,9 @@ 
 				'to_id' => $res_id,
 				'to_app' => 'resources'
 			);
-		} elseif ($accessory_of > 0) {
+		}
+		elseif ($accessory_of > 0)
+		{
 			// Pre-set according to parent
 			$owner = $this->bo->read($accessory_of);
 			if($owner['accessory_of'] > 0)
@@ -498,16 +530,22 @@ 
 			}
 			$content['cat_id'] = $owner['cat_id'];
 			$content['bookable'] = true;
-		} else {
+		}
+		else
+		{
 			// New resource
 			$content['cat_id'] = $nm_session_data['filter'];
 			$content['bookable'] = true;
 		}
-		if($msg) {
+		if($msg)
+		{
 			$content['msg'] = $msg;
 		}
 
-		if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);
+		if ($_GET['msg'])
+		{
+			$content['msg'] = strip_tags($_GET['msg']);
+		}
 
 		// some presetes
 		$content['resource_picture'] = $this->bo->get_picture($content['res_id'],false);
@@ -545,7 +583,10 @@ 
 		);
 
 		$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('',$search_options);
-		if($res_id) unset($sel_options['accessory_of'][$res_id]);
+		if($res_id)
+		{
+			unset($sel_options['accessory_of'][$res_id]);
+		}
 
 // 		$content['general|page|pictures|links'] = 'resources.edit_tabs.page';  //debug
 

Spacing +92 added lines, -93 removed lines

@@ -37,8 +37,8 @@ 
 	function __construct()
 	{
 // 		print_r($GLOBALS['egw_info']); die();
-		$this->tmpl	= new Etemplate('resources.show');
-		$this->bo	= new resources_bo();
+		$this->tmpl = new Etemplate('resources.show');
+		$this->bo = new resources_bo();
 // 		$this->calui	= CreateObject('resources.ui_calviews');
 	}
 
@@ -49,7 +49,7 @@ 
 	 * @param array $content content from eTemplate callback
 	 *
 	 */
-	function index($content='')
+	function index($content = '')
 	{
 		if (is_array($content))
 		{
@@ -59,25 +59,25 @@ 
 
 			if (isset($content['btn_delete_selected']))
 			{
-				foreach($content['nm']['rows'] as $row)
+				foreach ($content['nm']['rows'] as $row)
 				{
-					if($res_id = $row['checkbox'][0])
+					if ($res_id = $row['checkbox'][0])
 					{
-						$msg .= '<p>'. $this->bo->delete($res_id). '</p><br>';
+						$msg .= '<p>'.$this->bo->delete($res_id).'</p><br>';
 					}
 				}
 				return $this->index($msg);
 			}
-			foreach($content['nm']['rows'] as $row)
+			foreach ($content['nm']['rows'] as $row)
 			{
-				if(isset($row['delete']))
+				if (isset($row['delete']))
 				{
-					$res_id = array_search('pressed',$row['delete']);
+					$res_id = array_search('pressed', $row['delete']);
 					return $this->index($this->bo->delete($res_id));
 				}
-				if(isset($row['view_acc']))
+				if (isset($row['view_acc']))
 				{
-					$sessiondata['filter2'] = array_search('pressed',$row['view_acc']);
+					$sessiondata['filter2'] = array_search('pressed', $row['view_acc']);
 					Api\Cache::setSession('resources', 'index_nm', $sessiondata);
 					return $this->index();
 				}
@@ -90,18 +90,18 @@ 
 				}
 				else
 				{
-					if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-						$success,$failed,$action_msg,'resources_index_nm',$msg))
+					if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+						$success, $failed, $action_msg, 'resources_index_nm', $msg))
 					{
-						$msg .= lang('%1 resource(s) %2',$success,$action_msg);
+						$msg .= lang('%1 resource(s) %2', $success, $action_msg);
 					}
-					elseif(empty($msg))
+					elseif (empty($msg))
 					{
-						$msg .= lang('%1 resource(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+						$msg .= lang('%1 resource(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 					}
 					else
 					{
-						$msg .= lang('%1 resource(s) %2, %3 failed',$success,$action_msg,$failed);
+						$msg .= lang('%1 resource(s) %2, %3 failed', $success, $action_msg, $failed);
 					}
 				}
 			}
@@ -111,65 +111,65 @@ 
 		$content = array();
 		$content['msg'] = $msg ? $msg : $_GET['msg'];
 
-		$content['nm']['get_rows']		= 'resources.resources_bo.get_rows';
+		$content['nm']['get_rows'] = 'resources.resources_bo.get_rows';
 		$content['nm']['no_filter'] 	= False;
 		$content['nm']['filter_no_lang'] = true;
 		$content['nm']['no_cat']	= true;
 		$content['nm']['bottom_too']	= true;
 		$content['nm']['order']		= 'name';
-		$content['nm']['sort']		= 'ASC';
-		$content['nm']['store_state']	= 'get_rows';
+		$content['nm']['sort'] = 'ASC';
+		$content['nm']['store_state'] = 'get_rows';
 		$content['nm']['row_id']	= 'res_id';
 		$content['nm']['favorites'] = true;
 
 		$nm_session_data = Api\Cache::getSession('resources', 'index_nm');
-		if($nm_session_data)
+		if ($nm_session_data)
 		{
 			$content['nm'] = $nm_session_data;
 		}
-		$content['nm']['options-filter']= array(''=>lang('all categories'))+(array)$this->bo->acl->get_cats(Acl::READ);
+		$content['nm']['options-filter'] = array(''=>lang('all categories')) + (array)$this->bo->acl->get_cats(Acl::READ);
 		$content['nm']['options-filter2'] = resources_bo::$filter_options;
-		if(!$content['nm']['filter2'])
+		if (!$content['nm']['filter2'])
 		{
 			$content['nm']['filter2'] = key(resources_bo::$filter_options);
 		}
 
 		$config = Api\Config::read('resources');
-		if($config['history'])
+		if ($config['history'])
 		{
 			$content['nm']['options-filter2'][resources_bo::DELETED] = lang('Deleted');
 		}
 
-		if($_GET['search']) {
+		if ($_GET['search']) {
 			$content['nm']['search'] = $_GET['search'];
 		}
-		if($_GET['view_accs_of'])
+		if ($_GET['view_accs_of'])
 		{
 			$content['nm']['filter2'] = (int)$_GET['view_accs_of'];
 		}
-		$content['nm']['actions']	= $this->get_actions();
+		$content['nm']['actions'] = $this->get_actions();
 		$content['nm']['placeholder_actions'] = array('add');
 
 		// check if user is permitted to add resources
 		// If they can't read any categories, they won't be able to save it
-		if(!$this->bo->acl->get_cats(Acl::ADD) || !$this->bo->acl->get_cats(Acl::READ))
+		if (!$this->bo->acl->get_cats(Acl::ADD) || !$this->bo->acl->get_cats(Acl::READ))
 		{
 			$no_button['add'] = $no_button['nm']['add'] = true;
 		}
 		$no_button['back'] = true;
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('resources');
 
-		Framework::includeJS('.','resources','resources');
+		Framework::includeJS('.', 'resources', 'resources');
 
-		if($content['nm']['filter2'] > 0)
+		if ($content['nm']['filter2'] > 0)
 		{
 			$master = $this->bo->so->read(array('res_id' => $content['nm']['filter2']));
 			$content['nm']['options-filter2'] = resources_bo::$filter_options + array(
-				$master['res_id'] => lang('accessories of') . ' ' . $master['name']
+				$master['res_id'] => lang('accessories of').' '.$master['name']
 			);
-			$content['nm']['get_rows'] 	= 'resources.resources_bo.get_rows';
-			$GLOBALS['egw_info']['flags']['app_header'] = lang('resources') . ' - ' . lang('accessories of '). ' '. $master['name'] .
-				($master['short_description'] ? ' [' . $master['short_description'] . ']' : '');
+			$content['nm']['get_rows'] = 'resources.resources_bo.get_rows';
+			$GLOBALS['egw_info']['flags']['app_header'] = lang('resources').' - '.lang('accessories of ').' '.$master['name'].
+				($master['short_description'] ? ' ['.$master['short_description'].']' : '');
 		}
 		$preserv = $content;
 
@@ -177,7 +177,7 @@ 
 
 		Api\Cache::setSession('resources', 'index_nm', $content['nm']);
 		$this->tmpl->read('resources.show');
-		return $this->tmpl->exec('resources.resources_ui.index',$content,$sel_options,$no_button,$preserv);
+		return $this->tmpl->exec('resources.resources_ui.index', $content, $sel_options, $no_button, $preserv);
 	}
 
 	/**
@@ -194,9 +194,9 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=resources.resources_ui.edit&res_id=$id',
 				'popup' => Link::get_registry('resources', 'add_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'rowNoEdit',
-				'onExecute' => Api\Header\UserAgent::mobile()?'javaScript:app.resources.viewEntry':'',
+				'onExecute' => Api\Header\UserAgent::mobile() ? 'javaScript:app.resources.viewEntry' : '',
 				'mobileViewTemplate' => 'view?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/resources/templates/mobile/view.xet'))
 			),
 			'add' => array(
@@ -278,7 +278,7 @@ 
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)
+	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg)
 	{
 		$success = $failed = 0;
 		if ($use_all)
@@ -286,11 +286,11 @@ 
 			// get the whole selection
 			$query = is_array($session_name) ? $session_name : Api\Cache::getSession($session_name, 'session_data');
 
-			@set_time_limit(0);                     // switch off the execution time limit, as it's for big selections to small
-			$query['num_rows'] = -1;        // all
-			$this->bo->get_rows($query,$resources,$readonlys);
+			@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+			$query['num_rows'] = -1; // all
+			$this->bo->get_rows($query, $resources, $readonlys);
 			$checked = array();
-			foreach($resources as $resource)
+			foreach ($resources as $resource)
 			{
 				$checked[] = $resource['res_id'];
 			}
@@ -300,17 +300,17 @@ 
 		// Dialogs to get options
 		list($action, $settings) = explode('_', $action, 2);
 
-		switch($action)
+		switch ($action)
 		{
 			case 'restore':
 				$action_msg = lang('restored');
-				foreach($checked as $n=>$id)
+				foreach ($checked as $n=>$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if (!$id) continue;
 					$resource = $this->bo->read($id);
 					$resource['deleted'] = null;
-					if($resource['accessory_of'] > 0)
+					if ($resource['accessory_of'] > 0)
 					{
 						/*
 						If restoring an accessory, and parent is deleted, and not in
@@ -318,18 +318,18 @@ 
 						*/
 						$parent = $this->bo->read($resource['accessory_of']);
 						$checked_key = array_search($parent['res_id'], $checked);
-						if($checked_key === false && $parent['deleted'])
+						if ($checked_key === false && $parent['deleted'])
 						{
 							$resource['accessory_of'] = -1;
 						}
 					}
 
 					$this->bo->save($resource);
-					if($settings == 'accessories')
+					if ($settings == 'accessories')
 					{
 						// Restore accessories too
-						$accessories = $this->bo->get_acc_list($id,true);
-						foreach($accessories as $acc_id => $name)
+						$accessories = $this->bo->get_acc_list($id, true);
+						foreach ($accessories as $acc_id => $name)
 						{
 							$acc = $this->bo->read($acc_id);
 							$acc['deleted'] = null;
@@ -339,20 +339,20 @@ 
 					}
 					$success++;
 				}
-				if($restored_accessories) $action_msg .= ", " . lang('%1 accessories restored',$restored_accessories);
+				if ($restored_accessories) $action_msg .= ", ".lang('%1 accessories restored', $restored_accessories);
 				break;
 			case 'delete':
 				$action_msg = lang('deleted');
 				$promoted_accessories = 0;
-				foreach($checked as $n => &$id)
+				foreach ($checked as $n => &$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if (!$id) continue;
 					$resource = $this->bo->read($id);
-					if($settings == 'promote')
+					if ($settings == 'promote')
 					{
 						// Handle a selected accessory
-						if($resource['accessory_of'] > 0)
+						if ($resource['accessory_of'] > 0)
 						{
 							$resource['accessory_of'] = -1;
 							$this->bo->save($resource);
@@ -361,8 +361,8 @@ 
 						}
 
 						// Make associated accessories into resources - include deleted
-						$accessories = $this->bo->get_acc_list($id,true);
-						foreach($accessories as $acc_id => $name)
+						$accessories = $this->bo->get_acc_list($id, true);
+						foreach ($accessories as $acc_id => $name)
 						{
 							$acc = $this->bo->read($acc_id);
 							$acc['accessory_of'] = -1;
@@ -373,19 +373,19 @@ 
 
 							// Don't need to process these ones now
 							$checked_key = array_search($acc_id, $checked);
-							if($checked_key !== false) unset($checked[$checked_key]);
+							if ($checked_key !== false) unset($checked[$checked_key]);
 						}
 					}
 					else
 					{
 						// Remove checked accessories, deleting resource will remove them
 						// We get an error if we try to delete them after they're gone
-						$accessories = $this->bo->get_acc_list($id,$resource['deleted']);
+						$accessories = $this->bo->get_acc_list($id, $resource['deleted']);
 
-						foreach($accessories as $acc_id => $name)
+						foreach ($accessories as $acc_id => $name)
 						{
 							$checked_key = array_search($acc_id, $checked);
-							if($checked_key !== false)
+							if ($checked_key !== false)
 							{
 								$success++;
 								unset($checked[$checked_key]);
@@ -399,11 +399,11 @@ 
 					}
 					else
 					{
-						$msg = $error . "\n";
+						$msg = $error."\n";
 						$failed++;
 					}
 				}
-				if($promoted_accessories) $action_msg .= ", " . lang('%1 accessories now resources',$promoted_accessories);
+				if ($promoted_accessories) $action_msg .= ", ".lang('%1 accessories now resources', $promoted_accessories);
 				break;
 		}
 		return $failed == 0;
@@ -415,13 +415,13 @@ 
 	 *
 	 * @param $content   Content from the eTemplate Exec call or id on inital call
 	 */
-	function edit($content=0,$accessory_of = -1)
+	function edit($content = 0, $accessory_of = -1)
 	{
 		if (is_array($content))
 		{
 			list($button) = @each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'save':
 				case 'apply':
@@ -432,20 +432,20 @@ 
 // 						// links are already saved by eTemplate
 // 						unset($resource['link_to']['to_id']);
 // 					}
-					if($content['res_id'])
+					if ($content['res_id'])
 					{
 						 $acc_count = count($this->bo->get_acc_list($content['res_id']));
 					}
 					$result = $this->bo->save($content);
 
-					if(is_numeric($result))
+					if (is_numeric($result))
 					{
-						$msg = lang('Resource %1 saved!',$result);
+						$msg = lang('Resource %1 saved!', $result);
 						$content['res_id'] = $result;
-						if($acc_count && $content['accessory_of'] != -1)
+						if ($acc_count && $content['accessory_of'] != -1)
 						{
 							// Resource with accessories changed into accessory
-							if($acc_count) $msg = lang('%1 accessories now resources',$acc_count);
+							if ($acc_count) $msg = lang('%1 accessories now resources', $acc_count);
 						}
 					}
 					else
@@ -456,9 +456,9 @@ 
 					break;
 				case 'delete':
 					unset($content['delete']);
-					if(!$this->bo->delete($content['res_id']))
+					if (!$this->bo->delete($content['res_id']))
 					{
-						$msg = lang('Resource %1 deleted!',$content['res_id']);
+						$msg = lang('Resource %1 deleted!', $content['res_id']);
 					}
 					else
 					{
@@ -466,9 +466,9 @@ 
 						break;
 					}
 			}
-			Framework::refresh_opener($msg, 'resources',$content['res_id'],($button == 'delete'?'delete':'edit'));
+			Framework::refresh_opener($msg, 'resources', $content['res_id'], ($button == 'delete' ? 'delete' : 'edit'));
 
-			if($button != 'apply')
+			if ($button != 'apply')
 			{
 				Framework::window_close();
 			}
@@ -484,7 +484,7 @@ 
 		if ($res_id > 0)
 		{
 			$content = $this->bo->read($res_id);
-			$content['picture_src'] = strpos($content['picture_src'],'.') !== false ? 'gen_src' : $content['picture_src'];
+			$content['picture_src'] = strpos($content['picture_src'], '.') !== false ? 'gen_src' : $content['picture_src'];
 			$content['link_to'] = array(
 				'to_id' => $res_id,
 				'to_app' => 'resources'
@@ -492,7 +492,7 @@ 
 		} elseif ($accessory_of > 0) {
 			// Pre-set according to parent
 			$owner = $this->bo->read($accessory_of);
-			if($owner['accessory_of'] > 0)
+			if ($owner['accessory_of'] > 0)
 			{
 				// Accessory of accessory not allowed, grab parent resource
 				$accessory_of = $owner['accessory_of'];
@@ -505,33 +505,32 @@ 
 			$content['cat_id'] = $nm_session_data['filter'];
 			$content['bookable'] = true;
 		}
-		if($msg) {
+		if ($msg) {
 			$content['msg'] = $msg;
 		}
 
 		if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);
 
 		// some presetes
-		$content['resource_picture'] = $this->bo->get_picture($content['res_id'],false);
+		$content['resource_picture'] = $this->bo->get_picture($content['res_id'], false);
 		// Set original size picture
-		$content['picture_original'] = $content['picture_src'] == 'own_src'?
-				'webdav.php/apps/resources/'.$content['res_id'].'/.picture.jpg': $this->bo->get_picture($content['res_id'],true);
+		$content['picture_original'] = $content['picture_src'] == 'own_src' ?
+				'webdav.php/apps/resources/'.$content['res_id'].'/.picture.jpg' : $this->bo->get_picture($content['res_id'], true);
 
 		$content['quantity'] = $content['quantity'] ? $content['quantity'] : 1;
 		$content['useable'] = $content['useable'] ? $content['useable'] : 1;
 		$content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of;
 
-		if($content['res_id'] && $content['accessory_of'] == -1)
+		if ($content['res_id'] && $content['accessory_of'] == -1)
 		{
 			$content['acc_count'] = count($this->bo->get_acc_list($content['res_id']));
 		}
 		$sel_options['status'] = resources_bo::$field2label;
 
 		//$sel_options['gen_src_list'] = $this->bo->get_genpicturelist();
-		$sel_options['cat_id'] =  $this->bo->acl->get_cats(Acl::ADD);
-		$sel_options['cat_id'] = count($sel_options['cat_id']) == 1 ? $sel_options['cat_id'] :
-			array('' => lang('select one')) + $sel_options['cat_id'];
-		if($accessory_of > 0 || $content['accessory_of'] > 0)
+		$sel_options['cat_id'] = $this->bo->acl->get_cats(Acl::ADD);
+		$sel_options['cat_id'] = count($sel_options['cat_id']) == 1 ? $sel_options['cat_id'] : array('' => lang('select one')) + $sel_options['cat_id'];
+		if ($accessory_of > 0 || $content['accessory_of'] > 0)
 		{
 			$content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of;
 		}
@@ -546,19 +545,19 @@ 
 			)
 		);
 
-		$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('',$search_options);
-		if($res_id) unset($sel_options['accessory_of'][$res_id]);
+		$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('', $search_options);
+		if ($res_id) unset($sel_options['accessory_of'][$res_id]);
 
 // 		$content['general|page|pictures|links'] = 'resources.edit_tabs.page';  //debug
 
 		// Permissions
 		$read_only = array();
-		if($res_id && !$this->bo->acl->is_permitted($content['cat_id'],Acl::EDIT))
+		if ($res_id && !$this->bo->acl->is_permitted($content['cat_id'], Acl::EDIT))
 		{
 			$read_only['__ALL__'] = true;
 		}
 		$config = Api\Config::read('resources');
-		if(!$this->bo->acl->is_permitted($content['cat_id'],Acl::DELETE) ||
+		if (!$this->bo->acl->is_permitted($content['cat_id'], Acl::DELETE) ||
 			($content['deleted'] && !$GLOBALS['egw_info']['user']['apps']['admin'] && $config['history'] == 'history'))
 		{
 			$read_only['delete'] = true;
@@ -566,19 +565,19 @@ 
 
 		// Can't make a resource with accessories an accessory
 		$read_only['accessory_of'] = $content['acc_count'];
-		if($read_only['accessory_of'])
+		if ($read_only['accessory_of'])
 		{
 			$content['accessory_label'] = lang('Remove accessories before changing Accessory of');
 		}
 
 		// Disable custom tab if there are no custom fields defined
-		$read_only['tabs']['custom'] = !(Api\Storage\Customfields::get('resources',true));
-		$read_only['tabs']['history'] = ($content['history']['id'] != 0?false:true);
+		$read_only['tabs']['custom'] = !(Api\Storage\Customfields::get('resources', true));
+		$read_only['tabs']['history'] = ($content['history']['id'] != 0 ?false:true);
 
 		$preserv = $content;
 
 		$this->tmpl->read('resources.edit');
-		return $this->tmpl->exec('resources.resources_ui.edit',$content,$sel_options,$read_only,$preserv,2);
+		return $this->tmpl->exec('resources.resources_ui.edit', $content, $sel_options, $read_only, $preserv, 2);
 	}
 
 }

setup/check_install.php

Doc Comments +1 added lines

@@ -316,6 +316,7 @@
  * Check if given package is installed via composer in EGroupware's vendor directory
  *
  * @param string $package package-name in composer notation eg. "pear-pear.horde.org/Horde_Imap_Client" or "pear-pear.php.net/Net_Sieve"
+ * @return string|null
  */
 function composer_check($package)
 {

Braces +119 added lines, -30 removed lines

@@ -239,10 +239,15 @@ 
 		foreach(explode(PATH_SEPARATOR,$open_basedir) as $dir)
 		{
 			$dir = realpath($dir);
-			if (($sp_visible = substr($session_path,0,strlen($dir)) == $dir)) break;
+			if (($sp_visible = substr($session_path,0,strlen($dir)) == $dir))
+			{
+				break;
+			}
 		}
 	}
-	if ($sp_visible)	// only check if session_save_path is visible by webserver
+	if ($sp_visible)
+	{
+		// only check if session_save_path is visible by webserver
 	{
 		$checks[$session_path] = array(
 			'func' => 'permission_check',
@@ -251,17 +256,25 @@ 
 			'error' => lang('You will NOT be able to log into eGroupWare using PHP sessions: "session could not be verified" !!!'),
 		);
 	}
+	}
 }
 $setup_info = $GLOBALS['egw_setup']->detection->get_versions();
 foreach($setup_info as $app => $app_data)
 {
-	if (!isset($app_data['check_install'])) continue;
+	if (!isset($app_data['check_install']))
+	{
+		continue;
+	}
 
 	foreach ($app_data['check_install'] as $name => $data)
 	{
 		if (isset($checks[$name]))
 		{
-			if ($checks[$name] == $data) continue;	// identical check --> ignore it
+			if ($checks[$name] == $data)
+			{
+				continue;
+			}
+			// identical check --> ignore it
 
 			if ($data['func'] == 'pear_check' || in_array($data['func'],array('extension_check','php_ini_check')) && !isset($data['warning']))
 			{
@@ -269,9 +282,18 @@ 
 				{
 					$checks[$name]['from'] = array($checks[$name]['from']);
 				}
-				if (!isset($data['from'])) $data['from'] = $app;
-				if (!isset($checks[$name]['from']) || !is_array($checks[$name]['from'])) $checks[$name]['from'] = array();
-				if (!in_array($data['from'],$checks[$name]['from'])) $checks[$name]['from'][] = $data['from'];
+				if (!isset($data['from']))
+				{
+					$data['from'] = $app;
+				}
+				if (!isset($checks[$name]['from']) || !is_array($checks[$name]['from']))
+				{
+					$checks[$name]['from'] = array();
+				}
+				if (!in_array($data['from'],$checks[$name]['from']))
+				{
+					$checks[$name]['from'][] = $data['from'];
+				}
 			}
 			else
 			{
@@ -280,7 +302,10 @@ 
 		}
 		else
 		{
-			if (!isset($data['from'])) $data['from'] = $app;
+			if (!isset($data['from']))
+			{
+				$data['from'] = $app;
+			}
 			$checks[$name] = $data;
 		}
 		//echo "added check $data[func]($name) for $app"; _debug_array($data);
@@ -298,7 +323,10 @@ 
 		}
 	}
 }
-if ($checks) $sorted_checks += $checks;
+if ($checks)
+{
+	$sorted_checks += $checks;
+}
 
 function php_version($name,$args)
 {
@@ -351,22 +379,35 @@ 
 	}
 	@include_once 'PEAR/Config.php';
 
-	if (!class_exists('PEAR_Config')) return false;
+	if (!class_exists('PEAR_Config'))
+	{
+		return false;
+	}
 
 	$config = new PEAR_Config('',$pear_config);
 	//echo "<pre>config = ".print_r($config,true)."</pre>\n";
 
-	if (empty($channel)) $channel = $config->get('default_channel');
+	if (empty($channel))
+	{
+		$channel = $config->get('default_channel');
+	}
 	//echo "<pre>channel = ".print_r($channel,true)."</pre>\n";
 
-	if (!method_exists($config,'getRegistry')) return false;	// PEAR version to old
+	if (!method_exists($config,'getRegistry'))
+	{
+		return false;
+	}
+	// PEAR version to old
 
 	$reg = &$config->getRegistry();
 	//echo "<pre>reg = ".print_r($reg,true)."</pre>\n";
 
 	// a bug in pear causes an endless loop if the install-dir does not exist
 	// bug reported: http://pear.php.net/bugs/bug.php?id=11317
-	if (!file_exists($reg->install_dir)) return false;
+	if (!file_exists($reg->install_dir))
+	{
+		return false;
+	}
 
 	$installed = $reg->packageInfo(null,null,$channel);
 
@@ -376,7 +417,10 @@ 
 	{
 		$name = isset($package['package']) ? $package['package'] : $package['name'];
 		$version = $package['version'];
-		if (is_array($version)) $version = $version['release'];
+		if (is_array($version))
+		{
+			$version = $version['release'];
+		}
 
 		$packages[$name] = $version;
 		//echo "<p>$name: ".print_r($package['version'],true)."</p>\n";
@@ -415,7 +459,10 @@ 
 		{
 			$pear_available = $found = true;
 			// check if package is installed
-			if ($package && isset($pear_packages[$package])) $available = true;
+			if ($package && isset($pear_packages[$package]))
+			{
+				$available = true;
+			}
 			// check if it's the right version
 			$version_available = $pear_packages[$package ? $package : 'PEAR'];
 		}
@@ -425,7 +472,10 @@ 
 			{
 				$pear_available = @include_once('PEAR.php');
 
-				if (!class_exists('PEAR')) $pear_available = false;
+				if (!class_exists('PEAR'))
+				{
+					$pear_available = false;
+				}
 			}
 			$found = $pear_available;
 			if ($pear_available && $package)
@@ -434,7 +484,10 @@ 
 
 				$found = @include_once($file);
 
-				if (!class_exists($package)) $found = false;
+				if (!class_exists($package))
+				{
+					$found = false;
+				}
 			}
 		}
 	}
@@ -445,10 +498,13 @@ 
 		($available ? ($version_available ? $version_available : lang('True')) :
 		($found ? lang('Found, but unknown version') : lang('False')))."</span></div>\n";
 
-	if (!$available)	// give further info only if not availible
+	if (!$available)
+	{
+		// give further info only if not availible
 	{
 		echo '<div class="setup_info">' . lang('PEAR%1 is needed by: %2.',$package ? '::'.$package : '',
 			is_array($args['from']) ? implode(', ',$args['from']) : $args['from']);
+	}
 
 		// if using Composer, dont confuse user with PEAR ;-)
 		if (file_exists(EGW_SERVER_ROOT.'/vendor'))
@@ -541,34 +597,55 @@ 
 
 function verbosePerms( $in_Perms )
 {
-	if($in_Perms & 0x1000)     // FIFO pipe
+	if($in_Perms & 0x1000)
+	{
+		// FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($in_Perms & 0x2000) // Character special
+	}
+	elseif($in_Perms & 0x2000)
+	{
+		// Character special
 	{
 		$sP = 'c';
 	}
-	elseif($in_Perms & 0x4000) // Directory
+	}
+	elseif($in_Perms & 0x4000)
+	{
+		// Directory
 	{
 		$sP = 'd';
 	}
-	elseif($in_Perms & 0x6000) // Block special
+	}
+	elseif($in_Perms & 0x6000)
+	{
+		// Block special
 	{
 		$sP = 'b';
 	}
-	elseif($in_Perms & 0x8000) // Regular
+	}
+	elseif($in_Perms & 0x8000)
+	{
+		// Regular
 	{
 		$sP = '-';
 	}
-	elseif($in_Perms & 0xA000) // Symbolic Link
+	}
+	elseif($in_Perms & 0xA000)
+	{
+		// Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif($in_Perms & 0xC000) // Socket
+	}
+	elseif($in_Perms & 0xC000)
+	{
+		// Socket
 	{
 		$sP = 's';
 	}
+	}
 	else                         // UNKNOWN
 	{
 		$sP = 'u';
@@ -709,9 +786,15 @@ 
 				$Ok = $Ok && permission_check(($name!='.'?$name.'/':'').$file,$args,False);
 			}
 		}
-		if ($handle) closedir($handle);
+		if ($handle)
+		{
+			closedir($handle);
+		}
+	}
+	if ($verbose)
+	{
+		echo "\n";
 	}
-	if ($verbose) echo "\n";
 
 	return $Ok;
 }
@@ -719,7 +802,10 @@ 
 function mk_value($value)
 {
 	$matches = null;
-	if (!preg_match('/^([0-9]+)([mk]+)$/i',$value,$matches)) return $value;
+	if (!preg_match('/^([0-9]+)([mk]+)$/i',$value,$matches))
+	{
+		return $value;
+	}
 
 	return (strtolower($matches[2]) == 'm' ? 1024*1024 : 1024) * (int) $matches[1];
 }
@@ -848,7 +934,8 @@ 
 		'T_footer' => 'footer.tpl',
 	));
 	$ConfigDomain = $_REQUEST['ConfigDomain'];
-	if (@$_GET['intro']) {
+	if (@$_GET['intro'])
+	{
 		if(($ConfigLang = setup::get_lang()))
 		{
 			$GLOBALS['egw_setup']->set_cookie('ConfigLang',$ConfigLang,(int) (time()+(1200*9)),'/');
@@ -865,7 +952,9 @@ 
 		echo '<p><a href="manageheader.php">'.lang('Skip the installation tests (not recommended)')."</a></p>\n";
 		$setup_tpl->pparse('out','T_footer');
 		exit;
-	} else {
+	}
+	else
+	{
 		$GLOBALS['egw_setup']->html->show_header(lang('Checking the eGroupWare Installation'),False,'config',$ConfigDomain ? $ConfigDomain . '(' . @$GLOBALS['egw_domain'][$ConfigDomain]['db_type'] . ')' : '');
 		echo '<h1>'.lang('Checking the eGroupWare Installation')."</h1>\n";
 		# echo "<pre style=\"text-align: left;\">\n";;

Spacing +119 added lines, -123 removed lines

@@ -13,7 +13,7 @@ 
 use EGroupware\Api;
 
 $run_by_webserver = !!$_SERVER['PHP_SELF'];
-$is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN';
+$is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
 
 if ($run_by_webserver)
 {
@@ -41,9 +41,9 @@ 
 	$error_icon = '*** Error: ';
 	$warning_icon = '!!! Warning: ';
 
-	function lang($msg,$arg1=NULL,$arg2=NULL,$arg3=NULL,$arg4=NULL)
+	function lang($msg, $arg1 = NULL, $arg2 = NULL, $arg3 = NULL, $arg4 = NULL)
 	{
-		return is_null($arg1) ? $msg : str_replace(array('%1','%2','%3','%4'),array($arg1,$arg2,$arg3,$arg4),$msg);
+		return is_null($arg1) ? $msg : str_replace(array('%1', '%2', '%3', '%4'), array($arg1, $arg2, $arg3, $arg4), $msg);
 	}
 }
 
@@ -79,13 +79,13 @@ 
 		'func' => 'php_ini_check',
 		'value' => 0,
 		'verbose_value' => 'Off',
-		'warning' => lang('%1 is set to %2. This is NOT recommeded for a production system, as displayed error messages can contain passwords or other sensitive information!','display_errors',ini_get('display_errors')),
+		'warning' => lang('%1 is set to %2. This is NOT recommeded for a production system, as displayed error messages can contain passwords or other sensitive information!', 'display_errors', ini_get('display_errors')),
 	),
 	'memory_limit' => array(
 		'func' => 'php_ini_check',
 		'value' => '128M',
 		'check' => '>=',
-		'error' => lang('memory_limit is set to less than %1: some applications of eGroupWare need more than the recommend 8M, expect occasional failures','24M'),
+		'error' => lang('memory_limit is set to less than %1: some applications of eGroupWare need more than the recommend 8M, expect occasional failures', '24M'),
 		'change' => 'memory_limit = 24M'
 	),
 	'max_execution_time' => array(
@@ -105,14 +105,14 @@ 
 		'func' => 'php_ini_check',
 		'value' => '8M',
 		'check' => '>=',
-		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!','upload_max_filesize',ini_get('upload_max_filesize')),
+		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!', 'upload_max_filesize', ini_get('upload_max_filesize')),
 		'change' => 'upload_max_filesize = 8M'
 	),
 	'post_max_size' => array(
 		'func' => 'php_ini_check',
 		'value' => '8M',
 		'check' => '>=',
-		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!','post_max_size',ini_get('max_post_size')),
+		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!', 'post_max_size', ini_get('max_post_size')),
 		'change' => 'post_max_size = 8M'
 	),
 	'allow_url_fopen' => array(
@@ -138,7 +138,7 @@ 
 		'verbose_value' => '"System/Localtime"',
 		'check' => '!=',
 		'error' => lang('No VALID timezone set! ("%1" is NOT sufficient, you have to use a timezone identifer like "%2", see %3full list of valid identifers%4)',
-			'System/Localtime','Europe/Berlin','<a href="http://www.php.net/manual/en/timezones.php" target="_blank">','</a>'),
+			'System/Localtime', 'Europe/Berlin', '<a href="http://www.php.net/manual/en/timezones.php" target="_blank">', '</a>'),
 	),
 	'pdo' => array(
 		'func' => 'extension_check',
@@ -146,19 +146,19 @@ 
 	),
 	'mysqli' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','mysql','MySQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'mysql', 'MySQL')
 	),
 	'pdo_mysql' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','pdo_mysql','MySQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'pdo_mysql', 'MySQL')
 	),
 	'pgsql' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','pgsql','pgSQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'pgsql', 'pgSQL')
 	),
 	'pdo_pgsql' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','pdo_pgsql','pgSQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'pdo_pgsql', 'pgSQL')
 	),
 	/* disable checks for other database extensions, as we are not really supporting them anymore
 	'mssql' => array(
@@ -202,7 +202,7 @@ 
 	realpath('..') => array(
 		'func' => 'permission_check',
 		'is_world_writable' => False,
-		'only_if_exists' => true,	// quitens "file does not exist" for doc symlinks in Debian to files outside open_basedir
+		'only_if_exists' => true, // quitens "file does not exist" for doc symlinks in Debian to files outside open_basedir
 		'recursiv' => True
 	),
 	realpath('../header.inc.php') => array(
@@ -236,10 +236,10 @@ 
 	$sp_visible = true;
 	if (($open_basedir = ini_get('open_basedir')) && $open_basedir != 'none')
 	{
-		foreach(explode(PATH_SEPARATOR,$open_basedir) as $dir)
+		foreach (explode(PATH_SEPARATOR, $open_basedir) as $dir)
 		{
 			$dir = realpath($dir);
-			if (($sp_visible = substr($session_path,0,strlen($dir)) == $dir)) break;
+			if (($sp_visible = substr($session_path, 0, strlen($dir)) == $dir)) break;
 		}
 	}
 	if ($sp_visible)	// only check if session_save_path is visible by webserver
@@ -247,13 +247,13 @@ 
 		$checks[$session_path] = array(
 			'func' => 'permission_check',
 			'is_writable' => true,
-			'msg' => lang("Checking if php.ini setting session.save_path='%1' is writable by the webserver",session_save_path()),
+			'msg' => lang("Checking if php.ini setting session.save_path='%1' is writable by the webserver", session_save_path()),
 			'error' => lang('You will NOT be able to log into eGroupWare using PHP sessions: "session could not be verified" !!!'),
 		);
 	}
 }
 $setup_info = $GLOBALS['egw_setup']->detection->get_versions();
-foreach($setup_info as $app => $app_data)
+foreach ($setup_info as $app => $app_data)
 {
 	if (!isset($app_data['check_install'])) continue;
 
@@ -261,9 +261,9 @@ 
 	{
 		if (isset($checks[$name]))
 		{
-			if ($checks[$name] == $data) continue;	// identical check --> ignore it
+			if ($checks[$name] == $data) continue; // identical check --> ignore it
 
-			if ($data['func'] == 'pear_check' || in_array($data['func'],array('extension_check','php_ini_check')) && !isset($data['warning']))
+			if ($data['func'] == 'pear_check' || in_array($data['func'], array('extension_check', 'php_ini_check')) && !isset($data['warning']))
 			{
 				if (isset($checks[$name]['from']) && $checks[$name]['from'] && !is_array($checks[$name]['from']))
 				{
@@ -271,7 +271,7 @@ 
 				}
 				if (!isset($data['from'])) $data['from'] = $app;
 				if (!isset($checks[$name]['from']) || !is_array($checks[$name]['from'])) $checks[$name]['from'] = array();
-				if (!in_array($data['from'],$checks[$name]['from'])) $checks[$name]['from'][] = $data['from'];
+				if (!in_array($data['from'], $checks[$name]['from'])) $checks[$name]['from'][] = $data['from'];
 			}
 			else
 			{
@@ -287,9 +287,9 @@ 
 	}
 }
 $sorted_checks = array();
-foreach(array('php_version','php_ini_check','extension_check','pear_check','gd_check','permission_check') as $func)
+foreach (array('php_version', 'php_ini_check', 'extension_check', 'pear_check', 'gd_check', 'permission_check') as $func)
 {
-	foreach($checks as $name => $data)
+	foreach ($checks as $name => $data)
 	{
 		if ($data['func'] == $func)
 		{
@@ -300,15 +300,15 @@ 
 }
 if ($checks) $sorted_checks += $checks;
 
-function php_version($name,$args)
+function php_version($name, $args)
 {
 	global $passed_icon, $error_icon;
-	unset($name);	// not used, but required by function signature
+	unset($name); // not used, but required by function signature
 
-	$version_ok = version_compare(phpversion(),$args['value']) >= 0;
+	$version_ok = version_compare(phpversion(), $args['value']) >= 0;
 
 	echo '<div>'.($version_ok ? $passed_icon : $error_icon).' <span'.($version_ok ? '' : ' class="setup_error"').'>'.
-		lang('Checking required PHP version %1 (recommended %2)',$args['verbose_value'],$args['recommended']).': '.
+		lang('Checking required PHP version %1 (recommended %2)', $args['verbose_value'], $args['recommended']).': '.
 		phpversion().' ==> '.($version_ok ? lang('True') : lang('False'))."</span></div>\n";
 }
 
@@ -319,13 +319,13 @@ 
  */
 function composer_check($package)
 {
-	static $installed=null;
+	static $installed = null;
 	if (!isset($installed))
 	{
 		$installed = array();
-		if (file_exists(EGW_SERVER_ROOT.'/vendor') && file_exists($json=EGW_SERVER_ROOT.'/vendor/composer/installed.json'))
+		if (file_exists(EGW_SERVER_ROOT.'/vendor') && file_exists($json = EGW_SERVER_ROOT.'/vendor/composer/installed.json'))
 		{
-			foreach(json_decode(file_get_contents($json), true) as $package_data)
+			foreach (json_decode(file_get_contents($json), true) as $package_data)
 			{
 				$installed[strtolower($package_data['name'])] = $package_data['version'];
 			}
@@ -341,9 +341,9 @@ 
  * @param $channel =null use default or given channel
  * @return array with package-name => version pairs, eg. array('Log' => '1.9.8','PEAR' => '1.4.11')
  */
-function get_installed_pear_packages($channel=null)
+function get_installed_pear_packages($channel = null)
 {
-	$pear_config = '';	// use the system default
+	$pear_config = ''; // use the system default
 	// fix for SuSE having the pear.conf only for cli, will fail with open_basedir - no idea what to do then
 	if (@is_dir('/etc/php5/apache2') && !file_exists('/etc/php5/apache2/pear.conf') && @file_exists('/etc/php5/cli/pear.conf'))
 	{
@@ -353,13 +353,13 @@ 
 
 	if (!class_exists('PEAR_Config')) return false;
 
-	$config = new PEAR_Config('',$pear_config);
+	$config = new PEAR_Config('', $pear_config);
 	//echo "<pre>config = ".print_r($config,true)."</pre>\n";
 
 	if (empty($channel)) $channel = $config->get('default_channel');
 	//echo "<pre>channel = ".print_r($channel,true)."</pre>\n";
 
-	if (!method_exists($config,'getRegistry')) return false;	// PEAR version to old
+	if (!method_exists($config, 'getRegistry')) return false; // PEAR version to old
 
 	$reg = &$config->getRegistry();
 	//echo "<pre>reg = ".print_r($reg,true)."</pre>\n";
@@ -368,11 +368,11 @@ 
 	// bug reported: http://pear.php.net/bugs/bug.php?id=11317
 	if (!file_exists($reg->install_dir)) return false;
 
-	$installed = $reg->packageInfo(null,null,$channel);
+	$installed = $reg->packageInfo(null, null, $channel);
 
 	//echo "<pre>installed =".print_r($installed,true)."</pre>\n";
 	$packages = array();
-	foreach($installed as $package)
+	foreach ($installed as $package)
 	{
 		$name = isset($package['package']) ? $package['package'] : $package['name'];
 		$version = $package['version'];
@@ -386,7 +386,7 @@ 
 	return $packages;
 }
 
-function pear_check($package,$args)
+function pear_check($package, $args)
 {
 	global $passed_icon, $warning_icon;
 	static $pear_available = null;
@@ -430,7 +430,7 @@ 
 			$found = $pear_available;
 			if ($pear_available && $package)
 			{
-				$file = str_replace('_','/',$package == 'Mail_Mime' ? 'Mail_mime' : $package).'.php';
+				$file = str_replace('_', '/', $package == 'Mail_Mime' ? 'Mail_mime' : $package).'.php';
 
 				$found = @include_once($file);
 
@@ -439,16 +439,15 @@ 
 		}
 	}
 	// is the right version availible
-	$available = $found && (!$min_version || version_compare($min_version,$version_available) <= 0);
+	$available = $found && (!$min_version || version_compare($min_version, $version_available) <= 0);
 	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.
-		lang('Checking PEAR%1 is installed',($package?($channel?' '.$channel.'/':'::').$package:'').($min_version?" ($min_version)":'')).': '.
-		($available ? ($version_available ? $version_available : lang('True')) :
-		($found ? lang('Found, but unknown version') : lang('False')))."</span></div>\n";
+		lang('Checking PEAR%1 is installed', ($package ? ($channel ? ' '.$channel.'/' : '::').$package : '').($min_version ? " ($min_version)" : '')).': '.
+		($available ? ($version_available ? $version_available : lang('True')) : ($found ? lang('Found, but unknown version') : lang('False')))."</span></div>\n";
 
 	if (!$available)	// give further info only if not availible
 	{
-		echo '<div class="setup_info">' . lang('PEAR%1 is needed by: %2.',$package ? '::'.$package : '',
-			is_array($args['from']) ? implode(', ',$args['from']) : $args['from']);
+		echo '<div class="setup_info">'.lang('PEAR%1 is needed by: %2.', $package ? '::'.$package : '',
+			is_array($args['from']) ? implode(', ', $args['from']) : $args['from']);
 
 		// if using Composer, dont confuse user with PEAR ;-)
 		if (file_exists(EGW_SERVER_ROOT.'/vendor'))
@@ -461,7 +460,7 @@ 
 			if (!$pear_available)
 			{
 				echo '<br/>'.lang('PEAR (%1) is a PHP repository and is usually in a package called %2.',
-					'<a href="http://pear.php.net" target="_blank">pear.php.net</a>','php-pear');
+					'<a href="http://pear.php.net" target="_blank">pear.php.net</a>', 'php-pear');
 			}
 			elseif ($package && !$found)
 			{
@@ -471,12 +470,12 @@ 
 			}
 			elseif ($min_version && !$version_available)
 			{
-				echo '<br/>'.lang('We could not determine the version of %1, please make sure it is at least %2',$package,$min_version);
+				echo '<br/>'.lang('We could not determine the version of %1, please make sure it is at least %2', $package, $min_version);
 			}
-			elseif ($min_version && version_compare($min_version,$version_available) > 0)
+			elseif ($min_version && version_compare($min_version, $version_available) > 0)
 			{
 				echo '<br/>'.lang('Your installed version of %1 is %2, required is at least %3, please run: ',
-					$package,$version_available,$min_version).' pear upgrade '.$package;
+					$package, $version_available, $min_version).' pear upgrade '.$package;
 			}
 			echo '<br/>'.lang('Alternatively you can use %1Composer%2 to install all requirements at once. Downloading it and run:',
 				'<a href="https://getcomposer.org/" target="_blank">', '</a>').
@@ -489,26 +488,26 @@ 
 	return $available;
 }
 
-function extension_check($name,$args)
+function extension_check($name, $args)
 {
 	//echo "<p>extension_check($name,".print_r($args,true).")</p>\n";
 	global $passed_icon, $warning_icon, $is_windows;
 
 	if (isset($args['win_only']) && $args['win_only'] && !$is_windows)
 	{
-		return True;	// check only under windows
+		return True; // check only under windows
 	}
 	// we check for the existens of 'dl', as multithreaded webservers dont have it !!!
 	$available = check_load_extension($name);
 
-	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking extension %1 is loaded or loadable',$name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
+	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking extension %1 is loaded or loadable', $name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
 
 	if (!$available)
 	{
 		if (!isset($args['warning']))
 		{
-			$args['warning'] = lang('The %1 extension is needed from: %2.',$name,
-				is_array($args['from']) ? implode(', ',$args['from']) : $args['from']);
+			$args['warning'] = lang('The %1 extension is needed from: %2.', $name,
+				is_array($args['from']) ? implode(', ', $args['from']) : $args['from']);
 		}
 		echo "<div class='setup_info'>".$args['warning'].'</div>';
 	}
@@ -517,20 +516,20 @@ 
 	return $available;
 }
 
-function function_check($name,$args)
+function function_check($name, $args)
 {
 	global $passed_icon, $warning_icon;
 
 	$available = function_exists($name);
 
-	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking function %1 exists',$name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
+	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking function %1 exists', $name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
 
 	if (!$available)
 	{
 		if (!isset($args['warning']))
 		{
-			$args['warning'] = lang('The function %1 is needed from: %2.',$name,
-				is_array($args['from'] ? implode(', ',$args['from']) : $args['from']));
+			$args['warning'] = lang('The function %1 is needed from: %2.', $name,
+				is_array($args['from'] ? implode(', ', $args['from']) : $args['from']));
 		}
 		echo "<div class='setup_info'>".$args['warning'].'</div>';
 	}
@@ -539,33 +538,33 @@ 
 	return $available;
 }
 
-function verbosePerms( $in_Perms )
+function verbosePerms($in_Perms)
 {
-	if($in_Perms & 0x1000)     // FIFO pipe
+	if ($in_Perms&0x1000)     // FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($in_Perms & 0x2000) // Character special
+	elseif ($in_Perms&0x2000) // Character special
 	{
 		$sP = 'c';
 	}
-	elseif($in_Perms & 0x4000) // Directory
+	elseif ($in_Perms&0x4000) // Directory
 	{
 		$sP = 'd';
 	}
-	elseif($in_Perms & 0x6000) // Block special
+	elseif ($in_Perms&0x6000) // Block special
 	{
 		$sP = 'b';
 	}
-	elseif($in_Perms & 0x8000) // Regular
+	elseif ($in_Perms&0x8000) // Regular
 	{
 		$sP = '-';
 	}
-	elseif($in_Perms & 0xA000) // Symbolic Link
+	elseif ($in_Perms&0xA000) // Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif($in_Perms & 0xC000) // Socket
+	elseif ($in_Perms&0xC000) // Socket
 	{
 		$sP = 's';
 	}
@@ -575,33 +574,30 @@ 
 	}
 
 	// owner
-	$sP .= (($in_Perms & 0x0100) ? 'r' : '-') .
-	(($in_Perms & 0x0080) ? 'w' : '-') .
-	(($in_Perms & 0x0040) ? (($in_Perms & 0x0800) ? 's' : 'x' ) :
-	(($in_Perms & 0x0800) ? 'S' : '-'));
+	$sP .= (($in_Perms&0x0100) ? 'r' : '-').
+	(($in_Perms&0x0080) ? 'w' : '-').
+	(($in_Perms&0x0040) ? (($in_Perms&0x0800) ? 's' : 'x') : (($in_Perms&0x0800) ? 'S' : '-'));
 
 	// group
-	$sP .= (($in_Perms & 0x0020) ? 'r' : '-') .
-	(($in_Perms & 0x0010) ? 'w' : '-') .
-	(($in_Perms & 0x0008) ? (($in_Perms & 0x0400) ? 's' : 'x' ) :
-	(($in_Perms & 0x0400) ? 'S' : '-'));
+	$sP .= (($in_Perms&0x0020) ? 'r' : '-').
+	(($in_Perms&0x0010) ? 'w' : '-').
+	(($in_Perms&0x0008) ? (($in_Perms&0x0400) ? 's' : 'x') : (($in_Perms&0x0400) ? 'S' : '-'));
 
 	// world
-	$sP .= (($in_Perms & 0x0004) ? 'r' : '-') .
-	(($in_Perms & 0x0002) ? 'w' : '-') .
-	(($in_Perms & 0x0001) ? (($in_Perms & 0x0200) ? 't' : 'x' ) :
-	(($in_Perms & 0x0200) ? 'T' : '-'));
+	$sP .= (($in_Perms&0x0004) ? 'r' : '-').
+	(($in_Perms&0x0002) ? 'w' : '-').
+	(($in_Perms&0x0001) ? (($in_Perms&0x0200) ? 't' : 'x') : (($in_Perms&0x0200) ? 'T' : '-'));
 	return $sP;
 }
 
-function permission_check($name,$args,$verbose=True)
+function permission_check($name, $args, $verbose = True)
 {
-	global $passed_icon, $error_icon, $warning_icon,$is_windows;
+	global $passed_icon, $error_icon, $warning_icon, $is_windows;
 	//echo "<p>permision_check('$name',".print_r($args,True).",'$verbose')</p>\n";
 
 	// add a ../ for non-absolute pathes
 	$rel_name = $name;
-	if ($name && substr($name,0,3) != '../' && $name[0] != '/' && $name[0] != '\\' && strpos($name,':') === false)
+	if ($name && substr($name, 0, 3) != '../' && $name[0] != '/' && $name[0] != '\\' && strpos($name, ':') === false)
 	{
 		$name = '../'.$name;
 	}
@@ -623,22 +619,22 @@ 
 	if (isset($args['is_readable']))
 	{
 		$checks[] = lang('readable by the webserver');
-		$check_not = (!$args['is_readable']?lang('not'):'');
+		$check_not = (!$args['is_readable'] ?lang('not') : '');
 	}
 	if (isset($args['is_writable']))
 	{
 		$checks[] = lang('writable by the webserver');
-		$check_not = (!$args['is_writable']?lang('not'):'');
+		$check_not = (!$args['is_writable'] ?lang('not') : '');
 	}
 	if (isset($args['is_world_readable']))
 	{
 		$checks[] = lang('world readable');
-		$check_not = (!$args['is_world_readable']?lang('not'):'');
+		$check_not = (!$args['is_world_readable'] ?lang('not') : '');
 	}
 	if (isset($args['is_world_writable']))
 	{
 		$checks[] = lang('world writable');
-		$check_not = (!$args['is_world_writable']?lang('not'):'');
+		$check_not = (!$args['is_world_writable'] ?lang('not') : '');
 	}
 
 	if (isset($args['msg']) && ($msg = $args['msg']))
@@ -647,7 +643,7 @@ 
 	}
 	else
 	{
-		$msg = lang('Checking file-permissions of %1 for %2 %3: %4',$rel_name,$check_not,implode(', ',$checks),$perms)."<br />\n";
+		$msg = lang('Checking file-permissions of %1 for %2 %3: %4', $rel_name, $check_not, implode(', ', $checks), $perms)."<br />\n";
 	}
 	$extra_error_msg = '';
 	if (isset($args['error']) && $args['error'])
@@ -656,13 +652,13 @@ 
 	}
 	if (!file_exists($name))
 	{
-		echo '<div>'. $error_icon . '<span class="setup_error">' . $msg . lang('%1 does not exist !!!',$rel_name).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.'<span class="setup_error">'.$msg.lang('%1 does not exist !!!', $rel_name).$extra_error_msg."</span></div>\n";
 		return False;
 	}
 	$warning = False;
 	if (!$GLOBALS['run_by_webserver'] && (@$args['is_readable'] || @$args['is_writable']))
 	{
-		echo $warning_icon.' '.$msg. lang('Check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known.')."\n";
+		echo $warning_icon.' '.$msg.lang('Check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known.')."\n";
 		unset($args['is_readable']);
 		unset($args['is_writable']);
 		$warning = True;
@@ -670,22 +666,22 @@ 
 	$Ok = True;
 	if (isset($args['is_writable']) && is_writable($name) != $args['is_writable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_writable']?lang('not').' ':'',lang('writable by the webserver')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_writable'] ?lang('not').' ' : '', lang('writable by the webserver')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
 	if (isset($args['is_readable']) && is_readable($name) != $args['is_readable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_readable']?lang('not').' ':'',lang('readable by the webserver')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_readable'] ?lang('not').' ' : '', lang('readable by the webserver')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
-	if (!$is_windows && isset($args['is_world_readable']) && !(fileperms($name) & 04) == $args['is_world_readable'])
+	if (!$is_windows && isset($args['is_world_readable']) && !(fileperms($name)&04) == $args['is_world_readable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_world_readable']?lang('not').' ':'',lang('world readable')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_world_readable'] ?lang('not').' ' : '', lang('world readable')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
-	if (!$is_windows && isset($args['is_world_writable']) && !(fileperms($name) & 02) == $args['is_world_writable'])
+	if (!$is_windows && isset($args['is_world_writable']) && !(fileperms($name)&02) == $args['is_world_writable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_world_writable']?lang('not').' ':'',lang('world writable')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_world_writable'] ?lang('not').' ' : '', lang('world writable')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
 	if ($Ok && !$warning && $verbose)
@@ -697,16 +693,16 @@ 
 		if ($verbose)
 		{
 			@set_time_limit(0);
-			echo "<div class='setup_info'>" . lang('This might take a while, please wait ...')."</div>\n";
+			echo "<div class='setup_info'>".lang('This might take a while, please wait ...')."</div>\n";
 			flush();
 		}
 		@set_time_limit(0);
 		$handle = @opendir($name);
-		while($handle && ($file = readdir($handle)))
+		while ($handle && ($file = readdir($handle)))
 		{
 			if ($file != '.' && $file != '..')
 			{
-				$Ok = $Ok && permission_check(($name!='.'?$name.'/':'').$file,$args,False);
+				$Ok = $Ok && permission_check(($name != '.' ? $name.'/' : '').$file, $args, False);
 			}
 		}
 		if ($handle) closedir($handle);
@@ -719,12 +715,12 @@ 
 function mk_value($value)
 {
 	$matches = null;
-	if (!preg_match('/^([0-9]+)([mk]+)$/i',$value,$matches)) return $value;
+	if (!preg_match('/^([0-9]+)([mk]+)$/i', $value, $matches)) return $value;
 
-	return (strtolower($matches[2]) == 'm' ? 1024*1024 : 1024) * (int) $matches[1];
+	return (strtolower($matches[2]) == 'm' ? 1024 * 1024 : 1024) * (int)$matches[1];
 }
 
-function php_ini_check($name,$args)
+function php_ini_check($name, $args)
 {
 	global $passed_icon, $error_icon, $warning_icon, $is_windows;
 
@@ -742,20 +738,20 @@ 
 	{
 		case 'not set':
 			$check = lang('not set');
-			$result = !($ini_value & $args['value']);
+			$result = !($ini_value&$args['value']);
 			break;
 		case 'set':
 			$check = lang('set');
-			$result = !!($ini_value & $args['value']);
+			$result = !!($ini_value&$args['value']);
 			break;
 		case '>=':
-			$result = !$ini_value ||	// value not used, eg. no memory limit
-			(int) mk_value($ini_value) >= (int) mk_value($args['value']);
+			$result = !$ini_value || // value not used, eg. no memory limit
+			(int)mk_value($ini_value) >= (int)mk_value($args['value']);
 			break;
 		case 'contain':
 			$check = lang('contain');
 			$sep = $is_windows ? '/[; ]+/' : '/[: ]+/';
-			$result = in_array($args['value'],preg_split($sep,$ini_value));
+			$result = in_array($args['value'], preg_split($sep, $ini_value));
 			break;
 		case '!=':
 			$check = lang('set and not');
@@ -772,9 +768,9 @@ 
 			$tz = new DateTimeZone($ini_value);
 			unset($tz);
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
-			$result = false;	// no valid timezone
+			$result = false; // no valid timezone
 		}
 	}
 	$msg = ' '.lang('Checking php.ini').": $name $check $verbose_value: <span class='setup_info'>ini_get('$name')='$ini_value'$ini_value_verbose</span>";
@@ -796,7 +792,7 @@ 
 		elseif (!isset($args['safe_mode']))
 		{
 			echo "<div>".$warning_icon.' <span class="setup_warning">'.$msg.'</span><div class="setup_info">'.
-				lang('%1 is needed by: %2.',$name,is_array($args['from']) ? implode(', ',$args['from']) : $args['from'])
+				lang('%1 is needed by: %2.', $name, is_array($args['from']) ? implode(', ', $args['from']) : $args['from'])
 				."</div></div>\n";
 		}
 		if (isset($args['safe_mode']) && $safe_mode || @$args['change'])
@@ -806,7 +802,7 @@ 
 				echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.'</span></div>';
 			}
 			echo "<div class='setup_error'>\n";
-			echo '*** '.lang('Please make the following change in your php.ini').' ('.get_php_ini().'): '.(@$args['safe_mode']?$args['safe_mode']:$args['change'])."<br />\n";
+			echo '*** '.lang('Please make the following change in your php.ini').' ('.get_php_ini().'): '.(@$args['safe_mode'] ? $args['safe_mode'] : $args['change'])."<br />\n";
 			echo '*** '.lang('AND reload your webserver, so the above changes take effect !!!')."</div>\n";
 		}
 	}
@@ -821,16 +817,16 @@ 
 	ob_end_clean();
 
 	$found = null;
-	return preg_match('/\(php.ini\).*<\/td><td[^>]*>([^ <]+)/',$phpinfo,$found) ? $found[1] : False;
+	return preg_match('/\(php.ini\).*<\/td><td[^>]*>([^ <]+)/', $phpinfo, $found) ? $found[1] : False;
 }
 
 function gd_check()
 {
 	global $passed_icon, $warning_icon;
 
-	$available = (function_exists('imagecopyresampled')  || function_exists('imagecopyresized'));
+	$available = (function_exists('imagecopyresampled') || function_exists('imagecopyresized'));
 
-	echo "<div>".($available ? $passed_icon : $warning_icon).' <span'.($available?'':' class="setup_warning"').'>'.lang('Checking for GD support...').': '.($available ? lang('True') : lang('False'))."</span></div>\n";
+	echo "<div>".($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking for GD support...').': '.($available ? lang('True') : lang('False'))."</span></div>\n";
 
 	if (!$available)
 	{
@@ -849,24 +845,24 @@ 
 	));
 	$ConfigDomain = $_REQUEST['ConfigDomain'];
 	if (@$_GET['intro']) {
-		if(($ConfigLang = setup::get_lang()))
+		if (($ConfigLang = setup::get_lang()))
 		{
-			$GLOBALS['egw_setup']->set_cookie('ConfigLang',$ConfigLang,(int) (time()+(1200*9)),'/');
+			$GLOBALS['egw_setup']->set_cookie('ConfigLang', $ConfigLang, (int)(time() + (1200 * 9)), '/');
 		}
-		$GLOBALS['egw_setup']->html->show_header(lang('Welcome to the eGroupWare Installation'),False,'config');
+		$GLOBALS['egw_setup']->html->show_header(lang('Welcome to the eGroupWare Installation'), False, 'config');
 		echo '<h1>'.lang('Welcome to the eGroupWare Installation')."</h1>\n";
-		if(!$ConfigLang)
+		if (!$ConfigLang)
 		{
-			echo '<p><form action="check_install.php?intro=1" method="Post">Please Select your language '.setup_html::lang_select(True,'en')."</form></p>\n";
+			echo '<p><form action="check_install.php?intro=1" method="Post">Please Select your language '.setup_html::lang_select(True, 'en')."</form></p>\n";
 		}
 		echo '<p>'.lang('The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application.').'</p>';
 		echo '<p>'.lang('We will now run a series of tests, which may take a few minutes.  Click the link below to proceed.').'</p>';
 		echo '<h3><a href="check_install.php">'.lang('Run installation tests').'</a></h3>';
 		echo '<p><a href="manageheader.php">'.lang('Skip the installation tests (not recommended)')."</a></p>\n";
-		$setup_tpl->pparse('out','T_footer');
+		$setup_tpl->pparse('out', 'T_footer');
 		exit;
 	} else {
-		$GLOBALS['egw_setup']->html->show_header(lang('Checking the eGroupWare Installation'),False,'config',$ConfigDomain ? $ConfigDomain . '(' . @$GLOBALS['egw_domain'][$ConfigDomain]['db_type'] . ')' : '');
+		$GLOBALS['egw_setup']->html->show_header(lang('Checking the eGroupWare Installation'), False, 'config', $ConfigDomain ? $ConfigDomain.'('.@$GLOBALS['egw_domain'][$ConfigDomain]['db_type'].')' : '');
 		echo '<h1>'.lang('Checking the eGroupWare Installation')."</h1>\n";
 		# echo "<pre style=\"text-align: left;\">\n";;
 	}
@@ -880,7 +876,7 @@ 
 $Ok = True;
 foreach ($sorted_checks as $name => $args)
 {
-	$check_ok = $args['func']($name,$args);
+	$check_ok = $args['func']($name, $args);
 	$Ok = $Ok && $check_ok;
 }
 
@@ -892,9 +888,9 @@ 
 	{
 		if (!$Ok)
 		{
-			echo '<h3>'.lang('Please fix the above errors (%1) and warnings(%2)',$error_icon,$warning_icon)."</h3>\n";
+			echo '<h3>'.lang('Please fix the above errors (%1) and warnings(%2)', $error_icon, $warning_icon)."</h3>\n";
 			echo '<h3><a href="check_install.php">'.lang('Click here to re-run the installation tests')."</a></h3>\n";
-			echo '<h3>'.lang('or %1Continue to the Header Admin%2','<a href="manageheader.php">','</a>')."</h3>\n";
+			echo '<h3>'.lang('or %1Continue to the Header Admin%2', '<a href="manageheader.php">', '</a>')."</h3>\n";
 		}
 		else
 		{
@@ -906,10 +902,10 @@ 
 		echo '<h3>';
 		if (!$Ok)
 		{
-			echo lang('Please fix the above errors (%1) and warnings(%2)',$error_icon,$warning_icon).'. ';
+			echo lang('Please fix the above errors (%1) and warnings(%2)', $error_icon, $warning_icon).'. ';
 		}
-		echo '<br /><a href="'.str_replace('check_install.php','',@$_SERVER['HTTP_REFERER']).'">'.lang('Return to Setup')."</a></h3>\n";
+		echo '<br /><a href="'.str_replace('check_install.php', '', @$_SERVER['HTTP_REFERER']).'">'.lang('Return to Setup')."</a></h3>\n";
 	}
-	$setup_tpl->pparse('out','T_footer');
+	$setup_tpl->pparse('out', 'T_footer');
 	//echo "</body>\n</html>\n";
 }