EGroupware / egroupware

addressbook/inc/class.addressbook_contactform.inc.php

Doc Comments +11 added lines, -15 removed lines

@@ -30,14 +30,12 @@ 
 	/**
 	 * Shows the contactform and stores the submitted data
 	 *
-	 * @param array $content=null submitted eTemplate content
-	 * @param int $addressbook=null int owner-id of addressbook to save contacts too
-	 * @param array $fields=null field-names to show
-	 * @param string $msg=null message to show after submitting the form
-	 * @param string $email=null comma-separated email addresses
-	 * @param string $tpl_name=null custom etemplate to use
-	 * @param string $subject=null subject for email
-	 * @param string $copytoreceiver=false send a copy of notification to receiver
+	 * @param array $content submitted eTemplate content
+	 * @param int $addressbook int owner-id of addressbook to save contacts too
+	 * @param array $fields field-names to show
+	 * @param string $tpl_name custom etemplate to use
+	 * @param string $subject subject for email
+	 * @param string $copytoreceiver send a copy of notification to receiver
 	 * @return string html content
 	 */
 	function display(array $content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array())
@@ -49,13 +47,11 @@ 
 	 * Shows the contactform and stores the submitted data ($content is a var parameter, eg. for extending classes)
 	 *
 	 * @param array &$content=null submitted eTemplate content
-	 * @param int $addressbook=null int owner-id of addressbook to save contacts too
-	 * @param array $fields=null field-names to show
-	 * @param string $msg=null message to show after submitting the form
-	 * @param string $email=null comma-separated email addresses
-	 * @param string $tpl_name=null custom etemplate to use
-	 * @param string $subject=null subject for email
-	 * @param string $copytoreceiver=false send a copy of notification to receiver
+	 * @param int $addressbook int owner-id of addressbook to save contacts too
+	 * @param array $fields field-names to show
+	 * @param string $tpl_name custom etemplate to use
+	 * @param string $subject subject for email
+	 * @param string $copytoreceiver send a copy of notification to receiver
 	 * @return string html content
 	 */
 	function display_var(array &$content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array())

Spacing +25 added lines, -25 removed lines

@@ -36,9 +36,9 @@ 
 	 * @param string $copytoreceiver=false send a copy of notification to receiver
 	 * @return string html content
 	 */
-	function display(array $content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array())
+	function display(array $content = null, $addressbook = null, $fields = null, $msg = null, $email = null, $tpl_name = null, $subject = null, $copytoreceiver = false, $sel_options = array())
 	{
-		return $this->display_var($content,$addressbook,$fields,$msg,$email,$tpl_name,$subject,$copytoreceiver,$sel_options);
+		return $this->display_var($content, $addressbook, $fields, $msg, $email, $tpl_name, $subject, $copytoreceiver, $sel_options);
 	}
 
 	/**
@@ -54,23 +54,23 @@ 
 	 * @param string $copytoreceiver=false send a copy of notification to receiver
 	 * @return string html content
 	 */
