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

@@ -40,9 +40,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);
 	}
 
 	/**
@@ -58,25 +58,25 @@ 
 	 * @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($_POST['g-recaptcha-response'])) $recaptcha = sitemgr_module::verify_recaptcha ($_POST['g-recaptcha-response']);
+			if (isset($_POST['g-recaptcha-response'])) $recaptcha = sitemgr_module::verify_recaptcha($_POST['g-recaptcha-response']);
 			$captcha = (isset($content['captcha_result']) && $content['captcha'] != $content['captcha_result']) || ($recaptcha && $recaptcha->success == false);
 			if ($captcha || // no correct captcha OR
-				(time() - $content['start_time'] < 10 &&				// bot indicator (less then 10 sec to fill out the form and
+				(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'])
 			{
@@ -84,11 +84,11 @@ 
 				$contact = new Api\Contacts();
 				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']))
 							{
@@ -97,7 +97,7 @@ 
 								// edit rights for the addressbook used to store the new entry,
 								// which is clearly not wanted securitywise
 								Vfs::$is_root = true;
-								Link::link('addressbook',$id,Link::VFS_APPNAME,$value,$name);
+								Link::link('addressbook', $id, Link::VFS_APPNAME, $value, $name);
 								Vfs::$is_root = false;
 							}
 						}
@@ -116,7 +116,7 @@ 
 					{
 						$tracking = new Api\Contacts\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>';
 					}
@@ -139,7 +139,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
 				{
@@ -150,10 +150,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']))
 					{
@@ -174,18 +174,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 Api\Contacts();
 					$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']))
 					{
@@ -207,16 +207,16 @@ 
 		if (!sitemgr_module::get_recaptcha())
 		{
 			// 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;
 			}
 		}
 		else
@@ -232,6 +232,6 @@ 
 			$content = array_merge($_GET, (array)$content);
 		}
 
-		return $tpl->exec($this->callback,$content,$sel_options,array(),$preserv);
+		return $tpl->exec($this->callback, $content, $sel_options, array(), $preserv);
 	}
 }

Braces +50 added lines, -14 removed lines

@@ -61,30 +61,46 @@ 
 	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($_POST['g-recaptcha-response'])) $recaptcha = sitemgr_module::verify_recaptcha ($_POST['g-recaptcha-response']);
+			if (isset($_POST['g-recaptcha-response']))
+			{
+				$recaptcha = sitemgr_module::verify_recaptcha ($_POST['g-recaptcha-response']);
+			}
 			$captcha = (isset($content['captcha_result']) && $content['captcha'] != $content['captcha_result']) || ($recaptcha && $recaptcha->success == false);
 			if ($captcha || // 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 Api\Contacts();
-				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
@@ -141,9 +157,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 Api\Contacts();
@@ -174,12 +193,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 Api\Contacts();
+				}
+					if (is_null($contact))
+					{
+						$contact = new Api\Contacts();
+					}
 					$content['show']['custom'.$custom] = true;
 					$content['customfield'][$custom] = $name;
 					$content['customlabel'][$custom] = $contact->customfields[substr($name,1)]['label'];
@@ -202,16 +228,26 @@ 
 		}
 		$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;
+		}
 		if (!sitemgr_module::get_recaptcha())
 		{
 			// 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)

Braces +164 added lines, -67 removed lines

@@ -38,7 +38,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);
@@ -48,8 +49,13 @@ 
 		// Addressbook defines its own export imits
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
 		$export_limit = Api\Storage\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;
 		}
 
@@ -57,18 +63,24 @@ 
 		$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 = Api\Cache::getSession('addressbook', 'index');
 			$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'];
+			}
 			$readonlys = null;
 			$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);
@@ -107,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']);
@@ -126,29 +147,36 @@ 
 		}
 		$GLOBALS['egw_info']['flags']['currentapp'] = $old_app;
 
-		if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+		if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+		{
 			$selection = array_slice($selection, 0, $export_limit);
 		}
 
-		if($options['explode_multiselects']) {
+		if($options['explode_multiselects'])
+		{
 			$customfields = Api\Storage\Customfields::get('addressbook');
 			$additional_fields = array();
 			$cat_obj = new Api\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;
 								}
@@ -158,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;
 							}
@@ -174,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,
@@ -185,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']++;
 						}
 					}
@@ -220,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]);
 				}
@@ -263,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);
 			}
 
@@ -286,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);
+					}
 				}
 			}
 
@@ -306,7 +373,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Addressbook CSV export');
 	}
 
@@ -315,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.");
 	}
 
@@ -324,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';
 	}
 
@@ -351,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',
 		);
@@ -369,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;
 		}
@@ -380,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);
+				}
 			}
 		}
 	}
@@ -436,12 +530,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',

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 +84 added lines, -84 removed lines

@@ -23,13 +23,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();
 	}
 
@@ -38,7 +38,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);
@@ -47,9 +47,9 @@ 
 
 		// Addressbook defines its own export imits
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
-		$export_limit = Api\Storage\Merge::getExportLimit($app='addressbook');
+		$export_limit = Api\Storage\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;
 		}
 
@@ -60,18 +60,18 @@ 
 		if ($options['selection'] == 'search') {
 			// uicontacts selection with checkbox 'use_all'
 			$query = Api\Cache::getSession('addressbook', 'index');
-			$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['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'];
 			$readonlys = null;
-			$this->ui->get_rows($query,$selection,$readonlys, true);	// only return the ids
+			$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')
@@ -80,90 +80,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(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+		if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
 			$selection = array_slice($selection, 0, $export_limit);
 		}
 
-		if($options['explode_multiselects']) {
+		if ($options['explode_multiselects']) {
 			$customfields = Api\Storage\Customfields::get('addressbook');
 			$additional_fields = array();
 			$cat_obj = new Api\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,
@@ -174,10 +174,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;
@@ -186,29 +186,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']++;
 						}
 					}
@@ -220,18 +220,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 {
@@ -244,12 +244,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['account_id'] ? $_contact['account_id'] : 'c'.$_contact['id'];
 				}
@@ -264,20 +264,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
@@ -286,12 +286,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);
 				}
 			}
 
@@ -338,7 +338,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();
 		}
@@ -369,26 +369,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'];
@@ -397,16 +397,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);
 			}
 		}
 	}
@@ -417,7 +417,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'];
 		}
@@ -439,9 +439,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',

addressbook/inc/class.addressbook_favorite_portlet.inc.php

Doc Comments -2 removed lines

@@ -79,8 +79,6 @@
 	 * Here we need to handle any incoming data.  Setup is done in the constructor,
 	 * output is handled by parent.
 	 *
-	 * @param type $id
-	 * @param Etemplate $etemplate
 	 */
 	public static function process($values = array())
 	{

Spacing +17 added lines, -17 removed lines

@@ -30,13 +30,13 @@ 
 		$context['appname'] = 'addressbook';
 
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
 		$ui = new addressbook_ui();
 
 		$this->context['template'] = 'addressbook.index.rows';
 		$this->context['sel_options'] = array();
-		foreach($ui->content_types as $tid => $data)
+		foreach ($ui->content_types as $tid => $data)
 		{
 			$this->context['sel_options']['tid'][$tid] = $data['name'];
 		}
@@ -49,11 +49,11 @@ 
 		);
 	}
 
-	public function exec($id = null, Etemplate &$etemplate = null)
+	public function exec($id = null, Etemplate&$etemplate = null)
 	{
 		$ui = new addressbook_ui();
-		$this->context['sel_options']['filter'] = $this->context['sel_options']['owner'] = $ui->get_addressbooks(Acl::READ,lang('All'));
-		$this->context['sel_options']['filter2'] = $ui->get_lists(Acl::READ,array('' => lang('none')));
+		$this->context['sel_options']['filter'] = $this->context['sel_options']['owner'] = $ui->get_addressbooks(Acl::READ, lang('All'));
+		$this->context['sel_options']['filter2'] = $ui->get_lists(Acl::READ, array('' => lang('none')));
 		$this->nm_settings['actions'] = $ui->get_actions($this->nm_settings['col_filter']['tid'], $this->nm_settings['org_view']);
 
 		parent::exec($id, $etemplate);
@@ -96,27 +96,27 @@ 
 			{
 				// Some processing to add values in for links and cats
 				$success = $failed = $action_msg = $msg = null;
-				if ($ui->action($values['nm']['action'],$values['nm']['selected'],$values['nm']['select_all'],
-						$success,$failed,$action_msg,$values['do_email'] ? 'email' : 'index',$msg,$values['nm']['checkboxes']))
+				if ($ui->action($values['nm']['action'], $values['nm']['selected'], $values['nm']['select_all'],
+						$success, $failed, $action_msg, $values['do_email'] ? 'email' : 'index', $msg, $values['nm']['checkboxes']))
 				{
-					$msg .= lang('%1 contact(s) %2',$success,$action_msg);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'success'));
-					foreach($values['nm']['selected'] as &$id)
+					$msg .= lang('%1 contact(s) %2', $success, $action_msg);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'success'));
+					foreach ($values['nm']['selected'] as &$id)
 					{
 						$id = 'addressbook::'.$id;
 					}
 					// Directly request an update - this will get addressbook tab too
-					Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($values['nm']['selected']));
+					Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($values['nm']['selected']));
 				}
-				elseif(is_null($msg))
+				elseif (is_null($msg))
 				{
-					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 				}
-				elseif($msg)
+				elseif ($msg)
 				{
-					$msg .= "\n".lang('%1 entries %2, %3 failed.',$success,$action_msg,$failed);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+					$msg .= "\n".lang('%1 entries %2, %3 failed.', $success, $action_msg, $failed);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 				}
 				unset($values['nm']['action']);
 				unset($values['nm']['select_all']);

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

@@ -25,7 +25,7 @@
 	 * Construct the portlet
 	 *
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		$context['appname'] = 'addressbook';
 

addressbook/inc/class.addressbook_groupdav.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -106,7 +106,7 @@ 
 	 * @param array &$files
 	 * @param int $user account_id
 	 * @param string $id =''
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function propfind($path,&$options,&$files,$user,$id='')
 	{
@@ -188,7 +188,7 @@ 
 	 *
 	 * @param string $path
 	 * @param array& $filter
-	 * @param array|boolean $start =false false=return all or array(start,num)
+	 * @param integer[] $start =false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
 	function &propfind_callback($path,array &$filter,$start=false,$report_not_found_multiget_ids=true)
@@ -539,7 +539,7 @@ 
 	 * @param array &$options
 	 * @param int $id
 	 * @param int $user =null account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function get(&$options,$id,$user=null)
 	{
@@ -566,7 +566,7 @@ 
 	 * @param int $id
 	 * @param int $user =null account_id of owner, default null
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
@@ -1024,7 +1024,7 @@ 
 	 *
 	 * @param int $acl Acl::READ, Acl::EDIT or Acl::DELETE
 	 * @param array|int $contact contact-array or id
-	 * @return boolean null if entry does not exist, false if no access, true if access permitted
+	 * @return null|boolean null if entry does not exist, false if no access, true if access permitted
 	 */
 	function check_access($acl,$contact)
 	{

Spacing +125 added lines, -126 removed lines

@@ -76,7 +76,7 @@ 
 		// LDAP does NOT have a carddav_name attribute --> stick with id mapped to LDAP attribute uid
 		if (version_compare($GLOBALS['egw_info']['apps']['phpgwapi']['version'], '1.9.007', '<') ||
 			$this->bo->contact_repository != 'sql' ||
-			$this->bo->account_repository != 'sql' && strpos($_SERVER['REQUEST_URI'].'/','/addressbook-accounts/') !== false)
+			$this->bo->account_repository != 'sql' && strpos($_SERVER['REQUEST_URI'].'/', '/addressbook-accounts/') !== false)
 		{
 			self::$path_extension = '.vcf';
 		}
@@ -88,11 +88,11 @@ 
 		if ($this->debug) error_log(__METHOD__."() contact_repository={$this->bo->contact_repository}, account_repository={$this->bo->account_repository}, REQUEST_URI=$_SERVER[REQUEST_URI] --> path_attr=".self::$path_attr.", path_extension=".self::$path_extension);
 
 		$this->home_set_pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
-		$this->home_set_pref = $this->home_set_pref ? explode(',',$this->home_set_pref) : array();
+		$this->home_set_pref = $this->home_set_pref ? explode(',', $this->home_set_pref) : array();
 
 		// silently switch "Sync all into one" preference on for OS X addressbook, as it only supports one AB
 		// this restores behavior before Lion (10.7), where AB synced all ABs contained in addressbook-home-set
-		if (substr(self::get_agent(),0,9) == 'cfnetwork' && !in_array('O',$this->home_set_pref))
+		if (substr(self::get_agent(), 0, 9) == 'cfnetwork' && !in_array('O', $this->home_set_pref))
 		{
 			$this->home_set_pref[] = 'O';
 		}
@@ -108,13 +108,13 @@ 
 	 * @param string $id =''
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function propfind($path,&$options,&$files,$user,$id='')
+	function propfind($path, &$options, &$files, $user, $id = '')
 	{
 		$filter = array();
 		// If "Sync selected addressbooks into one" is set
-		if ($user && $user == $GLOBALS['egw_info']['user']['account_id'] && in_array('O',$this->home_set_pref))
+		if ($user && $user == $GLOBALS['egw_info']['user']['account_id'] && in_array('O', $this->home_set_pref))
 		{
-			$filter['owner'] = array_keys($this->get_shared(true));	// true: ignore all-in-one pref
+			$filter['owner'] = array_keys($this->get_shared(true)); // true: ignore all-in-one pref
 			$filter['owner'][] = $user;
 		}
 		// show addressbook of a single user?
@@ -127,11 +127,11 @@ 
 
 		// process REPORT filters or multiget href's
 		$nresults = null;
-		if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options,$filter,$id, $nresults))
+		if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options, $filter, $id, $nresults))
 		{
 			return false;
 		}
-		if ($id) $path = dirname($path).'/';	// carddav_name get's added anyway in the callback
+		if ($id) $path = dirname($path).'/'; // carddav_name get's added anyway in the callback
 
 		if ($this->debug) error_log(__METHOD__."($path,".array2string($options).",,$user,$id) filter=".array2string($filter));
 
