EGroupware / egroupware

api/src/Etemplate/Widget/Box.php

Spacing +12 added lines, -12 removed lines

@@ -42,17 +42,17 @@ 
 	 * @param array $params =array('') parameter(s) first parameter has to be cname!
 	 * @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)
 	{
-		$cname =& $params[0];
-		$expand =& $params[1];
+		$cname = & $params[0];
+		$expand = & $params[1];
 		$old_cname = $params[0];
 		$old_expand = $params[1];
 
 		if ($this->id && $this->type != 'groupbox') $cname = self::form_name($cname, $this->id, $params[1]);
 		if ($expand['cname'] !== $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)))
@@ -67,11 +67,11 @@ 
 
 		// Expand children
 		$columns_disabled = null;
-		for($n = 0; ; ++$n)
+		for ($n = 0; ; ++$n)
 		{
 			if (isset($this->children[$n]))
 			{
-				$child =& $this->children[$n];
+				$child = & $this->children[$n];
 				// If type has something that can be expanded, we need to expand it so the correct method is run
 				$this->expand_widget($child, $expand);
 			}
@@ -107,17 +107,17 @@ 
 	 */
 	private function need_autorepeat(Etemplate\Widget $widget, $cname, array $expand)
 	{
-		foreach(array($widget) + $widget->children as $check_widget)
+		foreach (array($widget) + $widget->children as $check_widget)
 		{
 			$pat = $check_widget->id;
-			while(($pattern = strstr($pat, '$')))
+			while (($pattern = strstr($pat, '$')))
 			{
-				$pat = substr($pattern,$pattern[1] == '{' ? 2 : 1);
+				$pat = substr($pattern, $pattern[1] == '{' ? 2 : 1);
 
-				$Ok = $pat[0] == 'r' && !(substr($pat,0,2) == 'r_' ||
-					substr($pat,0,4) == 'row_' && substr($pat,0,8) != 'row_cont');
+				$Ok = $pat[0] == 'r' && !(substr($pat, 0, 2) == 'r_' ||
+					substr($pat, 0, 4) == 'row_' && substr($pat, 0, 8) != 'row_cont');
 
-				if ($Ok && ($fname=self::form_name($cname, $check_widget->id, $expand)) &&
+				if ($Ok && ($fname = self::form_name($cname, $check_widget->id, $expand)) &&
 					// need to break if fname ends in [] as get_array() will ignore it and returns whole array
 					// for an id like "run[$row_cont[appname]]"
 					substr($fname, -2) != '[]' &&

Braces +8 added lines, -2 removed lines

@@ -49,7 +49,10 @@ 
 		$old_cname = $params[0];
 		$old_expand = $params[1];
 
-		if ($this->id && $this->type != 'groupbox') $cname = self::form_name($cname, $this->id, $params[1]);
+		if ($this->id && $this->type != 'groupbox')
+		{
+			$cname = self::form_name($cname, $this->id, $params[1]);
+		}
 		if ($expand['cname'] !== $cname && $cname)
 		{
 			$expand['cont'] =& self::get_array(self::$request->content, $cname);
@@ -121,10 +124,13 @@ 
 					// need to break if fname ends in [] as get_array() will ignore it and returns whole array
 					// for an id like "run[$row_cont[appname]]"
 					substr($fname, -2) != '[]' &&
-					($value = self::get_array(self::$request->content, $fname)) !== null)	// null = not found (can be false!)
+					($value = self::get_array(self::$request->content, $fname)) !== null)
+				{
+					// null = not found (can be false!)
 				{
 					//error_log(__METHOD__."($widget,$cname) $this autorepeating row $expand[row] because of $check_widget->id = '$fname' is ".array2string($value));
 					unset($value);
+				}
 					return true;
 				}
 			}

api/src/Etemplate/Widget/AjaxSelect.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 	 * @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)
 	{
 		$matches = null;
 		if ($cname == '$row')	// happens eg. with custom-fields: $cname='$row', this->id='#something'
@@ -55,13 +55,13 @@ 
 
 		// Make sure  s, etc.  are properly encoded when sent, and not double-encoded
 		$options = (isset(self::$request->sel_options[$form_name]) ? $form_name : $this->id);
-		if(is_array(self::$request->sel_options[$options]))
+		if (is_array(self::$request->sel_options[$options]))
 		{
 
 			// Fix any custom options from application
-			self::fix_encoded_options(self::$request->sel_options[$options],true);
+			self::fix_encoded_options(self::$request->sel_options[$options], true);
 
-			if(!self::$request->sel_options[$options])
+			if (!self::$request->sel_options[$options])
 			{
 				unset(self::$request->sel_options[$options]);
 			}

Braces +4 added lines, -1 removed lines

@@ -29,10 +29,13 @@
 	public function beforeSendToClient($cname, array $expand=null)
 	{
 		$matches = null;
-		if ($cname == '$row')	// happens eg. with custom-fields: $cname='$row', this->id='#something'
+		if ($cname == '$row')
+		{
+			// happens eg. with custom-fields: $cname='$row', this->id='#something'
 		{
 			$form_name = $this->id;
 		}
+		}
 		// happens with fields in nm-header: $cname='nm', this->id='${row}[something]' or '{$row}[something]'
 		elseif (preg_match('/(\${row}|{\$row})\[([^]]+)\]$/', $this->id, $matches))
 		{

api/src/Etemplate/Widget/Nextmatch/Accountfilter.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,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
 	 */
-	public function set_attrs($xml, $cloned=true)
+	public function set_attrs($xml, $cloned = true)
 	{
 		parent::set_attrs($xml, $cloned);
 

api/src/Etemplate/Widget/Nextmatch/Customfilter.php

Spacing +8 added lines, -8 removed lines

@@ -29,18 +29,18 @@ 
 	 * @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)
 	{
-		switch($this->attrs['type'])
+		switch ($this->attrs['type'])
 		{
 			case "link-entry":
 				self::$transformation['type'] = $this->attrs['type'] = 'nextmatch-entryheader';
 				break;
 			default:
-				list($type) = explode('-',$this->attrs['type']);
-				if($type == 'select')
+				list($type) = explode('-', $this->attrs['type']);
+				if ($type == 'select')
 				{
-					if(in_array($this->attrs['type'], Widget\Select::$cached_types))
+					if (in_array($this->attrs['type'], Widget\Select::$cached_types))
 					{
 						$widget_type = $this->attrs['type'];
 					}
@@ -53,7 +53,7 @@ 
 		$this->setElementAttribute($form_name, 'options', trim($this->attrs['widget_options']) != '' ? $this->attrs['widget_options'] : '');
 
 		$this->setElementAttribute($form_name, 'type', $this->attrs['type']);
-		if($widget_type)
+		if ($widget_type)
 		{
 			$this->setElementAttribute($form_name, 'widget_type', $widget_type);
 		}
@@ -69,11 +69,11 @@ 
 	 * @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())
 	{
 		$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);
 		// returning null instead of array(), as array() will be overwritten by etemplate_new::complete_array_merge()
 		// with preserved old content and therefore user can not empty a taglist
 		$valid = $value ? $value : null;

api/src/Etemplate/Widget/Link.php

Spacing +48 added lines, -48 removed lines

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

Braces +32 added lines, -10 removed lines

@@ -37,7 +37,8 @@ 
 	 */
 	public function __construct($xml = '')
 	{
-		if($xml) {
+		if($xml)
+		{
 			parent::__construct($xml);
 		}
 	}
@@ -85,14 +86,18 @@ 
 
 
 		// ToDo: implement on client-side
-		if (!$attrs['help']) self::setElementAttribute($form_name, 'help', 'view this linked entry in its application');
+		if (!$attrs['help'])
+		{
+			self::setElementAttribute($form_name, 'help', 'view this linked entry in its application');
+		}
 
 		if($attrs['type'] == 'link-list')
 		{
 			$app = $value['to_app'];
 			$id  = $value['to_id'];
 			$links = Api\Link::get_links($app,$id,'','link_lastmod DESC',true, $value['show_deleted']);
-			foreach($links as $link) {
+			foreach($links as $link)
+			{
 				$value[] = $link;
 			}
 		}
@@ -104,7 +109,10 @@ 
 	public static function ajax_link_search($app, $type, $pattern, $options=array())
 	{
 		$options['type'] = $type ? $type : $options['type'];
-		if(!$options['num_rows']) $options['num_rows'] = 1000;
+		if(!$options['num_rows'])
+		{
+			$options['num_rows'] = 1000;
+		}
 
 		$links = Api\Link::query($app, $pattern, $options);
 
@@ -160,8 +168,10 @@ 
 	public static function ajax_link($app, $id, Array $links)
 	{
 		// Files need to know full path in tmp directory
-		foreach($links as $key => $link) {
-			if($link['app'] == Api\Link::VFS_APPNAME) {
+		foreach($links as $key => $link)
+		{
+			if($link['app'] == Api\Link::VFS_APPNAME)
+			{
 				if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 				{
 					$path = $GLOBALS['egw_info']['server']['temp_dir'] . '/' . $link['id'];
@@ -253,7 +263,10 @@ 
 			$id .= "/$dest_file";
 		}
 
-		if(!is_array($files)) $files = array($files);
+		if(!is_array($files))
+		{
+			$files = array($files);
+		}
 		foreach($files as $target)
 		{
 			Api\Link::link_file($app, $id, $target);
@@ -340,7 +353,10 @@ 
 				else
 				{
 					// Not enough information, leave it to the application
-					if(!is_array($value['to_id'])) $value['to_id'] = array();
+					if(!is_array($value['to_id']))
+					{
+						$value['to_id'] = array();
+					}
 					$value['to_id'][] = $link;
 				}
 			}
@@ -360,7 +376,10 @@ 
 				}
 				foreach($files as $name => $attrs)
 				{
-					if(!is_array($value['to_id'])) $value['to_id'] = array();
+					if(!is_array($value['to_id']))
+					{
+						$value['to_id'] = array();
+					}
 					$value['to_id'][] = array(
 						'app'	=> Api\Link::VFS_APPNAME,
 						'id'	=> array(
@@ -372,7 +391,10 @@ 
 				}
 			}
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 			//error_log($this);
 			//error_log("   " . array2string($valid));
 		}

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

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

api/src/Etemplate/Widget/File.php

Indentation +4 added lines, -4 removed lines

@@ -238,10 +238,10 @@
 	}
 
 	/**
-	* Delete a directory RECURSIVELY
-	* @param string $dir - directory path
-	* @link http://php.net/manual/en/function.rmdir.php
-	*/
+	 * Delete a directory RECURSIVELY
+	 * @param string $dir - directory path
+	 * @link http://php.net/manual/en/function.rmdir.php
+	 */
 	private static function rrmdir($dir)
 	{
 		if (is_dir($dir))

Spacing +37 added lines, -37 removed lines

@@ -27,12 +27,12 @@ 
 	 *
 	 * @param string $xml
 	 */
-	public function __construct($xml='')
+	public function __construct($xml = '')
 	{
-		if($xml) parent::__construct($xml);
+		if ($xml) parent::__construct($xml);
 
 		// Legacy multiple - id ends in []
-		if(substr($this->id,-2) == '[]')
+		if (substr($this->id, -2) == '[]')
 		{
 			$this->setElementAttribute($this->id, 'multiple', true);
 		}
@@ -52,7 +52,7 @@ 
 		$response = Api\Json\Response::get();
 		$request_id = str_replace(' ', '+', rawurldecode($_REQUEST['request_id']));
 		$widget_id = $_REQUEST['widget_id'];
-		if(!self::$request = Etemplate\Request::read($request_id)) {
+		if (!self::$request = Etemplate\Request::read($request_id)) {
 			$response->error("Could not read session");
 			return;
 		}
@@ -70,20 +70,20 @@ 
 		foreach ($_FILES as $field => &$files)
 		{
 			$widget = $template->getElementById($widget_id ? $widget_id : $field);
-			if($widget && $widget->attrs['mime']) {
+			if ($widget && $widget->attrs['mime']) {
 				$mime = $widget->attrs['mime'];
 			}
 
 			// Check for legacy [] in id to indicate multiple - it changes format
-			if(is_array($files['name'])) {
+			if (is_array($files['name'])) {
 				$file_list = array();
-				foreach($files as $f_field => $values)
+				foreach ($files as $f_field => $values)
 				{
-					foreach($values as $key => $f_value) {
+					foreach ($values as $key => $f_value) {
 						$file_list[$key][$f_field] = $f_value;
 					}
 				}
-				foreach($file_list as $file)
+				foreach ($file_list as $file)
 				{
 					self::process_uploaded_file($field, $file, $mime, $file_data);
 				}
@@ -99,13 +99,13 @@ 
 		$response->data($file_data);
 
 		// Check for a callback, call it if there is one
-		foreach($_FILES as $field => $file)
+		foreach ($_FILES as $field => $file)
 		{
-			if(($element = $template->getElementById($field)))
+			if (($element = $template->getElementById($field)))
 			{
 				$callback = $element->attrs['callback'];
-				if(!$callback) $callback = $template->getElementAttribute($field, 'callback');
-				if($callback)
+				if (!$callback) $callback = $template->getElementAttribute($field, 'callback');
+				if ($callback)
 				{
 					ExecMethod($callback, $_FILES[$field]);
 				}
@@ -118,10 +118,10 @@ 
 	 */
 	protected static function process_uploaded_file($field, Array &$file, $mime, Array &$file_data)
 	{
-		unset($field);	// not used
+		unset($field); // not used
 
 		// Chunks get mangled a little
-		if($file['name'] == 'blob')
+		if ($file['name'] == 'blob')
 		{
 			$file['name'] = $_POST['resumableFilename'];
 			$file['type'] = $_POST['resumableType'];
@@ -129,14 +129,14 @@ 
 
 		if ($file['error'] == UPLOAD_ERR_OK && trim($file['name']) != '' && $file['size'] > 0 && is_uploaded_file($file['tmp_name'])) {
 			// Mime check
-			if($mime)
+			if ($mime)
 			{
 				$type = $file['type'];
 				$is_preg = $mime[0] == '/';
-				if (!$is_preg && strcasecmp($mime,$type) ||
-					$is_preg && !preg_match($mime,$type))
+				if (!$is_preg && strcasecmp($mime, $type) ||
+					$is_preg && !preg_match($mime, $type))
 				{
-					$file_data[$file['name']] = $file['name'].':'.lang('File is of wrong type (%1 != %2)!',$type,$mime);
+					$file_data[$file['name']] = $file['name'].':'.lang('File is of wrong type (%1 != %2)!', $type, $mime);
 					//error_log(__METHOD__.__LINE__.array2string($file_data[$file['name']]));
 					return false;
 				}
@@ -145,8 +145,8 @@ 
 			// Resumable / chunked uploads
 			// init the destination file (format <filename.ext>.part<#chunk>
 			// the file is stored in a temporary directory
-			$temp_dir = $GLOBALS['egw_info']['server']['temp_dir'].'/'.str_replace('/','_',$_POST['resumableIdentifier']);
-			$dest_file = $temp_dir.'/'.str_replace('/','_',$_POST['resumableFilename']).'.part'.(int)$_POST['resumableChunkNumber'];
+			$temp_dir = $GLOBALS['egw_info']['server']['temp_dir'].'/'.str_replace('/', '_', $_POST['resumableIdentifier']);
+			$dest_file = $temp_dir.'/'.str_replace('/', '_', $_POST['resumableFilename']).'.part'.(int)$_POST['resumableChunkNumber'];
 
 			// create the temporary directory
 			if (!is_dir($temp_dir))
@@ -162,10 +162,10 @@ 
 			else
 			{
 				// check if all the parts present, and create the final destination file
-				$new_file = self::createFileFromChunks($temp_dir, str_replace('/','_',$_POST['resumableFilename']),
+				$new_file = self::createFileFromChunks($temp_dir, str_replace('/', '_', $_POST['resumableFilename']),
 						$_POST['resumableChunkSize'], $_POST['resumableTotalSize']);
 			}
-			if( $new_file) {
+			if ($new_file) {
 				$file['tmp_name'] = $new_file;
 
 				// Data to send back to client
@@ -194,7 +194,7 @@ 
 
 		// count all the parts of this file
 		$total_files = 0;
-		foreach(scandir($temp_dir) as $file) {
+		foreach (scandir($temp_dir) as $file) {
 			if (stripos($file, $fileName) !== false) {
 				$total_files++;
 			}
@@ -202,10 +202,10 @@ 
 
 		// check that all the parts are present
 		// the size of the last part is between chunkSize and 2*$chunkSize
-		if ($total_files * $chunkSize >=  ($totalSize - $chunkSize + 1)) {
+		if ($total_files * $chunkSize >= ($totalSize - $chunkSize + 1)) {
 			if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 			{
-				$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'egw_');
+				$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'egw_');
 			}
 			else
 			{
@@ -214,7 +214,7 @@ 
 
 			// create the final destination file
 			if (($fp = fopen($new_file, 'w')) !== false) {
-				for ($i=1; $i<=$total_files; $i++) {
+				for ($i = 1; $i <= $total_files; $i++) {
 					fwrite($fp, file_get_contents($temp_dir.'/'.$fileName.'.part'.$i));
 				}
 				fclose($fp);
@@ -250,13 +250,13 @@ 
 			{
 				if ($object != "." && $object != "..")
 				{
-					if (filetype($dir . "/" . $object) == "dir")
+					if (filetype($dir."/".$object) == "dir")
 					{
-						self::rrmdir($dir . "/" . $object);
+						self::rrmdir($dir."/".$object);
 					}
 					else
 					{
-						unlink($dir . "/" . $object);
+						unlink($dir."/".$object);
 					}
 				}
 			}
@@ -273,23 +273,23 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value = $value_in = self::get_array($content, $form_name);
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 
-			if(!is_array($value)) $value = array();
+			if (!is_array($value)) $value = array();
 
 			// Incoming values indexed by temp name
-			if($value[0]) $value = $value[0];
+			if ($value[0]) $value = $value[0];
 
-			foreach($value as $tmp => $file)
+			foreach ($value as $tmp => $file)
 			{
-				if(!$file) continue;
+				if (!$file) continue;
 				if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 				{
 					$path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.$tmp;
@@ -309,7 +309,7 @@ 
 				);
 			}
 
-			if($valid && !$this->attrs['multiple']) $valid = $valid[0];
+			if ($valid && !$this->attrs['multiple']) $valid = $valid[0];
 		}
 	}
 }

Braces +58 added lines, -22 removed lines

@@ -29,7 +29,10 @@ 
 	 */
 	public function __construct($xml='')
 	{
-		if($xml) parent::__construct($xml);
+		if($xml)
+		{
+			parent::__construct($xml);
+		}
 
 		// Legacy multiple - id ends in []
 		if(substr($this->id,-2) == '[]')
@@ -48,11 +51,13 @@ 
 	 *
 	 * @note Currently, no attempt is made to clean up files automatically.
 	 */
-	public static function ajax_upload() {
+	public static function ajax_upload()
+	{
 		$response = Api\Json\Response::get();
 		$request_id = str_replace(' ', '+', rawurldecode($_REQUEST['request_id']));
 		$widget_id = $_REQUEST['widget_id'];
-		if(!self::$request = Etemplate\Request::read($request_id)) {
+		if(!self::$request = Etemplate\Request::read($request_id))
+		{
 			$response->error("Could not read session");
 			return;
 		}
@@ -70,16 +75,19 @@ 
 		foreach ($_FILES as $field => &$files)
 		{
 			$widget = $template->getElementById($widget_id ? $widget_id : $field);
-			if($widget && $widget->attrs['mime']) {
+			if($widget && $widget->attrs['mime'])
+			{
 				$mime = $widget->attrs['mime'];
 			}
 
 			// Check for legacy [] in id to indicate multiple - it changes format
-			if(is_array($files['name'])) {
+			if(is_array($files['name']))
+			{
 				$file_list = array();
 				foreach($files as $f_field => $values)
 				{
-					foreach($values as $key => $f_value) {
+					foreach($values as $key => $f_value)
+					{
 						$file_list[$key][$f_field] = $f_value;
 					}
 				}
@@ -104,7 +112,10 @@ 
 			if(($element = $template->getElementById($field)))
 			{
 				$callback = $element->attrs['callback'];
-				if(!$callback) $callback = $template->getElementAttribute($field, 'callback');
+				if(!$callback)
+				{
+					$callback = $template->getElementAttribute($field, 'callback');
+				}
 				if($callback)
 				{
 					ExecMethod($callback, $_FILES[$field]);
@@ -127,7 +138,8 @@ 
 			$file['type'] = $_POST['resumableType'];
 		}
 
-		if ($file['error'] == UPLOAD_ERR_OK && trim($file['name']) != '' && $file['size'] > 0 && is_uploaded_file($file['tmp_name'])) {
+		if ($file['error'] == UPLOAD_ERR_OK && trim($file['name']) != '' && $file['size'] > 0 && is_uploaded_file($file['tmp_name']))
+		{
 			// Mime check
 			if($mime)
 			{
@@ -165,7 +177,8 @@ 
 				$new_file = self::createFileFromChunks($temp_dir, str_replace('/','_',$_POST['resumableFilename']),
 						$_POST['resumableChunkSize'], $_POST['resumableTotalSize']);
 			}
-			if( $new_file) {
+			if( $new_file)
+			{
 				$file['tmp_name'] = $new_file;
 
 				// Data to send back to client
@@ -190,19 +203,23 @@ 
 	 * @param string $chunkSize - each chunk size (in bytes)
 	 * @param string $totalSize - original file size (in bytes)
 	 */
-	private static function createFileFromChunks($temp_dir, $fileName, $chunkSize, $totalSize) {
+	private static function createFileFromChunks($temp_dir, $fileName, $chunkSize, $totalSize)
+	{
 
 		// count all the parts of this file
 		$total_files = 0;
-		foreach(scandir($temp_dir) as $file) {
-			if (stripos($file, $fileName) !== false) {
+		foreach(scandir($temp_dir) as $file)
+		{
+			if (stripos($file, $fileName) !== false)
+			{
 				$total_files++;
 			}
 		}
 
 		// check that all the parts are present
 		// the size of the last part is between chunkSize and 2*$chunkSize
-		if ($total_files * $chunkSize >=  ($totalSize - $chunkSize + 1)) {
+		if ($total_files * $chunkSize >=  ($totalSize - $chunkSize + 1))
+		{
 			if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 			{
 				$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'egw_');
@@ -213,21 +230,28 @@ 
 			}
 
 			// create the final destination file
-			if (($fp = fopen($new_file, 'w')) !== false) {
-				for ($i=1; $i<=$total_files; $i++) {
+			if (($fp = fopen($new_file, 'w')) !== false)
+			{
+				for ($i=1; $i<=$total_files; $i++)
+				{
 					fwrite($fp, file_get_contents($temp_dir.'/'.$fileName.'.part'.$i));
 				}
 				fclose($fp);
-			} else {
+			}
+			else
+			{
 				_log('cannot create the destination file');
 				return false;
 			}
 
 			// rename the temporary directory (to avoid access from other
 			// concurrent chunks uploads) and than delete it
-			if (rename($temp_dir, $temp_dir.'_UNUSED')) {
+			if (rename($temp_dir, $temp_dir.'_UNUSED'))
+			{
 				self::rrmdir($temp_dir.'_UNUSED');
-			} else {
+			}
+			else
+			{
 				self::rrmdir($temp_dir);
 			}
 
@@ -282,14 +306,23 @@ 
 			$value = $value_in = self::get_array($content, $form_name);
 			$valid =& self::get_array($validated, $form_name, true);
 
-			if(!is_array($value)) $value = array();
+			if(!is_array($value))
+			{
+				$value = array();
+			}
 
 			// Incoming values indexed by temp name
-			if($value[0]) $value = $value[0];
+			if($value[0])
+			{
+				$value = $value[0];
+			}
 
 			foreach($value as $tmp => $file)
 			{
-				if(!$file) continue;
+				if(!$file)
+				{
+					continue;
+				}
 				if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 				{
 					$path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.$tmp;
@@ -309,7 +342,10 @@ 
 				);
 			}
 
-			if($valid && !$this->attrs['multiple']) $valid = $valid[0];
+			if($valid && !$this->attrs['multiple'])
+			{
+				$valid = $valid[0];
+			}
 		}
 	}
 }

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

@@ -116,7 +116,7 @@
 	/**
 	 * Process one uploaded file.  There should only be one per request...
 	 */
-	protected static function process_uploaded_file($field, Array &$file, $mime, Array &$file_data)
+	protected static function process_uploaded_file($field, array &$file, $mime, array &$file_data)
 	{
 		unset($field);	// not used
 

api/src/Etemplate/Widget/Button.php

Spacing +5 added lines, -5 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);
 		//error_log(__METHOD__."('$cname', ".array2string($expand).", ...) $this: get_array(\$content, '$form_name')=".array2string(self::get_array($content, $form_name)));
@@ -53,18 +53,18 @@ 
 		{
 			$value = self::get_array($content, $form_name);
 
-			if(
+			if (
 				// Handle case of not existing $row_cont[id], eg: create[]
 				is_array($value) && count($value) == 1 ||
 				// check === true, as get_array() ignores a "[]" postfix and returns array() eg. for a not existing $row_cont[id] in "delete[$row_cont[id]]"
 				$value == true
 			)
 			{
-				$valid =& self::get_array($validated, $form_name, true);
+				$valid = & self::get_array($validated, $form_name, true);
 				if (true) $valid = is_array($value) ? $value : 'pressed';
 
 				// recorded pressed button globally, was in the template object before, put now as static on this object
-				if ($this->type == 'cancel' || $form_name == 'cancel' || substr($form_name,-10) == '[cancel]')
+				if ($this->type == 'cancel' || $form_name == 'cancel' || substr($form_name, -10) == '[cancel]')
 				{
 					self::$canceled = true;
 				}
@@ -76,4 +76,4 @@ 
 		}
 	}
 }
-Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Button', array('button','buttononly'));
+Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Button', array('button', 'buttononly'));

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())
 	{

Braces +5 added lines, -3 removed lines

@@ -58,10 +58,12 @@
 				is_array($value) && count($value) == 1 ||
 				// check === true, as get_array() ignores a "[]" postfix and returns array() eg. for a not existing $row_cont[id] in "delete[$row_cont[id]]"
 				$value == true
-			)
-			{
+			) {
 				$valid =& self::get_array($validated, $form_name, true);
-				if (true) $valid = is_array($value) ? $value : 'pressed';
+				if (true)
+				{
+					$valid = is_array($value) ? $value : 'pressed';
+				}
 
 				// recorded pressed button globally, was in the template object before, put now as static on this object
 				if ($this->type == 'cancel' || $form_name == 'cancel' || substr($form_name,-10) == '[cancel]')

api/src/Etemplate/Widget/Grid.php

Spacing +20 added lines, -20 removed lines

@@ -65,11 +65,11 @@ 
 	 * @param boolean $respect_disabled =false false (default): ignore disabled, true: method is NOT run for disabled widgets AND their children
 	 * @param array $columns_disabled=array() disabled columns
 	 */
-	public function run($method_name, $params=array(''), $respect_disabled=false, &$columns_disabled=array())
+	public function run($method_name, $params = array(''), $respect_disabled = false, &$columns_disabled = array())
 	{
 		// maintain $expand array name-expansion
-		$cname =& $params[0];
-		$expand =& $params[1];
+		$cname = & $params[0];
+		$expand = & $params[1];
 		$old_cname = $params[0];
 		$old_expand = $params[1];
 
@@ -85,13 +85,13 @@ 
 			//error_log(__METHOD__."('$method_name', ".array2string($params).', '.array2string($respect_disabled).") $this disabled='{$this->attrs['disabled']}'=".array2string($disabled).": NOT running");
 			$params[0] = $old_cname;
 			$params[1] = $old_expand;
-			return false;	// return
+			return false; // return
 		}
 
 		if ($this->id) $cname = self::form_name($cname, $this->id, $expand);
 		if ($expand['cname'] !== $cname && $cname)
 		{
-			$expand['cont'] =& self::get_array(self::$request->content, $cname);
+			$expand['cont'] = & self::get_array(self::$request->content, $cname);
 			$expand['cname'] = $cname;
 		}
 
@@ -101,10 +101,10 @@ 
 		}
 		//foreach($this->children as $n => $child)
 		$repeat_child = null;
-		for($n = 0; ; ++$n)
+		for ($n = 0; ; ++$n)
 		{
 			// maintain $expand array name-expansion
-			switch($this->type)
+			switch ($this->type)
 			{
 				case 'rows':
 					$expand['row'] = $n;
@@ -116,7 +116,7 @@ 
 			if (isset($this->children[$n]))
 			{
 				$child = $this->children[$n];
-				if($this->type == 'rows' || $this->type == 'columns')
+				if ($this->type == 'rows' || $this->type == 'columns')
 				{
 					/*
 					 * We store a clone of the repeated child, because at the end
@@ -143,7 +143,7 @@ 
 				if (in_array($n, $columns_disabled))
 				{
 					//error_log(__METHOD__."('$method_name', ".array2string($params).', '.array2string($respect_disabled).") $this column $n is disabled: NOT running");
-					continue;	// do NOT run $method_name on disabled columns
+					continue; // do NOT run $method_name on disabled columns
 				}
 			}
 			//error_log('Running ' . $method_name . ' on child ' . $n . '(' . $child . ') ['.$expand['row'] . ','.$expand['c'] . ']');
@@ -151,7 +151,7 @@ 
 
 			if ($this->type == 'columns' && $disabled)
 			{
-				$columns_disabled[] = $n;	// mark column as disabled
+				$columns_disabled[] = $n; // mark column as disabled
 			}
 		}
 		if ($this->type == 'grid')
@@ -175,34 +175,34 @@ 
 	private function need_autorepeat($cname, array $expand)
 	{
 		// check id's of children
-		foreach($this->children as $n => $direct_child)
+		foreach ($this->children as $n => $direct_child)
 		{
-			foreach(array_merge(array($direct_child), $n ? array() : $direct_child->children) as $child)
+			foreach (array_merge(array($direct_child), $n ? array() : $direct_child->children) as $child)
 			{
 				$pat = $child->id;
-				while(($patstr = strstr($pat, '$')))
+				while (($patstr = strstr($pat, '$')))
 				{
-					$pat = substr($patstr,$patstr[1] == '{' ? 2 : 1);
+					$pat = substr($patstr, $patstr[1] == '{' ? 2 : 1);
 
 					switch ($this->type)
 					{
 						case 'column':
-							$Ok = $pat[0] == 'c' && !(substr($pat,0,4) == 'cont' || substr($pat,0,2) == 'c_' ||
-								substr($pat,0,4) == 'col_');
+							$Ok = $pat[0] == 'c' && !(substr($pat, 0, 4) == 'cont' || substr($pat, 0, 2) == 'c_' ||
+								substr($pat, 0, 4) == 'col_');
 							break;
 						case 'row':
-							$Ok = $pat[0] == 'r' && !(substr($pat,0,2) == 'r_' ||
-								substr($pat,0,4) == 'row_' && substr($pat,0,8) != 'row_cont');
+							$Ok = $pat[0] == 'r' && !(substr($pat, 0, 2) == 'r_' ||
+								substr($pat, 0, 4) == 'row_' && substr($pat, 0, 8) != 'row_cont');
 							//error_log(__METHOD__."() pat='$pat' --> Ok=".array2string($Ok));
 							break;
 						default:
 							return false;
 					}
-					if ($Ok && ($fname=self::form_name($cname, $child->id, $expand)) &&
+					if ($Ok && ($fname = self::form_name($cname, $child->id, $expand)) &&
 						// need to break if fname ends in [] as get_array() will ignore it and returns whole array
 						// for an id like "run[$row_cont[appname]]"
 						substr($fname, -2) != '[]' &&
-						($value = self::get_array(self::$request->content,$fname)) !== null)	// null = not found (can be false!)
+						($value = self::get_array(self::$request->content, $fname)) !== null)	// null = not found (can be false!)
 					{
 						//error_log(__METHOD__."('$cname', ) $this autorepeating row $expand[row] because of $child->id = '$fname' is ".array2string($value));
 						unset($value);

Braces +8 added lines, -2 removed lines

@@ -88,7 +88,10 @@ 
 			return false;	// return
 		}
 
-		if ($this->id) $cname = self::form_name($cname, $this->id, $expand);
+		if ($this->id)
+		{
+			$cname = self::form_name($cname, $this->id, $expand);
+		}
 		if ($expand['cname'] !== $cname && $cname)
 		{
 			$expand['cont'] =& self::get_array(self::$request->content, $cname);
@@ -202,10 +205,13 @@ 
 						// need to break if fname ends in [] as get_array() will ignore it and returns whole array
 						// for an id like "run[$row_cont[appname]]"
 						substr($fname, -2) != '[]' &&
-						($value = self::get_array(self::$request->content,$fname)) !== null)	// null = not found (can be false!)
+						($value = self::get_array(self::$request->content,$fname)) !== null)
+					{
+						// null = not found (can be false!)
 					{
 						//error_log(__METHOD__."('$cname', ) $this autorepeating row $expand[row] because of $child->id = '$fname' is ".array2string($value));
 						unset($value);
+					}
 						return true;
 					}
 				}

api/src/Etemplate/Widget/HtmlArea.php

Spacing +5 added lines, -5 removed lines

@@ -38,16 +38,16 @@ 
 		$form_name = self::form_name($cname, $this->id);
 
 		$config = Api\Html\CkEditorConfig::get_ckeditor_config_array($this->attrs['mode'], $this->attrs['height'],
-			$this->attrs['expand_toolbar'],$this->attrs['base_href']
+			$this->attrs['expand_toolbar'], $this->attrs['base_href']
 		);
 		// User preferences
 		$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 		$font_size = Api\Html\CkEditorConfig::font_size_from_prefs();
 		$font_span = '<span style="width: 100%; display: inline; '.
-			($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').
+			($font ? 'font-family:'.$font.'; ' : '').($font_size ? 'font-size:'.$font_size.'; ' : '').
 			'">&#8203;</span>';
 		if (empty($font) && empty($font_size)) $font_span = '';
-		if($font_span)
+		if ($font_span)
 		{
 			$config['preference_style'] = $font_span;
 		}
@@ -65,7 +65,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);
 
@@ -77,7 +77,7 @@ 
 			{
 				$value = Api\Html\HtmLawed::purify($value, $this->attrs['validation_rules']);
 			}
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 		}
 	}

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())
 	{

Braces +8 added lines, -2 removed lines

@@ -46,7 +46,10 @@ 
 		$font_span = '<span style="width: 100%; display: inline; '.
 			($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').
 			'">&#8203;</span>';
-		if (empty($font) && empty($font_size)) $font_span = '';
+		if (empty($font) && empty($font_size))
+		{
+			$font_span = '';
+		}
 		if($font_span)
 		{
 			$config['preference_style'] = $font_span;
@@ -78,7 +81,10 @@ 
 				$value = Api\Html\HtmLawed::purify($value, $this->attrs['validation_rules']);
 			}
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 		}
 	}
 }