EGroupware / egroupware

api/src/Etemplate/Widget/Taglist.php

Indentation +3 added lines, -3 removed lines

@@ -81,9 +81,9 @@
 		}
 		
 		usort($results, function ($a, $b) use ($query) {
-		    similar_text($query, $a["label"], $percent_a);
-		    similar_text($query, $b["label"], $percent_b);
-		    return $percent_a === $percent_b ? 0 : ($percent_a > $percent_b ? -1 : 1);
+			similar_text($query, $a["label"], $percent_a);
+			similar_text($query, $b["label"], $percent_b);
+			return $percent_a === $percent_b ? 0 : ($percent_a > $percent_b ? -1 : 1);
 		});
 		
 		 // switch regular JSON response handling off

Spacing +19 added lines, -19 removed lines

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

Braces +9 added lines, -5 removed lines

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