@@ -139,7 +139,7 @@ 
 		if (!($filter['address_data'] = $options['props'] == 'all' &&
 			$options['root']['ns'] == Api\CalDAV::CARDDAV) && is_array($options['props']))
 		{
-			foreach($options['props'] as $prop)
+			foreach ($options['props'] as $prop)
 			{
 				if ($prop['name'] == 'address-data')
 				{
@@ -158,7 +158,7 @@ 
 
 			$this->sync_collection_token = null;
 
-			$filter['order'] = 'contact_modified ASC';	// return oldest modifications first
+			$filter['order'] = 'contact_modified ASC'; // return oldest modifications first
 			$filter['sync-collection'] = true;
 		}
 
@@ -172,13 +172,13 @@ 
 			if ($options['root']['name'] == 'sync-collection' && $this->bo->total > $nresults)
 			{
 				--$this->sync_collection_token;
-				$files['sync-token-params'][] = true;	// tel get_sync_collection_token that we have more entries
+				$files['sync-token-params'][] = true; // tel get_sync_collection_token that we have more entries
 			}
 		}
 		else
 		{
 			// return iterator, calling ourself to return result in chunks
-			$files['files'] = new Api\CalDAV\PropfindIterator($this,$path,$filter,$files['files']);
+			$files['files'] = new Api\CalDAV\PropfindIterator($this, $path, $filter, $files['files']);
 		}
 		return true;
 	}
@@ -191,7 +191,7 @@ 
 	 * @param array|boolean $start =false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
-	function &propfind_callback($path,array &$filter,$start=false,$report_not_found_multiget_ids=true)
+	function &propfind_callback($path, array &$filter, $start = false, $report_not_found_multiget_ids = true)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($filter).", ".array2string($start).", $report_not_found_multiget_ids)");
 		$starttime = microtime(true);
@@ -219,18 +219,18 @@ 
 		if (isset($filter[self::$path_attr]))
 		{
 			if (!is_array($filter[self::$path_attr])) $filter[self::$path_attr] = (array)$filter[self::$path_attr];
-			$requested_multiget_ids =& $filter[self::$path_attr];
+			$requested_multiget_ids = & $filter[self::$path_attr];
 		}
 
 		$files = array();
 		// we query etag and modified, as LDAP does not have the strong sql etag
-		$cols = array('id','uid','etag','modified','n_fn');
-		if (!in_array(self::$path_attr,$cols)) $cols[] = self::$path_attr;
+		$cols = array('id', 'uid', 'etag', 'modified', 'n_fn');
+		if (!in_array(self::$path_attr, $cols)) $cols[] = self::$path_attr;
 		// we need tid for sync-collection report
 		if (array_key_exists('tid', $filter) && !isset($filter['tid']) && !in_array('tid', $cols)) $cols[] = 'tid';
-		if (($contacts =& $this->bo->search(array(),$cols,$order,'','',False,'AND',$start,$filter)))
+		if (($contacts = & $this->bo->search(array(), $cols, $order, '', '', False, 'AND', $start, $filter)))
 		{
-			foreach($contacts as &$contact)
+			foreach ($contacts as &$contact)
 			{
 				// remove contact from requested multiget ids, to be able to report not found urls
 				if ($requested_multiget_ids && ($k = array_search($contact[self::$path_attr], $requested_multiget_ids)) !== false)
@@ -250,9 +250,9 @@ 
 				);
 				if ($address_data)
 				{
-					$content = $handler->getVCard($contact['id'],$this->charset,false);
+					$content = $handler->getVCard($contact['id'], $this->charset, false);
 					$props['getcontentlength'] = bytes($content);
-					$props[] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'address-data',$content,true);
+					$props[] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'address-data', $content, true);
 				}
 				$files[] = $this->add_resource($path, $contact, $props);
 			}
@@ -283,10 +283,10 @@ 
 				}
 			}
 			// add groups after contacts, but only if enabled and NOT for '/addressbook/' (!isset($filter['owner'])
-			if (in_array('D',$this->home_set_pref) && (string)$filter['owner'] !== '0')
+			if (in_array('D', $this->home_set_pref) && (string)$filter['owner'] !== '0')
 			{
 				$where = array(
-					'list_owner' => isset($filter['owner'])?$filter['owner']:array_keys($this->bo->grants)
+					'list_owner' => isset($filter['owner']) ? $filter['owner'] : array_keys($this->bo->grants)
 				);
 				// add sync-token to support sync-collection report
 				if ($sync_collection_report)
@@ -299,20 +299,20 @@ 
 					$where['list_'.self::$path_attr] = $filter[self::$path_attr];
 				}
 				//error_log(__METHOD__."() filter=".array2string($filter).", do_groups=".in_array('D',$this->home_set_pref).", where=".array2string($where));
-				if ($where['id'] && ($lists = $this->bo->read_lists($where,'contact_uid',$where['list_owner'])))	// limit to contacts in same AB!
+				if ($where['id'] && ($lists = $this->bo->read_lists($where, 'contact_uid', $where['list_owner'])))	// limit to contacts in same AB!
 				{
-					foreach($lists as $list)
+					foreach ($lists as $list)
 					{
 						$list[self::$path_attr] = $list['list_carddav_name'];
 						$etag = $list['list_id'].':'.$list['list_etag'];
 						// for all-in-one addressbook, add selected ABs to etag
 						if (isset($filter['owner']) && is_array($filter['owner']))
 						{
-							$etag .= ':'.implode('-',$filter['owner']);
+							$etag .= ':'.implode('-', $filter['owner']);
 						}
 						$props = array(
 							'getcontenttype' => Api\CalDAV::mkprop('getcontenttype', 'text/vcard'),
-							'getlastmodified' => Api\DateTime::to($list['list_modified'],'ts'),
+							'getlastmodified' => Api\DateTime::to($list['list_modified'], 'ts'),
 							'displayname' => $list['list_name'],
 							'getetag' => '"'.$etag.'"',
 						);
@@ -320,7 +320,7 @@ 
 						{
 							$content = $handler->getGroupVCard($list);
 							$props['getcontentlength'] = bytes($content);
-							$props[] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'address-data',$content,true);
+							$props[] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'address-data', $content, true);
 						}
 						$files[] = $this->add_resource($path, $list, $props);
 
@@ -330,7 +330,7 @@ 
 							unset($requested_multiget_ids[$k]);
 						}
 
-						if ($sync_collection_report && $this->sync_collection_token < ($ts=$GLOBALS['egw']->db->from_timestamp($list['list_modified'])))
+						if ($sync_collection_report && $this->sync_collection_token < ($ts = $GLOBALS['egw']->db->from_timestamp($list['list_modified'])))
 						{
 							$this->sync_collection_token = $ts;
 						}
@@ -340,7 +340,7 @@ 
 			// report not found multiget urls
 			if ($report_not_found_multiget_ids && $requested_multiget_ids)
 			{
-				foreach($requested_multiget_ids as $id)
+				foreach ($requested_multiget_ids as $id)
 				{
 					$files[] = array('path' => $path.$id.self::$path_extension);
 				}
@@ -360,7 +360,7 @@ 
 	 * @param int &$nresult on return limit for number or results or unchanged/null
 	 * @return boolean true if filter could be processed
 	 */
-	function _report_filters($options,&$filters,$id, &$nresults)
+	function _report_filters($options, &$filters, $id, &$nresults)
 	{
 		if ($options['filters'])
 		{
@@ -385,17 +385,17 @@ 
 			$prop_filters = array();
 
 			$matches = $prop_test = $column = null;
-			foreach($options['filters'] as $n => $filter)
+			foreach ($options['filters'] as $n => $filter)
 			{
-				if (!is_int($n)) continue;	// eg. attributes of filter xml element
+				if (!is_int($n)) continue; // eg. attributes of filter xml element
 
-				switch((string)$filter['name'])
+				switch ((string)$filter['name'])
 				{
 					case 'param-filter':
 						$this->caldav->log(__METHOD__."(...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
 						break;
 					case 'prop-filter':	// can be multiple prop-filter, see example
-						if ($matches) $prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+						if ($matches) $prop_filters[] = implode($prop_test == 'allof' ? ' AND ' : ' OR ', $matches);
 						$matches = array();
 						$prop_filter = strtoupper($filter['attrs']['name']);
 						$prop_test = isset($filter['attrs']['test']) ? $filter['attrs']['test'] : 'anyof';
@@ -408,11 +408,11 @@ 
 						if (!isset($this->filter_prop2cal[$prop_filter]))	// eg. not existing NICKNAME in EGroupware
 						{
 							if ($this->debug || $prop_filter != 'NICKNAME') error_log(__METHOD__."(...) text-match: $prop_filter {$filter['attrs']['match-type']} '{$filter['data']}' unknown property '$prop_filter' --> ignored");
-							$column = false;	// to ignore following data too
+							$column = false; // to ignore following data too
 						}
 						else
 						{
-							switch($filter['attrs']['collation'])	// todo: which other collations allowed, we are allways unicode
+							switch ($filter['attrs']['collation'])	// todo: which other collations allowed, we are allways unicode
 							{
 								case 'i;unicode-casemap':
 								default:
@@ -432,20 +432,20 @@ 
 							if ($column)	// false for properties not known to EGroupware
 							{
 								$value = str_replace(array('%', '_'), array('\\%', '\\_'), $filter['data']);
-								switch($match_type)
+								switch ($match_type)
 								{
 									case 'equals':
-										$sql_filter = $column . $comp . $GLOBALS['egw']->db->quote($value);
+										$sql_filter = $column.$comp.$GLOBALS['egw']->db->quote($value);
 										break;
 									default:
 									case 'contains':
-										$sql_filter = $column . $comp . $GLOBALS['egw']->db->quote('%'.$value.'%');
+										$sql_filter = $column.$comp.$GLOBALS['egw']->db->quote('%'.$value.'%');
 										break;
 									case 'starts-with':
-										$sql_filter = $column . $comp . $GLOBALS['egw']->db->quote($value.'%');
+										$sql_filter = $column.$comp.$GLOBALS['egw']->db->quote($value.'%');
 										break;
 									case 'ends-with':
-										$sql_filter = $column . $comp . $GLOBALS['egw']->db->quote('%'.$value);
+										$sql_filter = $column.$comp.$GLOBALS['egw']->db->quote('%'.$value);
 										break;
 								}
 								$matches[] = ($negate_condition ? 'NOT ' : '').$sql_filter;
@@ -461,10 +461,10 @@ 
 						break;
 				}
 			}
-			if ($matches) $prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+			if ($matches) $prop_filters[] = implode($prop_test == 'allof' ? ' AND ' : ' OR ', $matches);
 			if ($prop_filters)
 			{
-				$filters[] = $filter = '(('.implode($filter_test=='allof'?') AND (':') OR (', $prop_filters).'))';
+				$filters[] = $filter = '(('.implode($filter_test == 'allof' ? ') AND (' : ') OR (', $prop_filters).'))';
 				if ($this->debug) error_log(__METHOD__."(path=$options[path], ...) sql-filter: $filter");
 			}
 		}
@@ -474,9 +474,9 @@ 
 		    <B:nresults>10</B:nresults>
 		  </B:limit>
 		*/
-		foreach((array)$options['other'] as $option)
+		foreach ((array)$options['other'] as $option)
 		{
-			switch($option['name'])
+			switch ($option['name'])
 			{
 				case 'nresults':
 					$nresults = (int)$option['data'];
@@ -485,7 +485,7 @@ 
 				case 'limit':
 					break;
 				case 'href':
-					break;	// from addressbook-multiget, handled below
+					break; // from addressbook-multiget, handled below
 				// rfc 6578 sync-report
 				case 'sync-token':
 					if (!empty($option['data']))
@@ -493,7 +493,7 @@ 
 						$parts = explode('/', $option['data']);
 						$sync_token = array_pop($parts);
 						$filters[] = 'contact_modified>'.(int)$sync_token;
-						$filters['tid'] = null;	// to return deleted entries too
+						$filters['tid'] = null; // to return deleted entries too
 					}
 					break;
 				case 'sync-level':
@@ -511,23 +511,23 @@ 
 		if ($options['root']['name'] == 'addressbook-multiget')
 		{
 			$ids = array();
-			foreach($options['other'] as $option)
+			foreach ($options['other'] as $option)
 			{
 				if ($option['name'] == 'href')
 				{
-					$parts = explode('/',$option['data']);
+					$parts = explode('/', $option['data']);
 					if (($id = urldecode(array_pop($parts))))
 					{
-						$ids[] = self::$path_extension ? basename($id,self::$path_extension) : $id;
+						$ids[] = self::$path_extension ? basename($id, self::$path_extension) : $id;
 					}
 				}
 			}
 			if ($ids) $filters[self::$path_attr] = $ids;
-			if ($this->debug) error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',',$ids));
+			if ($this->debug) error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',', $ids));
 		}
 		elseif ($id)
 		{
-			$filters[self::$path_attr] = self::$path_extension ? basename($id,self::$path_extension) : $id;
+			$filters[self::$path_attr] = self::$path_extension ? basename($id, self::$path_extension) : $id;
 		}
 		//error_log(__METHOD__."() options[other]=".array2string($options['other'])." --> filters=".array2string($filters));
 		return true;
@@ -541,17 +541,16 @@ 
 	 * @param int $user =null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function get(&$options,$id,$user=null)
+	function get(&$options, $id, $user = null)
 	{
-		unset($user);	// not used, but required by function signature
+		unset($user); // not used, but required by function signature
 
-		if (!is_array($contact = $this->_common_get_put_delete('GET',$options,$id)))
+		if (!is_array($contact = $this->_common_get_put_delete('GET', $options, $id)))
 		{
 			return $contact;
 		}
 		$handler = self::_get_handler();
-		$options['data'] = $contact['list_id'] ? $handler->getGroupVCard($contact) :
-			$handler->getVCard($contact['id'],$this->charset,false);
+		$options['data'] = $contact['list_id'] ? $handler->getGroupVCard($contact) : $handler->getVCard($contact['id'], $this->charset, false);
 		// e.g. Evolution does not understand 'text/vcard'
 		$options['mimetype'] = 'text/x-vcard; charset='.$this->charset;
 		header('Content-Encoding: identity');
@@ -568,11 +567,11 @@ 
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null,$prefix=null)
+	function put(&$options, $id, $user = null, $prefix = null)
 	{
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).",$id,$user)");
 
-		$oldContact = $this->_common_get_put_delete('PUT',$options,$id);
+		$oldContact = $this->_common_get_put_delete('PUT', $options, $id);
 		if (!is_null($oldContact) && !is_array($oldContact))
 		{
 			if ($this->debug) error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($oldContact));
@@ -597,7 +596,7 @@ 
 					switch (strtolower($key))
 					{
 						case 'charset':
-							$charset = strtoupper(substr($value,1,-1));
+							$charset = strtoupper(substr($value, 1, -1));
 					}
 				}
 			}
