EGroupware / egroupware

api/src/Etemplate.php

Doc Comments +1 added lines, -1 removed lines

@@ -543,7 +543,7 @@
 	 *
 	 * @param string $name cell-name
 	 * @param string $attr attribute-name
-	 * @param mixed $val if not NULL sets attribute else returns it
+	 * @param boolean|string $val if not NULL sets attribute else returns it
 	 * @return reference to attribute
 	 * @deprecated use setElementAttribute($name, $attr, $val)
 	 */

Braces +77 added lines, -20 removed lines

@@ -47,14 +47,24 @@ 
 	function __construct($name='',$load_via='')
 	{
 		// we do NOT call parent consturctor, as we only want to enherit it's (static) methods
-		if (false) parent::__construct ($name);	// satisfy IDE, as we dont call parent constructor
+		if (false)
+		{
+			parent::__construct ($name);
+		}
+		// satisfy IDE, as we dont call parent constructor
 
 		$this->sitemgr = isset($GLOBALS['Common_BO']) && is_object($GLOBALS['Common_BO']);
 
-		if ($name) $this->read($name,$template='default','default',0,'',$load_via);
+		if ($name)
+		{
+			$this->read($name,$template='default','default',0,'',$load_via);
+		}
 
 		// generate new etemplate request object, if not already existing
-		if(!isset(self::$request)) self::$request = Etemplate\Request::read();
+		if(!isset(self::$request))
+		{
+			self::$request = Etemplate\Request::read();
+		}
 	}
 
 	/**
@@ -111,7 +121,10 @@ 
 
 		foreach($hook_data as $extras)
 		{
-			if (!$extras) continue;
+			if (!$extras)
+			{
+				continue;
+			}
 
 			foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
 			{
@@ -136,7 +149,10 @@ 
 		// Include the etemplate2 javascript code
 		Framework::includeJS('etemplate', 'etemplate2', 'api');
 
-		if (!$this->rel_path) throw new Exception\AssertionFailed("No (valid) template '$this->name' found!");
+		if (!$this->rel_path)
+		{
+			throw new Exception\AssertionFailed("No (valid) template '$this->name' found!");
+		}
 
 		if ($output_mode == 4)
 		{
@@ -151,14 +167,23 @@ 
 		self::$request->preserv = $preserv ? $preserv : array();
 		self::$request->method = $method;
 		self::$request->ignore_validation = $ignore_validation;
-		if (self::$request->output_mode == -1) self::$request->output_mode = 0;
+		if (self::$request->output_mode == -1)
+		{
+			self::$request->output_mode = 0;
+		}
 		self::$request->template = $this->as_array();
 
-		if (empty($this->name)) throw new Exception\AssertionFailed("Template  name is not set '$this->name' !");
+		if (empty($this->name))
+		{
+			throw new Exception\AssertionFailed("Template  name is not set '$this->name' !");
+		}
 		// instanciate template to fill self::$request->sel_options for select-* widgets
 		// not sure if we want to handle it this way, thought otherwise we will have a few ajax request for each dialog fetching predefined selectboxes
 		$template = self::instance($this->name, $this->template_set, $this->version, $this->laod_via);
-		if (!$template) throw new Exception\AssertionFailed("Template $this->name not instanciable! Maybe you forgot to rename template id.");
+		if (!$template)
+		{
+			throw new Exception\AssertionFailed("Template $this->name not instanciable! Maybe you forgot to rename template id.");
+		}
 		$template->run('beforeSendToClient', array('', array('cont'=>$content)));
 
 		// some apps (eg. InfoLog) set app_header only in get_rows depending on filter settings
@@ -202,10 +227,13 @@ 
 			'data' => $data,
 			'DOMNodeID' => $dom_id,
 		);
-		if (self::$response)	// call is within an ajax event / form submit
+		if (self::$response)
+		{
+			// call is within an ajax event / form submit
 		{
 			//error_log("Ajax " . __LINE__);
 			self::$response->generic('et2_load', $load_array+Framework::get_extra());
+		}
 			Framework::clear_extra();	// to not send/set it twice for multiple etemplates (eg. CRM view)
 		}
 		else	// first call
@@ -287,7 +315,10 @@ 
 	{
 		foreach($sel_options as &$options)
 		{
-			if (!is_array($options)||empty($options)) continue;
+			if (!is_array($options)||empty($options))
+			{
+				continue;
+			}
 			foreach($options as $key => $value)
 			{
 				if (is_numeric($key) && (!is_array($value) || !isset($value['value'])))
@@ -325,7 +356,10 @@ 
 
 		// Set current app for validation
 		list($app) = explode('.',self::$request->method);
-		if(!$app) list($app) = explode('::',self::$request->method);
+		if(!$app)
+		{
+			list($app) = explode('::',self::$request->method);
+		}
 		if($app)
 		{
 			Translation::add_app($app);
@@ -356,7 +390,10 @@ 
 			'location_name'   => $template->id,
 		) + self::complete_array_merge(self::$request->preserv, $validated)) as $extras)
 		{
-			if (!$extras) continue;
+			if (!$extras)
+			{
+				continue;
+			}
 
 			foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
 			{
@@ -386,10 +423,15 @@ 
 		{
 			foreach($hook_data as $extras)
 			{
-				if (!$extras) continue;
+				if (!$extras)
+				{
+					continue;
+				}
 
-				foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
-					if ($extra['data'] && is_array($extra['data'])) {
+				foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
+				{
+					if ($extra['data'] && is_array($extra['data']))
+					{
 						$content = array_merge($content, $extra['data']);
 					}
 				}
@@ -428,7 +470,10 @@ 
 	 */
 	static public function process_exec()
 	{
-		if (get_magic_quotes_gpc()) $_POST['value'] = stripslashes($_POST['value']);
+		if (get_magic_quotes_gpc())
+		{
+			$_POST['value'] = stripslashes($_POST['value']);
+		}
 		$content = json_decode($_POST['value'],true);
 		//error_log(__METHOD__."(".array2string($content).")");
 
@@ -580,16 +625,22 @@ 
 	{
 		if (is_array($new))
 		{
-			if (!is_array($old)) $old = (array) $old;
+			if (!is_array($old))
+			{
+				$old = (array) $old;
+			}
 
 			foreach($new as $k => $v)
 			{
 				if (!is_array($v) || !isset($old[$k]) || 	// no array or a new array
 					isset($v[0]) && !is_array($v[0]) && isset($v[count($v)-1])	|| // or no associative array, eg. selecting multiple accounts
-					is_array($v) && count($v) == 0)			// Empty array replacing non-empty
+					is_array($v) && count($v) == 0)
+				{
+					// Empty array replacing non-empty
 				{
 					$old[$k] = $v;
 				}
+				}
 				else
 				{
 					$old[$k] = self::complete_array_merge($old[$k],$v);
@@ -642,10 +693,16 @@ 
 		if (is_null($dec_separator))
 		{
 			$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
-			if (empty($dec_separator)) $dec_separator = '.';
+			if (empty($dec_separator))
+			{
+				$dec_separator = '.';
+			}
 			$thousands_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][1];
 		}
-		if ((string)$number === '') return '';
+		if ((string)$number === '')
+		{
+			return '';
+		}
 
 		return number_format(str_replace(' ','',$number),$num_decimal_places,$dec_separator,$readonly ? $thousands_separator : '');
 	}

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

@@ -158,7 +158,7 @@
 		// instanciate template to fill self::$request->sel_options for select-* widgets
 		// not sure if we want to handle it this way, thought otherwise we will have a few ajax request for each dialog fetching predefined selectboxes
 		$template = self::instance($this->name, $this->template_set, $this->version, $this->laod_via);
-		if (!$template) throw new Exception\AssertionFailed("Template $this->name not instanciable! Maybe you forgot to rename template id.");
+		if (!$template) throw new Exception\AssertionFailed("template $this->name not instanciable! Maybe you forgot to rename template id.");
 		$template->run('beforeSendToClient', array('', array('cont'=>$content)));
 
 		// some apps (eg. InfoLog) set app_header only in get_rows depending on filter settings

Spacing +58 added lines, -59 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @public boolean
 	 */
-	public $sitemgr=false;
+	public $sitemgr = false;
 
 	/**
 	 * Tell egw framework it's ok to call this
@@ -44,17 +44,17 @@ 
 	 * @param string $name of etemplate or array with name and other keys
 	 * @param string|array $load_via with keys of other etemplate to load in order to get $name
 	 */
-	function __construct($name='',$load_via='')
+	function __construct($name = '', $load_via = '')
 	{
 		// we do NOT call parent consturctor, as we only want to enherit it's (static) methods
-		if (false) parent::__construct ($name);	// satisfy IDE, as we dont call parent constructor
+		if (false) parent::__construct($name); // satisfy IDE, as we dont call parent constructor
 
 		$this->sitemgr = isset($GLOBALS['Common_BO']) && is_object($GLOBALS['Common_BO']);
 
-		if ($name) $this->read($name,$template='default','default',0,'',$load_via);
+		if ($name) $this->read($name, $template = 'default', 'default', 0, '', $load_via);
 
 		// generate new etemplate request object, if not already existing
-		if(!isset(self::$request)) self::$request = Etemplate\Request::read();
+		if (!isset(self::$request)) self::$request = Etemplate\Request::read();
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 *
 	 * @param string|array $params url or array with get-params incl. menuaction
 	 */
-	static function location($params='')
+	static function location($params = '')
 	{
 		Framework::redirect_link(is_array($params) ? '/index.php' : $params,
 			is_array($params) ? $params : '');
@@ -100,7 +100,7 @@ 
 	 * @param array $changes change made in the last call if looping, only used internaly by process_exec
 	 * @return string html for $output_mode == 1, else nothing
 	 */
-	function exec($method,array $content,array $sel_options=null,array $readonlys=null,array $preserv=null,$output_mode=0,$ignore_validation='',array $changes=null)
+	function exec($method, array $content, array $sel_options = null, array $readonlys = null, array $preserv = null, $output_mode = 0, $ignore_validation = '', array $changes = null)
 	{
 		$hook_data = Hooks::process(
 			array('hook_location'   => 'etemplate2_before_exec') +
@@ -109,11 +109,11 @@ 
 			$content
 		);
 
-		foreach($hook_data as $extras)
+		foreach ($hook_data as $extras)
 		{
 			if (!$extras) continue;
 
-			foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
+			foreach (isset($extras[0]) ? $extras : array($extras) as $extra)
 			{
 				if ($extra['data'] && is_array($extra['data']))
 				{
@@ -143,7 +143,7 @@ 
 			$output_mode = 0;
 			self::$response = Json\Response::get();
 		}
-		self::$request->output_mode = $output_mode;	// let extensions "know" they are run eg. in a popup
+		self::$request->output_mode = $output_mode; // let extensions "know" they are run eg. in a popup
 		self::$request->content = self::$cont = $content;
 		self::$request->changes = $changes;
 		self::$request->sel_options = is_array($sel_options) ? self::fix_sel_options($sel_options) : array();
@@ -166,15 +166,15 @@ 
 
 		// compile required translations translations
 		$currentapp = $GLOBALS['egw_info']['flags']['currentapp'];
-		$langRequire = array('common' => array(), 'etemplate' => array());	// keep that order
-		foreach(Translation::$loaded_apps as $l_app => $lang)
+		$langRequire = array('common' => array(), 'etemplate' => array()); // keep that order
+		foreach (Translation::$loaded_apps as $l_app => $lang)
 		{
 			if (!in_array($l_app, array($currentapp, 'custom')))
 			{
 				$langRequire[$l_app] = array('app' => $l_app, 'lang' => $lang, 'etag' => Translation::etag($l_app, $lang));
 			}
 		}
-		foreach(array($currentapp, 'custom') as $l_app)
+		foreach (array($currentapp, 'custom') as $l_app)
 		{
 			if (isset(Translation::$loaded_apps[$l_app]))
 			{
@@ -195,7 +195,7 @@ 
 		);
 
 		// Info required to load the etemplate client-side
-		$dom_id = str_replace('.','-',$this->dom_id);
+		$dom_id = str_replace('.', '-', $this->dom_id);
 		$load_array = array(
 			'name' => $this->name,
 			'url' => self::rel2url($this->rel_path),
@@ -205,16 +205,16 @@ 
 		if (self::$response)	// call is within an ajax event / form submit
 		{
 			//error_log("Ajax " . __LINE__);
-			self::$response->generic('et2_load', $load_array+Framework::get_extra());
-			Framework::clear_extra();	// to not send/set it twice for multiple etemplates (eg. CRM view)
+			self::$response->generic('et2_load', $load_array + Framework::get_extra());
+			Framework::clear_extra(); // to not send/set it twice for multiple etemplates (eg. CRM view)
 		}
 		else	// first call
 		{
 			// check if application of template has a app.js file --> load it
-			list($app) = explode('.',$this->name);
+			list($app) = explode('.', $this->name);
 			if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/js/app.js'))
 			{
-				Framework::includeJS('.','app',$app,false);
+				Framework::includeJS('.', 'app', $app, false);
 			}
 			// Category styles
 			Categories::css($app);
@@ -232,8 +232,8 @@ 
 				$content = '<form target="egw_iframe_autocomplete_helper" action="'.$form_action.'" id="'.$dom_id.'" class="et2_container"></form>'."\n".
 					'<iframe name="egw_iframe_autocomplete_helper" style="width:0;height:0;position: absolute;visibility:hidden;"></iframe>';
 				$GLOBALS['egw']->framework->response->generic("data", array($content));
-				$GLOBALS['egw']->framework->response->generic('et2_load',$load_array+Framework::get_extra());
-				Framework::clear_extra();	// to not send/set it twice for multiple etemplates (eg. CRM view)
+				$GLOBALS['egw']->framework->response->generic('et2_load', $load_array + Framework::get_extra());
+				Framework::clear_extra(); // to not send/set it twice for multiple etemplates (eg. CRM view)
 				self::$request = null;
 				return;
 			}
@@ -252,7 +252,7 @@ 
 				echo '<div id="popupMainDiv" class="popupMainDiv">'."\n";
 			}
 			// Send any accumulated json responses - after flush to avoid sending the buffer as a response
-			if(Json\Response::isJSONResponse())
+			if (Json\Response::isJSONResponse())
 			{
 				$load_array['response'] = Json\Response::get()->returnResult();
 			}
@@ -279,10 +279,10 @@ 
 	 */
 	static protected function fix_sel_options(array $sel_options)
 	{
-		foreach($sel_options as &$options)
+		foreach ($sel_options as &$options)
 		{
-			if (!is_array($options)||empty($options)) continue;
-			foreach($options as $key => $value)
+			if (!is_array($options) || empty($options)) continue;
+			foreach ($options as $key => $value)
 			{
 				if (is_numeric($key) && (!is_array($value) || !isset($value['value'])))
 				{
@@ -318,9 +318,9 @@ 
 		}
 
 		// Set current app for validation
-		list($app) = explode('.',self::$request->method);
-		if(!$app) list($app) = explode('::',self::$request->method);
-		if($app)
+		list($app) = explode('.', self::$request->method);
+		if (!$app) list($app) = explode('::', self::$request->method);
+		if ($app)
 		{
 			Translation::add_app($app);
 			$GLOBALS['egw_info']['flags']['currentapp'] = $app;
@@ -329,7 +329,7 @@ 
 		$expand = array(
 			'cont' => &self::$request->content,
 		);
-		$template->run('validate', array('', $expand, $_content, &$validated), true);	// $respect_disabled=true: do NOT validate disabled widgets and children
+		$template->run('validate', array('', $expand, $_content, &$validated), true); // $respect_disabled=true: do NOT validate disabled widgets and children
 
 		if ($no_validation)
 		{
@@ -345,14 +345,14 @@ 
 		// tell request call to remove request, if it is not modified eg. by call to exec in callback
 		self::$request->remove_if_not_modified();
 
-		foreach(Hooks::process(array(
+		foreach (Hooks::process(array(
 			'hook_location'   => 'etemplate2_before_process',
 			'location_name'   => $template->id,
 		) + self::complete_array_merge(self::$request->preserv, $validated)) as $extras)
 		{
 			if (!$extras) continue;
 
-			foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
+			foreach (isset($extras[0]) ? $extras : array($extras) as $extra)
 			{
 				if ($extra['data'] && is_array($extra['data']))
 				{
@@ -365,8 +365,7 @@ 
 		//error_log(' validated='.array2string($validated));
 		$content = ExecMethod(self::$request->method, self::complete_array_merge(self::$request->preserv, $validated));
 
-		$tcontent = is_array($content) ? $content :
-			self::complete_array_merge(self::$request->preserv, $validated);
+		$tcontent = is_array($content) ? $content : self::complete_array_merge(self::$request->preserv, $validated);
 
 		$hook_data = Hooks::process(
 			array(
@@ -378,11 +377,11 @@ 
 
 		if (is_array($content))
 		{
-			foreach($hook_data as $extras)
+			foreach ($hook_data as $extras)
 			{
 				if (!$extras) continue;
 
-				foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
+				foreach (isset($extras[0]) ? $extras : array($extras) as $extra) {
 					if ($extra['data'] && is_array($extra['data'])) {
 						$content = array_merge($content, $extra['data']);
 					}
@@ -394,7 +393,7 @@ 
 		if (isset($GLOBALS['egw_info']['flags']['java_script']))
 		{
 			// Strip out any script tags
-			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is','/<\/script>/'),array('$2',''),$GLOBALS['egw_info']['flags']['java_script']);
+			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is', '/<\/script>/'), array('$2', ''), $GLOBALS['egw_info']['flags']['java_script']);
 			self::$response->script($GLOBALS['egw_info']['flags']['java_script']);
 			//error_log($app .' added javascript to $GLOBALS[egw_info][flags][java_script] - use Json\Response->script() instead.');
 		}
@@ -423,7 +422,7 @@ 
 	static public function process_exec()
 	{
 		if (get_magic_quotes_gpc()) $_POST['value'] = stripslashes($_POST['value']);
-		$content = json_decode($_POST['value'],true);
+		$content = json_decode($_POST['value'], true);
 		//error_log(__METHOD__."(".array2string($content).")");
 
 		self::$request = Etemplate\Request::read($_POST['etemplate_exec_id']);
@@ -437,7 +436,7 @@ 
 		$expand = array(
 			'cont' => &self::$request->content,
 		);
-		$template->run('validate', array('', $expand, $content, &$validated), true);	// $respect_disabled=true: do NOT validate disabled widgets and children
+		$template->run('validate', array('', $expand, $content, &$validated), true); // $respect_disabled=true: do NOT validate disabled widgets and children
 		if (self::validation_errors(self::$request->ignore_validation))
 		{
 			error_log(__METHOD__."(,".array2string($content).') validation_errors='.array2string(self::$validation_errors));
@@ -473,7 +472,7 @@ 
 	 *
 	 * @ToDo supported customized templates stored in DB
 	 */
-	public function read($name,$template_set=null,$lang='default',$group=0,$version='',$load_via='')
+	public function read($name, $template_set = null, $lang = 'default', $group = 0, $version = '', $load_via = '')
 	{
 
 		// For mobile experience try to load custom mobile templates
@@ -482,9 +481,9 @@ 
 			$template_set = "mobile";
 		}
 
-		unset($lang); unset($group);	// not used, but in old signature
-		$this->rel_path = self::relPath($this->name=$name, $this->template_set=$template_set,
-			$this->version=$version, $this->laod_via = $load_via);
+		unset($lang); unset($group); // not used, but in old signature
+		$this->rel_path = self::relPath($this->name = $name, $this->template_set = $template_set,
+			$this->version = $version, $this->laod_via = $load_via);
 		//error_log(__METHOD__."('$name', '$template_set', '$lang', $group, '$version', '$load_via') rel_path=".array2string($this->rel_path));
 
 		$this->dom_id = $name;
@@ -527,7 +526,7 @@ 
 	 * @return mixed reference to attribute, usually NULL
 	 * @deprecated use getElementAttribute($name, $attr)
 	 */
-	public function &get_cell_attribute($name,$attr)
+	public function &get_cell_attribute($name, $attr)
 	{
 		return self::getElementAttribute($name, $attr);
 	}
@@ -541,7 +540,7 @@ 
 	 * @return reference to attribute
 	 * @deprecated use setElementAttribute($name, $attr, $val)
 	 */
-	public function &set_cell_attribute($name,$attr,$val)
+	public function &set_cell_attribute($name, $attr, $val)
 	{
 		return self::setElementAttribute($name, $attr, $val);
 	}
@@ -554,7 +553,7 @@ 
 	 * @return reference to attribute
 	 * @deprecated use disableElement($name, $disabled=true)
 	 */
-	public function disable_cells($name,$disabled=True)
+	public function disable_cells($name, $disabled = True)
 	{
 		return self::disableElement($name, $disabled);
 	}
@@ -570,23 +569,23 @@ 
 	 * @param array $new
 	 * @return array the merged array
 	 */
-	public static function complete_array_merge($old,$new)
+	public static function complete_array_merge($old, $new)
 	{
 		if (is_array($new))
 		{
-			if (!is_array($old)) $old = (array) $old;
+			if (!is_array($old)) $old = (array)$old;
 
-			foreach($new as $k => $v)
+			foreach ($new as $k => $v)
 			{
-				if (!is_array($v) || !isset($old[$k]) || 	// no array or a new array
-					isset($v[0]) && !is_array($v[0]) && isset($v[count($v)-1])	|| // or no associative array, eg. selecting multiple accounts
+				if (!is_array($v) || !isset($old[$k]) || // no array or a new array
+					isset($v[0]) && !is_array($v[0]) && isset($v[count($v) - 1]) || // or no associative array, eg. selecting multiple accounts
 					is_array($v) && count($v) == 0)			// Empty array replacing non-empty
 				{
 					$old[$k] = $v;
 				}
 				else
 				{
-					$old[$k] = self::complete_array_merge($old[$k],$v);
+					$old[$k] = self::complete_array_merge($old[$k], $v);
 				}
 			}
 		}
@@ -598,7 +597,7 @@ 
 	 *
 	 * @param array $content =null
 	 */
-	public function debug(array $content=null)
+	public function debug(array $content = null)
 	{
 		$GLOBALS['egw']->framework->render(print_r($content, true));
 	}
@@ -612,11 +611,11 @@ 
 	 * @param int &$max_upload=null on return max. upload size in byte
 	 * @return string
 	 */
-	static function max_upload_size_message(&$max_upload=null)
+	static function max_upload_size_message(&$max_upload = null)
 	{
 		$upload_max_filesize = ini_get('upload_max_filesize');
 		$post_max_size = ini_get('post_max_size');
-		$max_upload = min(self::km2int($upload_max_filesize),self::km2int($post_max_size)-2800);
+		$max_upload = min(self::km2int($upload_max_filesize), self::km2int($post_max_size) - 2800);
 
 		return lang('Maximum size for uploads').': '.Vfs::hsize($max_upload).
 			" (php.ini: upload_max_filesize=$upload_max_filesize, post_max_size=$post_max_size)";
@@ -630,9 +629,9 @@ 
 	 * @param boolean $readonly =true
 	 * @return string
 	 */
-	static public function number_format($number,$num_decimal_places=2,$readonly=true)
+	static public function number_format($number, $num_decimal_places = 2, $readonly = true)
 	{
-		static $dec_separator=null,$thousands_separator=null;
+		static $dec_separator = null, $thousands_separator = null;
 		if (is_null($dec_separator))
 		{
 			$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
@@ -641,7 +640,7 @@ 
 		}
 		if ((string)$number === '') return '';
 
-		return number_format(str_replace(' ','',$number),$num_decimal_places,$dec_separator,$readonly ? $thousands_separator : '');
+		return number_format(str_replace(' ', '', $number), $num_decimal_places, $dec_separator, $readonly ? $thousands_separator : '');
 	}
 
 	/**
@@ -654,13 +653,13 @@ 
 	{
 		if (!is_numeric($size))
 		{
-			switch(strtolower(substr($size,-1)))
+			switch (strtolower(substr($size, -1)))
 			{
 				case 'm':
-					$size = 1024*1024*(int)$size;
+					$size = 1024 * 1024 * (int)$size;
 					break;
 				case 'k':
-					$size = 1024*(int)$size;
+					$size = 1024 * (int)$size;
 					break;
 			}
 		}

api/src/Etemplate/Widget.php

Doc Comments +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 	 *
 	 * @param string|XMLReader $xml
 	 * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
-	 * @return Template current object or clone, if any attribute was set
+	 * @return Widget current object or clone, if any attribute was set
 	 */
 	public function set_attrs($xml, $cloned=true)
 	{

Indentation +6 added lines, -6 removed lines

@@ -903,12 +903,12 @@
 	}
 
 	/**
-	* Check if we have not ignored validation errors
-	*
-	* @param string $ignore_validation ='' if not empty regular expression for validation-errors to ignore
-	* @param string $cname =null name-prefix, which need to be ignored, default self::$name_vars
-	* @return boolean true if there are not ignored validation errors, false otherwise
-	*/
+	 * Check if we have not ignored validation errors
+	 *
+	 * @param string $ignore_validation ='' if not empty regular expression for validation-errors to ignore
+	 * @param string $cname =null name-prefix, which need to be ignored, default self::$name_vars
+	 * @return boolean true if there are not ignored validation errors, false otherwise
+	 */
 	public static function validation_errors($ignore_validation='',$cname='')
 	{
 		// not yet used: if (is_null($cname)) $cname = self::$name_vars;

Spacing +104 added lines, -104 removed lines

@@ -99,9 +99,9 @@ 
 		$this->id = $reader->getAttribute('id');
 
 		// Update content?
-		if(self::$cont == null)
+		if (self::$cont == null)
 			self::$cont = is_array(self::$request->content) ? self::$request->content : array();
-		if($this->id && is_array(self::$cont[$this->id]))
+		if ($this->id && is_array(self::$cont[$this->id]))
 		{
 			$old_cont = self::$cont;
 			self::$cont = self::$cont[$this->id];
@@ -110,7 +110,7 @@ 
 		// read all attributes
 		$this->set_attrs($reader);
 
-		while($reader->read() && $reader->depth > $depth)
+		while ($reader->read() && $reader->depth > $depth)
 		{
 			if ($reader->nodeType == XMLReader::ELEMENT && $reader->depth > $depth)
 			{
@@ -119,7 +119,7 @@ 
 		}
 
 		// Reset content as we leave
-		if($old_cont) {
+		if ($old_cont) {
 			self::$cont = $old_cont;
 		}
 	}
@@ -157,7 +157,7 @@ 
 	 * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
 	 * @return Template current object or clone, if any attribute was set
 	 */
-	public function set_attrs($xml, $cloned=true)
+	public function set_attrs($xml, $cloned = true)
 	{
 		$reader = self::get_reader($xml);
 
@@ -174,14 +174,14 @@ 
 
 		// read and set all attributes
 		$template = $this;
-		while($reader->moveToNextAttribute())
+		while ($reader->moveToNextAttribute())
 		{
 			if ($reader->name != 'id' && $template->attr[$reader->name] != $reader->value)
 			{
 				if (!$cloned)
 				{
 					$template = clone($this);
-					$cloned = true;	// only clone it once, otherwise we loose attributes!
+					$cloned = true; // only clone it once, otherwise we loose attributes!
 				}
 				// $reader->value is an object and therefore assigned by reference
 				// this is important to not loose content when validating dynamic generated tabs as in settings!
@@ -198,7 +198,7 @@ 
 				if ($legacy_options && $reader->name == 'options')
 				{
 					$legacy_options = explode(',', $legacy_options);
-					foreach(self::csv_split($value, count($legacy_options)) as $n => $val)
+					foreach (self::csv_split($value, count($legacy_options)) as $n => $val)
 					{
 						if ($legacy_options[$n] && (string)$val !== '') $template->attrs[$legacy_options[$n]] = $val;
 					}
@@ -207,9 +207,9 @@ 
 		}
 
 		// Add in anything in the modification array
-		if(is_array(self::$request->modifications[$this->id]))
+		if (is_array(self::$request->modifications[$this->id]))
 		{
-			$this->attrs = array_merge($this->attrs,self::$request->modifications[$this->id]);
+			$this->attrs = array_merge($this->attrs, self::$request->modifications[$this->id]);
 		}
 
 		return $template;
@@ -230,32 +230,32 @@ 
 	 * @param string $enclosure ='"'
 	 * @return array
 	 */
-	public static function csv_split($str,$num=null,$delimiter=',',$enclosure='"')
+	public static function csv_split($str, $num = null, $delimiter = ',', $enclosure = '"')
 	{
-		if (strpos($str,$enclosure) === false)
+		if (strpos($str, $enclosure) === false)
 		{
-			return is_null($num) ? explode($delimiter,$str) : explode($delimiter,$str,$num);	// no need to run this more expensive code
+			return is_null($num) ? explode($delimiter, $str) : explode($delimiter, $str, $num); // no need to run this more expensive code
 		}
-		$parts = explode($delimiter,$str);
-		for($n = 0; isset($parts[$n]); ++$n)
+		$parts = explode($delimiter, $str);
+		for ($n = 0; isset($parts[$n]); ++$n)
 		{
-			$part =& $parts[$n];
+			$part = & $parts[$n];
 			if ($part[0] === $enclosure)
 			{
-				while (isset($parts[$n+1]) && substr($part,-1) !== $enclosure)
+				while (isset($parts[$n + 1]) && substr($part, -1) !== $enclosure)
 				{
 					$part .= $delimiter.$parts[++$n];
 					unset($parts[$n]);
 				}
-				$part = substr(str_replace($enclosure.$enclosure,$enclosure,$part),1,-1);
+				$part = substr(str_replace($enclosure.$enclosure, $enclosure, $part), 1, -1);
 			}
 		}
-		$parts_renum = array_values($parts);	// renumber the parts (in case we had to concat them)
+		$parts_renum = array_values($parts); // renumber the parts (in case we had to concat them)
 
 		if ($num > 0 && count($parts_renum) > $num)
 		{
-			$parts_renum[$num-1] = implode($delimiter,array_slice($parts_renum,$num-1,count($parts_renum)-$num+1));
-			$parts_renum = array_slice($parts_renum,0,$num);
+			$parts_renum[$num - 1] = implode($delimiter, array_slice($parts_renum, $num - 1, count($parts_renum) - $num + 1));
+			$parts_renum = array_slice($parts_renum, 0, $num);
 		}
 		return $parts_renum;
 	}
@@ -282,7 +282,7 @@ 
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."('$class', ".array2string($widgets).") $class is no subclass of ".__CLASS__.'!');
 		}
-		foreach((array)$widgets as $widget)
+		foreach ((array)$widgets as $widget)
 		{
 			self::$widget_registry[$widget] = $class;
 		}
@@ -307,15 +307,15 @@ 
 
 		if (!$widget_registry)	// not in instance cache --> rescan from filesystem
 		{
-			foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__.'/Widget')) as $path)
+			foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__.'/Widget')) as $path)
 			{
-				if(substr($path, -4) == '.php')
+				if (substr($path, -4) == '.php')
 				{
 					try
 					{
 						include_once($path);
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
 						error_log($e->getMessage());
 					}
@@ -323,18 +323,18 @@ 
 			}
 
 			// Use hook to load custom widgets from other apps
-			$widgets = Api\Hooks::process('etemplate2_register_widgets',array(),true);
-			foreach($widgets as $list)
+			$widgets = Api\Hooks::process('etemplate2_register_widgets', array(), true);
+			foreach ($widgets as $list)
 			{
 				if (is_array($list))
 				{
-					foreach($list as $class)
+					foreach ($list as $class)
 					{
 						try
 						{
-							class_exists($class);	// trigger autoloader
+							class_exists($class); // trigger autoloader
 						}
-						catch(Exception $e)
+						catch (Exception $e)
 						{
 							error_log($e->getMessage());
 						}
@@ -357,22 +357,22 @@ 
 	 * @param string|XMLReader $xml
 	 * @param string $id =null
 	 */
-	public static function factory($type, $xml, $id=null)
+	public static function factory($type, $xml, $id = null)
 	{
-		$class_name =& self::$widget_registry[$type];
+		$class_name = & self::$widget_registry[$type];
 
 		if (!isset($class_name))
 		{
-			list($basetype) = explode('-',$type);
+			list($basetype) = explode('-', $type);
 			if (//dont think this is used: !class_exists($class_name = 'etemplate_widget_'.str_replace('-','_',$type)) &&
 				!class_exists($class_name = __CLASS__.'\\'.ucfirst($basetype)) &&
 				// widgets supplied by application in class ${app}_widget_etemplate or ${app}_${subtype}_widget_etemplate
 				!(isset($GLOBALS['egw_info']['apps'][$basetype]) &&
-					(class_exists($class_name = str_replace('-','_',$type).'_etemplate_widget') ||
+					(class_exists($class_name = str_replace('-', '_', $type).'_etemplate_widget') ||
 					 class_exists($class_name = $basetype.'_etemplate_widget'))))
 			{
 				// Try for base type, it's probably better than the root
-				if(self::$widget_registry[$basetype] && self::$widget_registry[$basetype] != $class_name)
+				if (self::$widget_registry[$basetype] && self::$widget_registry[$basetype] != $class_name)
 				{
 					$class_name = self::$widget_registry[$basetype];
 				}
@@ -393,22 +393,22 @@ 
 		{
 			// Class in widget registry, but not loaded
 			// Try for a base class
-			$subtypes = explode('-',$type);
+			$subtypes = explode('-', $type);
 			$basetype = $subtypes[0];
-			$class_name = __CLASS__.'\\'.implode('\\',array_map('ucfirst',$subtypes));
-			if(!class_exists($class_name) && self::$widget_registry[$basetype] && self::$widget_registry[$basetype] != $class_name)
+			$class_name = __CLASS__.'\\'.implode('\\', array_map('ucfirst', $subtypes));
+			if (!class_exists($class_name) && self::$widget_registry[$basetype] && self::$widget_registry[$basetype] != $class_name)
 			{
 				// Try for base type, it's probably better than the root
 				$class_name = self::$widget_registry[$basetype];
 			}
-			if(!class_exists($class_name))
+			if (!class_exists($class_name))
 			{
 				// Fall back to widget class, we can not ignore it, as the widget may contain other widgets
 				$class_name = __CLASS__;
 			}
 		}
 
-		if(!$xml)
+		if (!$xml)
 		{
 			if (empty($type)) $type = 'widget';
 			$xml = "<$type id='$id'/>";
@@ -419,7 +419,7 @@ 
 		if ($type == 'template' && $id && ($template = Widget\Template::instance($id)))
 		{
 			// references can set different attributes like: class, span, content (namespace)
-			return $template->set_attrs($xml, false);	// false = need to clone template, if attributs are set!
+			return $template->set_attrs($xml, false); // false = need to clone template, if attributs are set!
 		}
 		return new $class_name($xml);
 	}
@@ -431,9 +431,9 @@ 
 	 * @param string $type =null
 	 * @return Widget|NULL
 	 */
-	public function getElementById($id, $type=null)
+	public function getElementById($id, $type = null)
 	{
-		foreach($this->children as $child)
+		foreach ($this->children as $child)
 		{
 			if ($child->id === $id && (is_null($type) || $child->type === $type))
 			{
@@ -456,7 +456,7 @@ 
 	public function getElementsByType($type)
 	{
 		$elements = array();
-		foreach($this->children as $child)
+		foreach ($this->children as $child)
 		{
 			if ($child->type === $type)
 			{
@@ -476,14 +476,14 @@ 
 	 * @param array $params =array('') parameter(s) first parameter has to be the cname, second $expand!
 	 * @param boolean $respect_disabled =false false (default): ignore disabled, true: method is NOT run for disabled widgets AND their children
 	 */
-	public function run($method_name, $params=array(''), $respect_disabled=false)
+	public function run($method_name, $params = array(''), $respect_disabled = false)
 	{
 		// maintain $expand array name-expansion
 		$cname = $params[0];
-		$expand =& $params[1];
+		$expand = & $params[1];
 		if ($expand['cname'] && $expand['cname'] !== $cname)
 		{
-			$expand['cont'] =& self::get_array(self::$request->content, $cname);
+			$expand['cont'] = & self::get_array(self::$request->content, $cname);
 			$expand['cname'] = $cname;
 		}
 		if ($respect_disabled && ($disabled = $this->attrs['disabled'] && self::check_disabled($this->attrs['disabled'], $expand)))
@@ -496,22 +496,22 @@ 
 			// Some parameter checking to avoid fatal errors
 			$call = true;
 			$method = new ReflectionMethod($this, $method_name);
-			foreach($method->getParameters() as $index => $param)
+			foreach ($method->getParameters() as $index => $param)
 			{
-				if(!$param->isOptional() && !array_key_exists($index,$params))
+				if (!$param->isOptional() && !array_key_exists($index, $params))
 				{
 					error_log("Missing required parameter {$param->getPosition()}: {$param->getName()}");
 					$call = false;
 				}
-				if($param->isArray() && !is_array($params[$index]))
+				if ($param->isArray() && !is_array($params[$index]))
 				{
 					error_log("$method_name expects an array for {$param->getPosition()}: {$param->getName()}");
 					$params[$index] = (array)$params[$index];
 				}
 			}
-			if($call) call_user_func_array(array($this, $method_name), $params);
+			if ($call) call_user_func_array(array($this, $method_name), $params);
 		}
-		foreach($this->children as $child)
+		foreach ($this->children as $child)
 		{
 			// If type has something that can be expanded, we need to expand it so the correct method is run
 			$this->expand_widget($child, $expand);
@@ -526,15 +526,15 @@ 
 	 * @param Widget& $child Widget to check & expand if needed
 	 * @param array& $expand Expansion array
 	 */
-	protected function expand_widget(Widget &$child, array &$expand)
+	protected function expand_widget(Widget&$child, array &$expand)
 	{
-		if(strpos($child->attrs['type'], '@') !== false || strpos($child->attrs['type'], '$') !== false)
+		if (strpos($child->attrs['type'], '@') !== false || strpos($child->attrs['type'], '$') !== false)
 		{
-			$type = self::expand_name($child->attrs['type'],$expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
-			$id = self::expand_name($child->id,$expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
+			$type = self::expand_name($child->attrs['type'], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
+			$id = self::expand_name($child->id, $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 			$attrs = $child->attrs;
 			unset($attrs['type']);
-			$expanded_child = self::factory($type, false,$id);
+			$expanded_child = self::factory($type, false, $id);
 			$expanded_child->id = $id;
 			$expanded_child->type = $type;
 			$expanded_child->attrs = $attrs + array('type' => $type);
@@ -557,14 +557,14 @@ 
 	{
 		if (($not = $disabled[0] == '!'))
 		{
-			$disabled = substr($disabled,1);
+			$disabled = substr($disabled, 1);
 		}
-		list($value,$check) = $vals = explode('=',$disabled);
+		list($value, $check) = $vals = explode('=', $disabled);
 
 		// use expand_name to be able to use @ or $
 		$val = self::expand_name($value, $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 		$check_val = self::expand_name($check, $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
-		$result = count($vals) == 1 ? $val != '' : ($check_val[0] == '/' ? preg_match($check_val,$val) : $val == $check_val);
+		$result = count($vals) == 1 ? $val != '' : ($check_val[0] == '/' ? preg_match($check_val, $val) : $val == $check_val);
 		if ($not) $result = !$result;
 
 		//error_log(__METHOD__."('".($not?'!':'')."$disabled' = '$val' ".(count($vals) == 1 ? '' : ($not?'!':'=')."= '$check_val'")." = ".($result?'True':'False'));
@@ -606,33 +606,33 @@ 
 	 * 	"del[$cont[id]]" expands to "del[123]" if $cont = array('id' => 123)
 	 * @return string the expanded name
 	 */
-	protected static function expand_name($name,$c,$row,$c_='',$row_='',$cont='')
+	protected static function expand_name($name, $c, $row, $c_ = '', $row_ = '', $cont = '')
 	{
 		$is_index_in_content = $name[0] == '@';
-		if (($pos_var=strpos($name,'$')) !== false)
+		if (($pos_var = strpos($name, '$')) !== false)
 		{
 			if (!$cont)
 			{
 				$cont = array();
 			}
 			if (!is_numeric($c)) $c = self::chrs2num($c);
-			$col = self::num2chrs($c-1);	// $c-1 to get: 0:'@', 1:'A', ...
-			$col_ = self::num2chrs($c_-1);
+			$col = self::num2chrs($c - 1); // $c-1 to get: 0:'@', 1:'A', ...
+			$col_ = self::num2chrs($c_ - 1);
 			$row_cont = $cont[$row];
 			$col_row_cont = $cont[$col.$row];
 
-			eval('$name = "'.str_replace('"','\\"',$name).'";');
-			unset($col_, $row_, $row_cont, $col_row_cont);	// quiten IDE warning about used vars, they might be used in above eval!
+			eval('$name = "'.str_replace('"', '\\"', $name).'";');
+			unset($col_, $row_, $row_cont, $col_row_cont); // quiten IDE warning about used vars, they might be used in above eval!
 		}
 		if ($is_index_in_content)
 		{
 			if ($name[1] == '@' && is_array(self::$request->content))
 			{
-				$name = self::get_array(self::$request->content,substr($name,2));
+				$name = self::get_array(self::$request->content, substr($name, 2));
 			}
-			elseif(is_array($cont))
+			elseif (is_array($cont))
 			{
-				$name = self::get_array($cont,substr($name,1));
+				$name = self::get_array($cont, substr($name, 1));
 			}
 			else
 			{
@@ -654,11 +654,11 @@ 
 		$min = ord('A');
 		$max = ord('Z') - $min + 1;
 
-		$num = 1+ord($chrs{0})-$min;
+		$num = 1 + ord($chrs{0}) - $min;
 		if (strlen($chrs) > 1)
 		{
 			$num *= 1 + $max - $min;
-			$num += 1+ord($chrs{1})-$min;
+			$num += 1 + ord($chrs{1}) - $min;
 		}
 		return $num;
 	}
@@ -689,7 +689,7 @@ 
 	 */
 	public function __toString()
 	{
-		return '['.get_class($this).'] ' .
+		return '['.get_class($this).'] '.
 			$this->type.($this->attrs['type'] && $this->attrs['type'] != $this->type ? '('.$this->attrs['type'].')' : '').'#'.$this->id;
 	}
 
@@ -698,7 +698,7 @@ 
 	 */
 	public function __clone()
 	{
-		foreach($this->children as $child_num => $child) {
+		foreach ($this->children as $child_num => $child) {
 			$this->children[$child_num] = clone $child;
 		}
 	}
@@ -709,16 +709,16 @@ 
 	 * @param string $indent =''
 	 * @return string
 	 */
-	public function toXml($indent='')
+	public function toXml($indent = '')
 	{
 		echo "$indent<$this->type";
 		if ($this->id) echo ' id="'.htmlspecialchars($this->id).'"';
-		foreach($this->attrs as $name => $value)
+		foreach ($this->attrs as $name => $value)
 		{
 			if ($name == 'options' && $this->legacy_options && (!is_array($this->legacy_options) ||
 				isset($this->legacy_options[$this->attrs['type'] ? $this->attrs['type'] : $this->type])))
 			{
-				continue;	// do NOT output already converted legacy options
+				continue; // do NOT output already converted legacy options
 			}
 			echo ' '.$name.'="'.htmlspecialchars($value).'"';
 		}
@@ -727,7 +727,7 @@ 
 		if ($this->children)
 		{
 			echo ">\n";
-			foreach($this->children as $child)
+			foreach ($this->children as $child)
 			{
 				$child->toXml($indent."\t");
 			}
@@ -750,7 +750,7 @@ 
 	 * @param array $expand =null values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @return string complete form-name
 	 */
-	static function form_name($cname,$name,array $expand=null)
+	static function form_name($cname, $name, array $expand = null)
 	{
 		if ($expand && !empty($name))
 		{
@@ -758,18 +758,18 @@ 
 		}
 		if (count($name_parts = explode('[', $name, 2)) > 1)
 		{
-			$name_parts = array_merge(array($name_parts[0]), explode('][', substr($name_parts[1],0,-1)));
+			$name_parts = array_merge(array($name_parts[0]), explode('][', substr($name_parts[1], 0, -1)));
 		}
 		if (!empty($cname))
 		{
-			array_unshift($name_parts,$cname);
+			array_unshift($name_parts, $cname);
 		}
 		$form_name = array_shift($name_parts);
 		if (count($name_parts))
 		{
 			// RB: not sure why this business with entity encoding for square brakets, it messes up validation
 			//$form_name .= '&#x5B;'.implode('&#x5D;&#x5B;',$name_parts).'&#x5D;';
-			$form_name .= '['.implode('][',$name_parts).']';
+			$form_name .= '['.implode('][', $name_parts).']';
 		}
 		return $form_name;
 	}
@@ -786,36 +786,36 @@ 
 	 * @param bool $skip_empty returns false if $idx is not present in $arr
 	 * @return mixed reference to $arr[$idx] or null if $idx is not set and not $reference_into
 	 */
-	static function &get_array(&$arr,$_idx,$reference_into=False,$skip_empty=False)
+	static function &get_array(&$arr, $_idx, $reference_into = False, $skip_empty = False)
 	{
 		if (!is_array($arr))
 		{
 			throw new Api\Exception\AssertionFailed(__METHOD__."(\$arr,'$_idx',$reference_into,$skip_empty) \$arr is no array!");
 		}
-		if (is_object($_idx)) return false;	// given an error in php5.2
+		if (is_object($_idx)) return false; // given an error in php5.2
 
 		// Make sure none of these are left
-		$idx = str_replace(array('&#x5B;','&#x5D;'), array('[',']'), $_idx);
+		$idx = str_replace(array('&#x5B;', '&#x5D;'), array('[', ']'), $_idx);
 
 		// Handle things expecting arrays - ends in []
-		if(substr($idx,-2) == "[]")
+		if (substr($idx, -2) == "[]")
 		{
-			$idx = substr($idx,0,-2);
+			$idx = substr($idx, 0, -2);
 		}
 
 		if (count($idxs = explode('[', $idx, 2)) > 1)
 		{
-			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1],0,-1)));
+			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1], 0, -1)));
 		}
 		$pos = &$arr;
-		foreach($idxs as $idx)
+		foreach ($idxs as $idx)
 		{
 			if (!is_array($pos) && (!$reference_into || $reference_into && isset($pos)))
 			{
 				//if ($reference_into) error_log(__METHOD__."(".(strlen($s=array2string($arr))>512?substr($s,0,512).'...':$s).", '$idx', ".array2string($reference_into).", ".array2string($skip_empty).") ".function_backtrace());
 				return null;
 			}
-			if($skip_empty && (!is_array($pos) || !isset($pos[$idx]))) return null;
+			if ($skip_empty && (!is_array($pos) || !isset($pos[$idx]))) return null;
 			$pos = &$pos[$idx];
 		}
 		return $pos;
@@ -833,7 +833,7 @@ 
 	 */
 	static function set_array(&$_arr, $_idx, $_value)
 	{
-		$ref =& self::get_array($_arr, $_idx, true);
+		$ref = & self::get_array($_arr, $_idx, true);
 		if (true) $ref = $_value;
 	}
 
@@ -847,7 +847,7 @@ 
 	 * @param string $form_name =null form_name, to not calculate him again
 	 * @return boolean
 	 */
-	public function is_readonly($cname='', $form_name=null)
+	public function is_readonly($cname = '', $form_name = null)
 	{
 		if (!isset($form_name))
 		{
@@ -857,11 +857,11 @@ 
 			$form_name = self::form_name($cname, $this->id, $expand);
 		}
 		$readonly = $this->attrs['readonly'] || self::$request->readonlys[$form_name] ||
-			self::get_array(self::$request->readonlys,$form_name) === true ||
+			self::get_array(self::$request->readonlys, $form_name) === true ||
 			isset(self::$request->readonlys['__ALL__']) && (
 				// Exceptions to all
 				self::$request->readonlys[$form_name] !== false &&
-				self::get_array(self::$request->readonlys,$form_name) !== false
+				self::get_array(self::$request->readonlys, $form_name) !== false
 			);
 
 		//error_log(__METHOD__."('$cname') this->id='$this->id' --> form_name='$form_name': attrs[readonly]=".array2string($this->attrs['readonly']).", readonlys['$form_name']=".array2string(self::$request->readonlys[$form_name]).", readonlys[$form_name]=".array2string(self::get_array(self::$request->readonlys,$form_name)).", readonlys['__ALL__']=".array2string(self::$request->readonlys['__ALL__'])." returning ".array2string($readonly));
@@ -881,12 +881,12 @@ 
 	 * @param string|boolean $error error-message already translated or false to reset all existing error for given name
 	 * @param string $cname =null set it to '', if the name is already a form-name, defaults to self::$name_vars
 	 */
-	public static function set_validation_error($name,$error,$cname=null)
+	public static function set_validation_error($name, $error, $cname = null)
 	{
 		// not yet used: if (is_null($cname)) $cname = self::$name_vars;
 		error_log(__METHOD__."('$name','$error','$cname') ".function_backtrace());
 
-		if ($cname) $name = self::form_name($cname,$name);
+		if ($cname) $name = self::form_name($cname, $name);
 
 		if ($error === false)
 		{
@@ -909,18 +909,18 @@ 
 	* @param string $cname =null name-prefix, which need to be ignored, default self::$name_vars
 	* @return boolean true if there are not ignored validation errors, false otherwise
 	*/
-	public static function validation_errors($ignore_validation='',$cname='')
+	public static function validation_errors($ignore_validation = '', $cname = '')
 	{
 		// not yet used: if (is_null($cname)) $cname = self::$name_vars;
 		//echo "<p>uietemplate::validation_errors('$ignore_validation','$cname') validation_error="; _debug_array(self::$validation_errors);
 		if (!$ignore_validation) return count(self::$validation_errors) > 0;
 
-		foreach(array_values(self::$validation_errors) as $name)
+		foreach (array_values(self::$validation_errors) as $name)
 		{
-			if ($cname) $name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2',$name);
+			if ($cname) $name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/', '\\1\\2', $name);
 
 			// treat $ignoare_validation only as regular expression, if it starts with a slash
-			if ($ignore_validation[0] == '/' && !preg_match($ignore_validation,$name) ||
+			if ($ignore_validation[0] == '/' && !preg_match($ignore_validation, $name) ||
 				$ignore_validation[0] != '/' && $ignore_validation != $name)
 			{
 				//echo "<p>uietemplate::validation_errors('$ignore_validation','$cname') name='$name' ($error) not ignored!!!</p>\n";
@@ -957,14 +957,14 @@ 
 	 * @param mixed $val if not NULL sets attribute else returns it
 	 * @return reference to attribute
 	 */
-	public static function &setElementAttribute($name,$attr,$val)
+	public static function &setElementAttribute($name, $attr, $val)
 	{
 		//error_log(__METHOD__."('$name', '$attr', ...) request=".get_class(self::$request).", response=".get_class(self::$response).function_backtrace());
-		$ref =& self::$request->modifications[$name][$attr];
-		if(self::$request && self::$response && (!isset($this) || $val != $this->attrs[$attr]))
+		$ref = & self::$request->modifications[$name][$attr];
+		if (self::$request && self::$response && (!isset($this) || $val != $this->attrs[$attr]))
 		{
 			// In an AJAX response - automatically add
-			self::$response->generic('assign',array(
+			self::$response->generic('assign', array(
 				'etemplate_exec_id' => self::$request->id(),
 				'id' => $name,
 				'key' => $attr,
@@ -988,7 +988,7 @@ 
 	 * @param boolean $disabled =true disable or enable a cell, default true=disable
 	 * @return reference to attribute
 	 */
-	public function disableElement($name,$disabled=True)
+	public function disableElement($name, $disabled = True)
 	{
 		return self::setElementAttribute($name, 'disabled', $disabled);
 	}

Braces +68 added lines, -18 removed lines

@@ -100,7 +100,9 @@ 
 
 		// Update content?
 		if(self::$cont == null)
-			self::$cont = is_array(self::$request->content) ? self::$request->content : array();
+		{
+					self::$cont = is_array(self::$request->content) ? self::$request->content : array();
+		}
 		if($this->id && is_array(self::$cont[$this->id]))
 		{
 			$old_cont = self::$cont;
@@ -119,7 +121,8 @@ 
 		}
 
 		// Reset content as we leave
-		if($old_cont) {
+		if($old_cont)
+		{
 			self::$cont = $old_cont;
 		}
 	}
@@ -200,7 +203,10 @@ 
 					$legacy_options = explode(',', $legacy_options);
 					foreach(self::csv_split($value, count($legacy_options)) as $n => $val)
 					{
-						if ($legacy_options[$n] && (string)$val !== '') $template->attrs[$legacy_options[$n]] = $val;
+						if ($legacy_options[$n] && (string)$val !== '')
+						{
+							$template->attrs[$legacy_options[$n]] = $val;
+						}
 					}
 				}
 			}
@@ -305,7 +311,9 @@ 
 
 		$widget_registry = Api\Cache::getInstance('etemplate', 'widget_registry');
 
-		if (!$widget_registry)	// not in instance cache --> rescan from filesystem
+		if (!$widget_registry)
+		{
+			// not in instance cache --> rescan from filesystem
 		{
 			foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__.'/Widget')) as $path)
 			{
@@ -314,6 +322,7 @@ 
 					try
 					{
 						include_once($path);
+		}
 					}
 					catch(Exception $e)
 					{
@@ -410,7 +419,10 @@ 
 
 		if(!$xml)
 		{
-			if (empty($type)) $type = 'widget';
+			if (empty($type))
+			{
+				$type = 'widget';
+			}
 			$xml = "<$type id='$id'/>";
 		}
 		//error_log(__METHOD__."('$type', ..., '$id') using $class_name");
@@ -509,7 +521,10 @@ 
 					$params[$index] = (array)$params[$index];
 				}
 			}
-			if($call) call_user_func_array(array($this, $method_name), $params);
+			if($call)
+			{
+				call_user_func_array(array($this, $method_name), $params);
+			}
 		}
 		foreach($this->children as $child)
 		{
@@ -565,7 +580,10 @@ 
 		$val = self::expand_name($value, $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 		$check_val = self::expand_name($check, $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 		$result = count($vals) == 1 ? $val != '' : ($check_val[0] == '/' ? preg_match($check_val,$val) : $val == $check_val);
-		if ($not) $result = !$result;
+		if ($not)
+		{
+			$result = !$result;
+		}
 
 		//error_log(__METHOD__."('".($not?'!':'')."$disabled' = '$val' ".(count($vals) == 1 ? '' : ($not?'!':'=')."= '$check_val'")." = ".($result?'True':'False'));
 		return $result;
@@ -615,7 +633,10 @@ 
 			{
 				$cont = array();
 			}
-			if (!is_numeric($c)) $c = self::chrs2num($c);
+			if (!is_numeric($c))
+			{
+				$c = self::chrs2num($c);
+			}
 			$col = self::num2chrs($c-1);	// $c-1 to get: 0:'@', 1:'A', ...
 			$col_ = self::num2chrs($c_-1);
 			$row_cont = $cont[$row];
@@ -698,7 +719,8 @@ 
 	 */
 	public function __clone()
 	{
-		foreach($this->children as $child_num => $child) {
+		foreach($this->children as $child_num => $child)
+		{
 			$this->children[$child_num] = clone $child;
 		}
 	}
@@ -712,7 +734,10 @@ 
 	public function toXml($indent='')
 	{
 		echo "$indent<$this->type";
-		if ($this->id) echo ' id="'.htmlspecialchars($this->id).'"';
+		if ($this->id)
+		{
+			echo ' id="'.htmlspecialchars($this->id).'"';
+		}
 		foreach($this->attrs as $name => $value)
 		{
 			if ($name == 'options' && $this->legacy_options && (!is_array($this->legacy_options) ||
@@ -792,7 +817,11 @@ 
 		{
 			throw new Api\Exception\AssertionFailed(__METHOD__."(\$arr,'$_idx',$reference_into,$skip_empty) \$arr is no array!");
 		}
-		if (is_object($_idx)) return false;	// given an error in php5.2
+		if (is_object($_idx))
+		{
+			return false;
+		}
+		// given an error in php5.2
 
 		// Make sure none of these are left
 		$idx = str_replace(array('&#x5B;','&#x5D;'), array('[',']'), $_idx);
@@ -815,7 +844,10 @@ 
 				//if ($reference_into) error_log(__METHOD__."(".(strlen($s=array2string($arr))>512?substr($s,0,512).'...':$s).", '$idx', ".array2string($reference_into).", ".array2string($skip_empty).") ".function_backtrace());
 				return null;
 			}
-			if($skip_empty && (!is_array($pos) || !isset($pos[$idx]))) return null;
+			if($skip_empty && (!is_array($pos) || !isset($pos[$idx])))
+			{
+				return null;
+			}
 			$pos = &$pos[$idx];
 		}
 		return $pos;
@@ -834,7 +866,10 @@ 
 	static function set_array(&$_arr, $_idx, $_value)
 	{
 		$ref =& self::get_array($_arr, $_idx, true);
-		if (true) $ref = $_value;
+		if (true)
+		{
+			$ref = $_value;
+		}
 	}
 
 	/**
@@ -886,7 +921,10 @@ 
 		// not yet used: if (is_null($cname)) $cname = self::$name_vars;
 		error_log(__METHOD__."('$name','$error','$cname') ".function_backtrace());
 
-		if ($cname) $name = self::form_name($cname,$name);
+		if ($cname)
+		{
+			$name = self::form_name($cname,$name);
+		}
 
 		if ($error === false)
 		{
@@ -913,11 +951,17 @@ 
 	{
 		// not yet used: if (is_null($cname)) $cname = self::$name_vars;
 		//echo "<p>uietemplate::validation_errors('$ignore_validation','$cname') validation_error="; _debug_array(self::$validation_errors);
-		if (!$ignore_validation) return count(self::$validation_errors) > 0;
+		if (!$ignore_validation)
+		{
+			return count(self::$validation_errors) > 0;
+		}
 
 		foreach(array_values(self::$validation_errors) as $name)
 		{
-			if ($cname) $name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2',$name);
+			if ($cname)
+			{
+				$name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2',$name);
+			}
 
 			// treat $ignoare_validation only as regular expression, if it starts with a slash
 			if ($ignore_validation[0] == '/' && !preg_match($ignore_validation,$name) ||
@@ -974,8 +1018,14 @@ 
 			self::$request->unset_to_process('');
 			//error_log(__METHOD__."('$name', '$attr', ...) ".function_backtrace());
 		}
-		if (isset($this)) $this->attrs[$attr] = $val;
-		if (!is_null($val)) $ref = $val;
+		if (isset($this))
+		{
+			$this->attrs[$attr] = $val;
+		}
+		if (!is_null($val))
+		{
+			$ref = $val;
+		}
 
 		//error_log(__METHOD__."('$name', '$attr', ".array2string($val).')');
 		return $ref;

api/src/Etemplate/Widget/Checkbox.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @return boolean true if no validation error, false otherwise
+	 * @return boolean|null true if no validation error, false otherwise
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{

Spacing +11 added lines, -11 removed lines

@@ -44,7 +44,7 @@ 
 	 * @param array &$validated=array() validated content
 	 * @return boolean true if no validation error, false otherwise
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -56,28 +56,28 @@ 
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value = self::get_array($content, $form_name);
-			if (!isset($value))	return;	// value not transmitted --> nothing to validate
-			$valid =& self::get_array($validated, $form_name, true);
+			if (!isset($value))	return; // value not transmitted --> nothing to validate
+			$valid = & self::get_array($validated, $form_name, true);
 
 			if (!$value && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!'), '');
 			}
 			$type = $this->type ? $this->type : $this->attrs['type'];
 			$value_attr = $type == 'radio' ? 'set_value' : 'selected_value';
 			// defaults for set and unset values
 			$selected_value = true;
 			$unselected_value = false;
-			if (array_key_exists($value_attr, $this->attrs) || array_key_exists('unselected_value',$this->attrs))
+			if (array_key_exists($value_attr, $this->attrs) || array_key_exists('unselected_value', $this->attrs))
 			{
-				if(array_key_exists($value_attr, $this->attrs))
+				if (array_key_exists($value_attr, $this->attrs))
 				{
 					// Expand any content stuff
-					$selected_value = self::expand_name($this->attrs[$value_attr], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'],$expand['cont']);
+					$selected_value = self::expand_name($this->attrs[$value_attr], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 				}
-				if(array_key_exists('unselected_value',$this->attrs))
+				if (array_key_exists('unselected_value', $this->attrs))
 				{
-					$unselected_value = self::expand_name($this->attrs['unselected_value'], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'],$expand['cont']);
+					$unselected_value = self::expand_name($this->attrs['unselected_value'], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 				}
 			}
 			if ($type == 'radio')
@@ -87,14 +87,14 @@ 
 				{
 					$valid = $value;
 				}
-				elseif ( !$options && $selected_value && $value == $selected_value)
+				elseif (!$options && $selected_value && $value == $selected_value)
 				{
 					// Options set in template, not in sel_options
 					$valid = $selected_value;
 				}
 				elseif (!isset($valid))
 				{
-					$valid = '';	// do not overwrite value of an other radio-button of the same group (identical name)!
+					$valid = ''; // do not overwrite value of an other radio-button of the same group (identical name)!
 				}
 			}
 			elseif (in_array((string)$selected_value, (array)$value))

Braces +13 added lines, -3 removed lines

@@ -56,7 +56,11 @@ 
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value = self::get_array($content, $form_name);
-			if (!isset($value))	return;	// value not transmitted --> nothing to validate
+			if (!isset($value))
+			{
+				return;
+			}
+			// value not transmitted --> nothing to validate
 			$valid =& self::get_array($validated, $form_name, true);
 
 			if (!$value && $this->attrs['needed'])
@@ -101,7 +105,10 @@ 
 			{
 				if ($multiple)
 				{
-					if (!isset($valid)) $valid = array();
+					if (!isset($valid))
+					{
+						$valid = array();
+					}
 					$valid[] = $selected_value;
 				}
 				else
@@ -113,7 +120,10 @@ 
 			{
 				if ($multiple)
 				{
-					if (!isset($valid)) $valid = array();
+					if (!isset($valid))
+					{
+						$valid = array();
+					}
 				}
 				elseif ($value === 'true')
 				{

api/src/Etemplate/Widget/Date.php

Doc Comments +1 added lines, -2 removed lines

@@ -101,7 +101,6 @@ 
 	/**
 	 * Put date in the proper format for sending to client
 	 * @param string|int $value
-	 * @param string $format
 	 */
 	public function format_date($value)
 	{
@@ -139,7 +138,7 @@ 
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @return boolean true if no validation error, false otherwise
+	 * @return boolean|null true if no validation error, false otherwise
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{

Spacing +25 added lines, -25 removed lines

@@ -60,17 +60,17 @@ 
 	 * @param string $cname
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function beforeSendToClient($cname, array $expand=null)
+	public function beforeSendToClient($cname, array $expand = null)
 	{
-		if($this->type == 'date-houronly')
+		if ($this->type == 'date-houronly')
 		{
 			return parent::beforeSendToClient($cname, $expand);
 		}
 
 		$form_name = self::form_name($cname, $this->id, $expand);
-		$value =& self::get_array(self::$request->content, $form_name, false, true);
+		$value = & self::get_array(self::$request->content, $form_name, false, true);
 
-		if($this->type != 'date-duration' && $value)
+		if ($this->type != 'date-duration' && $value)
 		{
 			$value = $this->format_date($value);
 		}
@@ -90,10 +90,10 @@ 
 	 */
 	public function set_row_value($cname, Array $expand, Array &$data)
 	{
-		if($this->type == 'date-duration') return;
+		if ($this->type == 'date-duration') return;
 
 		$form_name = self::form_name($cname, $this->id, $expand);
-		$value =& $this->get_array($data, $form_name, true);
+		$value = & $this->get_array($data, $form_name, true);
 
 		if (true) $value = $this->format_date($value);
 	}
@@ -105,7 +105,7 @@ 
 	 */
 	public function format_date($value)
 	{
-		if (!$value) return $value;	// otherwise we will get current date or 1970-01-01 instead of an empty value
+		if (!$value) return $value; // otherwise we will get current date or 1970-01-01 instead of an empty value
 
 		if ($this->attrs['dataformat'] && !is_numeric($value))
 		{
@@ -115,11 +115,11 @@ 
 		{
 			$date = new Api\DateTime($value);
 		}
-		if($this->type == 'date-timeonly')
+		if ($this->type == 'date-timeonly')
 		{
 			$date->setDate(1970, 1, 1);
 		}
-		if($date)
+		if ($date)
 		{
 			// postfix date-string with "Z" so javascript doesn't add/subtract anything
 			$value = $date->format('Y-m-d\TH:i:s\Z');
@@ -141,18 +141,18 @@ 
 	 * @param array &$validated=array() validated content
 	 * @return boolean true if no validation error, false otherwise
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
 		if (!$this->is_readonly($cname, $form_name) && $this->type != 'date-since')	// date-since is always readonly
 		{
 			$value = self::get_array($content, $form_name);
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 
 			if ((string)$value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!'));
+				self::set_validation_error($form_name, lang('Field must not be empty !!!'));
 			}
 			elseif (is_null($value))
 			{
@@ -162,49 +162,49 @@ 
 			{
 				$valid = (string)$value === '' ? '' : (int)$value;
 			}
-			if($value)
+			if ($value)
 			{
 				$date = new Api\DateTime($value);
 			}
 			if (!empty($this->attrs['min']))
 			{
-				if(is_numeric($this->attrs['min']))
+				if (is_numeric($this->attrs['min']))
 				{
-					$min = new Api\DateTime(strtotime( $this->attrs['min'] . 'days'));
+					$min = new Api\DateTime(strtotime($this->attrs['min'].'days'));
 				}
 				else
 				{
 					$min = new Api\DateTime(strtotime($this->attrs['min']));
 				}
-				if($value < $min)
+				if ($value < $min)
 				{
-					self::set_validation_error($form_name,lang(
+					self::set_validation_error($form_name, lang(
 						"Value has to be at least '%1' !!!",
 						$min->format($this->type != 'date')
-					),'');
+					), '');
 					$value = $min;
 				}
 			}
 			if (!empty($this->attrs['max']))
 			{
-				if(is_numeric($this->attrs['max']))
+				if (is_numeric($this->attrs['max']))
 				{
-					$max = new Api\DateTime(strtotime( $this->attrs['max'] . 'days'));
+					$max = new Api\DateTime(strtotime($this->attrs['max'].'days'));
 				}
 				else
 				{
 					$max = new Api\DateTime(strtotime($this->attrs['max']));
 				}
-				if($value < $max)
+				if ($value < $max)
 				{
-					self::set_validation_error($form_name,lang(
+					self::set_validation_error($form_name, lang(
 						"Value has to be at maximum '%1' !!!",
 						$max->format($this->type != 'date')
-					),'');
+					), '');
 					$value = $max;
 				}
 			}
-			if(!$value)
+			if (!$value)
 			{
 				// Not null, blank
 				$value = '';
@@ -221,7 +221,7 @@ 
 			else
 			{
 				// this is not really a user error, but one of the clientside engine
-				self::set_validation_error($form_name,lang("'%1' is not a valid date !!!", $value).' '.$this->dataformat);
+				self::set_validation_error($form_name, lang("'%1' is not a valid date !!!", $value).' '.$this->dataformat);
 			}
 			//error_log("$this : ($valid)" . Api\DateTime::to($valid));
 		}

Braces +21 added lines, -5 removed lines

@@ -90,12 +90,18 @@ 
 	 */
 	public function set_row_value($cname, Array $expand, Array &$data)
 	{
-		if($this->type == 'date-duration') return;
+		if($this->type == 'date-duration')
+		{
+			return;
+		}
 
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value =& $this->get_array($data, $form_name, true);
 
-		if (true) $value = $this->format_date($value);
+		if (true)
+		{
+			$value = $this->format_date($value);
+		}
 	}
 
 	/**
@@ -105,7 +111,11 @@ 
 	 */
 	public function format_date($value)
 	{
-		if (!$value) return $value;	// otherwise we will get current date or 1970-01-01 instead of an empty value
+		if (!$value)
+		{
+			return $value;
+		}
+		// otherwise we will get current date or 1970-01-01 instead of an empty value
 
 		if ($this->attrs['dataformat'] && !is_numeric($value))
 		{
@@ -145,9 +155,12 @@ 
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
-		if (!$this->is_readonly($cname, $form_name) && $this->type != 'date-since')	// date-since is always readonly
+		if (!$this->is_readonly($cname, $form_name) && $this->type != 'date-since')
+		{
+			// date-since is always readonly
 		{
 			$value = self::get_array($content, $form_name);
+		}
 			$valid =& self::get_array($validated, $form_name, true);
 
 			if ((string)$value === '' && $this->attrs['needed'])
@@ -209,10 +222,13 @@ 
 				// Not null, blank
 				$value = '';
 			}
-			elseif (empty($this->attrs['dataformat']))	// integer timestamp
+			elseif (empty($this->attrs['dataformat']))
+			{
+				// integer timestamp
 			{
 				$valid = $date->format('ts');
 			}
+			}
 			// string with formatting letters like for php's date() method
 			elseif ($date && ($valid = $date->format($this->attrs['dataformat'])))
 			{

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

@@ -88,7 +88,7 @@
 	 * @param array $data Row data
 	 * @return type
 	 */
-	public function set_row_value($cname, Array $expand, Array &$data)
+	public function set_row_value($cname, array $expand, array &$data)
 	{
 		if($this->type == 'date-duration') return;
 

api/src/Etemplate/Widget/Textbox.php

Doc Comments +1 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 	 *
 	 * @param string|XMLReader $xml
 	 * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
-	 * @return Template current object or clone, if any attribute was set
+	 * @return Textbox current object or clone, if any attribute was set
 	 */
 	public function set_attrs($xml, $cloned=true)
 	{
@@ -110,7 +110,6 @@ 
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{

Spacing +21 added lines, -21 removed lines

@@ -57,7 +57,7 @@ 
 	 * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
 	 * @return Template current object or clone, if any attribute was set
 	 */
-	public function set_attrs($xml, $cloned=true)
+	public function set_attrs($xml, $cloned = true)
 	{
 		parent::set_attrs($xml, $cloned);
 
@@ -69,7 +69,7 @@ 
 			$this->setElementAttribute($this->id, 'size', abs($this->attrs['size']));
 			self::$request->readonlys[$this->id] = false;
 			$this->setElementAttribute($this->id, 'readonly', true);
-			trigger_error("Using a negative size to set textbox readonly. " .$this, E_USER_DEPRECATED);
+			trigger_error("Using a negative size to set textbox readonly. ".$this, E_USER_DEPRECATED);
 		}
 		return $this;
 	}
@@ -80,16 +80,16 @@ 
 	 * @param string $cname
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function beforeSendToClient($cname, array $expand=null)
+	public function beforeSendToClient($cname, array $expand = null)
 	{
 		// to NOT transmit passwords back to client, we need to store (non-empty) value in preserv
 		if ($this->attrs['type'] == 'passwd' || $this->type == 'passwd')
 		{
 			$form_name = self::form_name($cname, $this->id, $expand);
-			$value =& self::get_array(self::$request->content, $form_name);
+			$value = & self::get_array(self::$request->content, $form_name);
 			if (!empty($value))
 			{
-				$preserv =& self::get_array(self::$request->preserv, $form_name, true);
+				$preserv = & self::get_array(self::$request->preserv, $form_name, true);
 				if (true) $preserv = (string)$value;
 				$value = str_repeat('*', strlen($preserv));
 			}
@@ -112,7 +112,7 @@ 
 	 * @param array &$validated=array() validated content
 	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -120,7 +120,7 @@ 
 		{
 			if (!isset($this->attrs['validator']))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					case 'int':
 					case 'integer':
@@ -150,24 +150,24 @@ 
 
 			if ((string)$value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!'), '');
 			}
-			if ((int) $this->attrs['maxlength'] > 0 && mb_strlen($value) > (int) $this->attrs['maxlength'])
+			if ((int)$this->attrs['maxlength'] > 0 && mb_strlen($value) > (int)$this->attrs['maxlength'])
 			{
-				$value = mb_substr($value,0,(int) $this->attrs['maxlength']);
+				$value = mb_substr($value, 0, (int)$this->attrs['maxlength']);
 			}
-			if ($this->attrs['validator'] && !preg_match($this->attrs['validator'],$value))
+			if ($this->attrs['validator'] && !preg_match($this->attrs['validator'], $value))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					case 'integer':
-						self::set_validation_error($form_name,lang("'%1' is not a valid integer !!!",$value),'');
+						self::set_validation_error($form_name, lang("'%1' is not a valid integer !!!", $value), '');
 						break;
 					case 'float':
-						self::set_validation_error($form_name,lang("'%1' is not a valid floatingpoint number !!!",$value),'');
+						self::set_validation_error($form_name, lang("'%1' is not a valid floatingpoint number !!!", $value), '');
 						break;
 					default:
-						self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value)/*." !preg_match('$this->attrs[validator]', '$value')"*/,'');
+						self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value)/*." !preg_match('$this->attrs[validator]', '$value')"*/, '');
 						break;
 				}
 			}
@@ -175,17 +175,17 @@ 
 			{
 				if ((string)$value !== '' || $this->attrs['needed'])	// empty values are Ok if needed is not set
 				{
-					$value = $this->type == 'integer' ? (int) $value : (float) str_replace(',','.',$value);	// allow for german (and maybe other) format
+					$value = $this->type == 'integer' ? (int)$value : (float)str_replace(',', '.', $value); // allow for german (and maybe other) format
 
 					if (!empty($this->attrs['min']) && $value < $this->attrs['min'])
 					{
-						self::set_validation_error($form_name,lang("Value has to be at least '%1' !!!",$this->attrs['min']),'');
-						$value = $this->type == 'integer' ? (int) $this->attrs['min'] : (float) $this->attrs['min'];
+						self::set_validation_error($form_name, lang("Value has to be at least '%1' !!!", $this->attrs['min']), '');
+						$value = $this->type == 'integer' ? (int)$this->attrs['min'] : (float)$this->attrs['min'];
 					}
 					if (!empty($this->attrs['max']) && $value > $this->attrs['max'])
 					{
-						self::set_validation_error($form_name,lang("Value has to be at maximum '%1' !!!",$this->attrs['max']),'');
-						$value = $this->type == 'integer' ? (int) $this->attrs['max'] : (float) $this->attrs['max'];
+						self::set_validation_error($form_name, lang("Value has to be at maximum '%1' !!!", $this->attrs['max']), '');
+						$value = $this->type == 'integer' ? (int)$this->attrs['max'] : (float)$this->attrs['max'];
 					}
 				}
 			}
@@ -197,4 +197,4 @@ 
 		}
 	}
 }
-Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Textbox', array('textbox','text','int','integer','float','passwd','hidden','colorpicker','hidden'));
+Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Textbox', array('textbox', 'text', 'int', 'integer', 'float', 'passwd', 'hidden', 'colorpicker', 'hidden'));

Braces +14 added lines, -4 removed lines

@@ -41,7 +41,10 @@ 
 		// normalize types
 		if ($this->type !== 'textbox')
 		{
-			if ($this->type == 'int') $this->type = 'integer';
+			if ($this->type == 'int')
+			{
+				$this->type = 'integer';
+			}
 
 			$this->attrs['type'] = $this->type;
 			$this->type = 'textbox';
@@ -90,7 +93,10 @@ 
 			if (!empty($value))
 			{
 				$preserv =& self::get_array(self::$request->preserv, $form_name, true);
-				if (true) $preserv = (string)$value;
+				if (true)
+				{
+					$preserv = (string)$value;
+				}
 				$value = str_repeat('*', strlen($preserv));
 			}
 		}
@@ -171,11 +177,15 @@ 
 						break;
 				}
 			}
-			elseif ($this->type == 'integer' || $this->type == 'float')	// cast int and float and check range
+			elseif ($this->type == 'integer' || $this->type == 'float')
+			{
+				// cast int and float and check range
 			{
 				if ((string)$value !== '' || $this->attrs['needed'])	// empty values are Ok if needed is not set
 				{
-					$value = $this->type == 'integer' ? (int) $value : (float) str_replace(',','.',$value);	// allow for german (and maybe other) format
+					$value = $this->type == 'integer' ? (int) $value : (float) str_replace(',','.',$value);
+			}
+			// allow for german (and maybe other) format
 
 					if (!empty($this->attrs['min']) && $value < $this->attrs['min'])
 					{

api/src/Etemplate/Widget/Tree.php

Doc Comments +1 added lines, -2 removed lines

@@ -361,7 +361,6 @@ 
 	 * Get options from $sel_options array for a given selectbox name
 	 *
 	 * @param string $name
-	 * @param boolean $no_lang=false value of no_lang attribute
 	 * @return array
 	 */
 	public static function selOptions($name)
@@ -400,7 +399,7 @@ 
 	 *
 	 * @param string $widget_type
 	 * @param string $legacy_options options string of widget
-	 * @param boolean $no_lang=false initial value of no_lang attribute (some types set it to true)
+	 * @param boolean $no_lang initial value of no_lang attribute (some types set it to true)
 	 * @param boolean $readonly =false
 	 * @param mixed $value =null value for readonly
 	 * @return array with value => label pairs

Spacing +33 added lines, -33 removed lines

@@ -120,7 +120,7 @@ 
 	 * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
 	 * @return Etempalte\Widget current object or clone, if any attribute was set
 	 */
-	public function set_attrs($xml, $cloned=true)
+	public function set_attrs($xml, $cloned = true)
 	{
 		$this->attrs['type'] = $xml->localName;
 		parent::set_attrs($xml, $cloned);
@@ -164,7 +164,7 @@ 
 
 		if (isset($item['item']) && is_array($item['item']))
 		{
-			foreach($item['item'] as &$child)
+			foreach ($item['item'] as &$child)
 			{
 				$child = self::htmlencode_node($child);
 			}
@@ -185,7 +185,7 @@ 
 		{
 			return true;
 		}
-		foreach((array)$item['item'] as $child)
+		foreach ((array)$item['item'] as $child)
 		{
 			if (self::in_tree($id, $child)) return true;
 		}
@@ -217,7 +217,7 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -231,13 +231,13 @@ 
 			{
 				$allowed = $this->attrs['multiple'] ? array() : array('' => $this->attrs['options']);
 				$allowed += self::selOptions($form_name);
-				foreach((array) $value as $val)
+				foreach ((array)$value as $val)
 				{
 					if ($this->type == 'tree-cat' && !($this->attrs['multiple'] && !$val) && !self::in_cats($val, $allowed) ||
 						$this->type == 'tree' && !self::in_tree($val, $allowed))
 					{
-						self::set_validation_error($form_name,lang("'%1' is NOT allowed%2)!", $val,
-							$this->type == 'tree-cat' ? " ('".implode("','",array_keys($allowed)).')' : ''), '');
+						self::set_validation_error($form_name, lang("'%1' is NOT allowed%2)!", $val,
+							$this->type == 'tree-cat' ? " ('".implode("','", array_keys($allowed)).')' : ''), '');
 						$value = '';
 						break;
 					}
@@ -254,18 +254,18 @@ 
 					{
 						$value = array_merge($value, (array)self::$request->preserv[$unavailable_name]);
 					}
-					elseif(!$value)	// for single cat, we only restore unavailable one, if no other was selected
+					elseif (!$value)	// for single cat, we only restore unavailable one, if no other was selected
 					{
 						$value = self::$request->preserv[$unavailable_name];
 					}
 				}
-				$value = implode(',',$value);
+				$value = implode(',', $value);
 			}
 			if ($ok && $value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!', $value), '');
 			}
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value).', allowed='.array2string($allowed));
 		}
@@ -291,7 +291,7 @@ 
 		{
 			// += to keep further options set by app code
 			self::$request->sel_options[$form_name] += self::typeOptions($this->attrs['type'], $this->attrs['options'],
-				$no_lang=null, $this->attrs['readonly'], self::get_array(self::$request->content, $form_name), $form_name);
+				$no_lang = null, $this->attrs['readonly'], self::get_array(self::$request->content, $form_name), $form_name);
 
 			// if no_lang was modified, forward modification to the client
 			if ($no_lang != $this->attr['no_lang'])
@@ -301,15 +301,15 @@ 
 		}
 
 		// Make sure  s, etc.  are properly encoded when sent, and not double-encoded
-		foreach(self::$request->sel_options[$form_name] as &$label)
+		foreach (self::$request->sel_options[$form_name] as &$label)
 		{
-			if(!is_array($label))
+			if (!is_array($label))
 			{
-				$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
+				$label = html_entity_decode($label, ENT_NOQUOTES, 'utf-8');
 			}
-			elseif($label['label'])
+			elseif ($label['label'])
 			{
-				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
+				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES, 'utf-8');
 			}
 		}
 
@@ -321,7 +321,7 @@ 
 	 * @param string $image_path =null default path to use, or empty to use default of /api/templates/default/images/dhtmlxtree
 	 * @return string templated url if available, otherwise default path
 	 */
-	public static function templateImagePath($image_path=null)
+	public static function templateImagePath($image_path = null)
 	{
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
 		if (empty($image_path))
@@ -353,20 +353,20 @@ 
 	 */
 	public static function imagePath($image)
 	{
-		static $image_path=null;
-		if (!isset($image_path)) $image_path = self::templateImagePath ();
+		static $image_path = null;
+		if (!isset($image_path)) $image_path = self::templateImagePath();
 
 		$parts = explode('/', $image_path);
-		$image_parts   = explode('/', $image);
+		$image_parts = explode('/', $image);
 
 		// remove common parts
-		while(isset($parts[0]) && $parts[0] === $image_parts[0])
+		while (isset($parts[0]) && $parts[0] === $image_parts[0])
 		{
 			array_shift($parts);
 			array_shift($image_parts);
 		}
 		// add .. for different parts, except last image part
-		$url = implode('/', array_merge(array_fill(0, count($parts)-1, '..'), $image_parts));
+		$url = implode('/', array_merge(array_fill(0, count($parts) - 1, '..'), $image_parts));
 
 		//error_log(__METHOD__."('$image') image_path=$image_path returning $url");
 		return $url;
@@ -388,10 +388,10 @@ 
 		}
 		else
 		{
-			$name_parts = explode('[',str_replace(']','',$name));
+			$name_parts = explode('[', str_replace(']', '', $name));
 			if (count($name_parts))
 			{
-				$org_name = $name_parts[count($name_parts)-1];
+				$org_name = $name_parts[count($name_parts) - 1];
 				if (isset(self::$request->sel_options[$org_name]) && is_array(self::$request->sel_options[$org_name]))
 				{
 					$options += self::$request->sel_options[$org_name];
@@ -421,9 +421,9 @@ 
 	 * @param string $form_name form-name of widget, used to store unavailable cats
 	 * @return array with value => label pairs
 	 */
-	public static function typeOptions($widget_type, $legacy_options, &$no_lang=false, $readonly=false, $value=null, $form_name=null)
+	public static function typeOptions($widget_type, $legacy_options, &$no_lang = false, $readonly = false, $value = null, $form_name = null)
 	{
-		list($rows,$type,$type2,$type3) = explode(',',$legacy_options);
+		list($rows, $type, $type2, $type3) = explode(',', $legacy_options);
 
 		$no_lang = false;
 		$options = array();
@@ -433,7 +433,7 @@ 
 				if ($readonly)  // for readonly we dont need to fetch all cat's, nor do we need to indent them by level
 				{
 					$cell['no_lang'] = True;
-					foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
+					foreach (is_array($value) ? $value : (strpos($value, ',') !== false ? explode(',', $value) : array($value)) as $id)
 					{
 						if ($id) $cell['sel_options'][$id] = stripslashes($GLOBALS['egw']->categories->id2name($id));
 					}
@@ -441,14 +441,14 @@ 
 				}
 				if (!$type3 || $type3 === $GLOBALS['egw']->categories->app_name)
 				{
-					$categories =& $GLOBALS['egw']->categories;
+					$categories = & $GLOBALS['egw']->categories;
 				}
 				else    // we need to instanciate a new cat object for the correct application
 				{
-					$categories = new Api\Categories('',$type3);
+					$categories = new Api\Categories('', $type3);
 				}
-				$cat2path=array();
-				foreach((array)$categories->return_sorted_array(0,False,'','','',!$type,0,true) as $cat)
+				$cat2path = array();
+				foreach ((array)$categories->return_sorted_array(0, False, '', '', '', !$type, 0, true) as $cat)
 				{
 					$s = stripslashes($cat['name']);
 
@@ -479,7 +479,7 @@ 
 				if ($value)
 				{
 					$pathes = $unavailable = array();
-					foreach(is_array($value) ? $value : explode(',',$value) as $cat)
+					foreach (is_array($value) ? $value : explode(',', $value) as $cat)
 					{
 						if (isset($cat2path[$cat]))
 						{

Braces +28 added lines, -7 removed lines

@@ -187,7 +187,10 @@ 
 		}
 		foreach((array)$item['item'] as $child)
 		{
-			if (self::in_tree($id, $child)) return true;
+			if (self::in_tree($id, $child))
+			{
+				return true;
+			}
 		}
 		return false;
 	}
@@ -254,10 +257,13 @@ 
 					{
 						$value = array_merge($value, (array)self::$request->preserv[$unavailable_name]);
 					}
-					elseif(!$value)	// for single cat, we only restore unavailable one, if no other was selected
+					elseif(!$value)
+					{
+						// for single cat, we only restore unavailable one, if no other was selected
 					{
 						$value = self::$request->preserv[$unavailable_name];
 					}
+					}
 				}
 				$value = implode(',',$value);
 			}
@@ -266,7 +272,10 @@ 
 				self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
 			}
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value).', allowed='.array2string($allowed));
 		}
 	}
@@ -286,7 +295,10 @@ 
 			//error_log(__METHOD__."() setting templated image-path for $form_name: $templated_path");
 		}
 
-		if (!is_array(self::$request->sel_options[$form_name])) self::$request->sel_options[$form_name] = array();
+		if (!is_array(self::$request->sel_options[$form_name]))
+		{
+			self::$request->sel_options[$form_name] = array();
+		}
 		if ($this->attrs['type'])
 		{
 			// += to keep further options set by app code
@@ -354,7 +366,10 @@ 
 	public static function imagePath($image)
 	{
 		static $image_path=null;
-		if (!isset($image_path)) $image_path = self::templateImagePath ();
+		if (!isset($image_path))
+		{
+			$image_path = self::templateImagePath ();
+		}
 
 		$parts = explode('/', $image_path);
 		$image_parts   = explode('/', $image);
@@ -430,12 +445,18 @@ 
 		switch ($widget_type)
 		{
 			case 'tree-cat':	// !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app, $type4: parent-id, $type5=owner (-1=global),$type6=show missing
-				if ($readonly)  // for readonly we dont need to fetch all cat's, nor do we need to indent them by level
+				if ($readonly)
+				{
+					// for readonly we dont need to fetch all cat's, nor do we need to indent them by level
 				{
 					$cell['no_lang'] = True;
+				}
 					foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
 					{
-						if ($id) $cell['sel_options'][$id] = stripslashes($GLOBALS['egw']->categories->id2name($id));
+						if ($id)
+						{
+							$cell['sel_options'][$id] = stripslashes($GLOBALS['egw']->categories->id2name($id));
+						}
 					}
 					break;
 				}

api/src/Etemplate/Widget/Url.php

Doc Comments -1 removed lines

@@ -52,7 +52,6 @@
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{

Spacing +11 added lines, -11 removed lines

@@ -54,7 +54,7 @@ 
 	 * @param array &$validated=array() validated content
 	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -64,12 +64,12 @@ 
 
 			if ((string)$value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!'), '');
 				return;
 			}
 			elseif ((string)$value != '' && !isset($this->attrs['preg']))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					case 'url':
 						// if no protocol given eg. "www.egroupware.org" prepend "http://" for validation
@@ -79,7 +79,7 @@ 
 						}
 						$url_valid = filter_var($value, FILTER_VALIDATE_URL) ||
 							// Remove intl chars & check again, but if it passes we'll keep the original
-							filter_var(preg_replace('/[^[:print:]]/','',$value), FILTER_VALIDATE_URL);
+							filter_var(preg_replace('/[^[:print:]]/', '', $value), FILTER_VALIDATE_URL);
 						//error_log(__METHOD__."() filter_var(value=".array2string($value).", FILTER_VALIDATE_URL)=".array2string(filter_var($value, FILTER_VALIDATE_URL))." --> url_valid=".array2string($url_valid));
 						// remove http:// validation prefix again
 						if ($missing_protocol)
@@ -88,7 +88,7 @@ 
 						}
 						if (!$url_valid)
 						{
-							self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value),'');
+							self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value), '');
 							return;
 						}
 						break;
@@ -98,19 +98,19 @@ 
 				}
 			}
 
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 
-			if ((int) $this->attrs['maxlength'] > 0 && strlen($value) > (int) $this->attrs['maxlength'])
+			if ((int)$this->attrs['maxlength'] > 0 && strlen($value) > (int)$this->attrs['maxlength'])
 			{
-				$value = substr($value,0,(int) $this->attrs['maxlength']);
+				$value = substr($value, 0, (int)$this->attrs['maxlength']);
 			}
-			if ($this->attrs['preg'] && !preg_match($this->attrs['preg'],$value))
+			if ($this->attrs['preg'] && !preg_match($this->attrs['preg'], $value))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					default:
 						//error_log("preg_match('{$this->attrs['preg']}', '$value')=".array2string(preg_match($this->attrs['preg'], $value)));
-						self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value)/*." !preg_match('$this->attrs[preg]', '$value')"*/,'');
+						self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value)/*." !preg_match('$this->attrs[preg]', '$value')"*/, '');
 						break;
 				}
 			}

Braces +4 added lines, -1 removed lines

@@ -37,7 +37,10 @@
 		{
 			$value = self::get_array($content, $form_name);
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 		}
 	}
 }

api/src/Etemplate/Widget/Vfs.php

Doc Comments +1 added lines

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

Indentation +7 added lines, -7 removed lines

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

Braces +40 added lines, -10 removed lines

@@ -27,7 +27,10 @@ 
 
 	public function __construct($xml='')
 	{
-		if($xml) parent::__construct($xml);
+		if($xml)
+		{
+			parent::__construct($xml);
+		}
 	}
 
 	/**
@@ -64,9 +67,15 @@ 
 				}
 				$value =& self::get_array(self::$request->content, $form_name, true);
 				$path = Api\Link::vfs_path($app,$id,'',true);
-				if (!empty($relpath)) $path .= '/'.$relpath;
+				if (!empty($relpath))
+				{
+					$path .= '/'.$relpath;
+				}
 
-				if (true) $value = array();
+				if (true)
+				{
+					$value = array();
+				}
 
 				// Single file, already existing
 				if (substr($path,-1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
@@ -194,7 +203,10 @@ 
 				$replace[substr($link['id']['tmp_name'], strlen(Api\Vfs::PREFIX))] =
 					Api\Link::vfs_path($app, $id, Api\Vfs::basename($link['id']['tmp_name']), true);
 
-				if (!in_array($matches[1], $remove_dir)) $remove_dir[] = $matches[1];
+				if (!in_array($matches[1], $remove_dir))
+				{
+					$remove_dir[] = $matches[1];
+				}
 			}
 		}
 		if ($replace)
@@ -218,7 +230,10 @@ 
 	 */
 	static function get_temp_dir($app, $postfix=null)
 	{
-		if (!isset($postfix)) $postfix = md5(time().session_id());
+		if (!isset($postfix))
+		{
+			$postfix = md5(time().session_id());
+		}
 
 		return '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.tmp/'.$app.'_'.$postfix;
 	}
@@ -245,10 +260,13 @@ 
 		{
 			// add extension to path
 			$parts = explode('.',$filename);
-			if (($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))       // really an extension --> add it to path
+			if (($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))
+			{
+				// really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
 			}
+			}
 		}
 		else    // multiple upload with dir given (trailing slash)
 		{
@@ -294,7 +312,10 @@ 
 		switch($this->type)
 		{
 			case 'vfs-upload':
-				if(!is_array($value)) $value = array();
+				if(!is_array($value))
+				{
+					$value = array();
+				}
 				/* Check & skip files that made it asyncronously
 				list($app,$id,$relpath) = explode(':',$this->id,3);
 				//...
@@ -305,7 +326,10 @@ 
 				parent::validate($cname, $content, $validated);
 				break;
 		}
-		if (true) $valid = $value;
+		if (true)
+		{
+			$valid = $value;
+		}
 	}
 
 	/**
@@ -317,14 +341,20 @@ 
 		if (empty($id) || $id == 'undefined')
 		{
 			static $tmppath = array();      // static var, so all vfs-uploads get created in the same temporary dir
-			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir ($app);
+			if (!isset($tmppath[$app]))
+			{
+				$tmppath[$app] = self::get_temp_dir ($app);
+			}
 			$path = $tmppath[$app];
 		}
 		else
 		{
 			$path = Api\Link::vfs_path($app,$id,'',true);
 		}
-		if (!empty($relpath)) $path .= '/'.$relpath;
+		if (!empty($relpath))
+		{
+			$path .= '/'.$relpath;
+		}
 		return $path;
 	}
 }

Spacing +39 added lines, -39 removed lines

@@ -25,9 +25,9 @@ 
 	// Legacy option for vfs-upload
 	protected $legacy_options = "mime";
 
-	public function __construct($xml='')
+	public function __construct($xml = '')
 	{
-		if($xml) parent::__construct($xml);
+		if ($xml) parent::__construct($xml);
 	}
 
 	/**
@@ -36,10 +36,10 @@ 
 	 */
 	public function beforeSendToClient($cname, $expand = array())
 	{
-		if($this->type == 'vfs-upload' || $this->attrs['type'] == 'vfs-upload')
+		if ($this->type == 'vfs-upload' || $this->attrs['type'] == 'vfs-upload')
 		{
 			$form_name = self::form_name($cname, $this->id, $expand ? $expand : array('cont'=>self::$request->content));
-			if($this->attrs['path'])
+			if ($this->attrs['path'])
 			{
 				$path = $this->attrs['path'];
 			}
@@ -50,26 +50,26 @@ 
 
 			$this->setElementAttribute($form_name, 'path', $path);
 			// ID maps to path - check there for any existing files
-			list($app,$id,$relpath) = explode(':',$path,3);
-			if($app && $id)
+			list($app, $id, $relpath) = explode(':', $path, 3);
+			if ($app && $id)
 			{
-				if(!is_numeric($id))
+				if (!is_numeric($id))
 				{
-					$_id = self::expand_name($id,0,0,0,0,self::$request->content);
-					if($_id != $id)
+					$_id = self::expand_name($id, 0, 0, 0, 0, self::$request->content);
+					if ($_id != $id)
 					{
 						$id = $_id;
 						$form_name = "$app:$id:$relpath";
 					}
 				}
-				$value =& self::get_array(self::$request->content, $form_name, true);
-				$path = Api\Link::vfs_path($app,$id,'',true);
+				$value = & self::get_array(self::$request->content, $form_name, true);
+				$path = Api\Link::vfs_path($app, $id, '', true);
 				if (!empty($relpath)) $path .= '/'.$relpath;
 
 				if (true) $value = array();
 
 				// Single file, already existing
-				if (substr($path,-1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
+				if (substr($path, -1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
 				{
 					$file = Api\Vfs::stat($path);
 					$file['path'] = $path;
@@ -78,14 +78,14 @@ 
 					$value = array($file);
 				}
 				// Single file, missing extension in path
-				else if (substr($path, -1) != '/' && !Api\Vfs::file_exists($path) && $relpath && substr($relpath,-4,1) !== '.')
+				else if (substr($path, -1) != '/' && !Api\Vfs::file_exists($path) && $relpath && substr($relpath, -4, 1) !== '.')
 				{
-					$find = Api\Vfs::find(substr($path,0, - strlen($relpath)), array(
+					$find = Api\Vfs::find(substr($path, 0, - strlen($relpath)), array(
 						'type' => 'f',
 						'maxdepth' => 1,
-						'name' => $relpath . '*'
+						'name' => $relpath.'*'
 					));
-					foreach($find as $file)
+					foreach ($find as $file)
 					{
 						$file_info = Api\Vfs::stat($file);
 						$file_info['path'] = $file;
@@ -97,7 +97,7 @@ 
 				else if (substr($path, -1) == '/' && Api\Vfs::is_dir($path))
 				{
 					$scan = Api\Vfs::scandir($path);
-					foreach($scan as $file)
+					foreach ($scan as $file)
 					{
 						$file_info = Api\Vfs::stat("$path$file");
 						$file_info['path'] = "$path$file";
@@ -113,7 +113,7 @@ 
 	public static function ajax_upload()
 	{
 		parent::ajax_upload();
-		foreach($_FILES as $file)
+		foreach ($_FILES as $file)
 		{
 			self::store_file($_REQUEST['path'] ? $_REQUEST['path'] : $_REQUEST['widget_id'], $file);
 		}
@@ -126,7 +126,7 @@ 
 	{
 		$request_id = urldecode($_REQUEST['request_id']);
 		$widget_id = $_REQUEST['widget_id'];
-		if(!self::$request = Etemplate\Request::read($request_id))
+		if (!self::$request = Etemplate\Request::read($request_id))
 		{
 			$error = lang("Could not read session");
 		}
@@ -186,10 +186,10 @@ 
 	static function fix_html_dragins($app, $id, array $links, &$html)
 	{
 		$replace = $remove_dir = array();
-		foreach($links as $link)
+		foreach ($links as $link)
 		{
 			$matches = null;
-			if (is_array($link) && preg_match('|^'.preg_quote(Api\Vfs::PREFIX,'|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
+			if (is_array($link) && preg_match('|^'.preg_quote(Api\Vfs::PREFIX, '|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
 			{
 				$replace[substr($link['id']['tmp_name'], strlen(Api\Vfs::PREFIX))] =
 					Api\Link::vfs_path($app, $id, Api\Vfs::basename($link['id']['tmp_name']), true);
@@ -201,7 +201,7 @@ 
 		{
 			$html = strtr($old = $html, $replace);
 			// remove all dirs
-			foreach($remove_dir as $dir)
+			foreach ($remove_dir as $dir)
 			{
 				Api\Vfs::remove($dir);
 			}
@@ -216,7 +216,7 @@ 
 	 * @param string $postfix =null default random id
 	 * @return string vfs path
 	 */
-	static function get_temp_dir($app, $postfix=null)
+	static function get_temp_dir($app, $postfix = null)
 	{
 		if (!isset($postfix)) $postfix = md5(time().session_id());
 
@@ -236,15 +236,15 @@ 
 		$name = $_REQUEST['widget_id'];
 
 		// Find real path
-		if($path[0] != '/')
+		if ($path[0] != '/')
 		{
 			$path = self::get_vfs_path($path);
 		}
 		$filename = $file['name'];
-		if (substr($path,-1) != '/')
+		if (substr($path, -1) != '/')
 		{
 			// add extension to path
-			$parts = explode('.',$filename);
+			$parts = explode('.', $filename);
 			if (($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))       // really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
@@ -256,17 +256,17 @@ 
 		}
 		if (!($dir = Api\Vfs::dirname($path)))
 		{
-			self::set_validation_error($name,lang('Error create parent directory %1!', "dirname('$path') === false"));
+			self::set_validation_error($name, lang('Error create parent directory %1!', "dirname('$path') === false"));
 			return false;
 		}
-		if (!Api\Vfs::file_exists($dir) && !Api\Vfs::mkdir($dir,null,STREAM_MKDIR_RECURSIVE))
+		if (!Api\Vfs::file_exists($dir) && !Api\Vfs::mkdir($dir, null, STREAM_MKDIR_RECURSIVE))
 		{
-			self::set_validation_error($name,lang('Error create parent directory %1!',Api\Vfs::decodePath($dir)));
+			self::set_validation_error($name, lang('Error create parent directory %1!', Api\Vfs::decodePath($dir)));
 			return false;
 		}
-		if (!copy($file['tmp_name'],Api\Vfs::PREFIX.$path))
+		if (!copy($file['tmp_name'], Api\Vfs::PREFIX.$path))
 		{
-			self::set_validation_error($name,lang('Error copying uploaded file to vfs!'));
+			self::set_validation_error($name, lang('Error copying uploaded file to vfs!'));
 			return false;
 		}
 
@@ -285,7 +285,7 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		// do not validate, as it would overwrite preserved values with null!
 		if (in_array($this->type, array('vfs-size', 'vfs-uid', 'vfs-gid', 'vfs', 'vfs-mime')))
@@ -294,12 +294,12 @@ 
 		}
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value = $value_in = self::get_array($content, $form_name);
-		$valid =& self::get_array($validated, $form_name, true);
+		$valid = & self::get_array($validated, $form_name, true);
 
-		switch($this->type)
+		switch ($this->type)
 		{
 			case 'vfs-upload':
-				if(!is_array($value)) $value = array();
+				if (!is_array($value)) $value = array();
 				/* Check & skip files that made it asyncronously
 				list($app,$id,$relpath) = explode(':',$this->id,3);
 				//...
@@ -318,16 +318,16 @@ 
 	 */
 	public static function get_vfs_path($path)
 	{
-		list($app,$id,$relpath) = explode(':',$path,3);
+		list($app, $id, $relpath) = explode(':', $path, 3);
 		if (empty($id) || $id == 'undefined')
 		{
-			static $tmppath = array();      // static var, so all vfs-uploads get created in the same temporary dir
-			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir ($app);
+			static $tmppath = array(); // static var, so all vfs-uploads get created in the same temporary dir
+			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir($app);
 			$path = $tmppath[$app];
 		}
 		else
 		{
-			$path = Api\Link::vfs_path($app,$id,'',true);
+			$path = Api\Link::vfs_path($app, $id, '', true);
 		}
 		if (!empty($relpath)) $path .= '/'.$relpath;
 		return $path;

api/src/Exception/NoPermission/Admin.php

Doc Comments +3 added lines

@@ -19,6 +19,9 @@
  */
 class Admin extends App
 {
+	/**
+	 * @param string $msg
+	 */
 	function __construct($msg=null,$code=102)
 	{
 		if (is_null($msg)) $msg = 'admin';

Spacing +2 added lines, -2 removed lines

@@ -19,10 +19,10 @@
  */
 class Admin extends App
 {
-	function __construct($msg=null,$code=102)
+	function __construct($msg = null, $code = 102)
 	{
 		if (is_null($msg)) $msg = 'admin';
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -21,7 +21,10 @@
 {
 	function __construct($msg=null,$code=102)
 	{
-		if (is_null($msg)) $msg = 'admin';
+		if (is_null($msg))
+		{
+			$msg = 'admin';
+		}
 
 		parent::__construct($msg,$code);
 	}