-	function display_var(array &$content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array())
+	function display_var(array &$content = null, $addressbook = null, $fields = null, $msg = null, $email = null, $tpl_name = null, $subject = null, $copytoreceiver = false, $sel_options = array())
 	{
 		#error_log( "<p>addressbook_contactform::display(".print_r($content,true).",$addressbook,".print_r($fields,true).",$msg,$tpl_name)</p>\n");
-		if (empty($tpl_name) && !empty($content['tpl_form_name'])) $tpl_name =$content['tpl_form_name'];
+		if (empty($tpl_name) && !empty($content['tpl_form_name'])) $tpl_name = $content['tpl_form_name'];
 		$tpl = new etemplate($tpl_name ? $tpl_name : 'addressbook.contactform');
 		// initializing some fields
-		if (!$fields) $fields = array('org_name','n_fn','email','tel_work','url','note','captcha');
+		if (!$fields) $fields = array('org_name', 'n_fn', 'email', 'tel_work', 'url', 'note', 'captcha');
 		$submitted = false;
 		// check if submitted
 		if (is_array($content))
 		{
-			if ((isset($content['captcha_result']) && $content['captcha'] != $content['captcha_result']) ||	// no correct captcha OR
-				(time() - $content['start_time'] < 10 &&				// bot indicator (less then 10 sec to fill out the form and
+			if ((isset($content['captcha_result']) && $content['captcha'] != $content['captcha_result']) || // no correct captcha OR
+				(time() - $content['start_time'] < 10 && // bot indicator (less then 10 sec to fill out the form and
 				!$GLOBALS['egw_info']['etemplate']['java_script']))	// javascript disabled)
 			{
 				$submitted = "truebutfalse";
-				$tpl->set_validation_error('captcha',lang('Wrong - try again ...'));
+				$tpl->set_validation_error('captcha', lang('Wrong - try again ...'));
 			}
 			elseif ($content['submitit'])
 			{
@@ -78,11 +78,11 @@ 
 				$contact = new addressbook_bo();
 				if ($content['owner'])	// save the contact in the addressbook
 				{
-					$content['private'] = 0;	// in case default_private is set
+					$content['private'] = 0; // in case default_private is set
 					if (($id = $contact->save($content)))
 					{
 						// check for fileuploads and attach the found files
-						foreach($content as $name => $value)
+						foreach ($content as $name => $value)
 						{
 							if (is_array($value) && isset($value['tmp_name']) && is_readable($value['tmp_name']))
 							{
@@ -91,7 +91,7 @@ 
 								// edit rights for the addressbook used to store the new entry,
 								// which is clearly not wanted securitywise
 								egw_vfs::$is_root = true;
-								egw_link::link('addressbook',$id,egw_link::VFS_APPNAME,$value,$name);
+								egw_link::link('addressbook', $id, egw_link::VFS_APPNAME, $value, $name);
 								egw_vfs::$is_root = false;
 							}
 						}
@@ -111,7 +111,7 @@ 
 						require_once(EGW_INCLUDE_ROOT.'/addressbook/inc/class.addressbook_tracking.inc.php');
 						$tracking = new addressbook_tracking($contact);
 					}
-					if ($tracking->do_notifications($contact->data2db($content),null))
+					if ($tracking->do_notifications($contact->data2db($content), null))
 					{
 						return '<p align="center">'.$content['msg'].'</p>';
 					}
@@ -134,7 +134,7 @@ 
 			$preserv['email_copytoreceiver'] = $copytoreceiver;
 			#if (!$fields) $fields = array('org_name','n_fn','email','tel_work','url','note','captcha');
 			$custom = 1;
-			foreach($fields as $name)
+			foreach ($fields as $name)
 			{
 				if ($name[0] == '#')	// custom field
 				{
@@ -145,10 +145,10 @@ 
 					}
 					$content['show']['custom'.$custom] = true;
 					$content['customfield'][$custom] = $name;
-					$content['customlabel'][$custom] = $contact->customfields[substr($name,1)]['label'];
+					$content['customlabel'][$custom] = $contact->customfields[substr($name, 1)]['label'];
 					++$custom;
 				}
-				elseif($name == 'adr_one_locality')
+				elseif ($name == 'adr_one_locality')
 				{
 					if (!($content['show'][$name] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['addr_format']))
 					{
@@ -169,18 +169,18 @@ 
 			unset($content['submitit']);
 			$custom = 1;
 			// fieldnames are "defined" by the commit attempt, that way, we do not have to remember them
-			foreach($content as $name => $value) {
-				$preserv[$name]=$value;
+			foreach ($content as $name => $value) {
+				$preserv[$name] = $value;
 				if ($name[0] == '#')     // custom field
 				{
 					static $contact;
 					if (is_null($contact)) $contact = new addressbook_bo();
 					$content['show']['custom'.$custom] = true;
 					$content['customfield'][$custom] = $name;
-					$content['customlabel'][$custom] = $contact->customfields[substr($name,1)]['label'];
+					$content['customlabel'][$custom] = $contact->customfields[substr($name, 1)]['label'];
 					++$custom;
 				}
-				elseif($name == 'adr_one_locality')
+				elseif ($name == 'adr_one_locality')
 				{
 					if (!($content['show'][$name] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['addr_format']))
 					{
@@ -201,17 +201,17 @@ 
 		if ($msg) $preserv['msg'] = $msg;
 
 		// a simple calculation captcha
-		$num1 = rand(1,99);
-		$num2 = rand(1,99);
+		$num1 = rand(1, 99);
+		$num2 = rand(1, 99);
 		if ($num2 > $num1)	// keep the result positive
 		{
 			$n = $num1; $num1 = $num2; $num2 = $n;
 		}
-		if (in_array('captcha',$fields))
+		if (in_array('captcha', $fields))
 		{
-			$content['captcha_task'] = sprintf('%d - %d =',$num1,$num2);
-			$preserv['captcha_result'] = $num1-$num2;
+			$content['captcha_task'] = sprintf('%d - %d =', $num1, $num2);
+			$preserv['captcha_result'] = $num1 - $num2;
 		}
-		return $tpl->exec($this->callback,$content,$sel_options,array(),$preserv);
+		return $tpl->exec($this->callback, $content, $sel_options, array(), $preserv);
 	}
 }

Braces +46 added lines, -13 removed lines

@@ -57,28 +57,41 @@ 
 	function display_var(array &$content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array())
 	{
 		#error_log( "<p>addressbook_contactform::display(".print_r($content,true).",$addressbook,".print_r($fields,true).",$msg,$tpl_name)</p>\n");
-		if (empty($tpl_name) && !empty($content['tpl_form_name'])) $tpl_name =$content['tpl_form_name'];
+		if (empty($tpl_name) && !empty($content['tpl_form_name']))
+		{
+			$tpl_name =$content['tpl_form_name'];
+		}
 		$tpl = new etemplate($tpl_name ? $tpl_name : 'addressbook.contactform');
 		// initializing some fields
-		if (!$fields) $fields = array('org_name','n_fn','email','tel_work','url','note','captcha');
+		if (!$fields)
+		{
+			$fields = array('org_name','n_fn','email','tel_work','url','note','captcha');
+		}
 		$submitted = false;
 		// check if submitted
 		if (is_array($content))
 		{
 			if ((isset($content['captcha_result']) && $content['captcha'] != $content['captcha_result']) ||	// no correct captcha OR
 				(time() - $content['start_time'] < 10 &&				// bot indicator (less then 10 sec to fill out the form and
-				!$GLOBALS['egw_info']['etemplate']['java_script']))	// javascript disabled)
+				!$GLOBALS['egw_info']['etemplate']['java_script']))
+			{
+				// javascript disabled)
 			{
 				$submitted = "truebutfalse";
+			}
 				$tpl->set_validation_error('captcha',lang('Wrong - try again ...'));
 			}
 			elseif ($content['submitit'])
 			{
 				$submitted = true;
 				$contact = new addressbook_bo();
-				if ($content['owner'])	// save the contact in the addressbook
+				if ($content['owner'])
+				{
+					// save the contact in the addressbook
 				{
-					$content['private'] = 0;	// in case default_private is set
+					$content['private'] = 0;
+				}
+				// in case default_private is set
 					if (($id = $contact->save($content)))
 					{
 						// check for fileuploads and attach the found files
@@ -136,9 +149,12 @@ 
 			$custom = 1;
 			foreach($fields as $name)
 			{
-				if ($name[0] == '#')	// custom field
+				if ($name[0] == '#')
+				{
+					// custom field
 				{
 					static $contact;
+				}
 					if (is_null($contact))
 					{
 						$contact = new addressbook_bo();
@@ -169,12 +185,19 @@ 
 			unset($content['submitit']);
 			$custom = 1;
 			// fieldnames are "defined" by the commit attempt, that way, we do not have to remember them
-			foreach($content as $name => $value) {
+			foreach($content as $name => $value)
+			{
 				$preserv[$name]=$value;
-				if ($name[0] == '#')     // custom field
+				if ($name[0] == '#')
+				{
+					// custom field
 				{
 					static $contact;
-					if (is_null($contact)) $contact = new addressbook_bo();
+				}
+					if (is_null($contact))
+					{
+						$contact = new addressbook_bo();
+					}
 					$content['show']['custom'.$custom] = true;
 					$content['customfield'][$custom] = $name;
 					$content['customlabel'][$custom] = $contact->customfields[substr($name,1)]['label'];
@@ -197,15 +220,25 @@ 
 		}
 		$content['addr_format'] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['addr_format'];
 
-		if ($addressbook) $preserv['owner'] = $addressbook;
-		if ($msg) $preserv['msg'] = $msg;
+		if ($addressbook)
+		{
+			$preserv['owner'] = $addressbook;
+		}
+		if ($msg)
+		{
+			$preserv['msg'] = $msg;
+		}
 
 		// a simple calculation captcha
 		$num1 = rand(1,99);
 		$num2 = rand(1,99);
-		if ($num2 > $num1)	// keep the result positive
+		if ($num2 > $num1)
+		{
+			// keep the result positive
 		{
-			$n = $num1; $num1 = $num2; $num2 = $n;
+			$n = $num1;
+		}
+		$num1 = $num2; $num2 = $n;
 		}
 		if (in_array('captcha',$fields))
 		{

addressbook/inc/class.addressbook_export_contacts_csv.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 

Indentation +5 added lines, -5 removed lines

@@ -365,10 +365,10 @@ 
 	}
 
 	/**
-	* Convert some internal data to something with more meaning
-	*
-	* Dates, times, user IDs, category IDs
-	*/
+	 * Convert some internal data to something with more meaning
+	 *
+	 * Dates, times, user IDs, category IDs
+	 */
 	public static function convert(addressbook_egw_record &$record, $options) {
 
 		if ($record->tel_prefer) {
@@ -436,7 +436,7 @@ 
 	 * Adjust automatically generated filter fields
 	 */
 	public function get_filter_fields(Array &$filters)
-    {
+	{
 		unset($filters['last_event']);
 		unset($filters['next_event']);
 		foreach($filters as $field_name => &$settings)

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

@@ -435,7 +435,7 @@
 	/**
 	 * Adjust automatically generated filter fields
 	 */
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
     {
 		unset($filters['last_event']);
 		unset($filters['next_event']);

Spacing +85 added lines, -85 removed lines

@@ -21,13 +21,13 @@ 
 	 * Constants used for exploding categories & multi-selectboxes into seperate fields
 	 */
 	const NO_EXPLODE = False;
-	const MAIN_CATS = 'main_cats';	// Only the top-level categories get their own field
-	const EACH_CAT = 'each_cat';	// Every category gets its own field
-	const EXPLODE = 'explode';	// For [custom] multi-selects, each option gets its own field
+	const MAIN_CATS = 'main_cats'; // Only the top-level categories get their own field
+	const EACH_CAT = 'each_cat'; // Every category gets its own field
+	const EXPLODE = 'explode'; // For [custom] multi-selects, each option gets its own field
 
 	public function __construct()
 	{
-		$this->ui= new addressbook_ui();
+		$this->ui = new addressbook_ui();
 		$this->get_selects();
 	}
 
@@ -36,7 +36,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 
 		$options = $_definition->plugin_options;
 		$this->export_object = $export_object = new importexport_export_csv($_stream, (array)$options);
@@ -45,9 +45,9 @@ 
 
 		// Addressbook defines its own export imits
 		$limit_exception = bo_merge::is_export_limit_excepted();
-		$export_limit = bo_merge::getExportLimit($app='addressbook');
+		$export_limit = bo_merge::getExportLimit($app = 'addressbook');
 		if (!$limit_exception) $export_object->export_limit = $export_limit; // we may not need that after all
-		if($export_limit == 'no' && !$limit_exception) {
+		if ($export_limit == 'no' && !$limit_exception) {
 			return;
 		}
 
@@ -57,18 +57,18 @@ 
 
 		if ($options['selection'] == 'search') {
 			// uicontacts selection with checkbox 'use_all'
-			$query = $GLOBALS['egw']->session->appsession('index','addressbook');
-			$query['num_rows'] = -1;	// all
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
+			$query = $GLOBALS['egw']->session->appsession('index', 'addressbook');
+			$query['num_rows'] = -1; // all
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
 			$query['order'] = 'contact_id';
-			if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
-			$this->ui->get_rows($query,$selection,$readonlys, true);	// only return the ids
+			if (!array_key_exists('filter', $query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
+			$this->ui->get_rows($query, $selection, $readonlys, true); // only return the ids
 		}
-		elseif ( $options['selection'] == 'all' ) {
+		elseif ($options['selection'] == 'all') {
 			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) {
 				$col_filter['account_id'] = null;
 			}
-			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '','',false,'AND',false,$col_filter);
+			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '', '', false, 'AND', false, $col_filter);
 			//$uicontacts->get_rows($query,$selection,$readonlys,true);
 		}
 		elseif ($options['selection'] == 'filter')
@@ -79,90 +79,90 @@ 
 			$query = array();
 
 			// Handle ranges
-			foreach($filter as $field => $value)
+			foreach ($filter as $field => $value)
 			{
-				if($field == 'cat_id')
+				if ($field == 'cat_id')
 				{
-					$query['col_filter'][$field] = implode(',',$value);
+					$query['col_filter'][$field] = implode(',', $value);
 					continue;
 				}
 
 				// Birthdays in addressbook are formatted Y-m-d
-				if($field == 'bday')
+				if ($field == 'bday')
 				{
-					if($value['from'])
+					if ($value['from'])
 					{
-						$query['col_filter'][] = "contact_bday >= " . $GLOBALS['egw']->db->quote(date('Y-m-d', (int)$value['from']));
+						$query['col_filter'][] = "contact_bday >= ".$GLOBALS['egw']->db->quote(date('Y-m-d', (int)$value['from']));
 					}
-					if($value['to'])
+					if ($value['to'])
 					{
-						$query['col_filter'][] = "contact_bday <= " . $GLOBALS['egw']->db->quote(date('Y-m-d', (int)$value['to']));
+						$query['col_filter'][] = "contact_bday <= ".$GLOBALS['egw']->db->quote(date('Y-m-d', (int)$value['to']));
 					}
 					continue;
 				}
 				// Custom fields & listed exceptions are not filtered with contact_ prefix
-				if(strpos($field, '#') !== 0 && !in_array($field, array('tid','owner')))
+				if (strpos($field, '#') !== 0 && !in_array($field, array('tid', 'owner')))
 				{
 					$field = 'contact_'.$field;
 				}
 				$query['col_filter'][$field] = $value;
-				if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+				if (!is_array($value) || (!$value['from'] && !$value['to'])) continue;
 
 				// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-				if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-				if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+				if ($value['from']) $query['col_filter'][] = "$field >= ".(int)$value['from'];
+				if ($value['to']) $query['col_filter'][] = "$field <= ".(int)$value['to'];
 				unset($query['col_filter'][$field]);
 			}
-			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '','',false,'AND',false,$query['col_filter']);
+			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '', '', false, 'AND', false, $query['col_filter']);
 		}
 		else
 		{
-			$selection = explode(',',$options['selection']);
+			$selection = explode(',', $options['selection']);
 		}
-		if(!is_array($selection))
+		if (!is_array($selection))
 		{
 			$selection = array();
 		}
 		$GLOBALS['egw_info']['flags']['currentapp'] = $old_app;
 
-		if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+		if (bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
 			$selection = array_slice($selection, 0, $export_limit);
 		}
 
-		if($options['explode_multiselects']) {
+		if ($options['explode_multiselects']) {
 			$customfields = config::get_customfields('addressbook');
 			$additional_fields = array();
 			$cat_obj = new categories('', 'addressbook');
-			foreach($options['explode_multiselects'] as $field => $explode) {
-				switch($explode['explode']) {
+			foreach ($options['explode_multiselects'] as $field => $explode) {
+				switch ($explode['explode']) {
 					case self::MAIN_CATS:
-						$cats = $cat_obj->return_array('mains', 0, false,'','ASC','',true);
-						foreach($cats as $settings) {
+						$cats = $cat_obj->return_array('mains', 0, false, '', 'ASC', '', true);
+						foreach ($cats as $settings) {
 							$additional_fields[$field][$settings['id']] = array(
 								'count' => 0,
 								'label' => $settings['name'],
 								'subs' => array(),
 							);
 							$subs = $cat_obj->return_sorted_array(0, False, '', 'ASC', 'cat_name', True, $settings['id']);
-							foreach($subs as $sub) {
+							foreach ($subs as $sub) {
 								$name = $sub['name'];
 								$path = $sub;
-								while($path['parent'] != $settings['id']) {
+								while ($path['parent'] != $settings['id']) {
 									$path = $cat_obj->read($path['parent']);
-									$name = $path['name'] . '/' . $name;
+									$name = $path['name'].'/'.$name;
 								}
 								$additional_fields[$field][$settings['id']]['subs'][$sub['id']] = $name;
 							}
 						}
 						break;
 					case self::EACH_CAT:
-						$cats = $cat_obj->return_array('all', 0, false,'','ASC','',true);
-						foreach($cats as $settings) {
+						$cats = $cat_obj->return_array('all', 0, false, '', 'ASC', '', true);
+						foreach ($cats as $settings) {
 							$name = $settings['name'];
 							$path = $settings;
-							while($path['level'] != 0) {
+							while ($path['level'] != 0) {
 								$path = $cat_obj->read($path['parent']);
-								$name = $path['name'] . '/' . $name;
+								$name = $path['name'].'/'.$name;
 							}
 							$additional_fields[$field][$settings['id']] = array(
 								'count' => 0,
@@ -173,10 +173,10 @@ 
 					case self::EXPLODE:
 						// Only works for custom fields
 						$index = substr($field, 1);
-						foreach($customfields[$index]['values'] as $key => $value) {
+						foreach ($customfields[$index]['values'] as $key => $value) {
 							$additional_fields[$field][$key] = array(
 								'count' => 0,
-								'label' => $customfields[$index]['label'] . ': ' . $value,
+								'label' => $customfields[$index]['label'].': '.$value,
 							);
 						}
 						break;
@@ -185,29 +185,29 @@ 
 
 			// Check records to see if additional fields are actually used
 			foreach ($selection as $_contact) {
-				if(is_array($_contact) && array_key_exists('photo', $_contact)) {
+				if (is_array($_contact) && array_key_exists('photo', $_contact)) {
 					unset($_contact['photo']);
 				}
-				if(is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
+				if (is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
 					$_contact = $_contact['id'];
 				}
-				if(is_array($_contact) && $_contact['id']) {
+				if (is_array($_contact) && $_contact['id']) {
 					$contact = new addressbook_egw_record();
 					$contact->set_record($_contact);
 				} else {
 					$contact = new addressbook_egw_record($_contact);
 				}
-				foreach($additional_fields as $field => &$values) {
-					if(!$contact->$field) continue;
-					foreach($values as $value => &$settings) {
-						if(!is_array($contact->$field)) {
+				foreach ($additional_fields as $field => &$values) {
+					if (!$contact->$field) continue;
+					foreach ($values as $value => &$settings) {
+						if (!is_array($contact->$field)) {
 							$contact->$field = explode(',', $contact->$field);
 						}
-						if(is_array($contact->$field) && in_array($value, $contact->$field)) {
+						if (is_array($contact->$field) && in_array($value, $contact->$field)) {
 							$settings['count']++;
-						} elseif($contact->$field == $value) {
+						} elseif ($contact->$field == $value) {
 							$settings['count']++;
-						} elseif($options['explode_multiselects'][$field]['explode'] == self::MAIN_CATS && array_intersect($contact->$field, array_keys($settings['subs']))) {
+						} elseif ($options['explode_multiselects'][$field]['explode'] == self::MAIN_CATS && array_intersect($contact->$field, array_keys($settings['subs']))) {
 							$settings['count']++;
 						}
 					}
@@ -219,18 +219,18 @@ 
 			unset($settings);
 
 			// Add additional columns
-			foreach($additional_fields as $field => $additional_values) {
+			foreach ($additional_fields as $field => $additional_values) {
 				// Remove original
 				unset($options['mapping'][$field]);
 				// Add exploded
 				$field_count = 0;
-				foreach($additional_values as $value => $settings) {
-					if($settings['count'] > 0) {
+				foreach ($additional_values as $value => $settings) {
+					if ($settings['count'] > 0) {
 						$field_count += $settings['count'];
 						$options['mapping'][$field.'-'.$value] = $settings['label'];
 					}
 				}
-				if($field_count > 0) {
+				if ($field_count > 0) {
 					// Set some options for converting
 					$options['explode_multiselects'][$field]['values'] = $additional_values;
 				} else {
@@ -243,12 +243,12 @@ 
 		$export_object->set_mapping($options['mapping']);
 		
 		// Add in last/next event, if needed
-		if($options['mapping']['last_date'] || $options['mapping']['next_date'])
+		if ($options['mapping']['last_date'] || $options['mapping']['next_date'])
 		{
 			$contact_ids = array();
-			foreach($selection as $_contact)
+			foreach ($selection as $_contact)
 			{
-				if(is_array($_contact) && $_contact['id'])
+				if (is_array($_contact) && $_contact['id'])
 				{
 					$contact_ids[] = $_contact['id'];
 				}
@@ -263,20 +263,20 @@ 
 		// $options['selection'] is array of identifiers as this plugin doesn't
 		// support other selectors atm.
 		foreach ($selection as $_contact) {
-			if(is_array($_contact) && array_key_exists('photo', $_contact)) {
+			if (is_array($_contact) && array_key_exists('photo', $_contact)) {
 				unset($_contact['photo']);
 			}
-			if(is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
+			if (is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
 				$_contact = $_contact['id'];
 			}
-			if(is_array($_contact) && $_contact['id']) {
+			if (is_array($_contact) && $_contact['id']) {
 				$contact = new addressbook_egw_record();
 				$contact->set_record($_contact);
 			} else {
 				$contact = new addressbook_egw_record($_contact);
 			}
 
-			if($events && $events[$contact->id])
+			if ($events && $events[$contact->id])
 			{
 				// NB: last_date and next_date are used instead of last_event & next_event
 				// to avoid automatic conversion - we want to export link title, not date-time
@@ -285,12 +285,12 @@ 
 			}
 			// Some conversion
 			$this->convert($contact, $options);
-			if($options['convert']) {
-				importexport_export_csv::convert($contact, addressbook_egw_record::$types, 'addressbook',$this->selects);
+			if ($options['convert']) {
+				importexport_export_csv::convert($contact, addressbook_egw_record::$types, 'addressbook', $this->selects);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($contact->get_record_array() as $key => $value) {
-					if(is_array($value)) $contact->$key = implode(',', $value);
+				foreach ($contact->get_record_array() as $key => $value) {
+					if (is_array($value)) $contact->$key = implode(',', $value);
 				}
 			}
 
@@ -337,7 +337,7 @@ 
 	 */
 	public function get_filename()
 	{
-		if(is_object($this->export_object) && $this->export_object->get_num_of_records() == 1)
+		if (is_object($this->export_object) && $this->export_object->get_num_of_records() == 1)
 		{
 			return $this->export_object->record->get_title();
 		}
@@ -368,26 +368,26 @@ 
 	*
 	* Dates, times, user IDs, category IDs
 	*/
-	public static function convert(addressbook_egw_record &$record, $options) {
+	public static function convert(addressbook_egw_record&$record, $options) {
 
 		if ($record->tel_prefer) {
 			$field = $record->tel_prefer;
 			$record->tel_prefer = $record->$field;
 		}
 
-		if(!is_array($options['explode_multiselects']))
+		if (!is_array($options['explode_multiselects']))
 		{
 			return;
 		}
-		foreach((array)$options['explode_multiselects'] as $field => $explode_settings) {
-			if(!is_array($record->$field)) $record->$field = explode(',', $record->$field);
-			foreach((array)$explode_settings['values'] as $value => $settings) {
+		foreach ((array)$options['explode_multiselects'] as $field => $explode_settings) {
+			if (!is_array($record->$field)) $record->$field = explode(',', $record->$field);
+			foreach ((array)$explode_settings['values'] as $value => $settings) {
 				$field_name = "$field-$value";
 				$record->$field_name = array();
-				if(is_array($record->$field) && in_array($value, $record->$field) || $record->$field == $value) {
-					if($explode_settings['explode'] != self::MAIN_CATS) {
+				if (is_array($record->$field) && in_array($value, $record->$field) || $record->$field == $value) {
+					if ($explode_settings['explode'] != self::MAIN_CATS) {
 						$record->$field_name = $options['convert'] ? lang('Yes') : true;
-					} elseif($options['convert']) {
+					} elseif ($options['convert']) {
 						// 3 part assign due to magic get method
 						$record_value = $record->$field_name;
 						$record_value[] = $settings['label'];
@@ -396,16 +396,16 @@ 
 						$record->$field_name = $value;
 					}
 				}
-				if($explode_settings['explode'] == self::MAIN_CATS && count(array_intersect($record->$field, array_keys($settings['subs'])))) {
+				if ($explode_settings['explode'] == self::MAIN_CATS && count(array_intersect($record->$field, array_keys($settings['subs'])))) {
 					// 3 part assign due to magic get method
 					$record_value = $record->$field_name;
-					if(!is_array($record_value)) $record_value = array($record_value);
-					foreach(array_intersect($record->$field, array_keys($settings['subs'])) as $sub_id) {
+					if (!is_array($record_value)) $record_value = array($record_value);
+					foreach (array_intersect($record->$field, array_keys($settings['subs'])) as $sub_id) {
 						$record_value[] = $options['convert'] ? $settings['subs'][$sub_id] : $sub_id;
 					}
 					$record->$field_name = $record_value;
 				}
-				if(is_array($record->$field_name)) $record->$field_name = implode(($options['convert'] ? ', ' : ','), $record->$field_name);
+				if (is_array($record->$field_name)) $record->$field_name = implode(($options['convert'] ? ', ' : ','), $record->$field_name);
 			}
 		}
 	}
@@ -416,7 +416,7 @@ 
 		$this->selects = array(
 			'tid' => array('n' => 'Contact')
 		);
-		foreach($this->ui->content_types as $tid => $data)
+		foreach ($this->ui->content_types as $tid => $data)
 		{
 			$this->selects['tid'][$tid] = $data['name'];
 		}
@@ -429,9 +429,9 @@ 
     {
 		unset($filters['last_event']);
 		unset($filters['next_event']);
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 		$filters['owner'] = array(
 			'name'		=> 'owner',

Braces +166 added lines, -68 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * export plugin of addressbook
  */
-class addressbook_export_contacts_csv implements importexport_iface_export_plugin {
+class addressbook_export_contacts_csv implements importexport_iface_export_plugin
+{
 
 
 	/**
@@ -36,7 +37,8 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 
 		$options = $_definition->plugin_options;
 		$this->export_object = $export_object = new importexport_export_csv($_stream, (array)$options);
@@ -46,8 +48,13 @@ 
 		// Addressbook defines its own export imits
 		$limit_exception = bo_merge::is_export_limit_excepted();
 		$export_limit = bo_merge::getExportLimit($app='addressbook');
-		if (!$limit_exception) $export_object->export_limit = $export_limit; // we may not need that after all
-		if($export_limit == 'no' && !$limit_exception) {
+		if (!$limit_exception)
+		{
+			$export_object->export_limit = $export_limit;
+		}
+		// we may not need that after all
+		if($export_limit == 'no' && !$limit_exception)
+		{
 			return;
 		}
 
@@ -55,17 +62,23 @@ 
 		$old_app = $GLOBALS['egw_info']['flags']['currentapp'];
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
 
-		if ($options['selection'] == 'search') {
+		if ($options['selection'] == 'search')
+		{
 			// uicontacts selection with checkbox 'use_all'
 			$query = $GLOBALS['egw']->session->appsession('index','addressbook');
 			$query['num_rows'] = -1;	// all
 			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
 			$query['order'] = 'contact_id';
-			if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
+			if(!array_key_exists('filter',$query))
+			{
+				$query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
+			}
 			$this->ui->get_rows($query,$selection,$readonlys, true);	// only return the ids
 		}
-		elseif ( $options['selection'] == 'all' ) {
-			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) {
+		elseif ( $options['selection'] == 'all' )
+		{
+			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+			{
 				$col_filter['account_id'] = null;
 			}
 			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '','',false,'AND',false,$col_filter);
@@ -106,11 +119,20 @@ 
 					$field = 'contact_'.$field;
 				}
 				$query['col_filter'][$field] = $value;
-				if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+				if(!is_array($value) || (!$value['from'] && !$value['to']))
+				{
+					continue;
+				}
 
 				// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-				if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-				if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+				if($value['from'])
+				{
+					$query['col_filter'][] = "$field >= " . (int)$value['from'];
+				}
+				if($value['to'])
+				{
+					$query['col_filter'][] = "$field <= " . (int)$value['to'];
+				}
 				unset($query['col_filter'][$field]);
 			}
 			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '','',false,'AND',false,$query['col_filter']);
@@ -125,29 +147,36 @@ 
 		}
 		$GLOBALS['egw_info']['flags']['currentapp'] = $old_app;
 
-		if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+		if(bo_merge::hasExportLimit($export_limit) && !$limit_exception)
+		{
 			$selection = array_slice($selection, 0, $export_limit);
 		}
 
-		if($options['explode_multiselects']) {
+		if($options['explode_multiselects'])
+		{
 			$customfields = config::get_customfields('addressbook');
 			$additional_fields = array();
 			$cat_obj = new categories('', 'addressbook');
-			foreach($options['explode_multiselects'] as $field => $explode) {
-				switch($explode['explode']) {
+			foreach($options['explode_multiselects'] as $field => $explode)
+			{
+				switch($explode['explode'])
+				{
 					case self::MAIN_CATS:
 						$cats = $cat_obj->return_array('mains', 0, false,'','ASC','',true);
-						foreach($cats as $settings) {
+						foreach($cats as $settings)
+						{
 							$additional_fields[$field][$settings['id']] = array(
 								'count' => 0,
 								'label' => $settings['name'],
 								'subs' => array(),
 							);
 							$subs = $cat_obj->return_sorted_array(0, False, '', 'ASC', 'cat_name', True, $settings['id']);
-							foreach($subs as $sub) {
+							foreach($subs as $sub)
+							{
 								$name = $sub['name'];
 								$path = $sub;
-								while($path['parent'] != $settings['id']) {
+								while($path['parent'] != $settings['id'])
+								{
 									$path = $cat_obj->read($path['parent']);
 									$name = $path['name'] . '/' . $name;
 								}
@@ -157,10 +186,12 @@ 
 						break;
 					case self::EACH_CAT:
 						$cats = $cat_obj->return_array('all', 0, false,'','ASC','',true);
-						foreach($cats as $settings) {
+						foreach($cats as $settings)
+						{
 							$name = $settings['name'];
 							$path = $settings;
-							while($path['level'] != 0) {
+							while($path['level'] != 0)
+							{
 								$path = $cat_obj->read($path['parent']);
 								$name = $path['name'] . '/' . $name;
 							}
@@ -173,7 +204,8 @@ 
 					case self::EXPLODE:
 						// Only works for custom fields
 						$index = substr($field, 1);
-						foreach($customfields[$index]['values'] as $key => $value) {
+						foreach($customfields[$index]['values'] as $key => $value)
+						{
 							$additional_fields[$field][$key] = array(
 								'count' => 0,
 								'label' => $customfields[$index]['label'] . ': ' . $value,
@@ -184,30 +216,47 @@ 
 			}
 
 			// Check records to see if additional fields are actually used
-			foreach ($selection as $_contact) {
-				if(is_array($_contact) && array_key_exists('photo', $_contact)) {
+			foreach ($selection as $_contact)
+			{
+				if(is_array($_contact) && array_key_exists('photo', $_contact))
+				{
 					unset($_contact['photo']);
 				}
-				if(is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
+				if(is_array($_contact) && count($_contact) == 1 && $_contact['id'])
+				{
 					$_contact = $_contact['id'];
 				}
-				if(is_array($_contact) && $_contact['id']) {
+				if(is_array($_contact) && $_contact['id'])
+				{
 					$contact = new addressbook_egw_record();
 					$contact->set_record($_contact);
-				} else {
+				}
+				else
+				{
 					$contact = new addressbook_egw_record($_contact);
 				}
-				foreach($additional_fields as $field => &$values) {
-					if(!$contact->$field) continue;
-					foreach($values as $value => &$settings) {
-						if(!is_array($contact->$field)) {
+				foreach($additional_fields as $field => &$values)
+				{
+					if(!$contact->$field)
+					{
+						continue;
+					}
+					foreach($values as $value => &$settings)
+					{
+						if(!is_array($contact->$field))
+						{
 							$contact->$field = explode(',', $contact->$field);
 						}
-						if(is_array($contact->$field) && in_array($value, $contact->$field)) {
+						if(is_array($contact->$field) && in_array($value, $contact->$field))
+						{
 							$settings['count']++;
-						} elseif($contact->$field == $value) {
+						}
+						elseif($contact->$field == $value)
+						{
 							$settings['count']++;
-						} elseif($options['explode_multiselects'][$field]['explode'] == self::MAIN_CATS && array_intersect($contact->$field, array_keys($settings['subs']))) {
+						}
+						elseif($options['explode_multiselects'][$field]['explode'] == self::MAIN_CATS && array_intersect($contact->$field, array_keys($settings['subs'])))
+						{
 							$settings['count']++;
 						}
 					}
@@ -219,21 +268,27 @@ 
 			unset($settings);
 
 			// Add additional columns
-			foreach($additional_fields as $field => $additional_values) {
+			foreach($additional_fields as $field => $additional_values)
+			{
 				// Remove original
 				unset($options['mapping'][$field]);
 				// Add exploded
 				$field_count = 0;
-				foreach($additional_values as $value => $settings) {
-					if($settings['count'] > 0) {
+				foreach($additional_values as $value => $settings)
+				{
+					if($settings['count'] > 0)
+					{
 						$field_count += $settings['count'];
 						$options['mapping'][$field.'-'.$value] = $settings['label'];
 					}
 				}
-				if($field_count > 0) {
+				if($field_count > 0)
+				{
 					// Set some options for converting
 					$options['explode_multiselects'][$field]['values'] = $additional_values;
-				} else {
+				}
+				else
+				{
 					// Don't need this anymore
 					unset($options['explode_multiselects'][$field]);
 				}
@@ -262,17 +317,23 @@ 
 
 		// $options['selection'] is array of identifiers as this plugin doesn't
 		// support other selectors atm.
-		foreach ($selection as $_contact) {
-			if(is_array($_contact) && array_key_exists('photo', $_contact)) {
+		foreach ($selection as $_contact)
+		{
+			if(is_array($_contact) && array_key_exists('photo', $_contact))
+			{
 				unset($_contact['photo']);
 			}
-			if(is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
+			if(is_array($_contact) && count($_contact) == 1 && $_contact['id'])
+			{
 				$_contact = $_contact['id'];
 			}
-			if(is_array($_contact) && $_contact['id']) {
+			if(is_array($_contact) && $_contact['id'])
+			{
 				$contact = new addressbook_egw_record();
 				$contact->set_record($_contact);
-			} else {
+			}
+			else
+			{
 				$contact = new addressbook_egw_record($_contact);
 			}
 
@@ -285,12 +346,19 @@ 
 			}
 			// Some conversion
 			$this->convert($contact, $options);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($contact, addressbook_egw_record::$types, 'addressbook',$this->selects);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($contact->get_record_array() as $key => $value) {
-					if(is_array($value)) $contact->$key = implode(',', $value);
+				foreach($contact->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$contact->$key = implode(',', $value);
+					}
 				}
 			}
 
@@ -305,7 +373,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Addressbook CSV export');
 	}
 
@@ -314,7 +383,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports contacts from your Addressbook into a CSV File.");
 	}
 
@@ -323,11 +393,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/csv';
 	}
 
@@ -350,14 +422,16 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'		=> 'importexport.export_csv_selectors',
 		);
@@ -368,9 +442,11 @@ 
 	*
 	* Dates, times, user IDs, category IDs
 	*/
-	public static function convert(addressbook_egw_record &$record, $options) {
+	public static function convert(addressbook_egw_record &$record, $options)
+	{
 
-		if ($record->tel_prefer) {
+		if ($record->tel_prefer)
+		{
 			$field = $record->tel_prefer;
 			$record->tel_prefer = $record->$field;
 		}
@@ -379,33 +455,52 @@ 
 		{
 			return;
 		}
-		foreach((array)$options['explode_multiselects'] as $field => $explode_settings) {
-			if(!is_array($record->$field)) $record->$field = explode(',', $record->$field);
-			foreach((array)$explode_settings['values'] as $value => $settings) {
+		foreach((array)$options['explode_multiselects'] as $field => $explode_settings)
+		{
+			if(!is_array($record->$field))
+			{
+				$record->$field = explode(',', $record->$field);
+			}
+			foreach((array)$explode_settings['values'] as $value => $settings)
+			{
 				$field_name = "$field-$value";
 				$record->$field_name = array();
-				if(is_array($record->$field) && in_array($value, $record->$field) || $record->$field == $value) {
-					if($explode_settings['explode'] != self::MAIN_CATS) {
+				if(is_array($record->$field) && in_array($value, $record->$field) || $record->$field == $value)
+				{
+					if($explode_settings['explode'] != self::MAIN_CATS)
+					{
 						$record->$field_name = $options['convert'] ? lang('Yes') : true;
-					} elseif($options['convert']) {
+					}
+					elseif($options['convert'])
+					{
 						// 3 part assign due to magic get method
 						$record_value = $record->$field_name;
 						$record_value[] = $settings['label'];
 						$record->$field_name = $record_value;
-					} else {
+					}
+					else
+					{
 						$record->$field_name = $value;
 					}
 				}
-				if($explode_settings['explode'] == self::MAIN_CATS && count(array_intersect($record->$field, array_keys($settings['subs'])))) {
+				if($explode_settings['explode'] == self::MAIN_CATS && count(array_intersect($record->$field, array_keys($settings['subs']))))
+				{
 					// 3 part assign due to magic get method
 					$record_value = $record->$field_name;
-					if(!is_array($record_value)) $record_value = array($record_value);
-					foreach(array_intersect($record->$field, array_keys($settings['subs'])) as $sub_id) {
+					if(!is_array($record_value))
+					{
+						$record_value = array($record_value);
+					}
+					foreach(array_intersect($record->$field, array_keys($settings['subs'])) as $sub_id)
+					{
 						$record_value[] = $options['convert'] ? $settings['subs'][$sub_id] : $sub_id;
 					}
 					$record->$field_name = $record_value;
 				}
-				if(is_array($record->$field_name)) $record->$field_name = implode(($options['convert'] ? ', ' : ','), $record->$field_name);
+				if(is_array($record->$field_name))
+				{
+					$record->$field_name = implode(($options['convert'] ? ', ' : ','), $record->$field_name);
+				}
 			}
 		}
 	}
@@ -426,12 +521,15 @@ 
 	 * Adjust automatically generated filter fields
 	 */
 	public function get_filter_fields(Array &$filters)
-    {
+	{
 		unset($filters['last_event']);
 		unset($filters['next_event']);
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 		}
 		$filters['owner'] = array(
 			'name'		=> 'owner',

addressbook/inc/class.addressbook_import_contacts_csv.inc.php

Doc Comments +2 added lines, -4 removed lines

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

Indentation +28 added lines, -28 removed lines

@@ -29,8 +29,8 @@ 
 	private $bocontacts;
 
 	/**
-	* For figuring out if a contact has changed
-	*/
+	 * For figuring out if a contact has changed
+	 */
 	protected $tracking;
 
 	/**
@@ -377,39 +377,39 @@ 
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
+		public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
+		public function get_results() {
+				return $this->results;
+		}
 } // end of iface_export_plugin
 ?>

Spacing +57 added lines, -57 removed lines

@@ -14,14 +14,14 @@ 
 /**
  * class import_csv for addressbook
  */
-class addressbook_import_contacts_csv extends importexport_basic_import_csv  {
+class addressbook_import_contacts_csv extends importexport_basic_import_csv {
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists', 'equal' );
+	protected static $conditions = array('exists', 'equal');
 
 	/**
 	 * @var bocontacts
@@ -45,7 +45,7 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition &$_definition ) {
+	public function init(importexport_definition&$_definition) {
 
 		// fetch the addressbook bo
 		$this->bocontacts = new addressbook_bo();
@@ -56,17 +56,17 @@ 
 		$this->lookups = array(
 			'tid' => array('n'=>'contact')
 		);
-		foreach($this->bocontacts->content_types as $tid => $data)
+		foreach ($this->bocontacts->content_types as $tid => $data)
 		{
 			$this->lookups['tid'][$tid] = $data['name'];
 		}
 
 		// set contact owner
-		$contact_owner = isset( $_definition->plugin_options['contact_owner'] ) ?
+		$contact_owner = isset($_definition->plugin_options['contact_owner']) ?
 			$_definition->plugin_options['contact_owner'] : $this->user;
 
 		// Import into importer's personal addressbook
-		if($contact_owner == 'personal')
+		if ($contact_owner == 'personal')
 		{
 			$contact_owner = $this->user;
 		}
@@ -83,15 +83,15 @@ 
 	 *
 	 * @return boolean success
 	 */
-	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
+	protected function import_record(importexport_iface_egw_record&$record, &$import_csv)
 	{
 
 		// Set owner, unless it's supposed to come from CSV file
-		if($this->definition->plugin_options['owner_from_csv'] && $record->owner) {
-			if(!is_numeric($record->owner)) {
+		if ($this->definition->plugin_options['owner_from_csv'] && $record->owner) {
+			if (!is_numeric($record->owner)) {
 				// Automatically handle text owner without explicit translation
 				$new_owner = importexport_helper_functions::account_name2id($record->owner);
-				if($new_owner == '') {
+				if ($new_owner == '') {
 					$this->errors[$import_csv->get_current_position()] = lang(
 						'Unable to convert "%1" to account ID.  Using plugin setting (%2) for owner.',
 						$record->owner,
@@ -107,7 +107,7 @@ 
 		}
 
 		// Check that owner (addressbook) is allowed
-		if(!array_key_exists($record->owner, $this->bocontacts->get_addressbooks()))
+		if (!array_key_exists($record->owner, $this->bocontacts->get_addressbooks()))
 		{
 			$this->errors[$import_csv->get_current_position()] = lang("Unable to import into %1, using %2",
 				common::grab_owner_name($record->owner),
@@ -118,18 +118,18 @@ 
 
 		// Do not allow owner == 0 (accounts) without an account_id
 		// It causes the contact to be filed as an account, and can't delete
-		if(!$record->owner && !$record->account_id)
+		if (!$record->owner && !$record->account_id)
 		{
 			$record->owner = $GLOBALS['egw_info']['user']['account_id'];
 		}
 
 		// Do not import into non-existing type, warn and change
-		if(!$record->tid || !$this->lookups['tid'][$record->tid])
+		if (!$record->tid || !$this->lookups['tid'][$record->tid])
 		{
 			// Avoid lots of warnings about type (2 types are contact and deleted)
-			if(!$this->type_warned || count($this->lookups['tid']) == 2 )
+			if (!$this->type_warned || count($this->lookups['tid']) == 2)
 			{
-				$this->warnings[$import_csv->get_current_position()] = lang('Unknown type %1, imported as %2',$record->tid,lang($this->lookups['tid']['n']));
+				$this->warnings[$import_csv->get_current_position()] = lang('Unknown type %1, imported as %2', $record->tid, lang($this->lookups['tid']['n']));
 				$this->type_warned = true;
 			}
 			$record->tid = 'n';
@@ -138,45 +138,45 @@ 
 		// Also handle categories in their own field
 		$record_array = $record->get_record_array();
 		$more_categories = array();
-		foreach($this->definition->plugin_options['field_mapping'] as $number => $field_name) {
-			if(!array_key_exists($field_name, $record_array) ||
-				substr($field_name,0,3) != 'cat' || !$record->$field_name || $field_name == 'cat_id') continue;
+		foreach ($this->definition->plugin_options['field_mapping'] as $number => $field_name) {
+			if (!array_key_exists($field_name, $record_array) ||
+				substr($field_name, 0, 3) != 'cat' || !$record->$field_name || $field_name == 'cat_id') continue;
 			list($cat, $cat_id) = explode('-', $field_name);
-			if(is_numeric($record->$field_name) && $record->$field_name != 1) {
+			if (is_numeric($record->$field_name) && $record->$field_name != 1) {
 				// Column has a single category ID
 				$more_categories[] = $record->$field_name;
-			} elseif($record->$field_name == '1' ||
+			} elseif ($record->$field_name == '1' ||
 				(!is_numeric($record->$field_name) && strtolower($record->$field_name) == strtolower(lang('Yes')))) {
 				// Each category got its own column.  '1' is the database value, lang('yes') is the human value
 				$more_categories[] = $cat_id;
 			} else {
 				// Text categories
-				$more_categories = array_merge($more_categories, importexport_helper_functions::cat_name2id(is_array($record->$field_name) ? $record->$field_name : explode(',',$record->$field_name), $cat_id));
+				$more_categories = array_merge($more_categories, importexport_helper_functions::cat_name2id(is_array($record->$field_name) ? $record->$field_name : explode(',', $record->$field_name), $cat_id));
 			}
 		}
-		if(count($more_categories) > 0) $record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',',$record->cat_id), $more_categories);
+		if (count($more_categories) > 0) $record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',', $record->cat_id), $more_categories);
 
 		// Private set but missing causes hidden entries
-		if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == '')) unset($record->private);
+		if (array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == '')) unset($record->private);
 
 		// Format birthday as backend requires - converter should give timestamp
-		if($record->bday && is_numeric($record->bday))
+		if ($record->bday && is_numeric($record->bday))
 		{
 			$time = new egw_time($record->bday);
 			$record->bday = $time->format('Y-m-d');
 		}
 
-		if ( $this->definition->plugin_options['conditions'] ) {
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+		if ($this->definition->plugin_options['conditions']) {
+			foreach ($this->definition->plugin_options['conditions'] as $condition) {
 				$contacts = array();
-				switch ( $condition['type'] ) {
+				switch ($condition['type']) {
 					// exists
 					case 'exists' :
-						if($record_array[$condition['string']]) {
-							$searchcondition = array( $condition['string'] => $record_array[$condition['string']]);
+						if ($record_array[$condition['string']]) {
+							$searchcondition = array($condition['string'] => $record_array[$condition['string']]);
 							// if we use account_id for the condition, we need to set the owner for filtering, as this
 							// enables addressbook_so to decide what backend is to be used
-							if ($condition['string']=='account_id') $searchcondition['owner']=0;
+							if ($condition['string'] == 'account_id') $searchcondition['owner'] = 0;
 							$contacts = $this->bocontacts->search(
 								//array( $condition['string'] => $record[$condition['string']],),
 								'',
@@ -185,37 +185,37 @@ 
 								$searchcondition
 							);
 						}
-						if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 ) {
+						if (is_array($contacts) && count(array_keys($contacts)) >= 1) {
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$contacts as $contact ) {
+							foreach ((array)$contacts as $contact) {
 								$record->id = $contact['id'];
-								if ( $this->definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-									if ( !is_array( $record_array['cat_id'] ) ) $record->cat_id = explode( ',', $record->cat_id );
-									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $contact['cat_id'] ) ) );
+								if ($this->definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($contact['cat_id'])) $contact['cat_id'] = explode(',', $contact['cat_id']);
+									if (!is_array($record_array['cat_id'])) $record->cat_id = explode(',', $record->cat_id);
+									$record->cat_id = implode(',', array_unique(array_merge($record->cat_id, $contact['cat_id'])));
 								}
-								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+								$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 							}
 						} else {
 							$action = $condition['false'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						break;
 					case 'equal':
 						// Match on field
 						$result = $this->equal($record, $condition, $matches);
-						if($result)
+						if ($result)
 						{
 							// Apply true action to any matching records found
 							$action = $condition['true'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						else
 						{
 							// Apply false action if no matching records found
 							$action = $condition['false'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						break;
 
@@ -228,7 +228,7 @@ 
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 		return $success;
 	}
@@ -240,21 +240,21 @@ 
 	 * @param importexport_iface_egw_record $record contact data for the action
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action($_action, importexport_iface_egw_record&$record, $record_num = 0) {
 		$_data = $record->get_record_array();
 		switch ($_action) {
 			case 'none' :
 				return true;
 			case 'delete':
-				if($_data['id'])
+				if ($_data['id'])
 				{
-					if ( $this->dry_run ) {
+					if ($this->dry_run) {
 						//print_r($_data);
 						$this->results[$_action]++;
 						return true;
 					}
 					$result = $this->bocontacts->delete($_data);
-					if($result && $result === true)
+					if ($result && $result === true)
 					{
 						$this->results[$_action]++;
 					}
@@ -269,13 +269,13 @@ 
 				// Only update if there are changes
 				$old = $this->bocontacts->read($_data['id']);
 				// if we get countrycodes as countryname, try to translate them -> the rest should be handled by bo classes.
-				foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
-					if (strlen(trim($_data[$c_prefix.'countryname']))==2) $_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']),$translated=true);
+				foreach (array('adr_one_', 'adr_two_') as $c_prefix) {
+					if (strlen(trim($_data[$c_prefix.'countryname'])) == 2) $_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']), $translated = true);
 				}
 				// Don't change a user account into a contact
-				if($old['owner'] == 0) {
+				if ($old['owner'] == 0) {
 					unset($_data['owner']);
-				} elseif(!$this->definition->plugin_options['change_owner']) {
+				} elseif (!$this->definition->plugin_options['change_owner']) {
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -283,7 +283,7 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0) {
+				if (count($changed) == 0) {
 					return true;
 				} else {
 					//error_log(__METHOD__.__LINE__.array2string($changed).' Old:'.$old['adr_one_countryname'].' ('.$old['adr_one_countrycode'].') New:'.$_data['adr_one_countryname'].' ('.$_data['adr_one_countryname'].')');
@@ -294,22 +294,22 @@ 
 
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if ($_action == 'insert') {
 					// Addressbook backend doesn't like inserting with ID specified, it screws up the owner & etag
 					unset($_data['id']);
 				}
-				if(!isset($_data['org_name'])) {
+				if (!isset($_data['org_name'])) {
 					// org_name is a trigger to update n_fileas
 					$_data['org_name'] = '';
 				}
 
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
 				} else {
-					$result = $this->bocontacts->save( $_data, $this->is_admin);
-					if(!$result) {
+					$result = $this->bocontacts->save($_data, $this->is_admin);
+					if (!$result) {
 						$this->errors[$record_num] = $this->bocontacts->error;
 					} else {
 						$this->results[$_action]++;
@@ -319,7 +319,7 @@ 
 					return $result;
 				}
 			default:
-				throw new egw_exception('Unsupported action: '. $_action);
+				throw new egw_exception('Unsupported action: '.$_action);
 			
 		}
 	}

Braces +127 added lines, -51 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * class import_csv for addressbook
  */
-class addressbook_import_contacts_csv extends importexport_basic_import_csv  {
+class addressbook_import_contacts_csv extends importexport_basic_import_csv
+{
 
 	/**
 	 * conditions for actions
@@ -45,7 +46,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition &$_definition ) {
+	public function init(importexport_definition &$_definition )
+	{
 
 		// fetch the addressbook bo
 		$this->bocontacts = new addressbook_bo();
@@ -87,22 +89,29 @@ 
 	{
 
 		// Set owner, unless it's supposed to come from CSV file
-		if($this->definition->plugin_options['owner_from_csv'] && $record->owner) {
-			if(!is_numeric($record->owner)) {
+		if($this->definition->plugin_options['owner_from_csv'] && $record->owner)
+		{
+			if(!is_numeric($record->owner))
+			{
 				// Automatically handle text owner without explicit translation
 				$new_owner = importexport_helper_functions::account_name2id($record->owner);
-				if($new_owner == '') {
+				if($new_owner == '')
+				{
 					$this->errors[$import_csv->get_current_position()] = lang(
 						'Unable to convert "%1" to account ID.  Using plugin setting (%2) for owner.',
 						$record->owner,
 						common::grab_owner_name($this->user)
 					);
 					$record->owner = $this->user;
-				} else {
+				}
+				else
+				{
 					$record->owner = $new_owner;
 				}
 			}
-		} else {
+		}
+		else
+		{
 			$record->owner = $this->user;
 		}
 
@@ -138,26 +147,41 @@ 
 		// Also handle categories in their own field
 		$record_array = $record->get_record_array();
 		$more_categories = array();
-		foreach($this->definition->plugin_options['field_mapping'] as $number => $field_name) {
+		foreach($this->definition->plugin_options['field_mapping'] as $number => $field_name)
+		{
 			if(!array_key_exists($field_name, $record_array) ||
-				substr($field_name,0,3) != 'cat' || !$record->$field_name || $field_name == 'cat_id') continue;
+				substr($field_name,0,3) != 'cat' || !$record->$field_name || $field_name == 'cat_id')
+			{
+				continue;
+			}
 			list($cat, $cat_id) = explode('-', $field_name);
-			if(is_numeric($record->$field_name) && $record->$field_name != 1) {
+			if(is_numeric($record->$field_name) && $record->$field_name != 1)
+			{
 				// Column has a single category ID
 				$more_categories[] = $record->$field_name;
-			} elseif($record->$field_name == '1' ||
-				(!is_numeric($record->$field_name) && strtolower($record->$field_name) == strtolower(lang('Yes')))) {
+			}
+			elseif($record->$field_name == '1' ||
+				(!is_numeric($record->$field_name) && strtolower($record->$field_name) == strtolower(lang('Yes'))))
+			{
 				// Each category got its own column.  '1' is the database value, lang('yes') is the human value
 				$more_categories[] = $cat_id;
-			} else {
+			}
+			else
+			{
 				// Text categories
 				$more_categories = array_merge($more_categories, importexport_helper_functions::cat_name2id(is_array($record->$field_name) ? $record->$field_name : explode(',',$record->$field_name), $cat_id));
 			}
 		}
-		if(count($more_categories) > 0) $record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',',$record->cat_id), $more_categories);
+		if(count($more_categories) > 0)
+		{
+			$record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',',$record->cat_id), $more_categories);
+		}
 
 		// Private set but missing causes hidden entries
-		if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == '')) unset($record->private);
+		if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == ''))
+		{
+			unset($record->private);
+		}
 
 		// Format birthday as backend requires - converter should give timestamp
 		if($record->bday && is_numeric($record->bday))
@@ -166,17 +190,24 @@ 
 			$record->bday = $time->format('Y-m-d');
 		}
 
-		if ( $this->definition->plugin_options['conditions'] ) {
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+		if ( $this->definition->plugin_options['conditions'] )
+		{
+			foreach ( $this->definition->plugin_options['conditions'] as $condition )
+			{
 				$contacts = array();
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
-						if($record_array[$condition['string']]) {
+						if($record_array[$condition['string']])
+						{
 							$searchcondition = array( $condition['string'] => $record_array[$condition['string']]);
 							// if we use account_id for the condition, we need to set the owner for filtering, as this
 							// enables addressbook_so to decide what backend is to be used
-							if ($condition['string']=='account_id') $searchcondition['owner']=0;
+							if ($condition['string']=='account_id')
+							{
+								$searchcondition['owner']=0;
+							}
 							$contacts = $this->bocontacts->search(
 								//array( $condition['string'] => $record[$condition['string']],),
 								'',
@@ -185,19 +216,30 @@ 
 								$searchcondition
 							);
 						}
-						if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 ) {
+						if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 )
+						{
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$contacts as $contact ) {
+							foreach ( (array)$contacts as $contact )
+							{
 								$record->id = $contact['id'];
-								if ( $this->definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-									if ( !is_array( $record_array['cat_id'] ) ) $record->cat_id = explode( ',', $record->cat_id );
+								if ( $this->definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $contact['cat_id'] ) )
+									{
+										$contact['cat_id'] = explode( ',', $contact['cat_id'] );
+									}
+									if ( !is_array( $record_array['cat_id'] ) )
+									{
+										$record->cat_id = explode( ',', $record->cat_id );
+									}
 									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $contact['cat_id'] ) ) );
 								}
 								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 							}
-						} else {
+						}
+						else
+						{
 							$action = $condition['false'];
 							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 						}
@@ -224,9 +266,14 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if ($action['stop']) break;
+				if ($action['stop'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -240,15 +287,18 @@ 
 	 * @param importexport_iface_egw_record $record contact data for the action
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	{
 		$_data = $record->get_record_array();
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'delete':
 				if($_data['id'])
 				{
-					if ( $this->dry_run ) {
+					if ( $this->dry_run )
+					{
 						//print_r($_data);
 						$this->results[$_action]++;
 						return true;
@@ -269,13 +319,20 @@ 
 				// Only update if there are changes
 				$old = $this->bocontacts->read($_data['id']);
 				// if we get countrycodes as countryname, try to translate them -> the rest should be handled by bo classes.
-				foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
-					if (strlen(trim($_data[$c_prefix.'countryname']))==2) $_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']),$translated=true);
+				foreach(array('adr_one_', 'adr_two_') as $c_prefix)
+				{
+					if (strlen(trim($_data[$c_prefix.'countryname']))==2)
+					{
+						$_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']),$translated=true);
+					}
 				}
 				// Don't change a user account into a contact
-				if($old['owner'] == 0) {
+				if($old['owner'] == 0)
+				{
 					unset($_data['owner']);
-				} elseif(!$this->definition->plugin_options['change_owner']) {
+				}
+				elseif(!$this->definition->plugin_options['change_owner'])
+				{
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -283,9 +340,12 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0) {
+				if(count($changed) == 0)
+				{
 					return true;
-				} else {
+				}
+				else
+				{
 					//error_log(__METHOD__.__LINE__.array2string($changed).' Old:'.$old['adr_one_countryname'].' ('.$old['adr_one_countrycode'].') New:'.$_data['adr_one_countryname'].' ('.$_data['adr_one_countryname'].')');
 				}
 				
@@ -294,24 +354,32 @@ 
 
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if($_action == 'insert')
+				{
 					// Addressbook backend doesn't like inserting with ID specified, it screws up the owner & etag
 					unset($_data['id']);
 				}
-				if(!isset($_data['org_name'])) {
+				if(!isset($_data['org_name']))
+				{
 					// org_name is a trigger to update n_fileas
 					$_data['org_name'] = '';
 				}
 
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$result = $this->bocontacts->save( $_data, $this->is_admin);
-					if(!$result) {
+					if(!$result)
+					{
 						$this->errors[$record_num] = $this->bocontacts->error;
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 						// This does nothing (yet?) but update the identifier
 						$record->save($result);
@@ -329,7 +397,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Addressbook CSV import');
 	}
 
@@ -338,7 +407,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports contacts into your Addressbook from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -347,7 +417,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -363,7 +434,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -372,7 +444,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -384,7 +457,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -396,7 +470,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -408,7 +483,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 } // end of iface_export_plugin

admin/inc/class.admin_accesslog.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -255,11 +255,10 @@
 	 *
 	 * @param type $action
 	 * @param type $checked
-	 * @param type $use_all
 	 * @param type $success
 	 * @param int $failed
 	 * @param type $action_msg
-	 * @return type number of failed
+	 * @return boolean number of failed
 	 */
 	function action($action,$checked,&$success,&$failed,&$action_msg)
 	{

Spacing +49 added lines, -49 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->so = new so_sql(self::APP,self::TABLE,null,'',true);
+		$this->so = new so_sql(self::APP, self::TABLE, null, '', true);
 		$this->so->timestamps = array('li', 'lo', 'session_dla', 'notification_heartbeat');
 	}
 
@@ -60,19 +60,19 @@ 
 	 * @param array &$readonlys eg. to disable buttons based on acl, not use here, maybe in a derived class
 	 * @return int total number of rows
 	 */
-	function get_rows($query,&$rows,&$readonlys)
+	function get_rows($query, &$rows, &$readonlys)
 	{
 		$heartbeat_limit = egw_session::heartbeat_limit();
 
 		if ($query['session_list'])	// filter active sessions
 		{
-			$query['col_filter']['lo'] = null;	// not logged out
+			$query['col_filter']['lo'] = null; // not logged out
 			$query['col_filter'][0] = 'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']);
-			switch((string)$query['session_list'])
+			switch ((string)$query['session_list'])
 			{
 				case 'active':	// remove status != 'active', eg. CalDAV/eSync
 					$query['col_filter'][1] = "notification_heartbeat > $heartbeat_limit";
-					$query['col_filter'][3] = "session_php NOT LIKE '% %'";	// remove blocked, bad login, etc
+					$query['col_filter'][3] = "session_php NOT LIKE '% %'"; // remove blocked, bad login, etc
 					break;
 				default:
 					$query['col_filter'][1] = "(notification_heartbeat IS NULL OR notification_heartbeat > $heartbeat_limit)";
@@ -80,20 +80,20 @@ 
 			}
 			$query['col_filter'][2] = 'account_id>0';
 		}
-		$total = $this->so->get_rows($query,$rows,$readonlys);
+		$total = $this->so->get_rows($query, $rows, $readonlys);
 
 		$heartbeat_limit_user = egw_time::server2user($heartbeat_limit, 'ts');
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			$row['sessionstatus'] = 'success';
 			if ($row['notification_heartbeat'] > $heartbeat_limit_user)
 			{
 				$row['sessionstatus'] = 'active';
 			}
-			if (stripos($row['session_php'],'blocked') !== false ||
-				stripos($row['session_php'],'bad login') !== false ||
-				strpos($row['session_php'],' ') !== false)
+			if (stripos($row['session_php'], 'blocked') !== false ||
+				stripos($row['session_php'], 'bad login') !== false ||
+				strpos($row['session_php'], ' ') !== false)
 			{
 				$row['sessionstatus'] = $row['session_php'];
 			}
@@ -102,7 +102,7 @@ 
 				$row['sessionstatus'] = 'logged out';
 			}
 			// eg. for bad login or password
-			if (!$row['account_id']) $row['alt_loginid'] = ($row['loginid']?$row['loginid']:lang('none'));
+			if (!$row['account_id']) $row['alt_loginid'] = ($row['loginid'] ? $row['loginid'] : lang('none'));
 
 			// do not allow to kill or select own session
 			if ($GLOBALS['egw']->session->sessionid_access_log == $row['sessionid'] && $query['session_list'])
@@ -110,13 +110,13 @@ 
 				$row['class'] .= ' rowNoDelete ';
 			}
 			// do not allow to delete access log off active sessions
-			if (!$row['lo'] && $row['session_dla'] > time()-$GLOBALS['egw_info']['server']['sessions_timeout'] &&
+			if (!$row['lo'] && $row['session_dla'] > time() - $GLOBALS['egw_info']['server']['sessions_timeout'] &&
 				in_array($row['sessionstatus'], array('active', 'success')) && !$query['session_list'])
 			{
 				$row['class'] .= ' rowNoDelete ';
 			}
 			$row['sessionstatus'] = lang($row['sessionstatus']);
-			unset($row['session_php']);	// for security reasons, do NOT give real PHP sessionid to UI
+			unset($row['session_php']); // for security reasons, do NOT give real PHP sessionid to UI
 		}
 		if ($query['session_list'])
 		{
@@ -136,33 +136,33 @@ 
 	 * @param string $msg =''
 	 * @param boolean $sessions_list =false
 	 */
-	function index(array $content=null, $msg='', $sessions_list=false)
+	function index(array $content = null, $msg = '', $sessions_list = false)
 	{
 
 		if (is_array($content)) $sessions_list = $content['nm']['session_list'];
 
 		// check if user has access to requested functionality
-		if ($GLOBALS['egw']->acl->check($sessions_list ? 'current_sessions' : 'access_log_acces',1,'admin'))
+		if ($GLOBALS['egw']->acl->check($sessions_list ? 'current_sessions' : 'access_log_acces', 1, 'admin'))
 		{
 			$GLOBALS['egw']->redirect_link('/index.php');
 		}
 
-		if(!isset($content))
+		if (!isset($content))
 		{
 			$content['nm'] = array(
-				'get_rows'       =>	'admin.admin_accesslog.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-				'no_filter'      => True,	// I  disable the 1. filter
-				'no_filter2'     => True,	// I  disable the 2. filter (params are the same as for filter)
-				'no_cat'         => True,	// I  disable the cat-selectbox
-				'header_left'    =>	false,	// I  template to show left of the range-value, left-aligned (optional)
-				'header_right'   =>	false,	// I  template to show right of the range-value, right-aligned (optional)
-				'never_hide'     => True,	// I  never hide the nextmatch-line if less then maxmatch entries
-				'lettersearch'   => false,	// I  show a lettersearch
-				'start'          =>	0,		// IO position in list
-				'order'          =>	'li',	// IO name of the column to sort after (optional for the sortheaders)
-				'sort'           =>	'DESC',	// IO direction of the sort: 'ASC' or 'DESC'
+				'get_rows'       =>	'admin.admin_accesslog.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+				'no_filter'      => True, // I  disable the 1. filter
+				'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+				'no_cat'         => True, // I  disable the cat-selectbox
+				'header_left'    =>	false, // I  template to show left of the range-value, left-aligned (optional)
+				'header_right'   =>	false, // I  template to show right of the range-value, right-aligned (optional)
+				'never_hide'     => True, // I  never hide the nextmatch-line if less then maxmatch entries
+				'lettersearch'   => false, // I  show a lettersearch
+				'start'          =>	0, // IO position in list
+				'order'          =>	'li', // IO name of the column to sort after (optional for the sortheaders)
+				'sort'           =>	'DESC', // IO direction of the sort: 'ASC' or 'DESC'
 				//'default_cols'   => 	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
-				'csv_fields'     =>	false,	// I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
+				'csv_fields'     =>	false, // I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
 								//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
 				'actions'		=> $this->get_actions($sessions_list),
 				'placeholder_actions' => false,
@@ -193,12 +193,12 @@ 
 					'col_filter' => $content['nm']['col_filter']
 				);
 
-				@set_time_limit(0);			// switch off the execution time limit, as it's for big selections to small
-				$query['num_rows'] = -1;	// all
+				@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+				$query['num_rows'] = -1; // all
 				$all = $readonlys = array();
-				$this->get_rows($query,$all,$readonlys);
+				$this->get_rows($query, $all, $readonlys);
 				$content['nm']['selected'] = array();
-				foreach($all as $session)
+				foreach ($all as $session)
 				{
 					$content['nm']['selected'][] = $session[$content['nm']['row_id']];
 				}
@@ -210,19 +210,19 @@ 
 			else
 			{
 				$success = $failed = $action = $action_msg = null;
-				if ($this->action($content['nm']['action'],$content['nm']['selected']
-					,$success,$failed,$action_msg,$msg))
+				if ($this->action($content['nm']['action'], $content['nm']['selected']
+					,$success, $failed, $action_msg, $msg))
 				{ // In case of action success
 					switch ($action_msg)
 					{
 						case'deleted':
-							$msg = lang('%1 log entries deleted.',$success);
+							$msg = lang('%1 log entries deleted.', $success);
 							break;
 						case'killed':
-							$msg = lang('%1 sessions killed',$success);
+							$msg = lang('%1 sessions killed', $success);
 					}
 				}
-				elseif($failed) // In case of action failiure
+				elseif ($failed) // In case of action failiure
 				{
 					switch ($action_msg)
 					{
@@ -239,7 +239,7 @@ 
 		$content['msg'] = $msg;
 		$content['percent'] = 100.0 * $GLOBALS['egw']->db->query(
 			'SELECT ((SELECT COUNT(*) FROM '.self::TABLE.' WHERE lo != 0) / COUNT(*)) FROM '.self::TABLE,
-			__LINE__,__FILE__)->fetchColumn();
+			__LINE__, __FILE__)->fetchColumn();
 
 		$tmpl = new etemplate_new('admin.accesslog');
 		$tmpl->exec('admin.admin_accesslog.index', $content, array(), $readonlys, array(
@@ -258,7 +258,7 @@ 
 	 * @param type $action_msg
 	 * @return type number of failed
 	 */
-	function action($action,$checked,&$success,&$failed,&$action_msg)
+	function action($action, $checked, &$success, &$failed, &$action_msg)
 	{
 		$success = $failed = 0;
 		//error_log(__METHOD__.'selected:' . array2string($checked). 'action:' . $action);
@@ -266,14 +266,14 @@ 
 		{
 			case "delete":
 				$action_msg = "deleted";
-				$del_msg= $this->so->delete(array('sessionid' => $checked));
+				$del_msg = $this->so->delete(array('sessionid' => $checked));
 				if ($checked && $del_msg)
 				{
 					$success = $del_msg;
 				}
 				else
 				{
-					$failed ++;
+					$failed++;
 				}
 				break;
 			case "kill":
@@ -281,19 +281,19 @@ 
 				$sessionid = $checked;
 				if (($key = array_search($GLOBALS['egw']->session->sessionid_access_log, $sessionid)))
 				{
-						unset($sessionid[$key]);	// dont allow to kill own sessions
+						unset($sessionid[$key]); // dont allow to kill own sessions
 				}
-				if ($GLOBALS['egw']->acl->check('current_sessions',8,'admin'))
+				if ($GLOBALS['egw']->acl->check('current_sessions', 8, 'admin'))
 				{
-					$failed ++;
+					$failed++;
 				}
 				else
 				{
-					foreach((array)$sessionid as $id)
+					foreach ((array)$sessionid as $id)
 					{
 						$GLOBALS['egw']->session->destroy($id);
 					}
-					$success= count($sessionid);
+					$success = count($sessionid);
 				}
 				break;
 		}
@@ -313,7 +313,7 @@ 
 		if ($sessions_list)
 		{
 		//	error_log(__METHOD__. $sessions_list);
-			$actions= array(
+			$actions = array(
 				'kill' => array(
 					'caption' => 'Kill',
 					'confirm' => 'Kill this session',
@@ -326,7 +326,7 @@ 
 		}
 		else
 		{
-			$actions= array(
+			$actions = array(
 				'delete' => array(
 					'caption' => 'Delete',
 					'confirm' => 'Delete this entry',
@@ -358,7 +358,7 @@ 
 	 * @param array $content =null
 	 * @param string $msg =''
 	 */
-	function sessions(array $content=null, $msg='')
+	function sessions(array $content = null, $msg = '')
 	{
 		return $this->index($content, $msg, true);
 	}

Braces +22 added lines, -7 removed lines

@@ -64,9 +64,13 @@ 
 	{
 		$heartbeat_limit = egw_session::heartbeat_limit();
 
-		if ($query['session_list'])	// filter active sessions
+		if ($query['session_list'])
+		{
+			// filter active sessions
 		{
-			$query['col_filter']['lo'] = null;	// not logged out
+			$query['col_filter']['lo'] = null;
+		}
+		// not logged out
 			$query['col_filter'][0] = 'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']);
 			switch((string)$query['session_list'])
 			{
@@ -97,12 +101,16 @@ 
 			{
 				$row['sessionstatus'] = $row['session_php'];
 			}
-			if ($row['lo']) {
+			if ($row['lo'])
+			{
 				$row['total'] = ($row['lo'] - $row['li']) / 60;
 				$row['sessionstatus'] = 'logged out';
 			}
 			// eg. for bad login or password
-			if (!$row['account_id']) $row['alt_loginid'] = ($row['loginid']?$row['loginid']:lang('none'));
+			if (!$row['account_id'])
+			{
+				$row['alt_loginid'] = ($row['loginid']?$row['loginid']:lang('none'));
+			}
 
 			// do not allow to kill or select own session
 			if ($GLOBALS['egw']->session->sessionid_access_log == $row['sessionid'] && $query['session_list'])
@@ -139,7 +147,10 @@ 
 	function index(array $content=null, $msg='', $sessions_list=false)
 	{
 
-		if (is_array($content)) $sessions_list = $content['nm']['session_list'];
+		if (is_array($content))
+		{
+			$sessions_list = $content['nm']['session_list'];
+		}
 
 		// check if user has access to requested functionality
 		if ($GLOBALS['egw']->acl->check($sessions_list ? 'current_sessions' : 'access_log_acces',1,'admin'))
@@ -212,7 +223,8 @@ 
 				$success = $failed = $action = $action_msg = null;
 				if ($this->action($content['nm']['action'],$content['nm']['selected']
 					,$success,$failed,$action_msg,$msg))
-				{ // In case of action success
+				{
+// In case of action success
 					switch ($action_msg)
 					{
 						case'deleted':
@@ -222,12 +234,15 @@ 
 							$msg = lang('%1 sessions killed',$success);
 					}
 				}
-				elseif($failed) // In case of action failiure
+				elseif($failed)
+				{
+					// In case of action failiure
 				{
 					switch ($action_msg)
 					{
 						case'deleted':
 							$msg = lang('Error deleting log entry!');
+				}
 							break;
 						case'killed':
 							$msg = lang('Permission denied!');

admin/inc/class.admin_categories.inc.php

Doc Comments +2 added lines

@@ -679,6 +679,8 @@
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like '%1 entries deleted'
 	 * @param array $query get_rows parameter
+	 * @param integer $success
+	 * @param integer $failed
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
 	function action($_action, $checked, $use_all, &$success, &$failed, &$action_msg, array $query)

Spacing +127 added lines, -128 removed lines

@@ -57,7 +57,7 @@ 
 		{
 			throw new egw_exception_no_permission_admin();
 		}
-		if ($GLOBALS['egw']->acl->check('global_categorie',1,'admin'))
+		if ($GLOBALS['egw']->acl->check('global_categorie', 1, 'admin'))
 		{
 			$GLOBALS['egw']->redirect_link('/index.php');
 		}
@@ -71,12 +71,12 @@ 
 	{
 		if (is_null(self::$acl_search))
 		{
-			self::$acl_search = !$GLOBALS['egw']->acl->check('global_categorie',2,'admin');
-			self::$acl_add    = !$GLOBALS['egw']->acl->check('global_categorie',4,'admin');
-			self::$acl_view   = !$GLOBALS['egw']->acl->check('global_categorie',8,'admin');
-			self::$acl_edit   = !$GLOBALS['egw']->acl->check('global_categorie',16,'admin');
-			self::$acl_delete = !$GLOBALS['egw']->acl->check('global_categorie',32,'admin');
-			self::$acl_add_sub= !$GLOBALS['egw']->acl->check('global_categorie',64,'admin');
+			self::$acl_search = !$GLOBALS['egw']->acl->check('global_categorie', 2, 'admin');
+			self::$acl_add    = !$GLOBALS['egw']->acl->check('global_categorie', 4, 'admin');
+			self::$acl_view   = !$GLOBALS['egw']->acl->check('global_categorie', 8, 'admin');
+			self::$acl_edit   = !$GLOBALS['egw']->acl->check('global_categorie', 16, 'admin');
+			self::$acl_delete = !$GLOBALS['egw']->acl->check('global_categorie', 32, 'admin');
+			self::$acl_add_sub = !$GLOBALS['egw']->acl->check('global_categorie', 64, 'admin');
 		}
 	}
 
@@ -86,11 +86,11 @@ 
 	 * @param array $content = null
 	 * @param string $msg = ''
 	 */
-	public function edit(array $content=null,$msg='')
+	public function edit(array $content = null, $msg = '')
 	{
 		// read the session, as the global_cats param is stored with it.
-		$appname = $content['appname'] ? $content['appname'] : ($_GET['appname']?$_GET['appname']:categories::GLOBAL_APPNAME);
-		$session = egw_cache::getSession(__CLASS__.$appname,'nm');
+		$appname = $content['appname'] ? $content['appname'] : ($_GET['appname'] ? $_GET['appname'] : categories::GLOBAL_APPNAME);
+		$session = egw_cache::getSession(__CLASS__.$appname, 'nm');
 		unset($session);
 		if (!isset($content))
 		{
@@ -98,7 +98,7 @@ 
 				($content = categories::read($_GET['cat_id']))))
 			{
 				$content = array('data' => array());
-				if(isset($_GET['parent']) && $_GET['parent'] > 0)
+				if (isset($_GET['parent']) && $_GET['parent'] > 0)
 				{
 					// Sub-category - set some defaults from parent
 					$content['parent'] = (int)$_GET['parent'];
@@ -114,7 +114,7 @@ 
 					$appname = categories::GLOBAL_APPNAME;
 				}
 			}
-			elseif ($content['appname'] != $appname || !self::$acl_edit || ( $content['owner'] != $GLOBALS['egw_info']['user']['account_id'] && $this->appname != 'admin'))
+			elseif ($content['appname'] != $appname || !self::$acl_edit || ($content['owner'] != $GLOBALS['egw_info']['user']['account_id'] && $this->appname != 'admin'))
 			{
 				// only allow to view category
 				$readonlys['__ALL__'] = true;
@@ -124,12 +124,12 @@ 
 		}
 		elseif ($content['button'] || $content['delete'])
 		{
-			$cats = new categories($content['owner'] ? $content['owner'] : categories::GLOBAL_ACCOUNT,$content['appname']);
+			$cats = new categories($content['owner'] ? $content['owner'] : categories::GLOBAL_ACCOUNT, $content['appname']);
 
 			if ($content['delete']['delete'] || $content['delete']['subs'])
 			{
 				$button = 'delete';
-				$delete_subs = $content['delete']['subs']?true:false;
+				$delete_subs = $content['delete']['subs'] ? true : false;
 			}
 			else
 			{
@@ -140,29 +140,29 @@ 
 
 			$refresh_app = $this->appname == 'preferences' ? $content['appname'] : $this->appname;
 
-			switch($button)
+			switch ($button)
 			{
 				case 'save':
 				case 'apply':
-					if(is_array($content['owner'])) $content['owner'] = implode(',',$content['owner']);
-					if($content['owner'] == '') $content['owner'] = 0;
+					if (is_array($content['owner'])) $content['owner'] = implode(',', $content['owner']);
+					if ($content['owner'] == '') $content['owner'] = 0;
 					if ($content['id'] && self::$acl_edit)
 					{
 
 						// If color changed, we need to do an edit 'refresh' instead of 'update'
 						// to reload the whole nextmatch instead of just the row
-						$data = $cats->id2name($content['id'],'data');
+						$data = $cats->id2name($content['id'], 'data');
 						$change_color = ($data['color'] != $content['data']['color']);
 						// Nicely reload just the category window / iframe
-						if($change_color)
+						if ($change_color)
 						{
-							if(egw_json_response::isJSONResponse())
+							if (egw_json_response::isJSONResponse())
 							{
 								// Update category styles
-								egw_json_response::get()->apply('opener.egw.includeCSS',array(categories::css($refresh_app == 'admin' ? categories::GLOBAL_APPNAME : $refresh_app)));
-								if($this->appname != 'admin')
+								egw_json_response::get()->apply('opener.egw.includeCSS', array(categories::css($refresh_app == 'admin' ? categories::GLOBAL_APPNAME : $refresh_app)));
+								if ($this->appname != 'admin')
 								{
-									egw_json_response::get()->apply('opener.egw.show_preferences',array(
+									egw_json_response::get()->apply('opener.egw.show_preferences', array(
 										'cats',
 										$this->appname == 'admin' ? categories::GLOBAL_APPNAME : array($refresh_app)
 									));
@@ -171,7 +171,7 @@ 
 								else
 								{
 									categories::css($refresh_app == 'admin' ? categories::GLOBAL_APPNAME : $refresh_app);
-									egw_json_response::get()->apply('opener.app.admin.load',array(
+									egw_json_response::get()->apply('opener.app.admin.load', array(
 										egw_framework::link('/index.php', array(
 											'menuaction' => $this->list_link,
 											'appname' => $appname
@@ -192,7 +192,7 @@ 
 						}
 						catch (egw_exception_wrong_userinput $e)
 						{
-							$msg = lang('Unwilling to save category with current settings. Check for inconsistency:').$e->getMessage();	// display conflicts etc.
+							$msg = lang('Unwilling to save category with current settings. Check for inconsistency:').$e->getMessage(); // display conflicts etc.
 						}
 					}
 					elseif (!$content['id'] && (
@@ -217,10 +217,10 @@ 
 				case 'delete':
 					if (self::$acl_delete)
 					{
-						$cats->delete($content['id'],$delete_subs,!$delete_subs);
+						$cats->delete($content['id'], $delete_subs, !$delete_subs);
 						$msg = lang('Category deleted.');
 
-						egw_framework::refresh_opener($msg, $refresh_app, $content['id'],'delete', $this->appname);
+						egw_framework::refresh_opener($msg, $refresh_app, $content['id'], 'delete', $this->appname);
 						egw_framework::window_close();
 						return;
 					}
@@ -234,19 +234,19 @@ 
 			egw_framework::refresh_opener($msg, $change_color ? null : $refresh_app, $content['id'], $change_color ? null : 'update', $this->appname);
 		}
 		$content['msg'] = $msg;
-		if(!$content['appname']) $content['appname'] = $appname;
-		if($content['data']['icon'])
+		if (!$content['appname']) $content['appname'] = $appname;
+		if ($content['data']['icon'])
 		{
-			$content['icon_url'] = $content['base_url'] . $content['data']['icon'];
+			$content['icon_url'] = $content['base_url'].$content['data']['icon'];
 		}
 
 		$sel_options['icon'] = self::get_icons();
 		$sel_options['owner'] = array();
 
 		// User's category - add current value to be able to preserve owner
-		if(!$content['id'])
+		if (!$content['id'])
 		{
-			if($this->appname != 'admin')
+			if ($this->appname != 'admin')
 			{
 				$content['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			}
@@ -256,35 +256,35 @@ 
 			}
 		}
 
-		if($this->appname != 'admin' && $content['owner'] > 0 )
+		if ($this->appname != 'admin' && $content['owner'] > 0)
 		{
 			$sel_options['owner'][$content['owner']] = common::grab_owner_name($content['owner']);
 		}
 		// Add 'All users', in case owner is readonlys
-		if($content['id'] && $content['owner'] == 0)
+		if ($content['id'] && $content['owner'] == 0)
 		{
 			$sel_options['owner'][0] = lang('All users');
 		}
-		if($this->appname == 'admin' || ($content['id'] && !((int)$content['owner'] > 0)))
+		if ($this->appname == 'admin' || ($content['id'] && !((int)$content['owner'] > 0)))
 		{
-			if($content['owner'] > 0)
+			if ($content['owner'] > 0)
 			{
 				$content['msg'] .= "\n".lang('owner "%1" removed, please select group-owner', common::grab_owner_name($content['owner']));
 				$content['owner'] = 0;
 			}
 			$sel_options['owner'][0] = lang('All users');
 			$accs = $GLOBALS['egw']->accounts->get_list('groups');
-			foreach($accs as $acc)
+			foreach ($accs as $acc)
 			{
 				if ($acc['account_type'] == 'g')
 				{
-					$sel_options['owner'][$acc['account_id']] = ExecMethod2('etemplate.select_widget.accountInfo',$acc['account_id'],$acc);
+					$sel_options['owner'][$acc['account_id']] = ExecMethod2('etemplate.select_widget.accountInfo', $acc['account_id'], $acc);
 				}
 			}
 			$content['no_private'] = true;
 		}
 
-		if($this->appname == 'admin')
+		if ($this->appname == 'admin')
 		{
 			$content['access'] = 'public';
 			// Allow admins access to all categories as parent
@@ -295,17 +295,17 @@ 
 			$readonlys['access'] = $content['owner'] != $GLOBALS['egw_info']['user']['account_id'];
 		}
 
-		egw_framework::validate_file('.','global_categories','admin');
+		egw_framework::validate_file('.', 'global_categories', 'admin');
 
-		$readonlys['button[delete]'] = !$content['id'] || !self::$acl_delete ||		// cant delete not yet saved category
+		$readonlys['button[delete]'] = !$content['id'] || !self::$acl_delete || // cant delete not yet saved category
 			$appname != $content['appname'] || // Can't edit a category from a different app
 			 ($this->appname != 'admin' && $content['owner'] != $GLOBALS['egw_info']['user']['account_id']);
 		// Make sure $content['owner'] is an array otherwise it wont show up values in the multiselectbox
-		if (!is_array($content['owner'])) $content['owner'] = explode(',',$content['owner']);
+		if (!is_array($content['owner'])) $content['owner'] = explode(',', $content['owner']);
 		$tmpl = new etemplate_new('admin.categories.edit');
-		$tmpl->exec($this->edit_link,$content,$sel_options,$readonlys,$content+array(
+		$tmpl->exec($this->edit_link, $content, $sel_options, $readonlys, $content + array(
 			'old_parent' => $content['old_parent'] ? $content['old_parent'] : $content['parent'], 'appname' => $appname
-		),2);
+		), 2);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 * @param string $icon = '' filename
 	 * @return string url
 	 */
-	static function icon_url($icon='')
+	static function icon_url($icon = '')
 	{
 		return $GLOBALS['egw_info']['server']['webserver_url'].self::ICON_PATH.'/'.$icon;
 	}
@@ -329,9 +329,9 @@ 
 		$dir = dir(EGW_SERVER_ROOT.self::ICON_PATH);
 		$icons = array();
 		$matches = null;
-		while(($file = $dir->read()))
+		while (($file = $dir->read()))
 		{
-			if (preg_match('/^(.*)\\.(png|gif|jpe?g)$/i',$file,$matches))
+			if (preg_match('/^(.*)\\.(png|gif|jpe?g)$/i', $file, $matches))
 			{
 				$icons[$file] = ucfirst($matches[1]);
 			}
@@ -350,13 +350,13 @@ 
 	 * @param array &$readonlys eg. to disable buttons based on acl, not use here, maybe in a derived class
 	 * @return int total number of rows
 	 */
-	public function get_rows(&$query,&$rows,&$readonlys)
+	public function get_rows(&$query, &$rows, &$readonlys)
 	{
 		self::init_static();
 
 		$filter = array();
 		$globalcat = ($query['filter'] === categories::GLOBAL_ACCOUNT || !$query['filter']);
-		if (isset($query['global_cats']) && $query['global_cats']===false)
+		if (isset($query['global_cats']) && $query['global_cats'] === false)
 		{
 			$globalcat = false;
 		}
@@ -364,49 +364,49 @@ 
 		// new column-filter access has highest priority
 		if (!empty($query['col_filter']['access']))$filter['access'] = $query['col_filter']['access'];
 
-		egw_cache::setSession(__CLASS__.$query['appname'],'nm',$query);
+		egw_cache::setSession(__CLASS__.$query['appname'], 'nm', $query);
 
-		if($query['filter'] > 0 || $query['col_filter']['owner'])
+		if ($query['filter'] > 0 || $query['col_filter']['owner'])
 		{
 			$owner = $query['col_filter']['owner'] ? $query['col_filter']['owner'] : $query['filter'];
 		}
-		if($query['col_filter']['app'])
+		if ($query['col_filter']['app'])
 		{
 			$filter['appname'] = $query['col_filter']['app'];
 		}
-		$GLOBALS['egw']->categories = $cats = new categories($filter['owner'],$query['appname']);
-		$globals = isset($GLOBALS['egw_info']['user']['apps']['admin']) ? 'all_no_acl' : $globalcat;	// ignore acl only for admins
+		$GLOBALS['egw']->categories = $cats = new categories($filter['owner'], $query['appname']);
+		$globals = isset($GLOBALS['egw_info']['user']['apps']['admin']) ? 'all_no_acl' : $globalcat; // ignore acl only for admins
 		$parent = $query['search'] ? false : 0;
-		$rows = $cats->return_sorted_array($query['start'],false,$query['search'],$query['sort'],$query['order'],$globals,$parent,true,$filter);
+		$rows = $cats->return_sorted_array($query['start'], false, $query['search'], $query['sort'], $query['order'], $globals, $parent, true, $filter);
 		$count = $cats->total_records;
-		foreach($rows as $key => &$row)
+		foreach ($rows as $key => &$row)
 		{
-			$row['owner'] = explode(',',$row['owner']);
-			if(($owner && !in_array($owner, $row['owner'])) || ((string)$query['filter'] === (string)categories::GLOBAL_ACCOUNT && $row['owner'][0] > 0))
+			$row['owner'] = explode(',', $row['owner']);
+			if (($owner && !in_array($owner, $row['owner'])) || ((string)$query['filter'] === (string)categories::GLOBAL_ACCOUNT && $row['owner'][0] > 0))
 			{
 				unset($rows[$key]);
 				$count--;
 				continue;
 			}
 
-			$row['level_spacer'] = str_repeat('    ',$row['level']);
+			$row['level_spacer'] = str_repeat('    ', $row['level']);
 
 			if ($row['data']['icon']) $row['icon_url'] = self::icon_url($row['data']['icon']);
 
 			$row['subs'] = count($row['children']);
 
 			$row['class'] = 'level'.$row['level'];
-			if($row['owner'][0] > 0 && !$GLOBALS['egw_info']['user']['apps']['admin'] && $row['owner'][0] != $GLOBALS['egw_info']['user']['account_id'])
+			if ($row['owner'][0] > 0 && !$GLOBALS['egw_info']['user']['apps']['admin'] && $row['owner'][0] != $GLOBALS['egw_info']['user']['account_id'])
 			{
 				$row['class'] .= ' rowNoEdit rowNoDelete ';
 			}
 			else if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 			{
-				if(!$cats->check_perms(EGW_ACL_EDIT, $row['id']) || !self::$acl_edit)
+				if (!$cats->check_perms(EGW_ACL_EDIT, $row['id']) || !self::$acl_edit)
 				{
 					$row['class'] .= ' rowNoEdit';
 				}
-				if(!$cats->check_perms(EGW_ACL_DELETE, $row['id']) || !self::$acl_delete ||
+				if (!$cats->check_perms(EGW_ACL_DELETE, $row['id']) || !self::$acl_delete ||
 					// Only admins can delete globals
 					$cats->is_global($row['id']) && !$GLOBALS['egw_info']['user']['apps']['admin'])
 				{
@@ -414,7 +414,7 @@ 
 				}
 			}
 			// Can only edit (via context menu) categories for the selected app (backend restriction)
-			if($row['appname'] != $query['appname'] || (array_sum($row['owner']) > 0))
+			if ($row['appname'] != $query['appname'] || (array_sum($row['owner']) > 0))
 			{
 				$row['class'] .= ' rowNoEdit ';
 			}
@@ -442,60 +442,60 @@ 
 	 * @param array $content = null
 	 * @param string $msg = ''
 	 */
-	public function index(array $content=null,$msg='')
+	public function index(array $content = null, $msg = '')
 	{
 		//_debug_array($_GET);
-		if ($this->appname != 'admin') translation::add_app('admin');	// need admin translations
+		if ($this->appname != 'admin') translation::add_app('admin'); // need admin translations
 
-		if(!isset($content))
+		if (!isset($content))
 		{
 			if (isset($_GET['msg'])) $msg = $_GET['msg'];
 
 			$appname = categories::GLOBAL_APPNAME;
-			foreach(array($content['nm']['appname'], $_GET['cats_app'], $_GET['appname']) as $field)
+			foreach (array($content['nm']['appname'], $_GET['cats_app'], $_GET['appname']) as $field)
 			{
-				if($field)
+				if ($field)
 				{
 					$appname = $field;
 					break;
 				}
 			}
-			$content['nm'] = egw_cache::getSession(__CLASS__.$appname,'nm');
+			$content['nm'] = egw_cache::getSession(__CLASS__.$appname, 'nm');
 			if (!is_array($content['nm']))
 			{
 				$content['nm'] = array(
-					'get_rows'       =>	$this->get_rows,	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+					'get_rows'       =>	$this->get_rows, // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
 					'options-filter' => array(
 						'' => lang('All categories'),
 						categories::GLOBAL_ACCOUNT => lang('Global categories'),
 						$GLOBALS['egw_info']['user']['account_id'] => lang('Own categories'),
 					),
-					'no_filter2'     => True,	// I  disable the 2. filter (params are the same as for filter)
-					'no_cat'         => True,	// I  disable the cat-selectbox
-					'header_left'    =>	false,	// I  template to show left of the range-value, left-aligned (optional)
-					'header_right'   =>	false,	// I  template to show right of the range-value, right-aligned (optional)
-					'never_hide'     => True,	// I  never hide the nextmatch-line if less then maxmatch entries
-					'lettersearch'   => false,	// I  show a lettersearch
-					'start'          =>	0,		// IO position in list
-					'order'          =>	'name',	// IO name of the column to sort after (optional for the sortheaders)
-					'sort'           =>	'ASC',	// IO direction of the sort: 'ASC' or 'DESC'
-					'default_cols'   => '!color,last_mod,subs,legacy_actions',	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
-					'csv_fields'     =>	false,	// I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
+					'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+					'no_cat'         => True, // I  disable the cat-selectbox
+					'header_left'    =>	false, // I  template to show left of the range-value, left-aligned (optional)
+					'header_right'   =>	false, // I  template to show right of the range-value, right-aligned (optional)
+					'never_hide'     => True, // I  never hide the nextmatch-line if less then maxmatch entries
+					'lettersearch'   => false, // I  show a lettersearch
+					'start'          =>	0, // IO position in list
+					'order'          =>	'name', // IO name of the column to sort after (optional for the sortheaders)
+					'sort'           =>	'ASC', // IO direction of the sort: 'ASC' or 'DESC'
+					'default_cols'   => '!color,last_mod,subs,legacy_actions', // I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
+					'csv_fields'     =>	false, // I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
 									//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
 					'no_search'      => !self::$acl_search,
 					'row_id'         => 'id',
 					'dataStorePrefix' => 'categories' // Avoid conflict with user list when in admin
 				);
-				$content['nm']['filter'] = $this->appname == 'admin'?categories::GLOBAL_ACCOUNT:$GLOBALS['egw_info']['user']['account_id'];
+				$content['nm']['filter'] = $this->appname == 'admin' ? categories::GLOBAL_ACCOUNT : $GLOBALS['egw_info']['user']['account_id'];
 			}
 			else
 			{
-				$content['nm']['start']=0;
+				$content['nm']['start'] = 0;
 			}
 			$content['nm']['appname'] = $appname = $_GET['appname'] ? $_GET['appname'] : $appname;
 			$content['nm']['actions'] = $this->get_actions($appname);
 			// switch filter off for super-global categories
-			if($appname == 'phpgw')
+			if ($appname == 'phpgw')
 			{
 				$content['nm']['no_filter'] = true;
 				// Make sure filter is set properly, could be different if user was looking at something else
@@ -503,18 +503,18 @@ 
 			}
 
 			$content['nm']['global_cats'] = true;
-			if (isset($_GET['global_cats']) && empty($_GET['global_cats'] ))
+			if (isset($_GET['global_cats']) && empty($_GET['global_cats']))
 			{
 				$content['nm']['global_cats'] = false;
 			}
 		}
-		elseif($content['nm']['action'])
+		elseif ($content['nm']['action'])
 		{
 			$appname = $content['nm']['appname'];
 			// Old buttons
-			foreach(array('delete') as $button)
+			foreach (array('delete') as $button)
 			{
-				if(isset($content['nm']['rows'][$button]))
+				if (isset($content['nm']['rows'][$button]))
 				{
 					list($id) = @each($content['nm']['rows'][$button]);
 					$content['nm']['action'] = $button;
@@ -529,39 +529,39 @@ 
 			else
 			{
 				// Action has an additional action - add / delete, etc.  Buttons named <multi-action>_action[action_name]
-				if(in_array($content['nm']['action'], array('owner')))
+				if (in_array($content['nm']['action'], array('owner')))
 				{
 					$action = $content['nm']['action'];
 					if ($content[$action.'_popup'])
 					{
-						$content = array_merge($content,$content[$action.'_popup']);
+						$content = array_merge($content, $content[$action.'_popup']);
 					}
-					$content['nm']['action'] .= '_' . key($content[$action . '_action']);
+					$content['nm']['action'] .= '_'.key($content[$action.'_action']);
 
-					if(is_array($content[$action]))
+					if (is_array($content[$action]))
 					{
-						$content[$action] = implode(',',$content[$action]);
+						$content[$action] = implode(',', $content[$action]);
 					}
-					$content['nm']['action'] .= '_' . $content[$action];
+					$content['nm']['action'] .= '_'.$content[$action];
 				}
 				$success = $failed = 0;
 				$action_msg = null;
-				if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-					$success,$failed,$action_msg,$content['nm']))
+				if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+					$success, $failed, $action_msg, $content['nm']))
 				{
-					$msg .= lang('%1 category(s) %2',$success,$action_msg);
+					$msg .= lang('%1 category(s) %2', $success, $action_msg);
 				}
-				elseif(empty($msg))
+				elseif (empty($msg))
 				{
-					$msg .= lang('%1 category(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+					$msg .= lang('%1 category(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 				}
 				egw_framework::refresh_opener($msg, $this->appname);
 				$msg = '';
 			}
 		}
 		$content['msg'] = $msg;
-		$content['nm']['add_link']= egw_framework::link('/index.php','menuaction='.$this->add_link . '&cat_id=&appname='.$appname);
-		$content['edit_link']= $this->edit_link.'&appname='.$appname;
+		$content['nm']['add_link'] = egw_framework::link('/index.php', 'menuaction='.$this->add_link.'&cat_id=&appname='.$appname);
+		$content['edit_link'] = $this->edit_link.'&appname='.$appname;
 		$content['owner'] = '';
 
 		$sel_options['appname'] = $this->get_app_list();
@@ -576,39 +576,39 @@ 
 
 		$sel_options['owner'][0] = lang('All users');
 		$accs = $GLOBALS['egw']->accounts->get_list('groups');
-		foreach($accs as $acc)
+		foreach ($accs as $acc)
 		{
 			if ($acc['account_type'] == 'g')
 			{
-				$sel_options['owner'][$acc['account_id']] = ExecMethod2('etemplate.select_widget.accountInfo',$acc['account_id'],$acc);
+				$sel_options['owner'][$acc['account_id']] = ExecMethod2('etemplate.select_widget.accountInfo', $acc['account_id'], $acc);
 			}
 		}
 
 		$readonlys['add'] = !self::$acl_add;
-		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$readonlys['nm']['rows']['owner'] = true;
 			$readonlys['nm']['col_filter']['owner'] = true;
 		}
-		if($appname == categories::GLOBAL_APPNAME) {
+		if ($appname == categories::GLOBAL_APPNAME) {
 			$sel_options['app'] = array(''=>'');
 			$readonlys['nm']['rows']['app'] = true;
 		}
 
 		$tmpl = new etemplate_new('admin.categories.index');
 
-		if($tmpl instanceof etemplate_widget_template)
+		if ($tmpl instanceof etemplate_widget_template)
 		{
 			// Category styles
 			categories::css($appname);
 		}
 
-		$tmpl->exec($this->list_link,$content,$sel_options,$readonlys,array(
+		$tmpl->exec($this->list_link, $content, $sel_options, $readonlys, array(
 			'nm' => $content['nm'],
 		));
 	}
 
-	protected function get_actions($appname=categories::GLOBAL_APPNAME) {
+	protected function get_actions($appname = categories::GLOBAL_APPNAME) {
 
 		$actions = array(
 			'open' => array(        // does edit if allowed, otherwise view
@@ -617,7 +617,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction='.$this->edit_link.'&cat_id=$id&appname='.$appname,
 				'popup' => '600x380',
-				'group' => $group=1,
+				'group' => $group = 1,
 			),
 			'add' => array(
 				'caption' => 'Add',
@@ -652,7 +652,7 @@ 
 			),
 		);
 
-		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			unset($actions['owner']);
 		}
@@ -678,14 +678,14 @@ 
 		$success = $failed = 0;
 		if ($use_all)
 		{
-			@set_time_limit(0);                     // switch off the execution time limit, as it's for big selections to small
-			$query['num_rows'] = -1;        // all
+			@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+			$query['num_rows'] = -1; // all
 			$result = $readonlys = array();
-			$this->get_rows($query,$result,$readonlys);
+			$this->get_rows($query, $result, $readonlys);
 			$checked = array();
-			foreach($result as $key => $info)
+			foreach ($result as $key => $info)
 			{
-				if(is_numeric($key))
+				if (is_numeric($key))
 				{
 					$checked[] = $info['id'];
 				}
@@ -693,19 +693,19 @@ 
 		}
 		$owner = $query['col_filter']['owner'] ? $query['col_filter']['owner'] : $query['filter'];
 		$app = $query['col_filter']['app'] ? $query['col_filter']['app'] : $query['appname'];
-		$cats = new categories($owner,$app);
+		$cats = new categories($owner, $app);
 
 		list($action, $settings) = explode('_', $_action, 2);
 
-		switch($action)
+		switch ($action)
 		{
 			case 'delete':
 				$action_msg = lang('deleted');
-				foreach($checked as $id)
+				foreach ($checked as $id)
 				{
-					if($cats->check_perms(EGW_ACL_DELETE, $id, (boolean)$GLOBALS['egw_info']['user']['apps']['admin']))
+					if ($cats->check_perms(EGW_ACL_DELETE, $id, (boolean)$GLOBALS['egw_info']['user']['apps']['admin']))
 					{
-						$cats->delete($id,$settings == 'sub',$settings != 'sub');
+						$cats->delete($id, $settings == 'sub', $settings != 'sub');
 						$success++;
 					}
 					else
@@ -719,20 +719,19 @@ 
 				list($add_remove, $ids_csv) = explode('_', $settings, 2);
 				$ids = explode(',', $ids_csv);
 				// Adding 'All users' removes all the others
-				if($add_remove == 'add' && array_search(categories::GLOBAL_ACCOUNT,$ids) !== false) $ids = array(categories::GLOBAL_ACCOUNT);
+				if ($add_remove == 'add' && array_search(categories::GLOBAL_ACCOUNT, $ids) !== false) $ids = array(categories::GLOBAL_ACCOUNT);
 
-				foreach($checked as $id)
+				foreach ($checked as $id)
 				{
 					if (!$data = $cats->read($id)) continue;
-					$data['owner'] = explode(',',$data['owner']);
-					if(array_search(categories::GLOBAL_ACCOUNT,$data['owner']) !== false || $data['owner'][0] > 0)
+					$data['owner'] = explode(',', $data['owner']);
+					if (array_search(categories::GLOBAL_ACCOUNT, $data['owner']) !== false || $data['owner'][0] > 0)
 					{
 						$data['owner'] = array();
 					}
 					$data['owner'] = $add_remove == 'add' ?
-						$ids == array(categories::GLOBAL_ACCOUNT) ? $ids : array_merge($data['owner'],$ids) :
-						array_diff($data['owner'],$ids);
-					$data['owner'] = implode(',',array_unique($data['owner']));
+						$ids == array(categories::GLOBAL_ACCOUNT) ? $ids : array_merge($data['owner'], $ids) : array_diff($data['owner'], $ids);
+					$data['owner'] = implode(',', array_unique($data['owner']));
 
 					if ($cats->edit($data))
 					{
@@ -763,7 +762,7 @@ 
 				continue;
 			}
 			// Skip apps that don't show in the app bar, they [usually] don't have categories
-			if($data['status'] > 1 || in_array($app, array('home','admin','felamimail','sitemgr','sitemgr-link'))) continue;
+			if ($data['status'] > 1 || in_array($app, array('home', 'admin', 'felamimail', 'sitemgr', 'sitemgr-link'))) continue;
 			if ($GLOBALS['egw_info']['user']['apps'][$app])
 			{
 				$apps[$app] = $data['title'] ? $data['title'] : lang($app);

Braces +64 added lines, -17 removed lines

@@ -144,8 +144,14 @@ 
 			{
 				case 'save':
 				case 'apply':
-					if(is_array($content['owner'])) $content['owner'] = implode(',',$content['owner']);
-					if($content['owner'] == '') $content['owner'] = 0;
+					if(is_array($content['owner']))
+					{
+						$content['owner'] = implode(',',$content['owner']);
+					}
+					if($content['owner'] == '')
+					{
+						$content['owner'] = 0;
+					}
 					if ($content['id'] && self::$acl_edit)
 					{
 
@@ -234,7 +240,10 @@ 
 			egw_framework::refresh_opener($msg, $change_color ? null : $refresh_app, $content['id'], $change_color ? null : 'update', $this->appname);
 		}
 		$content['msg'] = $msg;
-		if(!$content['appname']) $content['appname'] = $appname;
+		if(!$content['appname'])
+		{
+			$content['appname'] = $appname;
+		}
 		if($content['data']['icon'])
 		{
 			$content['icon_url'] = $content['base_url'] . $content['data']['icon'];
@@ -290,7 +299,9 @@ 
 			// Allow admins access to all categories as parent
 			$content['all_cats'] = 'all_no_acl';
 			$readonlys['owner'] = false;
-		} else {
+		}
+		else
+		{
 			$readonlys['owner'] = true;
 			$readonlys['access'] = $content['owner'] != $GLOBALS['egw_info']['user']['account_id'];
 		}
@@ -301,7 +312,10 @@ 
 			$appname != $content['appname'] || // Can't edit a category from a different app
 			 ($this->appname != 'admin' && $content['owner'] != $GLOBALS['egw_info']['user']['account_id']);
 		// Make sure $content['owner'] is an array otherwise it wont show up values in the multiselectbox
-		if (!is_array($content['owner'])) $content['owner'] = explode(',',$content['owner']);
+		if (!is_array($content['owner']))
+		{
+			$content['owner'] = explode(',',$content['owner']);
+		}
 		$tmpl = new etemplate_new('admin.categories.edit');
 		$tmpl->exec($this->edit_link,$content,$sel_options,$readonlys,$content+array(
 			'old_parent' => $content['old_parent'] ? $content['old_parent'] : $content['parent'], 'appname' => $appname
@@ -360,9 +374,15 @@ 
 		{
 			$globalcat = false;
 		}
-		if ($globalcat && $query['filter']) $filter['access'] = 'public';
+		if ($globalcat && $query['filter'])
+		{
+			$filter['access'] = 'public';
+		}
 		// new column-filter access has highest priority
-		if (!empty($query['col_filter']['access']))$filter['access'] = $query['col_filter']['access'];
+		if (!empty($query['col_filter']['access']))
+		{
+			$filter['access'] = $query['col_filter']['access'];
+		}
 
 		egw_cache::setSession(__CLASS__.$query['appname'],'nm',$query);
 
@@ -391,7 +411,10 @@ 
 
 			$row['level_spacer'] = str_repeat('    ',$row['level']);
 
-			if ($row['data']['icon']) $row['icon_url'] = self::icon_url($row['data']['icon']);
+			if ($row['data']['icon'])
+			{
+				$row['icon_url'] = self::icon_url($row['data']['icon']);
+			}
 
 			$row['subs'] = count($row['children']);
 
@@ -422,13 +445,19 @@ 
 			$readonlys['nm']["add[$row[id]]"]    = !self::$acl_add_sub;
 			$readonlys['nm']["delete[$row[id]]"] = !self::$acl_delete;
 		}
-		if (true) $rows = $count <= $query['num_rows'] ? array_values($rows) : array_slice($rows, $query['start'], $query['num_rows']);
+		if (true)
+		{
+			$rows = $count <= $query['num_rows'] ? array_values($rows) : array_slice($rows, $query['start'], $query['num_rows']);
+		}
 		// make appname available for actions
 		$rows['appname'] = $query['appname'];
 		$rows['edit_link'] = $this->edit_link;
 
 		// disable access column for global categories
-		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'admin') $rows['no_access'] = true;
+		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'admin')
+		{
+			$rows['no_access'] = true;
+		}
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang($this->appname).' - '.lang('categories').
 			($query['appname'] != categories::GLOBAL_APPNAME ? ': '.lang($query['appname']) : '');
@@ -445,11 +474,18 @@ 
 	public function index(array $content=null,$msg='')
 	{
 		//_debug_array($_GET);
-		if ($this->appname != 'admin') translation::add_app('admin');	// need admin translations
+		if ($this->appname != 'admin')
+		{
+			translation::add_app('admin');
+		}
+		// need admin translations
 
 		if(!isset($content))
 		{
-			if (isset($_GET['msg'])) $msg = $_GET['msg'];
+			if (isset($_GET['msg']))
+			{
+				$msg = $_GET['msg'];
+			}
 
 			$appname = categories::GLOBAL_APPNAME;
 			foreach(array($content['nm']['appname'], $_GET['cats_app'], $_GET['appname']) as $field)
@@ -590,7 +626,8 @@ 
 			$readonlys['nm']['rows']['owner'] = true;
 			$readonlys['nm']['col_filter']['owner'] = true;
 		}
-		if($appname == categories::GLOBAL_APPNAME) {
+		if($appname == categories::GLOBAL_APPNAME)
+		{
 			$sel_options['app'] = array(''=>'');
 			$readonlys['nm']['rows']['app'] = true;
 		}
@@ -608,7 +645,8 @@ 
 		));
 	}
 
-	protected function get_actions($appname=categories::GLOBAL_APPNAME) {
+	protected function get_actions($appname=categories::GLOBAL_APPNAME)
+	{
 
 		$actions = array(
 			'open' => array(        // does edit if allowed, otherwise view
@@ -719,11 +757,17 @@ 
 				list($add_remove, $ids_csv) = explode('_', $settings, 2);
 				$ids = explode(',', $ids_csv);
 				// Adding 'All users' removes all the others
-				if($add_remove == 'add' && array_search(categories::GLOBAL_ACCOUNT,$ids) !== false) $ids = array(categories::GLOBAL_ACCOUNT);
+				if($add_remove == 'add' && array_search(categories::GLOBAL_ACCOUNT,$ids) !== false)
+				{
+					$ids = array(categories::GLOBAL_ACCOUNT);
+				}
 
 				foreach($checked as $id)
 				{
-					if (!$data = $cats->read($id)) continue;
+					if (!$data = $cats->read($id))
+					{
+						continue;
+					}
 					$data['owner'] = explode(',',$data['owner']);
 					if(array_search(categories::GLOBAL_ACCOUNT,$data['owner']) !== false || $data['owner'][0] > 0)
 					{
@@ -763,7 +807,10 @@ 
 				continue;
 			}
 			// Skip apps that don't show in the app bar, they [usually] don't have categories
-			if($data['status'] > 1 || in_array($app, array('home','admin','felamimail','sitemgr','sitemgr-link'))) continue;
+			if($data['status'] > 1 || in_array($app, array('home','admin','felamimail','sitemgr','sitemgr-link')))
+			{
+				continue;
+			}
 			if ($GLOBALS['egw_info']['user']['apps'][$app])
 			{
 				$apps[$app] = $data['title'] ? $data['title'] : lang($app);

admin/inc/class.admin_export_groups_csv.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
@@ -88,7 +88,7 @@ 
 	 * return html for options.
 	 * this way the plugin has all opportunities for options tab
 	 *
-	 * @return string html
+	 * @return boolean html
 	 */
 	public function get_options_etpl() {
 		return false;

Indentation +2 added lines, -2 removed lines

@@ -81,8 +81,8 @@
 	}
 
 	public static function get_mimetype() {
-                return 'text/csv';
-        }
+				return 'text/csv';
+		}
 
 	/**
 	 * return html for options.

Braces +29 added lines, -13 removed lines

@@ -14,14 +14,16 @@ 
 /**
  * Export users plugin
  */
-class admin_export_groups_csv implements importexport_iface_export_plugin {
+class admin_export_groups_csv implements importexport_iface_export_plugin
+{
 
 	/**
 	 * Exports records as defined in $_definition
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$selection = array();
@@ -40,14 +42,22 @@ 
 		);
 
 		// $_record is an array, that's what search() returns
-		foreach ($selection as $_record) {
+		foreach ($selection as $_record)
+		{
 			$record = new admin_egw_group_record($_record);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($record, admin_egw_group_record::$types, 'admin', $lookups);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
  			}
 			$export_object->export_record($record);
@@ -60,7 +70,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Group CSV export');
 	}
 
@@ -69,7 +80,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports groups into a CSV File. ");
 	}
 
@@ -78,11 +90,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
                 return 'text/csv';
         }
 
@@ -92,7 +106,8 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		return false;
 	}
 
@@ -100,7 +115,8 @@ 
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'preserv' => array('no_error_for_no_selection'),
 		);

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$selection = array();
@@ -42,12 +42,12 @@ 
 		// $_record is an array, that's what search() returns
 		foreach ($selection as $_record) {
 			$record = new admin_egw_group_record($_record);
-			if($options['convert']) {
+			if ($options['convert']) {
 				importexport_export_csv::convert($record, admin_egw_group_record::$types, 'admin', $lookups);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach ($record->get_record_array() as $key => $value) {
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
  			}
 			$export_object->export_record($record);

admin/inc/class.admin_import_groups_csv.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		$import_csv = new importexport_import_csv( $_stream, array(

Spacing +29 added lines, -29 removed lines

@@ -15,15 +15,15 @@ 
 /**
  * class import_csv for admin (groups)
  */
-class admin_import_groups_csv implements importexport_iface_import_plugin  {
+class admin_import_groups_csv implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 		// string
+		'fieldsep', // char
+		'charset', // string
 		'num_header_lines', // int number of header lines
 		'field_conversion', // array( $csv_col_num => conversion)
-		'field_mapping',	// array( $csv_col_num => adb_filed)
-		'conditions',		/* => array containing condition arrays:
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -40,14 +40,14 @@ 
 	/**
 	 * actions which could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'create', 'delete');
+	protected static $actions = array('none', 'update', 'create', 'delete');
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * @var definition
@@ -80,8 +80,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
-		$import_csv = new importexport_import_csv( $_stream, array(
+	public function import($_stream, importexport_definition $_definition) {
+		$import_csv = new importexport_import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -89,7 +89,7 @@ 
 		$this->definition = $_definition;
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		// set FieldMapping.
 		$import_csv->mapping = $_definition->plugin_options['field_mapping'];
@@ -98,9 +98,9 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if (isset($_definition->plugin_options['num_header_lines']) && $_definition->plugin_options['num_header_lines'] > 0) {
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		} elseif (isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -112,22 +112,22 @@ 
 		// Failures
 		$this->errors = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ($record = $import_csv->get_record()) {
 			$success = false;
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
 			importexport_import_csv::convert($record, admin_egw_group_record::$types, 'admin');
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ($_definition->plugin_options['conditions']) {
+				foreach ($_definition->plugin_options['conditions'] as $condition) {
+					switch ($condition['type']) {
 						// exists
 						case 'exists' :
 							$accounts = array();
 
 							// Skip the search if the field is empty
-							if($record[$condition['string']] !== '') {
+							if ($record[$condition['string']] !== '') {
 
 								$accounts = $GLOBALS['egw']->accounts->search(array(
 									'type' => 'groups',
@@ -136,25 +136,25 @@ 
 								));
 							}
 							// Search looks in the given field, but doesn't do an exact match
-							foreach ( (array)$accounts as $key => $account )
+							foreach ((array)$accounts as $key => $account)
 							{
-								if($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
+								if ($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
 							}
-							if ( is_array( $accounts ) && count( $accounts ) >= 1 ) {
+							if (is_array($accounts) && count($accounts) >= 1) {
 								$account = current($accounts);
 								// apply action to all contacts matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$accounts as $account ) {
+								foreach ((array)$accounts as $account) {
 									// Read full account, and copy needed info for accounts->save()
 									$account = $GLOBALS['egw']->accounts->read($account['account_id']);
 									$record['account_id'] = $account['account_id'];
 									$record['account_firstname'] = $account['account_firstname'];
 									$record['account_lastname'] = $account['account_lastname'];
-									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+									$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 								}
 							} else {
 								$action = $condition['false'];
-								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+								$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 							}
 							break;
 
@@ -167,9 +167,9 @@ 
 				}
 			} else {
 				// unconditional insert
-				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+				$success = $this->action('insert', $record, $import_csv->get_current_position());
 			}
-			if($success) $count++;
+			if ($success) $count++;
 		}
 		return $count;
 	}
@@ -181,18 +181,18 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
+	private function action($_action, $_data, $record_num = 0) {
 		switch ($_action) {
 			case 'none' :
 				return true;
 			case 'update' :
 			case 'create' :
-				if(count($_data['account_members']) < 1) {
+				if (count($_data['account_members']) < 1) {
 					$this->errors[$record_num] = lang('You must select at least one group member.');
 					return false;
 				}
 				$command = new admin_cmd_edit_group($_action == 'create' ? false : $_data['account_lid'], $_data);
-				if($this->dry_run) {
+				if ($this->dry_run) {
 					$this->results[$_action]++;
 					return true;
 				}

Indentation +28 added lines, -28 removed lines

@@ -69,9 +69,9 @@ 
 	protected $errors = array();
 
 	/**
-         * List of actions, and how many times that action was taken
-         */
-        protected $results = array();
+	 * List of actions, and how many times that action was taken
+	 */
+		protected $results = array();
 
 	/**
 	 * imports entries according to given definition object.
@@ -262,39 +262,39 @@ 
 	}
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can concatenate them if you need to
-	*
-	* @return Array (
-	*       record_# => warning message
-	*       )
-	*/
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can concatenate them if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
 	public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
+		public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
+		public function get_results() {
+				return $this->results;
+		}
 } // end of iface_export_plugin
 ?>

Braces +71 added lines, -30 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * class import_csv for admin (groups)
  */
-class admin_import_groups_csv implements importexport_iface_import_plugin  {
+class admin_import_groups_csv implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 		// char
@@ -79,7 +80,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 		$import_csv = new importexport_import_csv( $_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
@@ -97,9 +99,12 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0)
+		{
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		}
+		elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line'])
+		{
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -111,22 +116,30 @@ 
 		// Failures
 		$this->errors = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ( $record = $import_csv->get_record() )
+		{
 			$success = false;
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
 			importexport_import_csv::convert($record, admin_egw_group_record::$types, 'admin');
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ( $_definition->plugin_options['conditions'] )
+			{
+				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				{
+					switch ( $condition['type'] )
+					{
 						// exists
 						case 'exists' :
 							$accounts = array();
 
 							// Skip the search if the field is empty
-							if($record[$condition['string']] !== '') {
+							if($record[$condition['string']] !== '')
+							{
 							
 								$accounts = $GLOBALS['egw']->accounts->search(array(
 									'type' => 'groups',
@@ -137,13 +150,18 @@ 
 							// Search looks in the given field, but doesn't do an exact match
 							foreach ( (array)$accounts as $key => $account )
 							{
-								if($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
+								if($account[$condition['string']] != $record[$condition['string']])
+								{
+									unset($accounts[$key]);
+								}
 							}
-							if ( is_array( $accounts ) && count( $accounts ) >= 1 ) {
+							if ( is_array( $accounts ) && count( $accounts ) >= 1 )
+							{
 								$account = current($accounts);
 								// apply action to all contacts matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$accounts as $account ) {
+								foreach ( (array)$accounts as $account )
+								{
 									// Read full account, and copy needed info for accounts->save()
 									$account = $GLOBALS['egw']->accounts->read($account['account_id']);
 									$record['account_id'] = $account['account_id'];
@@ -151,7 +169,9 @@ 
 									$record['account_lastname'] = $account['account_lastname'];
 									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 								}
-							} else {
+							}
+							else
+							{
 								$action = $condition['false'];
 								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 							}
@@ -162,13 +182,21 @@ 
 							die('condition / action not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
-			} else {
+			}
+			else
+			{
 				// unconditional insert
 				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 			}
-			if($success) $count++;
+			if($success)
+			{
+				$count++;
+			}
 		}
 		return $count;
 	}
@@ -180,24 +208,29 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
-		switch ($_action) {
+	private function action ( $_action, $_data, $record_num = 0 )
+	{
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
 			case 'create' :
-				if(count($_data['account_members']) < 1) {
+				if(count($_data['account_members']) < 1)
+				{
 					$this->errors[$record_num] = lang('You must select at least one group member.');
 					return false;
 				}
 				$command = new admin_cmd_edit_group($_action == 'create' ? false : $_data['account_lid'], $_data);
-				if($this->dry_run) {
+				if($this->dry_run)
+				{
 					$this->results[$_action]++;
 					return true;
 				}
 				try {
 					$command->run();
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 					$this->errors[$record_num] = $e->getMessage();
 					return false;
 				}
@@ -214,7 +247,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Group CSV import');
 	}
 
@@ -223,7 +257,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Creates / updates user groups from CSV file");
 	}
 
@@ -232,7 +267,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -248,7 +284,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -257,7 +294,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -269,7 +307,8 @@ 
 	*       record_# => warning message
 	*       )
 	*/
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -281,7 +320,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -293,7 +333,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 } // end of iface_export_plugin

admin/inc/class.admin_statistics.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -291,7 +291,7 @@
 	 * Check if next submission is due, in which case we call submit and NOT return to the admin hook
 	 *
 	 * @param boolean $redirect should we redirect or return true
-	 * @return boolean true if statistic submission is due
+	 * @return boolean|null true if statistic submission is due
 	 */
 	public static function check($redirect=true)
 	{

Spacing +45 added lines, -45 removed lines

@@ -26,7 +26,7 @@ 
 	const SUBMIT_URL = 'https://www.egroupware.org/usage-statistic';
 	const STATISTIC_URL = 'http://www.egroupware.org/usage-statistic';
 
-	const SUBMISION_RATE = 2592000;	// 30 days
+	const SUBMISION_RATE = 2592000; // 30 days
 
 	/**
 	 * Which methods of this class can be called as menuation
@@ -42,27 +42,27 @@ 
 	 *
 	 * @param array $_content =null
 	 */
-	public function submit($_content=null)
+	public function submit($_content = null)
 	{
 		if (is_array($_content))
 		{
 			$config = new config(self::CONFIG_APP);
 			if ($_content['postpone'])
 			{
-				config::save_value(self::CONFIG_POSTPONE_SUBMIT,time()+$_content['postpone'],self::CONFIG_APP);
+				config::save_value(self::CONFIG_POSTPONE_SUBMIT, time() + $_content['postpone'], self::CONFIG_APP);
 				$what = 'postpone';
 			}
-			elseif(!$_content['cancel'])
+			elseif (!$_content['cancel'])
 			{
-				config::save_value(self::CONFIG_LAST_SUBMIT,time(),self::CONFIG_APP);
-				config::save_value(self::CONFIG_SUBMIT_ID,empty($_content['submit_id']) ? '***none***' : $_content['submit_id'],self::CONFIG_APP);
-				config::save_value(self::CONFIG_COUNTRY,empty($_content['country']) ? '***multinational***' : $_content['country'],self::CONFIG_APP);
-				config::save_value(self::CONFIG_USAGE_TYPE,$_content['usage_type'],self::CONFIG_APP);
-				config::save_value(self::CONFIG_INSTALL_TYPE,$_content['install_type'],self::CONFIG_APP);
-				config::save_value(self::CONFIG_POSTPONE_SUBMIT,null,self::CONFIG_APP);	// remove evtl. postpone time
+				config::save_value(self::CONFIG_LAST_SUBMIT, time(), self::CONFIG_APP);
+				config::save_value(self::CONFIG_SUBMIT_ID, empty($_content['submit_id']) ? '***none***' : $_content['submit_id'], self::CONFIG_APP);
+				config::save_value(self::CONFIG_COUNTRY, empty($_content['country']) ? '***multinational***' : $_content['country'], self::CONFIG_APP);
+				config::save_value(self::CONFIG_USAGE_TYPE, $_content['usage_type'], self::CONFIG_APP);
+				config::save_value(self::CONFIG_INSTALL_TYPE, $_content['install_type'], self::CONFIG_APP);
+				config::save_value(self::CONFIG_POSTPONE_SUBMIT, null, self::CONFIG_APP); // remove evtl. postpone time
 				$what = 'submitted';
 			}
-			egw::redirect_link('/admin/index.php','ajax=true&statistics='.($what ? $what : 'canceled'),'admin');
+			egw::redirect_link('/admin/index.php', 'ajax=true&statistics='.($what ? $what : 'canceled'), 'admin');
 		}
 		$sel_options['usage_type'] = array(
 			'commercial'   => lang('Commercial: all sorts of companies'),
@@ -82,19 +82,19 @@ 
 		$sel_options['postpone'] = array(
 			//10 => '10 secs',
 			3600 => lang('one hour'),
-			2*3600 => lang('two hours'),
-			24*3600 => lang('one day'),
-			2*24*3600 => lang('two days'),
-			7*24*3600 => lang('one week'),
-			14*24*3600 => lang('two weeks'),
-			30*24*3600 => lang('one month'),
-			60*24*3600 => lang('two months'),
+			2 * 3600 => lang('two hours'),
+			24 * 3600 => lang('one day'),
+			2 * 24 * 3600 => lang('two days'),
+			7 * 24 * 3600 => lang('one week'),
+			14 * 24 * 3600 => lang('two weeks'),
+			30 * 24 * 3600 => lang('one month'),
+			60 * 24 * 3600 => lang('two months'),
 		);
 		$config = config::read(self::CONFIG_APP);
 		//_debug_array($config);
-		$content = array_merge(self::gather_data(),array(
+		$content = array_merge(self::gather_data(), array(
 			'statistic_url' => self::STATISTIC_URL,
-			'submit_host' => parse_url(self::SUBMIT_URL,PHP_URL_HOST),
+			'submit_host' => parse_url(self::SUBMIT_URL, PHP_URL_HOST),
 			'submit_url'  => self::SUBMIT_URL,
 			'last_submitted' => $config[self::CONFIG_LAST_SUBMIT],
 		));
@@ -121,12 +121,12 @@ 
 			$sel_options['install_type'] = array($content['install_type'] => $sel_options['install_type'][$content['install_type']]);
 		}
 		// else default to previous type
-		elseif($config[self::CONFIG_INSTALL_TYPE])
+		elseif ($config[self::CONFIG_INSTALL_TYPE])
 		{
 			$content['install_type'] = $config[self::CONFIG_INSTALL_TYPE];
 		}
 		// check if we are due for a new submission
-		if (!isset($config[self::CONFIG_LAST_SUBMIT]) || $config[self::CONFIG_LAST_SUBMIT ] <= time()-self::SUBMISION_RATE)
+		if (!isset($config[self::CONFIG_LAST_SUBMIT]) || $config[self::CONFIG_LAST_SUBMIT] <= time() - self::SUBMISION_RATE)
 		{
 			// clear etemplate_exec_id and replace form.action, before submitting the form
 			$content['onclick'] = "return app.admin.submit_statistic(this.form,'$content[submit_url]');";
@@ -135,11 +135,11 @@ 
 		{
 			$readonlys['submit'] = $readonlys['postpone'] = true;
 			$content['msg'] = lang('Your last submission was less then %1 days ago!',
-				ceil((time()-$config[self::CONFIG_LAST_SUBMIT])/24/3600));
+				ceil((time() - $config[self::CONFIG_LAST_SUBMIT]) / 24 / 3600));
 		}
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Submit statistic information');
 		$tmpl = new etemplate_new('admin.statistics');
-		$tmpl->exec('admin.admin_statistics.submit',$content,$sel_options,$readonlys);
+		$tmpl->exec('admin.admin_statistics.submit', $content, $sel_options, $readonlys);
 	}
 
 	/**
@@ -162,7 +162,7 @@ 
 			$data['version'] .= ' '.$GLOBALS['egw_info']['apps']['stylite']['version'].'EPL';
 		}
 		// sessions in the last 30 days
-		$data['sessions'] = $GLOBALS['egw']->db->query('SELECT COUNT(*) FROM egw_access_log WHERE li > '.(time()-30*24*3600))->fetchColumn();
+		$data['sessions'] = $GLOBALS['egw']->db->query('SELECT COUNT(*) FROM egw_access_log WHERE li > '.(time() - 30 * 24 * 3600))->fetchColumn();
 
 		// total accounts from accounts table or ldap
 		$GLOBALS['egw']->accounts->search(array(
@@ -176,9 +176,9 @@ 
 		// @ required to get ride of warning, if files are outside of open_basedir
 		if (@file_exists($file = '/etc/SuSE-release') || @file_exists($file = '/etc/redhat-release') || @file_exists($file = '/etc/debian_version'))
 		{
-			$data['os'] .= ': '.str_replace(array("\n","\r"),'',implode(',',file($file)));
+			$data['os'] .= ': '.str_replace(array("\n", "\r"), '', implode(',', file($file)));
 		}
-		if(file_exists(EGW_INCLUDE_ROOT.'/.git'))
+		if (file_exists(EGW_INCLUDE_ROOT.'/.git'))
 		{
 			$data['install_type'] = 'git';
 		}
@@ -186,22 +186,22 @@ 
 		{
 			$data['install_type'] = 'svn';
 		}
-		elseif(EGW_INCLUDE_ROOT == '/usr/share/egroupware' && PHP_OS == 'Linux' && is_link('/usr/share/egroupware/header.inc.php'))
+		elseif (EGW_INCLUDE_ROOT == '/usr/share/egroupware' && PHP_OS == 'Linux' && is_link('/usr/share/egroupware/header.inc.php'))
 		{
 			$data['install_type'] = 'package';
 		}
-		foreach(array_keys($GLOBALS['egw_info']['apps']) as $app)
+		foreach (array_keys($GLOBALS['egw_info']['apps']) as $app)
 		{
-			if (in_array($app,array(
-				'admin','phpgwapi','emailadmin','sambaadmin','developer_tools',
-				'home','preferences','etemplate','registration','manual','egw-pear',
+			if (in_array($app, array(
+				'admin', 'phpgwapi', 'emailadmin', 'sambaadmin', 'developer_tools',
+				'home', 'preferences', 'etemplate', 'registration', 'manual', 'egw-pear',
 			)))
 			{
-				continue;	// --> ignore to not submit too much
+				continue; // --> ignore to not submit too much
 			}
 			if (($users = self::gather_app_users($app)))	// ignore apps noone is allowed to run
 			{
-				$data['apps'][$app] = $app.':'.round(100.0*$users/$data['users']).'%';
+				$data['apps'][$app] = $app.':'.round(100.0 * $users / $data['users']).'%';
 				if (($entries = self::gather_app_entries($app)))
 				{
 					$data['apps'][$app] .= ':'.$entries;
@@ -209,7 +209,7 @@ 
 			}
 		}
 		ksort($data['apps']);
-		$data['apps'] = implode("\n",$data['apps']);
+		$data['apps'] = implode("\n", $data['apps']);
 
 		return $data;
 	}
@@ -223,17 +223,17 @@ 
 	static function gather_app_users($app)
 	{
 		$users = array();
-		if (($access = $GLOBALS['egw']->acl->get_ids_for_location('run',1,$app)))
+		if (($access = $GLOBALS['egw']->acl->get_ids_for_location('run', 1, $app)))
 		{
-			foreach($access as $uid)
+			foreach ($access as $uid)
 			{
 				if ($uid > 0)
 				{
 					$users[] = $uid;
 				}
-				elseif (($members = $GLOBALS['egw']->accounts->members($uid,true)))
+				elseif (($members = $GLOBALS['egw']->accounts->members($uid, true)))
 				{
-					$users = array_merge($users,$members);
+					$users = array_merge($users, $members);
 				}
 			}
 			$users = array_unique($users);
@@ -257,7 +257,7 @@ 
 			'infolog'     => 'egw_infolog',
 			'filemanager' => 'egw_sqlfs',
 			'gallery'     => 'g2_Item',
-			'news_admin'  => 'egw_news WHERE news_submittedby > 0',	// exclude imported rss feeds
+			'news_admin'  => 'egw_news WHERE news_submittedby > 0', // exclude imported rss feeds
 			'polls'       => 'egw_polls',
 			'projectmanager' => 'egw_pm_projects',
 			'phpbrain'    => 'egw_kb_articles',
@@ -275,8 +275,8 @@ 
 				$entries = (int)$GLOBALS['egw']->db->query('SELECT COUNT(*) FROM '.$table)->fetchColumn();
 				//echo "$app ($table): $entries<br />\n";
 			}
-			catch(egw_exception_db $e) {
-				unset($e);	// not used
+			catch (egw_exception_db $e) {
+				unset($e); // not used
 				$entries = null;
 			}
 		}
@@ -289,19 +289,19 @@ 
 	 * @param boolean $redirect should we redirect or return true
 	 * @return boolean true if statistic submission is due
 	 */
-	public static function check($redirect=true)
+	public static function check($redirect = true)
 	{
 		$config = config::read(self::CONFIG_APP);
 
 		if (isset($config[self::CONFIG_POSTPONE_SUBMIT]) && $config[self::CONFIG_POSTPONE_SUBMIT] > time() ||
-			isset($config[self::CONFIG_LAST_SUBMIT ]) && $config[self::CONFIG_LAST_SUBMIT ] > time()-self::SUBMISION_RATE)
+			isset($config[self::CONFIG_LAST_SUBMIT]) && $config[self::CONFIG_LAST_SUBMIT] > time() - self::SUBMISION_RATE)
 		{
 			return false;
 		}
 		if (!$redirect) return true;
 
 		//die('Due for new statistics submission: last_submit='.$config[self::CONFIG_LAST_SUBMIT ].', postpone='.$config[self::CONFIG_POSTPONE_SUBMIT].', '.function_backtrace());
-		egw::redirect_link('/index.php',array(
+		egw::redirect_link('/index.php', array(
 			'menuaction' => 'admin.admin_ui.index',
 			'ajax' => 'true',
 			'load' => 'admin.admin_statistics.submit',

Braces +8 added lines, -2 removed lines

@@ -199,9 +199,12 @@ 
 			{
 				continue;	// --> ignore to not submit too much
 			}
-			if (($users = self::gather_app_users($app)))	// ignore apps noone is allowed to run
+			if (($users = self::gather_app_users($app)))
+			{
+				// ignore apps noone is allowed to run
 			{
 				$data['apps'][$app] = $app.':'.round(100.0*$users/$data['users']).'%';
+			}
 				if (($entries = self::gather_app_entries($app)))
 				{
 					$data['apps'][$app] .= ':'.$entries;
@@ -298,7 +301,10 @@ 
 		{
 			return false;
 		}
-		if (!$redirect) return true;
+		if (!$redirect)
+		{
+			return true;
+		}
 
 		//die('Due for new statistics submission: last_submit='.$config[self::CONFIG_LAST_SUBMIT ].', postpone='.$config[self::CONFIG_POSTPONE_SUBMIT].', '.function_backtrace());
 		egw::redirect_link('/index.php',array(

admin/inc/class.admin_ui.inc.php

Doc Comments +4 added lines

@@ -491,6 +491,10 @@
 	protected static function call_hook()
 	{
 		self::$hook_data = array();
+
+		/**
+		 * @param string $appname
+		 */
 		function display_section($appname,$file,$file2=False)
 		{
 			admin_ui::$hook_data[$appname] = $file2 ? $file2 : $file;

Spacing +31 added lines, -35 removed lines

@@ -35,7 +35,7 @@ 
 	 *
 	 * @param array $content
 	 */
-	public function index(array $content=null)
+	public function index(array $content = null)
 	{
 		if (admin_statistics::check(false))
 		{
@@ -61,7 +61,7 @@ 
 		//$content['msg'] = 'Hi Ralf ;-)';
 		$sel_options['tree'] = $this->tree_data();
 		$sel_options['filter'] = array('' => lang('All'));
-		foreach(self::$accounts->search(array(
+		foreach (self::$accounts->search(array(
 			'type' => 'groups',
 			'start' => false,
 			'order' => 'account_lid',
@@ -92,7 +92,7 @@ 
 		}
 		else
 		{
-			$content['iframe'] = 'about:blank';	// we show accounts-list be default now
+			$content['iframe'] = 'about:blank'; // we show accounts-list be default now
 		}
 
 		$tpl->exec('admin.admin_ui.index', $content, $sel_options);
@@ -113,11 +113,11 @@ 
 				'caption' => 'Show members',
 				'enableId' => '^/groups/-\\d+',
 				'default' => true,
-				'group' => $group=1,
+				'group' => $group = 1,
 			),
 			'add' => array(
 				'group' => $group,
-			)+$user_actions['add'],
+			) + $user_actions['add'],
 			'acl' => array(
 				'onExecute' => 'javaScript:app.admin.group',
 				'caption' => 'Access control',
@@ -128,7 +128,7 @@ 
 				'group' => 2,
 			),
 		);
-		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))	// no rights to set ACL-rights
+		if (!$GLOBALS['egw']->acl->check('account_access', 64, 'admin'))	// no rights to set ACL-rights
 		{
 			$actions['deny'] = array(
 				'caption'   => 'Deny access',
@@ -139,16 +139,16 @@ 
 				'group'     => 2,
 			);
 		}
-		$group = 5;	// allow to place actions in different groups by hook, this is the default
+		$group = 5; // allow to place actions in different groups by hook, this is the default
 		// supporting both old way using $GLOBALS['menuData'] and new just returning data in hook
 		$apps = array_unique(array_merge(array('admin'), $GLOBALS['egw']->hooks->hook_implemented('edit_group')));
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			$GLOBALS['menuData'] = $data = array();
 			$data = $GLOBALS['egw']->hooks->single('edit_group', $app);
 			if (!is_array($data)) $data = $GLOBALS['menuData'];
 			//error_log(__METHOD__."() app $app returned ".array2string($data));
-			foreach($data as $item)
+			foreach ($data as $item)
 			{
 				// allow hook to return "real" actions, but still support legacy: description, url, extradata, options
 				if (empty($item['caption']))
@@ -199,7 +199,7 @@ 
 					'default' => true,
 					'allowOnMultiple' => false,
 					'onExecute' => 'javaScript:app.admin.account',
-					'group' => $group=0,
+					'group' => $group = 0,
 				),
 				'add' => array(
 					'caption' => 'Add user',
@@ -210,25 +210,25 @@ 
 			// generate urls for add/edit accounts via addressbook
 			$edit = egw_link::get_registry('addressbook', 'edit');
 			$edit['account_id'] = '$id';
-			foreach($edit as $name => $val)
+			foreach ($edit as $name => $val)
 			{
 				$actions['edit']['url'] .= ($actions['edit']['url'] ? '&' : '').$name.'='.$val;
 			}
 			unset($edit['account_id']);
 			$edit['owner'] = 0;
-			foreach($edit as $name => $val)
+			foreach ($edit as $name => $val)
 			{
 				$actions['add']['url'] .= ($actions['edit']['url'] ? '&' : '').$name.'='.$val;
 			}
 			++$group;
 			// supporting both old way using $GLOBALS['menuData'] and new just returning data in hook
 			$apps = array_unique(array_merge(array('admin'), $GLOBALS['egw']->hooks->hook_implemented('edit_user')));
-			foreach($apps as $app)
+			foreach ($apps as $app)
 			{
 				$GLOBALS['menuData'] = $data = array();
 				$data = $GLOBALS['egw']->hooks->single('edit_user', $app);
 				if (!is_array($data)) $data = $GLOBALS['menuData'];
-				foreach($data as $item)
+				foreach ($data as $item)
 				{
 					// allow hook to return "real" actions, but still support legacy: description, url, extradata, options
 					if (empty($item['caption']))
@@ -277,7 +277,7 @@ 
 	 * @param array &$rows=null
 	 * @return int total number of rows available
 	 */
-	public static function get_users(array $query, array &$rows=null)
+	public static function get_users(array $query, array &$rows = null)
 	{
 		$params = array(
 			'type' => (int)$query['filter'] ? (int)$query['filter'] : 'accounts',
@@ -292,7 +292,7 @@ 
 			$params['query'] = $query['searchletter'];
 			$params['query_type'] = 'start';
 		}
-		elseif($query['search'])
+		elseif ($query['search'])
 		{
 			$params['query'] = $query['search'];
 			$params['query_type'] = 'all';
@@ -301,13 +301,10 @@ 
 		$rows = array_values(self::$accounts->search($params));
 		//error_log(__METHOD__."() accounts->search(".array2string($params).") total=".self::$accounts->total);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			$row['status'] = self::$accounts->is_expired($row) ?
-				lang('Expired').' '.egw_time::to($row['account_expires'], true) :
-					(!self::$accounts->is_active($row) ? lang('Disabled') :
-						($row['account_expires'] != -1 ? lang('Expires').' '.egw_time::to($row['account_expires'], true) :
-							lang('Enabled')));
+				lang('Expired').' '.egw_time::to($row['account_expires'], true) : (!self::$accounts->is_active($row) ? lang('Disabled') : ($row['account_expires'] != -1 ? lang('Expires').' '.egw_time::to($row['account_expires'], true) : lang('Enabled')));
 
 			if (!self::$accounts->is_active($row)) $row['status_class'] = 'adminAccountInactive';
 		}
@@ -348,14 +345,14 @@ 
 		if ($root == '/')
 		{
 			$hook_data = self::call_hook();
-			foreach($hook_data as $app => $app_data)
+			foreach ($hook_data as $app => $app_data)
 			{
-				if(!is_array($app_data))
+				if (!is_array($app_data))
 				{
 					// Application has no data
 					continue;
 				}
-				foreach($app_data as $text => $data)
+				foreach ($app_data as $text => $data)
 				{
 					if (!is_array($data))
 					{
@@ -386,18 +383,17 @@ 
 						}
 					}
 					unset($data['icon']);
-					$parent =& $tree['item'];
+					$parent = & $tree['item'];
 					$parts = explode('/', $data['id']);
-					if ($data['id'][0] == '/') array_shift($parts);	// remove root
+					if ($data['id'][0] == '/') array_shift($parts); // remove root
 					array_pop($parts);
 					$path = '';
-					foreach($parts as $part)
+					foreach ($parts as $part)
 					{
 						$path .= ($path == '/' ? '' : '/').$part;
 						if (!isset($parent[$path]))
 						{
-							$icon = etemplate_widget_tree::imagePath($part == 'apps' ? common::image('phpgwapi', 'home') :
-								(($i=common::image($part, 'navbar')) ? $i : common::image('phpgwapi', 'nonav')));
+							$icon = etemplate_widget_tree::imagePath($part == 'apps' ? common::image('phpgwapi', 'home') : (($i = common::image($part, 'navbar')) ? $i : common::image('phpgwapi', 'nonav')));
 							$parent[$path] = array(
 								'id' => $path,
 								'text' => $part == 'apps' ? lang('Applications') : lang($part),
@@ -409,7 +405,7 @@ 
 							);
 							if ($path == '/admin') $parent[$path]['open'] = true;
 						}
-						$parent =& $parent[$path]['item'];
+						$parent = & $parent[$path]['item'];
 					}
 					$data['text'] = lang($data['text']);
 					if (!empty($data['tooltip'])) $data['tooltip'] = lang($data['tooltip']);
@@ -421,7 +417,7 @@ 
 		}
 		elseif ($root == '/groups')
 		{
-			foreach($GLOBALS['egw']->accounts->search(array(
+			foreach ($GLOBALS['egw']->accounts->search(array(
 				'type' => 'groups',
 				'order' => 'account_lid',
 				'sort' => 'ASC',
@@ -448,8 +444,8 @@ 
 	private static function fix_userdata(array $data)
 	{
 		// store link as userdata, maybe we should store everything not directly understood by tree this way ...
-		foreach(array_diff_key($data, array_flip(array(
-			'id','text','tooltip','im0','im1','im2','item','child','select','open','call',
+		foreach (array_diff_key($data, array_flip(array(
+			'id', 'text', 'tooltip', 'im0', 'im1', 'im2', 'item', 'child', 'select', 'open', 'call',
 		))) as $name => $content)
 		{
 			$data['userdata'][] = array(
@@ -469,7 +465,7 @@ 
 	private static function strip_item_keys(array &$items)
 	{
 		$items = array_values($items);
-		foreach($items as &$item)
+		foreach ($items as &$item)
 		{
 			if (is_array($item) && isset($item['item']))
 			{
@@ -487,7 +483,7 @@ 
 	protected static function call_hook()
 	{
 		self::$hook_data = array();
-		function display_section($appname,$file,$file2=False)
+		function display_section($appname, $file, $file2 = False)
 		{
 			admin_ui::$hook_data[$appname] = $file2 ? $file2 : $file;
 			//error_log(__METHOD__."(".array2string(func_get_args()).")");

Braces +85 added lines, -21 removed lines

@@ -43,7 +43,10 @@ 
 		}
 		$tpl = new etemplate_new('admin.index');
 
-		if (!is_array($content)) $content = array();
+		if (!is_array($content))
+		{
+			$content = array();
+		}
 		$content['nm'] = array(
 			'get_rows' => 'admin_ui::get_users',
 			'no_cat' => true,
@@ -128,7 +131,9 @@ 
 				'group' => 2,
 			),
 		);
-		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))	// no rights to set ACL-rights
+		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))
+		{
+			// no rights to set ACL-rights
 		{
 			$actions['deny'] = array(
 				'caption'   => 'Deny access',
@@ -139,6 +144,7 @@ 
 				'group'     => 2,
 			);
 		}
+		}
 		$group = 5;	// allow to place actions in different groups by hook, this is the default
 		// supporting both old way using $GLOBALS['menuData'] and new just returning data in hook
 		$apps = array_unique(array_merge(array('admin'), $GLOBALS['egw']->hooks->hook_implemented('edit_group')));
@@ -146,7 +152,10 @@ 
 		{
 			$GLOBALS['menuData'] = $data = array();
 			$data = $GLOBALS['egw']->hooks->single('edit_group', $app);
-			if (!is_array($data)) $data = $GLOBALS['menuData'];
+			if (!is_array($data))
+			{
+				$data = $GLOBALS['menuData'];
+			}
 			//error_log(__METHOD__."() app $app returned ".array2string($data));
 			foreach($data as $item)
 			{
@@ -166,15 +175,33 @@ 
 					{
 						$item['popup'] = $matches[2].'x'.$matches[3];
 						$item['onExecute'] = 'javaScript:nm_action';
-						if (isset($matches[5])) $item['tooltip'] = $matches[5];
+						if (isset($matches[5]))
+						{
+							$item['tooltip'] = $matches[5];
+						}
 						unset($item['options']);
 					}
 				}
-				if (empty($item['icon'])) $item['icon'] = $app.'/navbar';
-				if (empty($item['group'])) $item['group'] = $group;
-				if (empty($item['onExecute'])) $item['onExecute'] = 'javaScript:app.admin.group';
-				if (!isset($item['allowOnMultiple'])) $item['allowOnMultiple'] = false;
-				if (!isset($item['enableId'])) $item['enableId'] = '^/groups/-\\d+';
+				if (empty($item['icon']))
+				{
+					$item['icon'] = $app.'/navbar';
+				}
+				if (empty($item['group']))
+				{
+					$item['group'] = $group;
+				}
+				if (empty($item['onExecute']))
+				{
+					$item['onExecute'] = 'javaScript:app.admin.group';
+				}
+				if (!isset($item['allowOnMultiple']))
+				{
+					$item['allowOnMultiple'] = false;
+				}
+				if (!isset($item['enableId']))
+				{
+					$item['enableId'] = '^/groups/-\\d+';
+				}
 
 				$actions[$item['id']] = $item;
 			}
@@ -227,7 +254,10 @@ 
 			{
 				$GLOBALS['menuData'] = $data = array();
 				$data = $GLOBALS['egw']->hooks->single('edit_user', $app);
-				if (!is_array($data)) $data = $GLOBALS['menuData'];
+				if (!is_array($data))
+				{
+					$data = $GLOBALS['menuData'];
+				}
 				foreach($data as $item)
 				{
 					// allow hook to return "real" actions, but still support legacy: description, url, extradata, options
@@ -245,15 +275,30 @@ 
 						if ($item['options'] && preg_match('/(egw_openWindowCentered2?|window.open)\([^)]+,(\d+),(\d+).*(title="([^"]+)")?/', $item['options'], $matches))
 						{
 							$item['popup'] = $matches[2].'x'.$matches[3];
-							if (isset($matches[5])) $item['tooltip'] = $matches[5];
+							if (isset($matches[5]))
+							{
+								$item['tooltip'] = $matches[5];
+							}
 							unset($item['options']);
 						}
 					}
-					if (empty($item['icon'])) $item['icon'] = $app.'/navbar';
-					if (empty($item['group'])) $item['group'] = $group;
-					if (empty($item['onExecute'])) $item['onExecute'] = $item['popup'] ?
+					if (empty($item['icon']))
+					{
+						$item['icon'] = $app.'/navbar';
+					}
+					if (empty($item['group']))
+					{
+						$item['group'] = $group;
+					}
+					if (empty($item['onExecute']))
+					{
+						$item['onExecute'] = $item['popup'] ?
 						'javaScript:nm_action' : 'javaScript:app.admin.iframe_location';
-					if (!isset($item['allowOnMultiple'])) $item['allowOnMultiple'] = false;
+					}
+					if (!isset($item['allowOnMultiple']))
+					{
+						$item['allowOnMultiple'] = false;
+					}
 
 					$actions[$item['id']] = $item;
 				}
@@ -309,7 +354,10 @@ 
 						($row['account_expires'] != -1 ? lang('Expires').' '.egw_time::to($row['account_expires'], true) :
 							lang('Enabled')));
 
-			if (!self::$accounts->is_active($row)) $row['status_class'] = 'adminAccountInactive';
+			if (!self::$accounts->is_active($row))
+			{
+				$row['status_class'] = 'adminAccountInactive';
+			}
 		}
 
 		return self::$accounts->total;
@@ -363,7 +411,10 @@ 
 							'link' => $data,
 						);
 					}
-					if (empty($data['text'])) $data['text'] = $text;
+					if (empty($data['text']))
+					{
+						$data['text'] = $text;
+					}
 					if (empty($data['id']))
 					{
 						$data['id'] = $root.($app == 'admin' ? 'admin' : 'apps/'.$app).'/';
@@ -388,7 +439,11 @@ 
 					unset($data['icon']);
 					$parent =& $tree['item'];
 					$parts = explode('/', $data['id']);
-					if ($data['id'][0] == '/') array_shift($parts);	// remove root
+					if ($data['id'][0] == '/')
+					{
+						array_shift($parts);
+					}
+					// remove root
 					array_pop($parts);
 					$path = '';
 					foreach($parts as $part)
@@ -407,14 +462,23 @@ 
 								'item' => array(),
 								'child' => 1,
 							);
-							if ($path == '/admin') $parent[$path]['open'] = true;
+							if ($path == '/admin')
+							{
+								$parent[$path]['open'] = true;
+							}
 						}
 						$parent =& $parent[$path]['item'];
 					}
 					$data['text'] = lang($data['text']);
-					if (!empty($data['tooltip'])) $data['tooltip'] = lang($data['tooltip']);
+					if (!empty($data['tooltip']))
+					{
+						$data['tooltip'] = lang($data['tooltip']);
+					}
 					// make sure keys are unique, as we overwrite tree entries otherwise
-					if (isset($parent[$data['id']])) $data['id'] .= md5($data['link']);
+					if (isset($parent[$data['id']]))
+					{
+						$data['id'] .= md5($data['link']);
+					}
 					$parent[$data['id']] = self::fix_userdata($data);
 				}
 			}