@@ -624,7 +623,7 @@ 
 
 		if (!$is_group && is_array($contact['cat_id']))
 		{
-			$contact['cat_id'] = implode(',',$this->bo->find_or_add_categories($contact['cat_id'], $contactId));
+			$contact['cat_id'] = implode(',', $this->bo->find_or_add_categories($contact['cat_id'], $contactId));
 		}
 		elseif ($contactId > 0)
 		{
@@ -648,12 +647,12 @@ 
 			$contact['carddav_name'] = $id;
 
 			// only set owner, if user is explicitly specified in URL (check via prefix, NOT for /addressbook/) or sync-all-in-one!)
-			if ($prefix && !in_array('O',$this->home_set_pref) && $user)
+			if ($prefix && !in_array('O', $this->home_set_pref) && $user)
 			{
 				$contact['owner'] = $user;
 			}
 			// check if default addressbook is synced and not Api\Accounts, if not use (always synced) personal addressbook
-			elseif(!$this->bo->default_addressbook || !in_array($this->bo->default_addressbook,$this->home_set_pref))
+			elseif (!$this->bo->default_addressbook || !in_array($this->bo->default_addressbook, $this->home_set_pref))
 			{
 				$contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			}
@@ -664,7 +663,7 @@ 
 			}
 			// check if user has add rights for addressbook
 			// done here again, as _common_get_put_delete knows nothing about default addressbooks...
-			if (!($this->bo->grants[$contact['owner']] & Acl::ADD))
+			if (!($this->bo->grants[$contact['owner']]&Acl::ADD))
 			{
 				if ($this->debug) error_log(__METHOD__."(,'$id', $user, '$prefix') returning '403 Forbidden'");
 				return '403 Forbidden';
@@ -681,7 +680,7 @@ 
 				$this->check_return_representation($options, $id, $user);
 				return '412 Precondition Failed';
 			}
-			return '403 Forbidden';	// happens when writing new entries in AB's without ADD rights
+			return '403 Forbidden'; // happens when writing new entries in AB's without ADD rights
 		}
 
 		if (empty($contact['etag']) || empty($contact['cardav_name']))
@@ -714,16 +713,16 @@ 
 	 * @param array|false $oldContact
 	 * @return int|boolean $list_id or false on error
 	 */
-	function save_group(array &$contact, $oldContact=null)
+	function save_group(array &$contact, $oldContact = null)
 	{
 		$data = array('list_name' => $contact['n_fn']);
 		if (!isset($contact['owner'])) $contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
-		foreach(array('id','carddav_name','uid','owner') as $name)
+		foreach (array('id', 'carddav_name', 'uid', 'owner') as $name)
 		{
 			$data['list_'.$name] = $contact[$name];
 		}
 		//error_log(__METHOD__.'('.array2string($contact).', '.array2string($oldContact).') data='.array2string($data));
-		if (($list_id=$this->bo->add_list(array('list_'.self::$path_attr => $contact[self::$path_attr]),
+		if (($list_id = $this->bo->add_list(array('list_'.self::$path_attr => $contact[self::$path_attr]),
 			$contact['owner'], null, $data)))
 		{
 			// update members given in $contact['##X-ADDRESSBOOKSERVER-MEMBER']
@@ -736,14 +735,14 @@ 
 			{
 				$new_members = array($new_members);
 			}
-			foreach($new_members as &$uid)
+			foreach ($new_members as &$uid)
 			{
-				$uid = substr($uid,9);	// cut off "urn:uuid:" prefix
+				$uid = substr($uid, 9); // cut off "urn:uuid:" prefix
 			}
 			if ($oldContact)
 			{
-				$to_add = array_diff($new_members,$oldContact['members']);
-				$to_delete = array_diff($oldContact['members'],$new_members);
+				$to_add = array_diff($new_members, $oldContact['members']);
+				$to_delete = array_diff($oldContact['members'], $new_members);
 			}
 			else
 			{
@@ -754,9 +753,9 @@ 
 			{
 				$to_add_ids = $to_delete_ids = array();
 				$filter = array('uid' => $to_delete ? array_merge($to_add, $to_delete) : $to_add);
-				if (($contacts =& $this->bo->search(array(), array('id', 'uid'),'','','',False,'AND',false,$filter)))
+				if (($contacts = & $this->bo->search(array(), array('id', 'uid'), '', '', '', False, 'AND', false, $filter)))
 				{
-					foreach($contacts as $c)
+					foreach ($contacts as $c)
 					{
 						if ($to_delete && in_array($c['uid'], $to_delete))
 						{
@@ -786,9 +785,9 @@ 
 	 * @param int $user
 	 * @return string
 	 */
-	public function getctag($path,$user)
+	public function getctag($path, $user)
 	{
-		static $ctags = array();	// a little per request caching, in case ctag and sync-token is both requested
+		static $ctags = array(); // a little per request caching, in case ctag and sync-token is both requested
 		if (isset($ctags[$path])) return $ctags[$path];
 
 		$user_in = $user;
@@ -796,9 +795,9 @@ 
 		if (is_null($user) || $user === '' || $path == '/addressbook/') $user = null;
 
 		// If "Sync selected addressbooks into one" is set --> ctag need to take selected AB's into account too
-		if ($user && $user == $GLOBALS['egw_info']['user']['account_id'] && in_array('O',$this->home_set_pref))
+		if ($user && $user == $GLOBALS['egw_info']['user']['account_id'] && in_array('O', $this->home_set_pref))
 		{
-			$user = array_merge((array)$user,array_keys($this->get_shared(true)));	// true: ignore all-in-one pref
+			$user = array_merge((array)$user, array_keys($this->get_shared(true))); // true: ignore all-in-one pref
 
 			// include accounts ctag, if accounts stored different from contacts (eg.in LDAP or ADS)
 			if ($this->bo->so_accounts && in_array('0', $user))
@@ -809,7 +808,7 @@ 
 		$ctag = $this->bo->get_ctag($user);
 
 		// include lists-ctag, if enabled
-		if (in_array('D',$this->home_set_pref))
+		if (in_array('D', $this->home_set_pref))
 		{
 			$lists_ctag = $this->bo->lists_ctag($user);
 		}
@@ -842,34 +841,34 @@ 
 	 * @param int $user =null account_id of owner of collection
 	 * @return array
 	 */
-	public function extra_properties(array $props, $displayname, $base_uri=null, $user=null)
+	public function extra_properties(array $props, $displayname, $base_uri = null, $user = null)
 	{
-		unset($displayname, $base_uri, $user);	// not used, but required by function signature
+		unset($displayname, $base_uri, $user); // not used, but required by function signature
 
 		if (!isset($props['addressbook-description']))
 		{
 			// default addressbook description: can be overwritten via PROPPATCH, in which case it's already set
-			$props['addressbook-description'] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-description',$props['displayname']);
+			$props['addressbook-description'] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'addressbook-description', $props['displayname']);
 		}
 		// setting an max image size, so iOS scales the images before transmitting them
 		// we currently scale down to width of 240px, which tests shown to be ~20k
-		$props['max-image-size'] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'max-image-size',24*1024);
+		$props['max-image-size'] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'max-image-size', 24 * 1024);
 
 		// supported reports (required property for CardDAV)
 		$props['supported-report-set'] = array(
-			'addressbook-query' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-query',''))))),
-			'addressbook-multiget' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-multiget',''))))),
+			'addressbook-query' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'addressbook-query', ''))))),
+			'addressbook-multiget' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'addressbook-multiget', ''))))),
 		);
 		// only advertice rfc 6578 sync-collection report, if "delete-prevention" is switched on (deleted entries get marked deleted but not actualy deleted
 		if ($GLOBALS['egw_info']['server']['history'])
 		{
-			$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop('sync-collection','')))));
+			$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop('sync-collection', '')))));
 		}
 		return $props;
 	}
@@ -881,7 +880,7 @@ 
 	 */
 	private function _get_handler()
 	{
-		$handler = new addressbook_vcal('addressbook','text/vcard');
+		$handler = new addressbook_vcal('addressbook', 'text/vcard');
 		$supportedFields = $handler->supportedFields;
 		// Apple iOS or OS X addressbook
 		if ($this->agent == 'cfnetwork' || $this->agent == 'dataaccess')
@@ -894,11 +893,11 @@ 
 			unset($supportedFields['TEL;CELL;WORK']);
 			$supportedFields['TEL;IPHONE'] = array('tel_cell_private');
 			unset($supportedFields['TEL;CELL;HOME']);
-			$databaseFields['X-ABSHOWAS'] = $supportedFields['X-ABSHOWAS'] = array('fileas_type');	// Horde vCard class uses uppercase prop-names!
+			$databaseFields['X-ABSHOWAS'] = $supportedFields['X-ABSHOWAS'] = array('fileas_type'); // Horde vCard class uses uppercase prop-names!
 
 			// Apple Addressbook pre Lion (OS X 10.7) messes up CLASS and CATEGORIES (Lion cant set them but leaves them alone)
 			$matches = null;
-			if (preg_match('|CFNetwork/([0-9]+)|i', $_SERVER['HTTP_USER_AGENT'],$matches) && $matches[1] < 520 ||
+			if (preg_match('|CFNetwork/([0-9]+)|i', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] < 520 ||
 				// iOS 5.1.1 does not display CLASS or CATEGORY, but wrongly escapes multiple, comma-separated categories
 				// and appends CLASS: PUBLIC to an empty NOTE: field --> leaving them out for iOS
 				$this->agent == 'dataaccess')
@@ -908,7 +907,7 @@ 
 				unset($supportedFields['CATEGORIES']);
 				unset($databaseFields['CATEGORIES']);
 			}
-			if (preg_match('|CFNetwork/([0-9]+)|i', $_SERVER['HTTP_USER_AGENT'],$matches) && $matches[1] < 520)
+			if (preg_match('|CFNetwork/([0-9]+)|i', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] < 520)
 			{
 				// gd cant parse or resize images stored from snow leopard addressbook: gd-jpeg:
 				// - JPEG library reports unrecoverable error
@@ -920,7 +919,7 @@ 
 			}
 			$handler->setDatabaseFields($databaseFields);
 		}
-		$handler->setSupportedFields('GroupDAV',$this->agent,$supportedFields);
+		$handler->setSupportedFields('GroupDAV', $this->agent, $supportedFields);
 		return $handler;
 	}
 
@@ -931,9 +930,9 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id)
+	function delete(&$options, $id)
 	{
-		if (!is_array($contact = $this->_common_get_put_delete('DELETE',$options,$id)))
+		if (!is_array($contact = $this->_common_get_put_delete('DELETE', $options, $id)))
 		{
 			return $contact;
 		}
@@ -941,7 +940,7 @@ 
 		{
 			$ok = $this->bo->delete_list($contact['list_id']) !== false;
 		}
-		elseif (($ok = $this->bo->delete($contact['id'],self::etag2value($this->http_if_match))) === 0)
+		elseif (($ok = $this->bo->delete($contact['id'], self::etag2value($this->http_if_match))) === 0)
 		{
 			return '412 Precondition Failed';
 		}
@@ -958,9 +957,9 @@ 
 	 * @param string $path =null
 	 * @return array|boolean array with entry, false if no read rights, null if $id does not exist
 	 */
-	function read($id, $path=null)
+	function read($id, $path = null)
 	{
-		static $non_deleted_tids=null;
+		static $non_deleted_tids = null;
 		if (is_null($non_deleted_tids))
 		{
 			$tids = $this->bo->content_types;
@@ -970,7 +969,7 @@ 
 		$contact = $this->bo->read(array(self::$path_attr => $id, 'tid' => $non_deleted_tids));
 
 		// if contact not found and accounts stored NOT like contacts, try reading it without path-extension as id
-		if (is_null($contact) && $this->bo->so_accounts && ($c = $this->bo->read($test=basename($id, '.vcf'))))
+		if (is_null($contact) && $this->bo->so_accounts && ($c = $this->bo->read($test = basename($id, '.vcf'))))
 		{
 			$contact = $c;
 		}
@@ -979,9 +978,9 @@ 
 		// bo->read_list(..., true) limits returned uid to same owner's addressbook, as iOS and OS X addressbooks
 		// only understands/shows that and if return more, save_lists would delete the others ones on update!
 		$limit_in_ab = true;
-		list(,$account_lid,$app) = explode('/',$path);	// eg. /<username>/addressbook/<id>
+		list(,$account_lid, $app) = explode('/', $path); // eg. /<username>/addressbook/<id>
 		// /<username>/addressbook/ with home_set_prefs containing 'O'=all-in-one contains selected ab's
-		if($account_lid == $GLOBALS['egw_info']['user']['account_lid'] && $app == 'addressbook' && in_array('O',$this->home_set_pref))
+		if ($account_lid == $GLOBALS['egw_info']['user']['account_lid'] && $app == 'addressbook' && in_array('O', $this->home_set_pref))
 		{
 			$limit_in_ab = array_keys($this->get_shared(true));
 			$limit_in_ab[] = $GLOBALS['egw_info']['user']['account_id'];
@@ -992,28 +991,28 @@ 
 		{
 			$limit_in_ab = array_keys($this->bo->grants);
 		}*/
-		if (!$contact && ($contact = $this->bo->read_lists(array('list_'.self::$path_attr => $id),'contact_uid',$limit_in_ab)))
+		if (!$contact && ($contact = $this->bo->read_lists(array('list_'.self::$path_attr => $id), 'contact_uid', $limit_in_ab)))
 		{
 			$contact = array_shift($contact);
 			$contact['n_fn'] = $contact['n_family'] = $contact['list_name'];
-			foreach(array('owner','id','carddav_name','modified','modifier','created','creator','etag','uid') as $name)
+			foreach (array('owner', 'id', 'carddav_name', 'modified', 'modifier', 'created', 'creator', 'etag', 'uid') as $name)
 			{
 				$contact[$name] = $contact['list_'.$name];
 			}
 			// if NOT limited to containing AB ($limit_in_ab === true), add that limit to etag
 			if ($limit_in_ab !== true)
 			{
-				$contact['etag'] .= ':'.implode('-',$limit_in_ab);
+				$contact['etag'] .= ':'.implode('-', $limit_in_ab);
 			}
 		}
-		elseif($contact === array())	// not found from read_lists()
+		elseif ($contact === array())	// not found from read_lists()
 		{
 			$contact = null;
 		}
 
 		if ($contact && $contact['tid'] == Api\Contacts::DELETED_TYPE)
 		{
-			$contact = null;	// handle deleted events, as not existing (404 Not Found)
+			$contact = null; // handle deleted events, as not existing (404 Not Found)
 		}
 		if ($this->debug > 1) error_log(__METHOD__."('$id') returning ".array2string($contact));
 		return $contact;
@@ -1026,9 +1025,9 @@ 
 	 * @param array|int $contact contact-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$contact)
+	function check_access($acl, $contact)
 	{
-		return $this->bo->check_perms($acl, $contact, true);	// true = deny to delete accounts
+		return $this->bo->check_perms($acl, $contact, true); // true = deny to delete accounts
 	}
 
 	/**
@@ -1056,15 +1055,15 @@ 
 	 * @param boolean $ignore_all_in_one =false if true, return selected addressbooks and not array() for all-in-one
 	 * @return array account_id => account_lid pairs
 	 */
-	function get_shared($ignore_all_in_one=false)
+	function get_shared($ignore_all_in_one = false)
 	{
 		$shared = array();
 
 		// if "Sync all selected addressbook into one" is set --> no (additional) shared addressbooks
-		if (!$ignore_all_in_one && in_array('O',$this->home_set_pref)) return array();
+		if (!$ignore_all_in_one && in_array('O', $this->home_set_pref)) return array();
 
 		// replace symbolic id's with real nummeric id's
-		foreach(array(
+		foreach (array(
 			'G' => $GLOBALS['egw_info']['user']['account_primary_group'],
 			'U' => '0',
 		) as $sym => $id)
@@ -1074,11 +1073,11 @@ 
 				$this->home_set_pref[$key] = $id;
 			}
 		}
-		foreach(array_keys($this->bo->get_addressbooks(Acl::READ)) as $id)
+		foreach (array_keys($this->bo->get_addressbooks(Acl::READ)) as $id)
 		{
 			if (($id || !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) &&
-				$GLOBALS['egw_info']['user']['account_id'] != $id &&	// no current user and no accounts, if disabled in ab prefs
-				(in_array('A',$this->home_set_pref) || in_array((string)$id,$this->home_set_pref)) &&
+				$GLOBALS['egw_info']['user']['account_id'] != $id && // no current user and no accounts, if disabled in ab prefs
+				(in_array('A', $this->home_set_pref) || in_array((string)$id, $this->home_set_pref)) &&
 				is_numeric($id) && ($owner = $id ? $this->accounts->id2name($id) : 'accounts'))
 			{
 				$shared[$id] = 'addressbook-'.$owner;
@@ -1098,14 +1097,14 @@ 
 	public static function groupdav_root_props(array $data)
 	{
 		$data['props']['addressbook-home-set'] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'addressbook-home-set', array(
-			Api\CalDAV::mkprop('href',$data['caldav']->base_uri.'/'.$GLOBALS['egw_info']['user']['account_lid'].'/')));
+			Api\CalDAV::mkprop('href', $data['caldav']->base_uri.'/'.$GLOBALS['egw_info']['user']['account_lid'].'/')));
 
 		$data['props']['principal-address'] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'principal-address',
 				$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] ? '' : array(
-				Api\CalDAV::mkprop('href',$data['caldav']->base_uri.'/addressbook-accounts/'.$GLOBALS['egw_info']['user']['person_id'].'.vcf')));
+				Api\CalDAV::mkprop('href', $data['caldav']->base_uri.'/addressbook-accounts/'.$GLOBALS['egw_info']['user']['person_id'].'.vcf')));
 
 		$data['props']['directory-gateway'] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'directory-gateway', array(
-			Api\CalDAV::mkprop('href',$data['caldav']->base_uri.'/addressbook/')));
+			Api\CalDAV::mkprop('href', $data['caldav']->base_uri.'/addressbook/')));
 	}
 
 	/**
@@ -1128,8 +1127,8 @@ 
 			$user = $hook_data['account_id'];
 			$addressbook_bo = new Api\Contacts();
 			$addressbooks += $addressbook_bo->get_addressbooks(Acl::READ, null, $user);
-			if ($user > 0)  unset($addressbooks[$user]);	// allways synced
-			unset($addressbooks[$user.'p']);// ignore (optional) private addressbook for now
+			if ($user > 0)  unset($addressbooks[$user]); // allways synced
+			unset($addressbooks[$user.'p']); // ignore (optional) private addressbook for now
 		}
 
 		// allow to force no other addressbooks
@@ -1156,9 +1155,9 @@ 
 			'label'  => 'Addressbooks to sync in addition to personal addressbook',
 			'name'   => 'addressbook-home-set',
 			'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likely not be supported!').
-				'<br/>'.lang('They will be sub-folders in users home (%1 attribute).','CardDAV "addressbook-home-set"').
-				'<br/>'.lang('Select "%1", if your client does not support multiple addressbooks.',lang('Sync all selected into one')).
-				'<br/>'.lang('Select "%1", if your client support groups, eg. OS X or iOS addressbook.',lang('Distribution lists as groups')),
+				'<br/>'.lang('They will be sub-folders in users home (%1 attribute).', 'CardDAV "addressbook-home-set"').
+				'<br/>'.lang('Select "%1", if your client does not support multiple addressbooks.', lang('Sync all selected into one')).
+				'<br/>'.lang('Select "%1", if your client support groups, eg. OS X or iOS addressbook.', lang('Distribution lists as groups')),
 			'values' => $addressbooks,
 			'xmlrpc' => True,
 			'admin'  => False,

Braces +167 added lines, -41 removed lines

@@ -85,7 +85,10 @@ 
 			self::$path_attr = 'carddav_name';
 			self::$path_extension = '';
 		}
-		if ($this->debug) error_log(__METHOD__."() contact_repository={$this->bo->contact_repository}, account_repository={$this->bo->account_repository}, REQUEST_URI=$_SERVER[REQUEST_URI] --> path_attr=".self::$path_attr.", path_extension=".self::$path_extension);
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() contact_repository={$this->bo->contact_repository}, account_repository={$this->bo->account_repository}, REQUEST_URI=$_SERVER[REQUEST_URI] --> path_attr=".self::$path_attr.", path_extension=".self::$path_extension);
+		}
 
 		$this->home_set_pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
 		$this->home_set_pref = $this->home_set_pref ? explode(',',$this->home_set_pref) : array();
@@ -123,7 +126,10 @@ 
 			$filter['owner'] = $user;
 		}
 		// should we hide the accounts addressbook
-		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
+		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+		{
+			$filter['account_id'] = null;
+		}
 
 		// process REPORT filters or multiget href's
 		$nresults = null;
@@ -131,9 +137,16 @@ 
 		{
 			return false;
 		}
-		if ($id) $path = dirname($path).'/';	// carddav_name get's added anyway in the callback
+		if ($id)
+		{
+			$path = dirname($path).'/';
+		}
+		// carddav_name get's added anyway in the callback
 
-		if ($this->debug) error_log(__METHOD__."($path,".array2string($options).",,$user,$id) filter=".array2string($filter));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($path,".array2string($options).",,$user,$id) filter=".array2string($filter));
+		}
 
 		// check if we have to return the full contact data or just the etag's
 		if (!($filter['address_data'] = $options['props'] == 'all' &&
@@ -218,16 +231,25 @@ 
 
 		if (isset($filter[self::$path_attr]))
 		{
-			if (!is_array($filter[self::$path_attr])) $filter[self::$path_attr] = (array)$filter[self::$path_attr];
+			if (!is_array($filter[self::$path_attr]))
+			{
+				$filter[self::$path_attr] = (array)$filter[self::$path_attr];
+			}
 			$requested_multiget_ids =& $filter[self::$path_attr];
 		}
 
 		$files = array();
 		// we query etag and modified, as LDAP does not have the strong sql etag
 		$cols = array('id','uid','etag','modified','n_fn');
-		if (!in_array(self::$path_attr,$cols)) $cols[] = self::$path_attr;
+		if (!in_array(self::$path_attr,$cols))
+		{
+			$cols[] = self::$path_attr;
+		}
 		// we need tid for sync-collection report
-		if (array_key_exists('tid', $filter) && !isset($filter['tid']) && !in_array('tid', $cols)) $cols[] = 'tid';
+		if (array_key_exists('tid', $filter) && !isset($filter['tid']) && !in_array('tid', $cols))
+		{
+			$cols[] = 'tid';
+		}
 		if (($contacts =& $this->bo->search(array(),$cols,$order,'','',False,'AND',$start,$filter)))
 		{
 			foreach($contacts as &$contact)
@@ -271,7 +293,10 @@ 
 			{
 				$accounts_filter = $filter_in;
 				$accounts_filter['owner'] = '0';
-				if ($sync_collection_report) $token_was = $this->sync_collection_token;
+				if ($sync_collection_report)
+				{
+					$token_was = $this->sync_collection_token;
+				}
 				self::$path_attr = 'id';
 				self::$path_extension = '.vcf';
 				$files = array_merge($files, $this->propfind_callback($path, $accounts_filter, false, false));
@@ -292,18 +317,27 @@ 
 				if ($sync_collection_report)
 				{
 					list(,$sync_token) = explode('>', $filter[0]);
-					if ((int)$sync_token) $where[] = 'list_modified>'.$GLOBALS['egw']->db->from_unixtime((int)$sync_token);
+					if ((int)$sync_token)
+					{
+						$where[] = 'list_modified>'.$GLOBALS['egw']->db->from_unixtime((int)$sync_token);
+					}
 				}
-				if (isset($filter[self::$path_attr]))	// multiget report?
+				if (isset($filter[self::$path_attr]))
+				{
+					// multiget report?
 				{
 					$where['list_'.self::$path_attr] = $filter[self::$path_attr];
 				}
+				}
 				//error_log(__METHOD__."() filter=".array2string($filter).", do_groups=".in_array('D',$this->home_set_pref).", where=".array2string($where));
-				if ($where['id'] && ($lists = $this->bo->read_lists($where,'contact_uid',$where['list_owner'])))	// limit to contacts in same AB!
+				if ($where['id'] && ($lists = $this->bo->read_lists($where,'contact_uid',$where['list_owner'])))
+				{
+					// limit to contacts in same AB!
 				{
 					foreach($lists as $list)
 					{
 						$list[self::$path_attr] = $list['list_carddav_name'];
+				}
 						$etag = $list['list_id'].':'.$list['list_etag'];
 						// for all-in-one addressbook, add selected ABs to etag
 						if (isset($filter['owner']) && is_array($filter['owner']))
@@ -347,7 +381,10 @@ 
 			}
 		}
 
-		if ($this->debug) error_log(__METHOD__."($path,".array2string($filter).','.array2string($start).") took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($path,".array2string($filter).','.array2string($start).") took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		}
 		return $files;
 	}
 
@@ -387,7 +424,11 @@ 
 			$matches = $prop_test = $column = null;
 			foreach($options['filters'] as $n => $filter)
 			{
-				if (!is_int($n)) continue;	// eg. attributes of filter xml element
+				if (!is_int($n))
+				{
+					continue;
+				}
+				// eg. attributes of filter xml element
 
 				switch((string)$filter['name'])
 				{
@@ -395,19 +436,28 @@ 
 						$this->caldav->log(__METHOD__."(...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
 						break;
 					case 'prop-filter':	// can be multiple prop-filter, see example
-						if ($matches) $prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+						if ($matches)
+						{
+							$prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+						}
 						$matches = array();
 						$prop_filter = strtoupper($filter['attrs']['name']);
 						$prop_test = isset($filter['attrs']['test']) ? $filter['attrs']['test'] : 'anyof';
-						if ($this->debug > 1) error_log(__METHOD__."(...) prop-filter='$prop_filter', test='$prop_test'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."(...) prop-filter='$prop_filter', test='$prop_test'");
+						}
 						break;
 					case 'is-not-defined':
 						$matches[] = '('.$column."='' OR ".$column.' IS NULL)';
 						break;
 					case 'text-match':	// prop-filter can have multiple text-match, see example
-						if (!isset($this->filter_prop2cal[$prop_filter]))	// eg. not existing NICKNAME in EGroupware
+						if (!isset($this->filter_prop2cal[$prop_filter]))
+						{
+							// eg. not existing NICKNAME in EGroupware
 						{
 							if ($this->debug || $prop_filter != 'NICKNAME') error_log(__METHOD__."(...) text-match: $prop_filter {$filter['attrs']['match-type']} '{$filter['data']}' unknown property '$prop_filter' --> ignored");
+						}
 							$column = false;	// to ignore following data too
 						}
 						else
@@ -420,8 +470,14 @@ 
 									break;
 							}
 							$column = $this->filter_prop2cal[strtoupper($prop_filter)];
-							if (strpos($column, '_') === false) $column = 'contact_'.$column;
-							if (!isset($filters['order'])) $filters['order'] = $column;
+							if (strpos($column, '_') === false)
+							{
+								$column = 'contact_'.$column;
+							}
+							if (!isset($filters['order']))
+							{
+								$filters['order'] = $column;
+							}
 							$match_type = $filter['attrs']['match-type'];
 							$negate_condition = isset($filter['attrs']['negate-condition']) && $filter['attrs']['negate-condition'] == 'yes';
 						}
@@ -429,9 +485,12 @@ 
 					case '':	// data of text-match element
 						if (isset($filter['data']) && isset($column))
 						{
-							if ($column)	// false for properties not known to EGroupware
+							if ($column)
+							{
+								// false for properties not known to EGroupware
 							{
 								$value = str_replace(array('%', '_'), array('\\%', '\\_'), $filter['data']);
+							}
 								switch($match_type)
 								{
 									case 'equals':
@@ -450,7 +509,10 @@ 
 								}
 								$matches[] = ($negate_condition ? 'NOT ' : '').$sql_filter;
 
-								if ($this->debug > 1) error_log(__METHOD__."(...) text-match: $prop_filter $match_type' '{$filter['data']}'");
+								if ($this->debug > 1)
+								{
+									error_log(__METHOD__."(...) text-match: $prop_filter $match_type' '{$filter['data']}'");
+								}
 							}
 							unset($column);
 							break;
@@ -461,11 +523,17 @@ 
 						break;
 				}
 			}
-			if ($matches) $prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+			if ($matches)
+			{
+				$prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+			}
 			if ($prop_filters)
 			{
 				$filters[] = $filter = '(('.implode($filter_test=='allof'?') AND (':') OR (', $prop_filters).'))';
-				if ($this->debug) error_log(__METHOD__."(path=$options[path], ...) sql-filter: $filter");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."(path=$options[path], ...) sql-filter: $filter");
+				}
 			}
 		}
 		// parse limit from $options['other']
@@ -522,8 +590,14 @@ 
 					}
 				}
 			}
-			if ($ids) $filters[self::$path_attr] = $ids;
-			if ($this->debug) error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',',$ids));
+			if ($ids)
+			{
+				$filters[self::$path_attr] = $ids;
+			}
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',',$ids));
+			}
 		}
 		elseif ($id)
 		{
@@ -570,12 +644,18 @@ 
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).",$id,$user)");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).",$id,$user)");
+		}
 
 		$oldContact = $this->_common_get_put_delete('PUT',$options,$id);
 		if (!is_null($oldContact) && !is_array($oldContact))
 		{
-			if ($this->debug) error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($oldContact));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($oldContact));
+			}
 			return $oldContact;
 		}
 
@@ -666,15 +746,24 @@ 
 			// done here again, as _common_get_put_delete knows nothing about default addressbooks...
 			if (!($this->bo->grants[$contact['owner']] & Acl::ADD))
 			{
-				if ($this->debug) error_log(__METHOD__."(,'$id', $user, '$prefix') returning '403 Forbidden'");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."(,'$id', $user, '$prefix') returning '403 Forbidden'");
+				}
 				return '403 Forbidden';
 			}
 		}
-		if ($this->http_if_match) $contact['etag'] = self::etag2value($this->http_if_match);
+		if ($this->http_if_match)
+		{
+			$contact['etag'] = self::etag2value($this->http_if_match);
+		}
 
 		if (!($save_ok = $is_group ? $this->save_group($contact, $oldContact) : $this->bo->save($contact)))
 		{
-			if ($this->debug) error_log(__METHOD__."(,$id) save(".array2string($contact).") failed, Ok=$save_ok");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,$id) save(".array2string($contact).") failed, Ok=$save_ok");
+			}
 			if ($save_ok === 0)
 			{
 				// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
@@ -703,7 +792,10 @@ 
 		// send evtl. necessary respose headers: Location, etag, ...
 		$this->put_response_headers($contact, $options['path'], $retval, self::$path_attr != 'id');
 
-		if ($this->debug > 1) error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($retval));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($retval));
+		}
 		return $retval;
 	}
 
@@ -717,7 +809,10 @@ 
 	function save_group(array &$contact, $oldContact=null)
 	{
 		$data = array('list_name' => $contact['n_fn']);
-		if (!isset($contact['owner'])) $contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+		if (!isset($contact['owner']))
+		{
+			$contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		foreach(array('id','carddav_name','uid','owner') as $name)
 		{
 			$data['list_'.$name] = $contact[$name];
@@ -769,13 +864,22 @@ 
 					}
 				}
 				//error_log('to_add_ids='.array2string($to_add_ids).', to_delete_ids='.array2string($to_delete_ids));
-				if ($to_add_ids) $this->bo->add2list($to_add_ids, $list_id, array());
-				if ($to_delete_ids) $this->bo->remove_from_list($to_delete_ids, $list_id);
+				if ($to_add_ids)
+				{
+					$this->bo->add2list($to_add_ids, $list_id, array());
+				}
+				if ($to_delete_ids)
+				{
+					$this->bo->remove_from_list($to_delete_ids, $list_id);
+				}
 			}
 			// reread as update of list-members updates etag and modified
 	 		$contact = $this->bo->read_list($list_id);
 		}
-		if ($this->debug > 1) error_log(__METHOD__.'('.array2string($contact).', '.array2string($oldContact).') on return contact='.array2string($data).' returning '.array2string($list_id));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__.'('.array2string($contact).', '.array2string($oldContact).') on return contact='.array2string($data).' returning '.array2string($list_id));
+		}
  		return $list_id;
 	}
 
@@ -789,11 +893,17 @@ 
 	public function getctag($path,$user)
 	{
 		static $ctags = array();	// a little per request caching, in case ctag and sync-token is both requested
-		if (isset($ctags[$path])) return $ctags[$path];
+		if (isset($ctags[$path]))
+		{
+			return $ctags[$path];
+		}
 
 		$user_in = $user;
 		// not showing addressbook of a single user?
-		if (is_null($user) || $user === '' || $path == '/addressbook/') $user = null;
+		if (is_null($user) || $user === '' || $path == '/addressbook/')
+		{
+			$user = null;
+		}
 
 		// If "Sync selected addressbooks into one" is set --> ctag need to take selected AB's into account too
 		if ($user && $user == $GLOBALS['egw_info']['user']['account_id'] && in_array('O',$this->home_set_pref))
@@ -1006,16 +1116,22 @@ 
 				$contact['etag'] .= ':'.implode('-',$limit_in_ab);
 			}
 		}
-		elseif($contact === array())	// not found from read_lists()
+		elseif($contact === array())
+		{
+			// not found from read_lists()
 		{
 			$contact = null;
 		}
+		}
 
 		if ($contact && $contact['tid'] == Api\Contacts::DELETED_TYPE)
 		{
 			$contact = null;	// handle deleted events, as not existing (404 Not Found)
 		}
-		if ($this->debug > 1) error_log(__METHOD__."('$id') returning ".array2string($contact));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."('$id') returning ".array2string($contact));
+		}
 		return $contact;
 	}
 
@@ -1045,7 +1161,10 @@ 
 		// remove add and delete grants for accounts (for admins too)
 		// as accounts can not be created as contacts, they eg. need further data
 		// and admins might not recognice they delete an account incl. its data
-		if (isset($grants[0])) $grants[0] &= ~(EGW_ACL_ADD|EGW_ACL_DELETE);
+		if (isset($grants[0]))
+		{
+			$grants[0] &= ~(EGW_ACL_ADD|EGW_ACL_DELETE);
+		}
 
 		return $grants;
 	}
@@ -1061,7 +1180,10 @@ 
 		$shared = array();
 
 		// if "Sync all selected addressbook into one" is set --> no (additional) shared addressbooks
-		if (!$ignore_all_in_one && in_array('O',$this->home_set_pref)) return array();
+		if (!$ignore_all_in_one && in_array('O',$this->home_set_pref))
+		{
+			return array();
+		}
 
 		// replace symbolic id's with real nummeric id's
 		foreach(array(
@@ -1128,7 +1250,11 @@ 
 			$user = $hook_data['account_id'];
 			$addressbook_bo = new Api\Contacts();
 			$addressbooks += $addressbook_bo->get_addressbooks(Acl::READ, null, $user);
-			if ($user > 0)  unset($addressbooks[$user]);	// allways synced
+			if ($user > 0)
+			{
+				unset($addressbooks[$user]);
+			}
+			// allways synced
 			unset($addressbooks[$user.'p']);// ignore (optional) private addressbook for now
 		}
 

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 +26 added lines, -26 removed lines

@@ -381,38 +381,38 @@
 	}
 
 	/**
-        * 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;
+		}
 }

Spacing +57 added lines, -57 removed lines

@@ -15,14 +15,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
@@ -48,7 +48,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 Api\Contacts();
@@ -59,17 +59,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;
 		}
@@ -86,15 +86,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,
@@ -110,7 +110,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",
 				Api\Accounts::username($record->owner),
@@ -121,18 +121,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';
@@ -141,45 +141,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 $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 $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_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 Api\DateTime($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 Api\Contacts\Storage 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']],),
 								'',
@@ -188,37 +188,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);
-						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;
 
@@ -231,7 +231,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;
 	}
@@ -243,21 +243,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]++;
 					}
@@ -272,14 +272,14 @@ 
 				// 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)
+				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']), 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']);
 				}
@@ -287,7 +287,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'].')');
@@ -298,22 +298,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]++;
@@ -323,7 +323,7 @@ 
 					return $result;
 				}
 			default:
-				throw new Api\Exception('Unsupported action: '. $_action);
+				throw new Api\Exception('Unsupported action: '.$_action);
 
 		}
 	}

Braces +126 added lines, -51 removed lines

@@ -15,7 +15,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
@@ -48,7 +49,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 Api\Contacts();
@@ -90,22 +92,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,
 						Api\Accounts::username($this->user)
 					);
 					$record->owner = $this->user;
-				} else {
+				}
+				else
+				{
 					$record->owner = $new_owner;
 				}
 			}
-		} else {
+		}
+		else
+		{
 			$record->owner = $this->user;
 		}
 
@@ -141,26 +150,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 $field_name) {
+		foreach($this->definition->plugin_options['field_mapping'] as $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_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))
@@ -169,17 +193,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 Api\Contacts\Storage 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']],),
 								'',
@@ -188,19 +219,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() ));
 						}
@@ -227,9 +269,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() );
 		}
@@ -243,15 +290,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;
@@ -272,14 +322,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) {
+				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']), true);
+					{
+											$_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']), 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']);
 				}
@@ -287,9 +343,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'].')');
 				}
 
@@ -298,24 +357,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);
@@ -333,7 +400,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Addressbook CSV import');
 	}
 
@@ -342,7 +410,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.");
 	}
 
@@ -351,7 +420,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -367,7 +437,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -376,7 +447,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -388,7 +460,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -400,7 +473,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -412,7 +486,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 }

addressbook/inc/class.addressbook_import_vcard.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -83,8 +83,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 ) {
 		$this->definition = $_definition;

Indentation +41 added lines, -41 removed lines

@@ -45,8 +45,8 @@ 
 	private $bocontacts;
 
 	/**
-	* For figuring out if a contact has changed
-	*/
+	 * For figuring out if a contact has changed
+	 */
 	protected $tracking;
 
 	/**
@@ -76,9 +76,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.
@@ -93,14 +93,14 @@ 
 		$this->is_admin = isset( $GLOBALS['egw_info']['user']['apps']['admin'] ) && $GLOBALS['egw_info']['user']['apps']['admin'];
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
-                // set 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')
-                {
-                        $contact_owner = $this->user;
-                }
+				// set 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')
+				{
+						$contact_owner = $this->user;
+				}
 
 		// dry run?
 		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
@@ -123,7 +123,7 @@ 
 		$this->errors = array();
 
 		// Fix for Apple Addressbook
-        $vCard = preg_replace('/item\d\.(ADR|TEL|EMAIL|URL)/', '\1', stream_get_contents($_stream));
+		$vCard = preg_replace('/item\d\.(ADR|TEL|EMAIL|URL)/', '\1', stream_get_contents($_stream));
 
 		$contacts = new Api\CalDAV\IcalIterator($vCard, '', $charset, array($this, '_vcard'),array(
 			// Owner (addressbook)
@@ -277,7 +277,7 @@ 
 		foreach($this->preview_records as $record)
 		{
 			// Convert to human-friendly
-            importexport_export_csv::convert($record,$record_class::$types,$_definition->application);
+			importexport_export_csv::convert($record,$record_class::$types,$_definition->application);
 			$record = $record->get_record_array();
 			$row = array();
 			foreach(array_keys($labels) as $field)
@@ -350,38 +350,38 @@ 
 	}
 
 	/**
-        * 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;
+		}
 }

Spacing +34 added lines, -34 removed lines

@@ -15,7 +15,7 @@ 
 /**
  * Plugin to import vCard files
  */
-class addressbook_import_vcard implements importexport_iface_import_plugin  {
+class addressbook_import_vcard implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
 
@@ -86,24 +86,24 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import($_stream, importexport_definition $_definition) {
 		$this->definition = $_definition;
 
 		// user, is admin ?
-		$this->is_admin = isset( $GLOBALS['egw_info']['user']['apps']['admin'] ) && $GLOBALS['egw_info']['user']['apps']['admin'];
+		$this->is_admin = isset($GLOBALS['egw_info']['user']['apps']['admin']) && $GLOBALS['egw_info']['user']['apps']['admin'];
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
                 // 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;
                 }
 
 		// 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;
 
 		// Needed for categories to work right
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
@@ -112,7 +112,7 @@ 
 		$this->bocontacts = new addressbook_vcal();
 
 		$charset = $_definition->plugin_options['charset'];
-		if($charset == 'user') $charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
+		if ($charset == 'user') $charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
 
 		// Start counting successes
 		$this->current = 0;
@@ -125,24 +125,24 @@ 
 		// Fix for Apple Addressbook
         $vCard = preg_replace('/item\d\.(ADR|TEL|EMAIL|URL)/', '\1', stream_get_contents($_stream));
 
-		$contacts = new Api\CalDAV\IcalIterator($vCard, '', $charset, array($this, '_vcard'),array(
+		$contacts = new Api\CalDAV\IcalIterator($vCard, '', $charset, array($this, '_vcard'), array(
 			// Owner (addressbook)
 			$contact_owner
 		));
 		$contacts->next();
-		while($contacts->valid()) {
+		while ($contacts->valid()) {
 			$this->current++;
 			$contact = $contacts->current();
 
 			$this->action('insert', $contact, $this->current);
 
 			// Stop if we have enough records for a preview
-			if($this->dry_run)
+			if ($this->dry_run)
 			{
 				$egw_record = new addressbook_egw_record();
 				$egw_record->set_record($contact);
 				$this->preview_records[] = $egw_record;
-				if($count >= $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) break;
+				if ($count >= $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) break;
 			}
 
 			$count++;
@@ -158,13 +158,13 @@ 
 	public function _vcard($_vcard, $owner)
 	{
 		$charset = $this->definition->plugin_options['charset'];
-		if($charset == 'user') $charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
-		$record = $this->bocontacts->vcardtoegw($_vcard,$charset);
+		if ($charset == 'user') $charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
+		$record = $this->bocontacts->vcardtoegw($_vcard, $charset);
 
 		$record['owner'] = $owner;
 
 		// 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[$this->current] = lang("Unable to import into %1, using %2",
 				Api\Accounts::username($record['owner']),
@@ -175,14 +175,14 @@ 
 
 		// 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'] = $this->user;
 		}
 
 		if (is_array($record['cat_id']))
 		{
-			$record['cat_id'] = implode(',',$this->bocontacts->find_or_add_categories($record['cat_id'], -1));
+			$record['cat_id'] = implode(',', $this->bocontacts->find_or_add_categories($record['cat_id'], -1));
 		}
 		return $record;
 	}
@@ -194,7 +194,7 @@ 
 	 * @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;
@@ -202,17 +202,17 @@ 
 				// 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)
+				foreach (array('adr_one_', 'adr_two_') as $c_prefix)
 				{
-					if (strlen(trim($_data[$c_prefix.'countryname']))==2)
+					if (strlen(trim($_data[$c_prefix.'countryname'])) == 2)
 					{
 						$_data[$c_prefix.'countryname'] = Api\Country::get_full_name(trim($_data[$c_prefix.'countryname']), 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']);
 				}
@@ -220,7 +220,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'].')');
@@ -231,22 +231,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]++;
@@ -254,14 +254,14 @@ 
 					return $result;
 				}
 			default:
-				throw new Api\Exception('Unsupported action: '. $_action);
+				throw new Api\Exception('Unsupported action: '.$_action);
 
 		}
 	}
 
-	public function preview( $_stream, importexport_definition $_definition )
+	public function preview($_stream, importexport_definition $_definition)
 	{
-		$rows = array('h1'=>array(),'f1'=>array(),'.h1'=>'class=th');
+		$rows = array('h1'=>array(), 'f1'=>array(), '.h1'=>'class=th');
 
 		// Set this so plugin doesn't do any data changes
 		$_definition->plugin_options = (array)$_definition->plugin_options + array('dry_run' => true);
@@ -274,18 +274,18 @@ 
 
 		$record_class = get_class($this->preview_records[0]);
 
-		foreach($this->preview_records as $record)
+		foreach ($this->preview_records as $record)
 		{
 			// Convert to human-friendly
-            importexport_export_csv::convert($record,$record_class::$types,$_definition->application);
+            importexport_export_csv::convert($record, $record_class::$types, $_definition->application);
 			$record = $record->get_record_array();
 			$row = array();
-			foreach(array_keys($labels) as $field)
+			foreach (array_keys($labels) as $field)
 			{
 				$row[$field] = $record[$field];
 
 				// Don't scare users, do something with jpeg
-				if($field == 'jpegphoto' && $row[$field])
+				if ($field == 'jpegphoto' && $row[$field])
 				{
 					$row[$field] = '<img style="max-width:50px;max-height:50px;" src="data:image/jpeg;base64,'.$row[$field].'"/>';
 				}

Braces +62 added lines, -26 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * Plugin to import vCard files
  */
-class addressbook_import_vcard implements importexport_iface_import_plugin  {
+class addressbook_import_vcard implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 
@@ -86,7 +87,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 		$this->definition = $_definition;
 
 		// user, is admin ?
@@ -112,7 +114,10 @@ 
 		$this->bocontacts = new addressbook_vcal();
 
 		$charset = $_definition->plugin_options['charset'];
-		if($charset == 'user') $charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
+		if($charset == 'user')
+		{
+			$charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
+		}
 
 		// Start counting successes
 		$this->current = 0;
@@ -130,7 +135,8 @@ 
 			$contact_owner
 		));
 		$contacts->next();
-		while($contacts->valid()) {
+		while($contacts->valid())
+		{
 			$this->current++;
 			$contact = $contacts->current();
 
@@ -142,7 +148,10 @@ 
 				$egw_record = new addressbook_egw_record();
 				$egw_record->set_record($contact);
 				$this->preview_records[] = $egw_record;
-				if($count >= $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) break;
+				if($count >= $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])
+				{
+					break;
+				}
 			}
 
 			$count++;
@@ -158,7 +167,10 @@ 
 	public function _vcard($_vcard, $owner)
 	{
 		$charset = $this->definition->plugin_options['charset'];
-		if($charset == 'user') $charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
+		if($charset == 'user')
+		{
+			$charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
+		}
 		$record = $this->bocontacts->vcardtoegw($_vcard,$charset);
 
 		$record['owner'] = $owner;
@@ -194,8 +206,10 @@ 
 	 * @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' :
@@ -210,9 +224,12 @@ 
 					}
 				}
 				// 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']);
 				}
@@ -220,9 +237,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'].')');
 				}
 
@@ -231,24 +251,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]++;
 					}
 					return $result;
@@ -302,7 +330,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Addressbook vCard import');
 	}
 
@@ -311,7 +340,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports contacts into your Addressbook from a vCard File. ");
 	}
 
@@ -320,7 +350,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'vcf';
 	}
 
@@ -336,7 +367,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -345,7 +377,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -357,7 +390,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -369,7 +403,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -381,7 +416,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 }

admin/admin-cli.php

Doc Comments -1 removed lines

@@ -532,7 +532,6 @@
 /**
  * Read the IMAP ACLs
  *
- * @param array $args admin-account[@domain],admin-password,accout_lid[,pw]
  * @return int 0 on success
  */
 function do_subscribe_other($account_lid,$pw=null)

Spacing +83 added lines, -84 removed lines

@@ -15,7 +15,7 @@ 
 use EGroupware\Api\Framework;
 use EGroupware\Api\Vfs;
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling admin-cli as web-page
 {
@@ -33,17 +33,17 @@ 
 }
 
 // allow to specify instance by using a username with appended @domain-name
-$arg0s = explode(',',@array_shift($arguments));
-@list($user,$domain) = explode('@',$arg0s[0].'@');
-load_egw($user,$arg0s[1],$domain);
+$arg0s = explode(',', @array_shift($arguments));
+@list($user, $domain) = explode('@', $arg0s[0].'@');
+load_egw($user, $arg0s[1], $domain);
 
-switch($action)
+switch ($action)
 {
 	case '--edit-user':
 		return do_edit_user($arg0s);
 
 	case '--add-user':	// like --edit-account, but always runs addaccount hook
-		return do_edit_user($arg0s,true);
+		return do_edit_user($arg0s, true);
 
 	case '--edit-alias':
 	case '--edit-forward':
@@ -54,17 +54,17 @@ 
 		return do_change_pw($arg0s);
 
 	case '--delete-user':
-		return do_delete_account($arg0s[2],$arg0s[3]);
+		return do_delete_account($arg0s[2], $arg0s[3]);
 
 	case '--edit-group':
 		return do_edit_group($arg0s);
 
 	case '--delete-group':
-		return do_delete_account($arg0s[2],0,false);
+		return do_delete_account($arg0s[2], 0, false);
 
 	case '--allow-app':
 	case '--deny-app':
-		return do_account_app($arg0s,$action == '--allow-app');
+		return do_account_app($arg0s, $action == '--allow-app');
 
 	case '--change-account-id':
 		return do_change_account_id($arg0s);
@@ -84,21 +84,21 @@ 
 
 	default:
 		// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
-		if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
-			is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
+		if (substr($action, 0, 2) == '--' && class_exists($class = str_replace('-', '_', substr($action, 2))) &&
+			is_subclass_of($class, 'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
 		{
 			$args = array();
-			$args['domain'] = array_shift($arg0s);	// domain must be first argument, to ensure right domain get's selected in header-include
-			foreach($arg0s as $arg)
+			$args['domain'] = array_shift($arg0s); // domain must be first argument, to ensure right domain get's selected in header-include
+			foreach ($arg0s as $arg)
 			{
-				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+				list($name, $value) = explode('=', $arg, 2);
+				if (property_exists('admin_cmd', $name))		// dont allow to overwrite admin_cmd properties
 				{
-					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
+					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!", $arg), 90);
 				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				if (substr($name, -1) == ']')	// allow 1-dim. arrays
 				{
-					list($name,$sub) = explode('[',substr($name,0,-1),2);
+					list($name, $sub) = explode('[', substr($name, 0, -1), 2);
 					$args[$name][$sub] = $value;
 				}
 				else
@@ -122,12 +122,12 @@ 
  */
 function run_command(admin_cmd $cmd)
 {
-	global $arguments,$user,$arg0s,$domain;
+	global $arguments, $user, $arg0s, $domain;
 
 	$skip_checks = false;
 	while ($arguments && ($extra = array_shift($arguments)))
 	{
-		switch($extra)
+		switch ($extra)
 		{
 			case '--schedule':	// schedule the command instead of running it directly
 				$time = admin_cmd::parse_date(array_shift($arguments));
@@ -157,15 +157,15 @@ 
 			case '--header-access':
 				if ($cmd instanceof setup_cmd)
 				{
-					list($user,$pw) = explode(',',array_shift($arguments),2);
-					$cmd->set_header_secret($user,$pw);
+					list($user, $pw) = explode(',', array_shift($arguments), 2);
+					$cmd->set_header_secret($user, $pw);
 				}
 				break;
 
 			default:
 				//fail(99,lang('Unknown option %1',$extra);
-				echo lang('Unknown option %1',$extra)."\n\n";
-				usage('',99);
+				echo lang('Unknown option %1', $extra)."\n\n";
+				usage('', 99);
 				break;
 		}
 	}
@@ -184,7 +184,7 @@ 
 		{
 			$url = $GLOBALS['egw_info']['server']['webserver_url'].'/json.php?menuaction=admin.admin_hooks.ajax_clear_cache';
 			if ($url[0] == '/') $url = 'http://'.(!empty($domain) && $domain != 'default' ? $domain : 'localhost').$url;
-			$data = file_get_contents($url, false, Framework::proxy_context($user,$arg0s[1]));
+			$data = file_get_contents($url, false, Framework::proxy_context($user, $arg0s[1]));
 			error_log("file_get_contents('$url') returned ".array2string($data));
 			if ($data && strpos($data, '"success"') !== false)
 			{
@@ -223,13 +223,13 @@ 
 	{
 		//fail(1,lang("Wrong admin-account or -password !!!"));
 		echo lang("Wrong admin-account or -password !!!")."\n\n";
-		usage('',1);
+		usage('', 1);
 	}
 	if (!$GLOBALS['egw_info']['user']['apps']['admin'])	// will be tested by the header too, but whould give html error-message
 	{
 		//fail(2,lang("Permission denied !!!"));
 		echo lang("Permission denied !!!")."\n\n";
-		usage('',2);
+		usage('', 2);
 	}
 	return $sessionid;
 }
@@ -241,7 +241,7 @@ 
  * @param string $passwd
  * @param string $domain
  */
-function load_egw($user,$passwd,$domain='default')
+function load_egw($user, $passwd, $domain = 'default')
 {
 	//echo "load_egw($user,$passwd,$domain)\n";
 	$_REQUEST['domain'] = $domain;
@@ -253,7 +253,7 @@ 
 
 	if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.save_path')) && is_dir('/tmp') && is_writable('/tmp'))
 	{
-		ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
+		ini_set('session.save_path', '/tmp'); // regular users may have no rights to apache's session dir
 	}
 
 	$GLOBALS['egw_info'] = array(
@@ -265,7 +265,7 @@ 
 		)
 	);
 
-	if (substr($user,0,5) != 'root_')
+	if (substr($user, 0, 5) != 'root_')
 	{
 		include('../header.inc.php');
 	}
@@ -275,9 +275,9 @@ 
 		include('../header.inc.php');
 
 		if ($user == 'root_'.$GLOBALS['egw_info']['server']['header_admin_user'] &&
-			_check_pw($GLOBALS['egw_info']['server']['header_admin_password'],$passwd) ||
+			_check_pw($GLOBALS['egw_info']['server']['header_admin_password'], $passwd) ||
 			$user == 'root_'.$GLOBALS['egw_domain'][$_GET['domain']]['config_user'] &&
-			_check_pw($GLOBALS['egw_domain'][$_GET['domain']]['config_passwd'],$passwd))
+			_check_pw($GLOBALS['egw_domain'][$_GET['domain']]['config_passwd'], $passwd))
 		{
 			echo "\nRoot access granted!\n";
 			Vfs::$is_root = true;
@@ -296,10 +296,10 @@ 
  * @param string $pw
  * @return boolean
  */
-function _check_pw($hash_or_cleartext,$pw)
+function _check_pw($hash_or_cleartext, $pw)
 {
 	//echo "_check_pw($hash_or_cleartext,$pw) md5=".md5($pw)."\n";
-	if (preg_match('/^[0-9a-f]{32}$/',$hash_or_cleartext))
+	if (preg_match('/^[0-9a-f]{32}$/', $hash_or_cleartext))
 	{
 		return $hash_or_cleartext == md5($pw);
 	}
@@ -312,7 +312,7 @@ 
  * @param string $action =null
  * @param int $ret =0 exit-code
  */
-function usage($action=null,$ret=0)
+function usage($action = null, $ret = 0)
 {
 	unset($action);
 	$cmd = basename($_SERVER['argv'][0]);
@@ -365,7 +365,7 @@ 
 function do_edit_mail($type, array $arg0s)
 {
 	array_shift($arg0s); // admin-account
-	array_shift($arg0s);	// admin-pw
+	array_shift($arg0s); // admin-pw
 	list($account, $acc_id) = explode('=', array_shift($arg0s));
 	$account_id = is_numeric($account) ? (int)$account : $GLOBALS['egw']->accounts->name2id($account);
 	if (!$GLOBALS['egw']->accounts->exists($account_id) && !($account_id = $GLOBALS['egw']->accounts->name2id($account)))
@@ -374,18 +374,17 @@ 
 		exit(1);
 	}
 	$found = 0;
-	foreach($acc_id ? array(Api\Mail\Account::read($acc_id, $account_id)) :
-		Api\Mail\Account::search($account_id, false) as $account)
+	foreach ($acc_id ? array(Api\Mail\Account::read($acc_id, $account_id)) : Api\Mail\Account::search($account_id, false) as $account)
 	{
-		if (!isset($acc_id) && !Api\Mail\Account::is_multiple($account)) continue;	// no need to waste time on personal accounts
+		if (!isset($acc_id) && !Api\Mail\Account::is_multiple($account)) continue; // no need to waste time on personal accounts
 
 		$args = $arg0s;
 		try {
 			if (!($data = $account->getUserData($account_id)))
 			{
-				continue;	// not a managed mail-server
+				continue; // not a managed mail-server
 			}
-			switch($type)
+			switch ($type)
 			{
 				case 'alias':
 					$create_identity = strtolower(array_shift($args)) === 'yes';
@@ -408,7 +407,7 @@ 
 			if ($type == 'alias' && $create_identity && $args)
 			{
 				// check if user allready has an identity created for given aliases
-				foreach(Api\Mail\Account::identities($account, false, 'ident_email', $account_id) as $ident_id => $email)
+				foreach (Api\Mail\Account::identities($account, false, 'ident_email', $account_id) as $ident_id => $email)
 				{
 					if (($key = array_search($email, $args)) !== false)
 					{
@@ -421,19 +420,19 @@ 
 					}
 				}
 				// create not existing identities by copying standard identity plus alias as email
-				foreach($args as $email)
+				foreach ($args as $email)
 				{
 					$identity = $account->params;
 					unset($identity['ident_id']);
 					unset($identity['ident_name']);
 					$identity['ident_email'] = $email;
-					$identity['account_id'] = $account_id;	// make this a personal identity for $account_id
+					$identity['account_id'] = $account_id; // make this a personal identity for $account_id
 					Api\Mail\Account::save_identity($identity);
 				}
 				if ($args) echo "Identity(s) for ".implode(', ', $args)." created.\n";
 			}
 		}
-		catch(\Exception $e) {
+		catch (\Exception $e) {
 			_egw_log_exception($e);
 			echo $e->getMessage()."\n";
 		}
@@ -458,7 +457,7 @@ 
 {
 	if (!is_array($arr)) $arr = array();
 
-	switch($mod[0][0])
+	switch ($mod[0][0])
 	{
 		case '-':
 			$mod[0] = substr($mod[0], 1);
@@ -483,14 +482,14 @@ 
  * @param boolean $allow true=allow, false=deny
  * @return int 0 on success
  */
-function do_account_app($args,$allow)
+function do_account_app($args, $allow)
 {
-	array_shift($args);	// admin-account
-	array_shift($args);	// admin-pw
+	array_shift($args); // admin-account
+	array_shift($args); // admin-pw
 	$account = array_shift($args);
 
 	include_once(EGW_INCLUDE_ROOT.'/admin/inc/class.admin_cmd_account_app.inc.php');
-	run_command(new admin_cmd_account_app($allow,$account,$args));
+	run_command(new admin_cmd_account_app($allow, $account, $args));
 }
 
 /**
@@ -500,9 +499,9 @@ 
  */
 function do_edit_group($args)
 {
-	array_shift($args);	// admin-account
-	array_shift($args);	// admin-pw
-	list($account,$new_account_name) = explode('=',array_shift($args));	// account[=new-account-name]
+	array_shift($args); // admin-account
+	array_shift($args); // admin-pw
+	list($account, $new_account_name) = explode('=', array_shift($args)); // account[=new-account-name]
 
 	$data = array(
 		'account_lid' => $new_account_name,
@@ -510,19 +509,19 @@ 
 		'account_members' => $args,
 	);
 	try {
-		admin_cmd::parse_account($account,false);
+		admin_cmd::parse_account($account, false);
 
-		foreach($data as &$value)	// existing account --> empty values mean dont change, not set them empty!
+		foreach ($data as &$value)	// existing account --> empty values mean dont change, not set them empty!
 		{
 			if ((string)$value === '') $value = null;
 		}
 	}
 	catch (Exception $e) {	// new group
-		unset($e);	// not used
+		unset($e); // not used
 		$data['account_lid'] = $account;
 		$account = false;
 	}
-	run_command(new admin_cmd_edit_group($account,$data));
+	run_command(new admin_cmd_edit_group($account, $data));
 }
 
 /**
@@ -532,12 +531,12 @@ 
  */
 function do_change_pw($args)
 {
-	array_shift($args);     // admin-account
-	array_shift($args);     // admin-pw
-	$account = array_shift($args);	// account
-	$password = array_shift($args);	// pw
+	array_shift($args); // admin-account
+	array_shift($args); // admin-pw
+	$account = array_shift($args); // account
+	$password = array_shift($args); // pw
 
-	run_command(new admin_cmd_change_pw($account,$password));
+	run_command(new admin_cmd_change_pw($account, $password));
 }
 
 /**
@@ -546,18 +545,18 @@ 
  * @param array $args admin-account[@domain],admin-password,account[=new-account-name],first-name,last-name,password,email,expires{never(default)|YYYY-MM-DD|already},can-change-pw{true(default)|false},anon-user{true|false(default)},primary-group{Default(default)|...}[,groups,...][,homedirectory,loginshell]
  * @param boolean $run_addaccount_hook =null default run hook depending on account existence, true=allways run addaccount hook
  */
-function do_edit_user($args,$run_addaccount_hook=null)
+function do_edit_user($args, $run_addaccount_hook = null)
 {
-	array_shift($args);	// admin-account
-	array_shift($args);	// admin-pw
-	list($account,$new_account_name) = explode('=',array_shift($args));	// account[=new-account-name]
+	array_shift($args); // admin-account
+	array_shift($args); // admin-pw
+	list($account, $new_account_name) = explode('=', array_shift($args)); // account[=new-account-name]
 
 	$data = array();
 	// do we need to support ldap only attributes: homedirectory and loginshell
 	if (($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' ||
 		 empty($GLOBALS['egw_info']['server']['account_repository']) && $GLOBALS['egw_info']['server']['auth_type'] == 'ldap') &&
-		$GLOBALS['egw_info']['server']['ldap_extra_attributes'] && count($args) > 9 &&	// 9 = primary group
-		($last_arg = array_pop($dummy=$args)) && $last_arg[0] == '/')	// last argument start with a slash
+		$GLOBALS['egw_info']['server']['ldap_extra_attributes'] && count($args) > 9 && // 9 = primary group
+		($last_arg = array_pop($dummy = $args)) && $last_arg[0] == '/')	// last argument start with a slash
 	{
 		$data['loginshell'] = array_pop($args);
 		$data['homedirectory'] = array_pop($args);
@@ -575,19 +574,19 @@ 
 		'account_groups' => $args,
 	);
 	try {
-		admin_cmd::parse_account($account,true);
+		admin_cmd::parse_account($account, true);
 
-		foreach($data as &$value)	// existing account --> empty values mean dont change, not set them empty!
+		foreach ($data as &$value)	// existing account --> empty values mean dont change, not set them empty!
 		{
 			if ((string)$value === '') $value = null;
 		}
 	}
 	catch (Exception $e) {	// new account
-		unset($e);	// not used
+		unset($e); // not used
 		$data['account_lid'] = $account;
 		$account = false;
 	}
-	run_command(new admin_cmd_edit_user($account,$data,null,$run_addaccount_hook));
+	run_command(new admin_cmd_edit_user($account, $data, null, $run_addaccount_hook));
 }
 
 /**
@@ -598,9 +597,9 @@ 
  * @param boolean $is_user =true are we called for a user or group
  * @return int 0 on success, 2-4 otherwise (see source)
  */
-function do_delete_account($account,$new_user=0,$is_user=true)
+function do_delete_account($account, $new_user = 0, $is_user = true)
 {
-	run_command(new admin_cmd_delete_account($account,$new_user,$is_user));
+	run_command(new admin_cmd_delete_account($account, $new_user, $is_user));
 }
 
 /**
@@ -621,13 +620,13 @@ 
  */
 function do_change_account_id($args)
 {
-	if (count($args) < 4) usage();	// 4 means at least user,pw,from1,to1
+	if (count($args) < 4) usage(); // 4 means at least user,pw,from1,to1
 
 	$ids2change = array();
-	for($n = 2; $n < count($args); $n += 2)
+	for ($n = 2; $n < count($args); $n += 2)
 	{
 		$from = (int)$args[$n];
-		$to   = (int)$args[$n+1];
+		$to   = (int)$args[$n + 1];
 		$ids2change[$from] = $to;
 	}
 	run_command(new admin_cmd_change_account_id($ids2change));
@@ -643,22 +642,22 @@ 
  */
 function list_exit_codes()
 {
-	error_reporting(error_reporting() & ~E_NOTICE);
+	error_reporting(error_reporting()&~E_NOTICE);
 
 	$codes = array('Ok');
-	foreach(file(__FILE__) as $line)
+	foreach (file(__FILE__) as $line)
 	{
 		$matches = null;
-		if (preg_match('/fail\(([0-9]+),(.*)\);/',$line,$matches))
+		if (preg_match('/fail\(([0-9]+),(.*)\);/', $line, $matches))
 		{
 			//echo "Line $n: $matches[1]: $matches[2]\n";
 			@eval('$codes['.$matches[1].'] = '.$matches[2].';');
 		}
 	}
-	ksort($codes,SORT_NUMERIC);
-	foreach($codes as $num => $msg)
+	ksort($codes, SORT_NUMERIC);
+	foreach ($codes as $num => $msg)
 	{
-		echo $num."\t".str_replace("\n","\n\t",$msg)."\n";
+		echo $num."\t".str_replace("\n", "\n\t", $msg)."\n";
 	}
 }
 
@@ -668,7 +667,7 @@ 
  * @param array $args admin-account[@domain],admin-password,accout_lid[,pw]
  * @return int 0 on success
  */
-function do_subscribe_other($account_lid,$pw=null)
+function do_subscribe_other($account_lid, $pw = null)
 {
 	unset($account_lid, $pw);
 	/* ToDo: this cant work, not even in 14.x

Braces +50 added lines, -12 removed lines

@@ -17,10 +17,13 @@ 
 
 chdir(dirname(__FILE__));	// to enable our relative pathes to work
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling admin-cli as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling admin-cli as web-page
 {
 	die('<h1>admin-cli.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 elseif ($_SERVER['argc'] <= 1 || $_SERVER['argc'] == 2 && in_array($_SERVER['argv'][1], array('-h', '--help')))
 {
 	usage();
@@ -92,13 +95,19 @@ 
 			foreach($arg0s as $arg)
 			{
 				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+				if(property_exists('admin_cmd',$name))
+				{
+					// dont allow to overwrite admin_cmd properties
 				{
 					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
 				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				}
+				if (substr($name,-1) == ']')
+				{
+					// allow 1-dim. arrays
 				{
 					list($name,$sub) = explode('[',substr($name,0,-1),2);
+				}
 					$args[$name][$sub] = $value;
 				}
 				else
@@ -183,7 +192,10 @@ 
 		if (!$dry_run)
 		{
 			$url = $GLOBALS['egw_info']['server']['webserver_url'].'/json.php?menuaction=admin.admin_hooks.ajax_clear_cache';
-			if ($url[0] == '/') $url = 'http://'.(!empty($domain) && $domain != 'default' ? $domain : 'localhost').$url;
+			if ($url[0] == '/')
+			{
+				$url = 'http://'.(!empty($domain) && $domain != 'default' ? $domain : 'localhost').$url;
+			}
 			$data = file_get_contents($url, false, Framework::proxy_context($user,$arg0s[1]));
 			error_log("file_get_contents('$url') returned ".array2string($data));
 			if ($data && strpos($data, '"success"') !== false)
@@ -225,10 +237,13 @@ 
 		echo lang("Wrong admin-account or -password !!!")."\n\n";
 		usage('',1);
 	}
-	if (!$GLOBALS['egw_info']['user']['apps']['admin'])	// will be tested by the header too, but whould give html error-message
+	if (!$GLOBALS['egw_info']['user']['apps']['admin'])
+	{
+		// will be tested by the header too, but whould give html error-message
 	{
 		//fail(2,lang("Permission denied !!!"));
 		echo lang("Permission denied !!!")."\n\n";
+	}
 		usage('',2);
 	}
 	return $sessionid;
@@ -377,7 +392,11 @@ 
 	foreach($acc_id ? array(Api\Mail\Account::read($acc_id, $account_id)) :
 		Api\Mail\Account::search($account_id, false) as $account)
 	{
-		if (!isset($acc_id) && !Api\Mail\Account::is_multiple($account)) continue;	// no need to waste time on personal accounts
+		if (!isset($acc_id) && !Api\Mail\Account::is_multiple($account))
+		{
+			continue;
+		}
+		// no need to waste time on personal accounts
 
 		$args = $arg0s;
 		try {
@@ -430,7 +449,10 @@ 
 					$identity['account_id'] = $account_id;	// make this a personal identity for $account_id
 					Api\Mail\Account::save_identity($identity);
 				}
-				if ($args) echo "Identity(s) for ".implode(', ', $args)." created.\n";
+				if ($args)
+				{
+					echo "Identity(s) for ".implode(', ', $args)." created.\n";
+				}
 			}
 		}
 		catch(\Exception $e) {
@@ -456,7 +478,10 @@ 
  */
 function array_modify(&$arr, array &$mod)
 {
-	if (!is_array($arr)) $arr = array();
+	if (!is_array($arr))
+	{
+		$arr = array();
+	}
 
 	switch($mod[0][0])
 	{
@@ -512,10 +537,13 @@ 
 	try {
 		admin_cmd::parse_account($account,false);
 
-		foreach($data as &$value)	// existing account --> empty values mean dont change, not set them empty!
+		foreach($data as &$value)
+		{
+			// existing account --> empty values mean dont change, not set them empty!
 		{
 			if ((string)$value === '') $value = null;
 		}
+		}
 	}
 	catch (Exception $e) {	// new group
 		unset($e);	// not used
@@ -557,9 +585,12 @@ 
 	if (($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' ||
 		 empty($GLOBALS['egw_info']['server']['account_repository']) && $GLOBALS['egw_info']['server']['auth_type'] == 'ldap') &&
 		$GLOBALS['egw_info']['server']['ldap_extra_attributes'] && count($args) > 9 &&	// 9 = primary group
-		($last_arg = array_pop($dummy=$args)) && $last_arg[0] == '/')	// last argument start with a slash
+		($last_arg = array_pop($dummy=$args)) && $last_arg[0] == '/')
+	{
+		// last argument start with a slash
 	{
 		$data['loginshell'] = array_pop($args);
+	}
 		$data['homedirectory'] = array_pop($args);
 	}
 	$data += array(
@@ -577,10 +608,13 @@ 
 	try {
 		admin_cmd::parse_account($account,true);
 
-		foreach($data as &$value)	// existing account --> empty values mean dont change, not set them empty!
+		foreach($data as &$value)
+		{
+			// existing account --> empty values mean dont change, not set them empty!
 		{
 			if ((string)$value === '') $value = null;
 		}
+		}
 	}
 	catch (Exception $e) {	// new account
 		unset($e);	// not used
@@ -621,7 +655,11 @@ 
  */
 function do_change_account_id($args)
 {
-	if (count($args) < 4) usage();	// 4 means at least user,pw,from1,to1
+	if (count($args) < 4)
+	{
+		usage();
+	}
+	// 4 means at least user,pw,from1,to1
 
 	$ids2change = array();
 	for($n = 2; $n < count($args); $n += 2)

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

@@ -50,7 +50,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->so = new Api\Storage\Base(self::APP,self::TABLE,null,'',true);
+		$this->so = new Api\Storage\Base(self::APP, self::TABLE, null, '', true);
 		$this->so->timestamps = array('li', 'lo', 'session_dla', 'notification_heartbeat');
 	}
 
@@ -63,19 +63,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 = Api\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)";
@@ -83,20 +83,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 = Api\DateTime::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'];
 			}
@@ -105,7 +105,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'])
@@ -113,13 +113,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'])
 		{
@@ -139,33 +139,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,
@@ -196,12 +196,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']];
 				}
@@ -213,19 +213,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)
 					{
@@ -242,7 +242,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('admin.accesslog');
 		$tmpl->exec('admin.admin_accesslog.index', $content, array(), $readonlys, array(
@@ -261,7 +261,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);
@@ -269,14 +269,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":
@@ -284,19 +284,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;
 		}
@@ -316,7 +316,7 @@ 
 		if ($sessions_list)
 		{
 		//	error_log(__METHOD__. $sessions_list);
-			$actions= array(
+			$actions = array(
 				'kill' => array(
 					'caption' => 'Kill',
 					'confirm' => 'Kill this session',
@@ -329,7 +329,7 @@ 
 		}
 		else
 		{
-			$actions= array(
+			$actions = array(
 				'delete' => array(
 					'caption' => 'Delete',
 					'confirm' => 'Delete this entry',
@@ -361,7 +361,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

@@ -67,9 +67,13 @@ 
 	{
 		$heartbeat_limit = Api\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'])
 			{
@@ -100,12 +104,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'])
@@ -142,7 +150,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'))
@@ -215,7 +226,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':
@@ -225,12 +237,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)

Braces +64 added lines, -17 removed lines

@@ -150,8 +150,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)
 					{
 
@@ -247,7 +253,10 @@ 
 			Framework::refresh_opener($msg, $this->appname, $content['id'], $change_color ? null : 'update', $refresh_app);
 		}
 		$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'];
@@ -302,7 +311,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'];
 		}
@@ -313,7 +324,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('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
@@ -373,9 +387,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'];
+		}
 
 		Api\Cache::setSession(__CLASS__.$query['appname'],'nm',$query);
 
@@ -404,7 +424,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']);
 
@@ -435,13 +458,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']) : '');
@@ -458,11 +487,18 @@ 
 	public function index(array $content=null,$msg='')
 	{
 		//_debug_array($_GET);
-		if ($this->appname != 'admin') Api\Translation::add_app('admin');	// need admin translations
+		if ($this->appname != 'admin')
+		{
+			Api\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)
@@ -602,7 +638,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;
 		}
@@ -620,7 +657,8 @@ 
 		));
 	}
 
-	protected function get_actions($appname=Api\Categories::GLOBAL_APPNAME) {
+	protected function get_actions($appname=Api\Categories::GLOBAL_APPNAME)
+	{
 
 		$actions = array(
 			'open' => array(        // does edit if allowed, otherwise view
@@ -731,11 +769,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)
 					{
@@ -775,7 +819,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);

Spacing +125 added lines, -126 removed lines

@@ -63,7 +63,7 @@ 
 		{
 			throw new Api\Exception\NoPermission\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');
 		}
@@ -77,12 +77,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');
 		}
 	}
 
@@ -92,11 +92,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']:Api\Categories::GLOBAL_APPNAME);
-		$session = Api\Cache::getSession(__CLASS__.$appname,'nm');
+		$appname = $content['appname'] ? $content['appname'] : ($_GET['appname'] ? $_GET['appname'] : Api\Categories::GLOBAL_APPNAME);
+		$session = Api\Cache::getSession(__CLASS__.$appname, 'nm');
 		unset($session);
 		if (!isset($content))
 		{
@@ -104,7 +104,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'];
@@ -120,7 +120,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;
@@ -130,12 +130,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
 			{
@@ -146,23 +146,23 @@ 
 
 			$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)
 					{
 
-						$data = $cats->id2name($content['id'],'data');
+						$data = $cats->id2name($content['id'], 'data');
 						try {
 							$cats->edit($content);
 							$msg = lang('Category saved.');
 						}
 						catch (Api\Exception\WrongUserinput $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'] && (
@@ -181,15 +181,15 @@ 
 					// to reload the whole nextmatch instead of just the row
 					$change_color = ($data['color'] != $content['data']['color']);
 					// Nicely reload just the category window / iframe
-					if($change_color)
+					if ($change_color)
 					{
-						if(Api\Json\Response::isJSONResponse())
+						if (Api\Json\Response::isJSONResponse())
 						{
 							// Update category styles
-							Api\Json\Response::get()->apply('opener.egw.includeCSS',array(Categories::css($refresh_app == 'admin' ? Categories::GLOBAL_APPNAME : $refresh_app)));
-							if($this->appname != 'admin')
+							Api\Json\Response::get()->apply('opener.egw.includeCSS', array(Categories::css($refresh_app == 'admin' ? Categories::GLOBAL_APPNAME : $refresh_app)));
+							if ($this->appname != 'admin')
 							{
-								Api\Json\Response::get()->apply('opener.egw.show_preferences',array(
+								Api\Json\Response::get()->apply('opener.egw.show_preferences', array(
 									'cats',
 									$this->appname == 'admin' ? Categories::GLOBAL_APPNAME : array($refresh_app)
 								));
@@ -199,7 +199,7 @@ 
 							{
 								Categories::css($refresh_app == 'admin' ? Categories::GLOBAL_APPNAME : $refresh_app);
 								// Need to forcably re-load the iframe to avoid smart etemplate refresh
-								Api\Json\Response::get()->apply('opener.app.admin.load',array(
+								Api\Json\Response::get()->apply('opener.app.admin.load', array(
 									Framework::link('/index.php', array(
 										'menuaction' => $this->list_link,
 										'appname' => $appname
@@ -229,10 +229,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.');
 
-						Framework::refresh_opener($msg, $refresh_app, $content['id'],'delete', $this->appname);
+						Framework::refresh_opener($msg, $refresh_app, $content['id'], 'delete', $this->appname);
 						Framework::window_close();
 						return;
 					}
@@ -247,19 +247,19 @@ 
 			Framework::refresh_opener($msg, $this->appname, $content['id'], $change_color ? null : 'update', $refresh_app);
 		}
 		$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'];
 			}
@@ -269,24 +269,24 @@ 
 			}
 		}
 
-		if($this->appname != 'admin' && $content['owner'] > 0 )
+		if ($this->appname != 'admin' && $content['owner'] > 0)
 		{
 			$sel_options['owner'][$content['owner']] = Api\Accounts::username($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', Api\Accounts::username($content['owner']));
 				$content['owner'] = 0;
 			}
 			$sel_options['owner'][0] = lang('All users');
-			foreach($GLOBALS['egw']->accounts->search(array('type' => 'groups')) as $acc)
+			foreach ($GLOBALS['egw']->accounts->search(array('type' => 'groups')) as $acc)
 			{
 				if ($acc['account_type'] == 'g')
 				{
@@ -296,7 +296,7 @@ 
 			$content['no_private'] = true;
 		}
 
-		if($this->appname == 'admin')
+		if ($this->appname == 'admin')
 		{
 			$content['access'] = 'public';
 			// Allow admins access to all categories as parent
@@ -307,17 +307,17 @@ 
 			$readonlys['access'] = $content['owner'] != $GLOBALS['egw_info']['user']['account_id'];
 		}
 
-		Framework::includeJS('.','global_categories','admin');
+		Framework::includeJS('.', '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('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);
 	}
 
 	/**
@@ -326,7 +326,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;
 	}
@@ -339,12 +339,12 @@ 
 	static function get_icons()
 	{
 		$icons = array();
-		if (file_exists($image_dir=EGW_SERVER_ROOT.self::ICON_PATH) && ($dir = dir($image_dir)))
+		if (file_exists($image_dir = EGW_SERVER_ROOT.self::ICON_PATH) && ($dir = dir($image_dir)))
 		{
 			$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]);
 				}
@@ -363,13 +363,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;
 		}
@@ -377,49 +377,49 @@ 
 		// new column-filter access has highest priority
 		if (!empty($query['col_filter']['access']))$filter['access'] = $query['col_filter']['access'];
 
-		Api\Cache::setSession(__CLASS__.$query['appname'],'nm',$query);
+		Api\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)Api\Categories::GLOBAL_ACCOUNT && $row['owner'][0] > 0))
+			$row['owner'] = explode(',', $row['owner']);
+			if (($owner && !in_array($owner, $row['owner'])) || ((string)$query['filter'] === (string)Api\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(Acl::EDIT, $row['id']) || !self::$acl_edit)
+				if (!$cats->check_perms(Acl::EDIT, $row['id']) || !self::$acl_edit)
 				{
 					$row['class'] .= ' rowNoEdit';
 				}
-				if(!$cats->check_perms(Acl::DELETE, $row['id']) || !self::$acl_delete ||
+				if (!$cats->check_perms(Acl::DELETE, $row['id']) || !self::$acl_delete ||
 					// Only admins can delete globals
 					$cats->is_global($row['id']) && !$GLOBALS['egw_info']['user']['apps']['admin'])
 				{
@@ -427,7 +427,7 @@ 
 				}
 			}
 			// Can only edit (via context menu) Categories for the selected app (backend restriction)
-			if($row['appname'] != $query['appname'])
+			if ($row['appname'] != $query['appname'])
 			{
 				$row['class'] .= ' rowNoEdit ';
 			}
@@ -455,60 +455,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') Api\Translation::add_app('admin');	// need admin translations
+		if ($this->appname != 'admin') Api\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'] = Api\Cache::getSession(__CLASS__.$appname,'nm');
+			$content['nm'] = Api\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'?Api\Categories::GLOBAL_ACCOUNT:$GLOBALS['egw_info']['user']['account_id'];
+				$content['nm']['filter'] = $this->appname == 'admin' ?Api\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
@@ -516,18 +516,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;
@@ -542,39 +542,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);
 				}
 				Framework::refresh_opener($msg, $this->appname);
 				$msg = '';
 			}
 		}
 		$content['msg'] = $msg;
-		$content['nm']['add_link']= Framework::link('/index.php','menuaction='.$this->add_link . '&cat_id=&appname='.$appname);
-		$content['edit_link']= $this->edit_link.'&appname='.$appname;
+		$content['nm']['add_link'] = 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();
@@ -588,7 +588,7 @@ 
 		);
 
 		$sel_options['owner'][0] = lang('All users');
-		foreach($GLOBALS['egw']->accounts->search(array('type' => 'groups')) as $acc)
+		foreach ($GLOBALS['egw']->accounts->search(array('type' => 'groups')) as $acc)
 		{
 			if ($acc['account_type'] == 'g')
 			{
@@ -597,12 +597,12 @@ 
 		}
 
 		$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;
 		}
@@ -615,12 +615,12 @@ 
 		// 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=Api\Categories::GLOBAL_APPNAME) {
+	protected function get_actions($appname = Api\Categories::GLOBAL_APPNAME) {
 
 		$actions = array(
 			'open' => array(        // does edit if allowed, otherwise view
@@ -629,7 +629,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',
@@ -664,7 +664,7 @@ 
 			),
 		);
 
-		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			unset($actions['owner']);
 		}
@@ -690,14 +690,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'];
 				}
@@ -705,19 +705,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(Acl::DELETE, $id, (boolean)$GLOBALS['egw_info']['user']['apps']['admin']))
+					if ($cats->check_perms(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
@@ -731,20 +731,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))
 					{
@@ -775,7 +774,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);