EGroupware / egroupware

admin/inc/class.admin_statistics.inc.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +44 added lines, -44 removed lines

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

Braces +8 added lines, -2 removed lines

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

admin/inc/class.admin_ui.inc.php

Doc Comments +4 added lines

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

Spacing +31 added lines, -35 removed lines

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

Braces +85 added lines, -21 removed lines

@@ -48,7 +48,10 @@ 
 		}
 		$tpl = new Etemplate('admin.index');
 
-		if (!is_array($content)) $content = array();
+		if (!is_array($content))
+		{
+			$content = array();
+		}
 		$content['nm'] = array(
 			'get_rows' => 'admin_ui::get_users',
 			'no_cat' => true,
@@ -132,7 +135,9 @@ 
 				'group' => 2,
 			),
 		);
-		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))	// no rights to set ACL-rights
+		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))
+		{
+			// no rights to set ACL-rights
 		{
 			$actions['deny'] = array(
 				'caption'   => 'Deny access',
@@ -143,6 +148,7 @@ 
 				'group'     => 2,
 			);
 		}
+		}
 		$group = 5;	// allow to place actions in different groups by hook, this is the default
 		// supporting both old way using $GLOBALS['menuData'] and new just returning data in hook
 		$apps = array_unique(array_merge(array('admin'), Api\Hooks::implemented('edit_group')));
@@ -150,7 +156,10 @@ 
 		{
 			$GLOBALS['menuData'] = $data = array();
 			$data = Api\Hooks::single('edit_group', $app);
-			if (!is_array($data)) $data = $GLOBALS['menuData'];
+			if (!is_array($data))
+			{
+				$data = $GLOBALS['menuData'];
+			}
 			//error_log(__METHOD__."() app $app returned ".array2string($data));
 			foreach($data as $item)
 			{
@@ -170,15 +179,33 @@ 
 					{
 						$item['popup'] = $matches[2].'x'.$matches[3];
 						$item['onExecute'] = 'javaScript:nm_action';
-						if (isset($matches[5])) $item['tooltip'] = $matches[5];
+						if (isset($matches[5]))
+						{
+							$item['tooltip'] = $matches[5];
+						}
 						unset($item['options']);
 					}
 				}
-				if (empty($item['icon'])) $item['icon'] = $app.'/navbar';
-				if (empty($item['group'])) $item['group'] = $group;
-				if (empty($item['onExecute'])) $item['onExecute'] = 'javaScript:app.admin.group';
-				if (!isset($item['allowOnMultiple'])) $item['allowOnMultiple'] = false;
-				if (!isset($item['enableId'])) $item['enableId'] = '^/groups/-\\d+';
+				if (empty($item['icon']))
+				{
+					$item['icon'] = $app.'/navbar';
+				}
+				if (empty($item['group']))
+				{
+					$item['group'] = $group;
+				}
+				if (empty($item['onExecute']))
+				{
+					$item['onExecute'] = 'javaScript:app.admin.group';
+				}
+				if (!isset($item['allowOnMultiple']))
+				{
+					$item['allowOnMultiple'] = false;
+				}
+				if (!isset($item['enableId']))
+				{
+					$item['enableId'] = '^/groups/-\\d+';
+				}
 
 				$actions[$item['id']] = $item;
 			}
@@ -231,7 +258,10 @@ 
 			{
 				$GLOBALS['menuData'] = $data = array();
 				$data = Api\Hooks::single('edit_user', $app);
-				if (!is_array($data)) $data = $GLOBALS['menuData'];
+				if (!is_array($data))
+				{
+					$data = $GLOBALS['menuData'];
+				}
 				foreach($data as $item)
 				{
 					// allow hook to return "real" actions, but still support legacy: description, url, extradata, options
@@ -249,15 +279,30 @@ 
 						if ($item['options'] && preg_match('/(egw_openWindowCentered2?|window.open)\([^)]+,(\d+),(\d+).*(title="([^"]+)")?/', $item['options'], $matches))
 						{
 							$item['popup'] = $matches[2].'x'.$matches[3];
-							if (isset($matches[5])) $item['tooltip'] = $matches[5];
+							if (isset($matches[5]))
+							{
+								$item['tooltip'] = $matches[5];
+							}
 							unset($item['options']);
 						}
 					}
-					if (empty($item['icon'])) $item['icon'] = $app.'/navbar';
-					if (empty($item['group'])) $item['group'] = $group;
-					if (empty($item['onExecute'])) $item['onExecute'] = $item['popup'] ?
+					if (empty($item['icon']))
+					{
+						$item['icon'] = $app.'/navbar';
+					}
+					if (empty($item['group']))
+					{
+						$item['group'] = $group;
+					}
+					if (empty($item['onExecute']))
+					{
+						$item['onExecute'] = $item['popup'] ?
 						'javaScript:nm_action' : 'javaScript:app.admin.iframe_location';
-					if (!isset($item['allowOnMultiple'])) $item['allowOnMultiple'] = false;
+					}
+					if (!isset($item['allowOnMultiple']))
+					{
+						$item['allowOnMultiple'] = false;
+					}
 
 					$actions[$item['id']] = $item;
 				}
@@ -313,7 +358,10 @@ 
 						($row['account_expires'] != -1 ? lang('Expires').' '.Api\DateTime::to($row['account_expires'], true) :
 							lang('Enabled')));
 
-			if (!self::$accounts->is_active($row)) $row['status_class'] = 'adminAccountInactive';
+			if (!self::$accounts->is_active($row))
+			{
+				$row['status_class'] = 'adminAccountInactive';
+			}
 		}
 
 		return self::$accounts->total;
@@ -367,7 +415,10 @@ 
 							'link' => $data,
 						);
 					}
-					if (empty($data['text'])) $data['text'] = $text;
+					if (empty($data['text']))
+					{
+						$data['text'] = $text;
+					}
 					if (empty($data['id']))
 					{
 						$data['id'] = $root.($app == 'admin' ? 'admin' : 'apps/'.$app).'/';
@@ -392,7 +443,11 @@ 
 					unset($data['icon']);
 					$parent =& $tree['item'];
 					$parts = explode('/', $data['id']);
-					if ($data['id'][0] == '/') array_shift($parts);	// remove root
+					if ($data['id'][0] == '/')
+					{
+						array_shift($parts);
+					}
+					// remove root
 					array_pop($parts);
 					$path = '';
 					foreach($parts as $part)
@@ -411,14 +466,23 @@ 
 								'item' => array(),
 								'child' => 1,
 							);
-							if ($path == '/admin') $parent[$path]['open'] = true;
+							if ($path == '/admin')
+							{
+								$parent[$path]['open'] = true;
+							}
 						}
 						$parent =& $parent[$path]['item'];
 					}
 					$data['text'] = lang($data['text']);
-					if (!empty($data['tooltip'])) $data['tooltip'] = lang($data['tooltip']);
+					if (!empty($data['tooltip']))
+					{
+						$data['tooltip'] = lang($data['tooltip']);
+					}
 					// make sure keys are unique, as we overwrite tree entries otherwise
-					if (isset($parent[$data['id']])) $data['id'] .= md5($data['link']);
+					if (isset($parent[$data['id']]))
+					{
+						$data['id'] .= md5($data['link']);
+					}
 					$parent[$data['id']] = self::fix_userdata($data);
 				}
 			}

admin/inc/class.customfields.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -548,7 +548,7 @@
 	 * Validate and create a new content type
 	 *
 	 * @param array $content
-	 * @return string|boolean New type ID, or false for error
+	 * @return false|string New type ID, or false for error
 	 */
 	function create_content_type(&$content)
 	{

Indentation +27 added lines, -27 removed lines

@@ -32,10 +32,10 @@ 
 {
 
 	/**
-	* appname of app which want to add / edit its customfields
-	*
-	* @var string
-	*/
+	 * appname of app which want to add / edit its customfields
+	 *
+	 * @var string
+	 */
 	var $appname;
 
 	/**
@@ -44,10 +44,10 @@ 
 	protected $use_private = false;
 
 	/**
-	* userdefiened types e.g. type of infolog
-	*
-	* @var array
-	*/
+	 * userdefiened types e.g. type of infolog
+	 *
+	 * @var array
+	 */
 	var $types2 = array();
 	var $content_types,$fields;
 
@@ -507,8 +507,8 @@ 
 	}
 
 	/**
-	* deletes custom field from customfield definitions
-	*/
+	 * deletes custom field from customfield definitions
+	 */
 	function delete_field(&$content)
 	{
 		unset($this->fields[key($content['fields']['delete'])]);
@@ -525,8 +525,8 @@ 
 	}
 
 	/**
-	* create a new custom field
-	*/
+	 * create a new custom field
+	 */
 	function create_field(&$content)
 	{
 		$new_name = trim($content['fields'][count($content['fields'])-1]['name']);
@@ -587,8 +587,8 @@ 
 	}
 
 	/**
-	* save changes to repository
-	*/
+	 * save changes to repository
+	 */
 	function save_repository()
 	{
 		//echo '<p>uicustomfields::save_repository() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
@@ -601,25 +601,25 @@ 
 	}
 
 	/**
-	* get customfields of using application
-	*
-	* @deprecated use Api\Storage\Customfields::get() direct, no need to instanciate this UI class
-	* @author Cornelius Weiss
-	* @param boolean $all_private_too =false should all the private fields be returned too
-	* @return array with customfields
-	*/
+	 * get customfields of using application
+	 *
+	 * @deprecated use Api\Storage\Customfields::get() direct, no need to instanciate this UI class
+	 * @author Cornelius Weiss
+	 * @param boolean $all_private_too =false should all the private fields be returned too
+	 * @return array with customfields
+	 */
 	function get_customfields($all_private_too=false)
 	{
 		return Api\Storage\Customfields::get($this->appname,$all_private_too);
 	}
 
 	/**
-	* get_content_types of using application
-	*
-	* @deprecated use Api\Config::get_content_types() direct, no need to instanciate this UI class
-	* @author Cornelius Weiss
-	* @return array with content-types
-	*/
+	 * get_content_types of using application
+	 *
+	 * @deprecated use Api\Config::get_content_types() direct, no need to instanciate this UI class
+	 * @author Cornelius Weiss
+	 * @return array with content-types
+	 */
 	function get_content_types()
 	{
 		return Api\Config::get_content_types($this->appname);

Spacing +79 added lines, -80 removed lines

@@ -49,7 +49,7 @@ 
 	* @var array
 	*/
 	var $types2 = array();
-	var $content_types,$fields;
+	var $content_types, $fields;
 
 	/**
 	 * Currently selected content type (if used by app)
@@ -103,14 +103,14 @@ 
 	 *
 	 * @param string $appname
 	 */
-	function __construct($appname='')
+	function __construct($appname = '')
 	{
 		if (($this->appname = $appname))
 		{
-			$this->fields = Api\Storage\Customfields::get($this->appname,true);
+			$this->fields = Api\Storage\Customfields::get($this->appname, true);
 			$this->content_types = Api\Config::get_content_types($this->appname);
 		}
-		$this->so = new Api\Storage\Base('phpgwapi','egw_customfields',null,'',true);
+		$this->so = new Api\Storage\Base('phpgwapi', 'egw_customfields', null, '', true);
 	}
 
 	/**
@@ -120,43 +120,43 @@ 
 	{
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['appname'] ? $content['appname'] : false));
-		if(!$this->appname) die(lang('Error! No appname found'));
+		if (!$this->appname) die(lang('Error! No appname found'));
 
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
 		// Read fields, constructor doesn't always know appname
-		$this->fields = Api\Storage\Customfields::get($this->appname,true);
+		$this->fields = Api\Storage\Customfields::get($this->appname, true);
 
 		$this->tmpl = new Etemplate();
 		$this->tmpl->read('admin.customfields');
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if ($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
 
 		// Handle incoming - types, options, etc.
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			if(count($this->content_types) == 0)
+			if (count($this->content_types) == 0)
 			{
 				$this->content_types = Api\Config::get_content_types($this->appname);
 			}
-			if (count($this->content_types)==0)
+			if (count($this->content_types) == 0)
 			{
 				// if you define your default types of your app with the search_link hook, they are available here, if no types were found
-				$this->content_types = (array)Api\Link::get_registry($this->appname,'default_types');
+				$this->content_types = (array)Api\Link::get_registry($this->appname, 'default_types');
 			}
 			// Set this now, we need to know it for updates
-			$this->content_type = $content['content_types']['types'] ? $content['content_types']['types'] : (array_key_exists(0,$this->content_types) ? $this->content_types[0] : key($this->content_types));
+			$this->content_type = $content['content_types']['types'] ? $content['content_types']['types'] : (array_key_exists(0, $this->content_types) ? $this->content_types[0] : key($this->content_types));
 
 			// Common type changes - add, delete
-			if($content['content_types']['delete'])
+			if ($content['content_types']['delete'])
 			{
 				$this->delete_content_type($content);
 			}
-			elseif($content['content_types']['create'])
+			elseif ($content['content_types']['create'])
 			{
-				if(($new_type = $this->create_content_type($content)))
+				if (($new_type = $this->create_content_type($content)))
 				{
 					$content['content_types']['types'] = $this->content_type = $new_type;
 				}
@@ -164,18 +164,18 @@ 
 				unset($content['content_types']['name']);
 			}
 			// No common type change and type didn't change, try an update
-			elseif($this->content_type && is_array($content) && $this->content_type == $content['old_content_type'])
+			elseif ($this->content_type && is_array($content) && $this->content_type == $content['old_content_type'])
 			{
 				$this->update($content);
 			}
 		}
 
 		// Custom field deleted from nextmatch
-		if($content['nm']['action'] == 'delete')
+		if ($content['nm']['action'] == 'delete')
 		{
-			foreach($this->fields as $name => $data)
+			foreach ($this->fields as $name => $data)
 			{
-				if(in_array($data['id'],$content['nm']['selected']))
+				if (in_array($data['id'], $content['nm']['selected']))
 				{
 					unset($this->fields[$name]);
 				}
@@ -184,7 +184,7 @@ 
 			$this->save_repository();
 		}
 
-		$content['nm']= Api\Cache::getSession('admin', 'customfield-index');
+		$content['nm'] = Api\Cache::getSession('admin', 'customfield-index');
 		if (!is_array($content['nm']))
 		{
 			// Initialize nextmatch
@@ -194,8 +194,8 @@ 
 				'no_filter'      => 'true',
 				'no_filter2'     => 'true',
 				'row_id'         => 'cf_id',
-				'order'          =>	'cf_order',// IO name of the column to sort
-				'sort'           =>	'ASC',// IO direction of the sort: 'ASC' or 'DESC'
+				'order'          =>	'cf_order', // IO name of the column to sort
+				'sort'           =>	'ASC', // IO direction of the sort: 'ASC' or 'DESC'
 				'actions'        => $this->get_actions()
 			);
 		}
@@ -203,11 +203,11 @@ 
 		$content['nm']['use_private'] = $this->use_private;
 
 		// Set up sub-types
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			foreach($this->content_types as $type => $entry)
+			foreach ($this->content_types as $type => $entry)
 			{
-				if(!is_array($entry))
+				if (!is_array($entry))
 				{
 					$this->content_types[$type] = array('name' => $entry);
 					$entry = $this->content_types[$type];
@@ -216,7 +216,7 @@ 
 			}
 			$sel_options['types'] = $sel_options['cf_type2'] = $this->types2;
 
-			$content['type_template'] = $this->appname . '.admin.types';
+			$content['type_template'] = $this->appname.'.admin.types';
 			$content['content_types']['appname'] = $this->appname;
 
 			$content['content_type_options'] = $this->content_types[$this->content_type]['options'];
@@ -258,15 +258,15 @@ 
 		static::app_index($content, $sel_options, $readonlys, $preserve);
 
 		// Make sure app css gets loaded, extending app might cause et2 to miss it
-		Framework::includeCSS('admin','app');
+		Framework::includeCSS('admin', 'app');
 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
 
 		// Some logic to make sure extending class (if there is one) gets called
 		// when etemplate2 comes back instead of parent class
-		$exec = get_class() == get_called_class() ? 'admin.customfields.index' : $this->appname . '.' . get_called_class() . '.index';
+		$exec = get_class() == get_called_class() ? 'admin.customfields.index' : $this->appname.'.'.get_called_class().'.index';
 
-		$this->tmpl->exec($exec,$content,$sel_options,$readonlys,$preserve);
+		$this->tmpl->exec($exec, $content, $sel_options, $readonlys, $preserve);
 	}
 
 	/**
@@ -281,28 +281,28 @@ 
 
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['cf_app'] ? $content['cf_app'] : false));
-		if(!$this->appname)
+		if (!$this->appname)
 		{
-			if($cf_id && $this->so)
+			if ($cf_id && $this->so)
 			{
 				$content = $this->so->read($cf_id);
 				$this->appname = $content['cf_app'];
 			}
 		}
-		if(!$this->appname)
+		if (!$this->appname)
 		{
 			die(lang('Error! No appname found'));
 		}
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
 		// Read fields, constructor doesn't always know appname
-		$this->fields = Api\Storage\Customfields::get($this->appname,true);
+		$this->fields = Api\Storage\Customfields::get($this->appname, true);
 
 		// Update based on info returned from template
 		if (is_array($content))
 		{
 			list($action) = @each($content['button']);
-			switch($action)
+			switch ($action)
 			{
 				case 'delete':
 					$this->so->delete($cf_id);
@@ -311,46 +311,46 @@ 
 					break;
 				case 'save':
 				case 'apply':
-					if(!$cf_id && $this->fields[$content['cf_name']])
+					if (!$cf_id && $this->fields[$content['cf_name']])
 					{
-						Framework::message(lang("Field '%1' already exists !!!",$content['cf_name']),'error');
+						Framework::message(lang("Field '%1' already exists !!!", $content['cf_name']), 'error');
 						$content['cf_name'] = '';
 						break;
 					}
-					if(empty($content['cf_label']))
+					if (empty($content['cf_label']))
 					{
 						$content['cf_label'] = $content['cf_name'];
 					}
 					if (!empty($content['cf_values']))
 					{
 						$values = array();
-						if($content['cf_values'][0] === '@')
+						if ($content['cf_values'][0] === '@')
 						{
-							$values['@'] = substr($content['cf_values'], $content['cf_values'][1] === '=' ? 2:1);
+							$values['@'] = substr($content['cf_values'], $content['cf_values'][1] === '=' ? 2 : 1);
 						}
 						else
 						{
-							foreach(explode("\n",trim($content['cf_values'])) as $line)
+							foreach (explode("\n", trim($content['cf_values'])) as $line)
 							{
-								list($var_raw,$value) = explode('=',trim($line),2);
+								list($var_raw, $value) = explode('=', trim($line), 2);
 								$var = trim($var_raw);
-								$values[$var] = trim($value)==='' ? $var : $value;
+								$values[$var] = trim($value) === '' ? $var : $value;
 							}
 						}
 						$content['cf_values'] = $values;
 					}
 					$update_content = array();
-					foreach($content as $key => $value)
+					foreach ($content as $key => $value)
 					{
-						if(substr($key,0,3) == 'cf_')
+						if (substr($key, 0, 3) == 'cf_')
 						{
-							$update_content[substr($key,3)] = $value;
+							$update_content[substr($key, 3)] = $value;
 						}
 					}
 					Api\Storage\Customfields::update($update_content);
-					if(!$cf_id)
+					if (!$cf_id)
 					{
-						$this->fields = Api\Storage\Customfields::get($this->appname,true);
+						$this->fields = Api\Storage\Customfields::get($this->appname, true);
 						$cf_id = (int)$this->fields[$content['cf_name']]['id'];
 					}
 					Framework::refresh_opener('Saved', 'admin', $cf_id, 'edit');
@@ -371,30 +371,30 @@ 
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if ($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
 
 		$this->tmpl = new Etemplate();
 		$this->tmpl->read('admin.customfield_edit');
 
-		Api\Translation::add_app('infolog');	// til we move the translations
+		Api\Translation::add_app('infolog'); // til we move the translations
 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
 		$sel_options = array();
 		$readonlys = array();
 
 		//echo 'customfields=<pre style="text-align: left;">'; print_r($this->fields); echo "</pre>\n";
-		$content['cf_order'] = (count($this->fields)+1) * 10;
+		$content['cf_order'] = (count($this->fields) + 1) * 10;
 		$content['use_private'] = $this->use_private;
 
-		if($cf_id)
+		if ($cf_id)
 		{
 			$content = array_merge($content, $this->so->read($cf_id));
 			$this->appname = $content['cf_app'];
-			if($content['cf_private'])
+			if ($content['cf_private'])
 			{
-				$content['cf_private'] = explode(',',$content['cf_private']);
+				$content['cf_private'] = explode(',', $content['cf_private']);
 			}
-			if($content['cf_name'])
+			if ($content['cf_name'])
 			{
 				$readonlys['cf_name'] = true;
 			}
@@ -407,7 +407,7 @@ 
 		if (is_array($content['cf_values']))
 		{
 			$values = '';
-			foreach($content['cf_values'] as $var => $value)
+			foreach ($content['cf_values'] as $var => $value)
 			{
 				$values .= (!empty($values) ? "\n" : '').$var.'='.$value;
 			}
@@ -415,18 +415,18 @@ 
 		}
 
 		// Show sub-type row, and get types
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			if(count($this->content_types) == 0)
+			if (count($this->content_types) == 0)
 			{
 				$this->content_types = Api\Config::get_content_types($this->appname);
 			}
-			if (count($this->content_types)==0)
+			if (count($this->content_types) == 0)
 			{
 				// if you define your default types of your app with the search_link hook, they are available here, if no types were found
-				$this->content_types = (array)egw_link::get_registry($this->appname,'default_types');
+				$this->content_types = (array)egw_link::get_registry($this->appname, 'default_types');
 			}
-			foreach($this->content_types as $type => $entry)
+			foreach ($this->content_types as $type => $entry)
 			{
 				$this->types2[$type] = is_array($entry) ? $entry['name'] : $entry;
 			}
@@ -438,19 +438,19 @@ 
 		}
 
 		// Include type-specific value help
-		foreach(self::$type_option_help as $key => $value)
+		foreach (self::$type_option_help as $key => $value)
 		{
 			$content['options'][$key] = lang($value);
 		}
 		$content['statustext'] = $content['options'][$content['cf_type']];
 		$content['attributes'] = self::$type_attribute_flags;
 
-		$this->tmpl->exec('admin.customfields.edit',$content,$sel_options,$readonlys,array(
+		$this->tmpl->exec('admin.customfields.edit', $content, $sel_options, $readonlys, array(
 			'cf_id' => $cf_id,
 			'cf_app' => $this->appname,
 			'cf_name' => $content['cf_name'],
 			'use_private' => $this->use_private,
-		),2);
+		), 2);
 	}
 
 	/**
@@ -459,7 +459,7 @@ 
 	 */
 	protected function app_index(&$content, &$sel_options, &$readonlys)
 	{
-		unset($content, $sel_options, $readonlys);	// not used, as this is a stub
+		unset($content, $sel_options, $readonlys); // not used, as this is a stub
 		// This is just a stub.
 	}
 
@@ -479,7 +479,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=admin.customfields.edit&cf_id=$id&use_private='.$this->use_private,
 				'popup' => '500x380',
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'th',
 			),
 			'add' => array(
@@ -529,17 +529,16 @@ 
 	*/
 	function create_field(&$content)
 	{
-		$new_name = trim($content['fields'][count($content['fields'])-1]['name']);
+		$new_name = trim($content['fields'][count($content['fields']) - 1]['name']);
 		if (empty($new_name) || isset($this->fields[$new_name]))
 		{
 			$content['error_msg'] .= empty($new_name) ?
-				lang('You have to enter a name, to create a new field!!!') :
-				lang("Field '%1' already exists !!!",$new_name);
+				lang('You have to enter a name, to create a new field!!!') : lang("Field '%1' already exists !!!", $new_name);
 		}
 		else
 		{
-			$this->fields[$new_name] = $content['fields'][count($content['fields'])-1];
-			if(!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			$this->fields[$new_name] = $content['fields'][count($content['fields']) - 1];
+			if (!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
 			$this->save_repository();
 		}
 	}
@@ -556,20 +555,20 @@ 
 		$new_type = false;
 		if (empty($new_name))
 		{
-			$this->tmpl->set_validation_error('content_types[name]','You have to enter a name, to create a new type!!!');
+			$this->tmpl->set_validation_error('content_types[name]', 'You have to enter a name, to create a new type!!!');
 		}
 		else
 		{
-			foreach($this->content_types as $type)
+			foreach ($this->content_types as $type)
 			{
-				if($type['name'] == $new_name)
+				if ($type['name'] == $new_name)
 				{
-					$this->tmpl->set_validation_error('content_types[name]',lang("type '%1' already exists !!!",$new_name));
+					$this->tmpl->set_validation_error('content_types[name]', lang("type '%1' already exists !!!", $new_name));
 					return false;
 				}
 			}
 			// search free type character
-			for($i=97;$i<=122;$i++)
+			for ($i = 97; $i <= 122; $i++)
 			{
 				if (!$this->content_types[chr($i)] &&
 					// skip letter of deleted type for addressbook content-types, as it gives SQL error
@@ -594,7 +593,7 @@ 
 		//echo '<p>uicustomfields::save_repository() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
 		$config = new Api\Config($this->appname);
 		$config->read_repository();
-		$config->value('types',$this->content_types);
+		$config->value('types', $this->content_types);
 		$config->save_repository();
 
 		Api\Storage\Customfields::save($this->appname, $this->fields);
@@ -608,9 +607,9 @@ 
 	* @param boolean $all_private_too =false should all the private fields be returned too
 	* @return array with customfields
 	*/
-	function get_customfields($all_private_too=false)
+	function get_customfields($all_private_too = false)
 	{
-		return Api\Storage\Customfields::get($this->appname,$all_private_too);
+		return Api\Storage\Customfields::get($this->appname, $all_private_too);
 	}
 
 	/**
@@ -636,13 +635,13 @@ 
 		$total = $this->so->get_rows($query, $rows, $readonlys);
 		unset($query['col_filter']['cf_app']);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			$row['cf_values'] = json_decode($row['cf_values'], true);
 			if (is_array($row['cf_values']))
 			{
 				$values = '';
-				foreach($row['cf_values'] as $var => $value)
+				foreach ($row['cf_values'] as $var => $value)
 				{
 					$values .= (!empty($values) ? "\n" : '').$var.'='.$value;
 				}

Braces +16 added lines, -4 removed lines

@@ -120,7 +120,10 @@ 
 	{
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['appname'] ? $content['appname'] : false));
-		if(!$this->appname) die(lang('Error! No appname found'));
+		if(!$this->appname)
+		{
+			die(lang('Error! No appname found'));
+		}
 
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
@@ -132,7 +135,10 @@ 
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if($test->read($this->appname.'.admin.types'))
+		{
+			$this->manage_content_types = true;
+		}
 
 		// Handle incoming - types, options, etc.
 		if($this->manage_content_types)
@@ -371,7 +377,10 @@ 
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if($test->read($this->appname.'.admin.types'))
+		{
+			$this->manage_content_types = true;
+		}
 
 		$this->tmpl = new Etemplate();
 		$this->tmpl->read('admin.customfield_edit');
@@ -539,7 +548,10 @@ 
 		else
 		{
 			$this->fields[$new_name] = $content['fields'][count($content['fields'])-1];
-			if(!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			if(!$this->fields[$new_name]['label'])
+			{
+				$this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			}
 			$this->save_repository();
 		}
 	}

api/src/Accounts.php

Doc Comments +4 added lines, -5 removed lines

@@ -360,7 +360,7 @@ 
 	 * All key of the returned array use the 'account_' prefix.
 	 * For backward compatibility some values are additionaly availible without the prefix, using them is depricated!
 	 *
-	 * @param int|string $id numeric account_id or string with account_lid (use of default value of 0 is depricated!!!)
+	 * @param integer $id numeric account_id or string with account_lid (use of default value of 0 is depricated!!!)
 	 * @param boolean $set_depricated_names =false set _additionaly_ the depricated keys without 'account_' prefix
 	 * @return array/boolean array with account data (keys: account_id, account_lid, ...) or false if account not found
 	 */
@@ -400,7 +400,7 @@ 
 	 * - 'account_firstname','account_lastname','account_email','account_fullname','account_phone'
 	 *
 	 * @param int|string $id
-	 * @return string|boolean json or false if not found
+	 * @return string json or false if not found
 	 */
 	function json($id)
 	{
@@ -791,7 +791,7 @@ 
 	 * Not all existing accounts are visible because off account_selection preference: 'none' or 'groupmembers'
 	 *
 	 * @param int|string $account_id nummeric account_id or account_lid
-	 * @return boolean true = account is visible, false = account not visible, null = account does not exist
+	 * @return null|boolean true = account is visible, false = account not visible, null = account does not exist
 	 */
 	function visible($account_id)
 	{
@@ -986,7 +986,6 @@ 
 	 *
 	 * @param string $account_lid
 	 * @param string $passwd
-	 * @param array $GLOBALS['auto_create_acct'] values for 'firstname', 'lastname', 'email' and 'primary_group'
 	 * @return int|boolean account_id or false on error
 	 */
 	function auto_add($account_lid, $passwd)
@@ -1106,7 +1105,7 @@ 
 	 *
 	 * We use now an instance-wide read-cache storing account-data and members(hips).
 	 *
-	 * @param int|array $account_ids user- or group-id(s) for which cache should be invalidated, default 0 = only search/name2id cache
+	 * @param integer $account_ids user- or group-id(s) for which cache should be invalidated, default 0 = only search/name2id cache
 	 */
 	static function cache_invalidate($account_ids=0)
 	{

Spacing +101 added lines, -102 removed lines

@@ -57,8 +57,8 @@ 
 	 *
 	 * @var array
 	 */
-	var $depricated_names = array('firstname','lastname','fullname','email','type',
-		'status','expires','lastlogin','lastloginfrom','lastpasswd_change');
+	var $depricated_names = array('firstname', 'lastname', 'fullname', 'email', 'type',
+		'status', 'expires', 'lastlogin', 'lastloginfrom', 'lastpasswd_change');
 
 	/**
 	 * List of all config vars accounts depend on and therefore should be passed in when calling contructor with array syntax
@@ -66,11 +66,11 @@ 
 	 * @var array
 	 */
 	static public $config_vars = array(
-		'account_repository', 'auth_type',	// auth_type if fallback if account_repository is not set
-		'install_id',	// instance-specific caching
-		'auto_create_expire', 'default_group_lid',	// auto-creation of accounts
-		'ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter',	// ldap backend
-		'ads_domain', 'ads_host', 'ads_admin_user', 'ads_admin_passwd', 'ads_connection', 'ads_context',	// ads backend
+		'account_repository', 'auth_type', // auth_type if fallback if account_repository is not set
+		'install_id', // instance-specific caching
+		'auto_create_expire', 'default_group_lid', // auto-creation of accounts
+		'ldap_host', 'ldap_root_dn', 'ldap_root_pw', 'ldap_context', 'ldap_group_context', 'ldap_search_filter', // ldap backend
+		'ads_domain', 'ads_host', 'ads_admin_user', 'ads_admin_passwd', 'ads_connection', 'ads_context', // ads backend
 	);
 
 	/**
@@ -135,18 +135,18 @@ 
 	 *
 	 * @param string|array $backend =null string with backend 'sql'|'ldap', or whole config array, default read from global egw_info
 	 */
-	public function __construct($backend=null)
+	public function __construct($backend = null)
 	{
 		if (is_array($backend))
 		{
 			$this->config = $backend;
 			$backend = null;
-			self::$_instance = $this;	// also set instance returned by singleton
-			self::$cache = array();		// and empty our internal (session) cache
+			self::$_instance = $this; // also set instance returned by singleton
+			self::$cache = array(); // and empty our internal (session) cache
 		}
 		else
 		{
-			$this->config =& $GLOBALS['egw_info']['server'];
+			$this->config = & $GLOBALS['egw_info']['server'];
 
 			if (!isset(self::$_instance)) self::$_instance = $this;
 		}
@@ -195,7 +195,7 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__.'('.array2string($param).') '.function_backtrace());
-		if (!isset($param['active'])) $param['active'] = true;	// default is true = only return active accounts
+		if (!isset($param['active'])) $param['active'] = true; // default is true = only return active accounts
 
 		self::setup_cache();
 		$account_search = &self::$cache['account_search'];
@@ -207,8 +207,8 @@ 
 		}
 		// no backend understands $param['app'], only sql understands type owngroups or groupmemember[+memberships]
 		// --> do an full search first and then filter and limit that search
-		elseif($param['app'] || $this->config['account_repository'] != 'sql' &&
-			in_array($param['type'], array('owngroups','groupmembers','groupmembers+memberships')))
+		elseif ($param['app'] || $this->config['account_repository'] != 'sql' &&
+			in_array($param['type'], array('owngroups', 'groupmembers', 'groupmembers+memberships')))
 		{
 			$app = $param['app'];
 			unset($param['app']);
@@ -220,15 +220,15 @@ 
 
 			if ($param['type'] == 'owngroups')
 			{
-				$members = $this->memberships($GLOBALS['egw_info']['user']['account_id'],true);
+				$members = $this->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 				$param['type'] = 'groups';
 			}
-			elseif(in_array($param['type'],array('groupmembers','groupmembers+memberships')))
+			elseif (in_array($param['type'], array('groupmembers', 'groupmembers+memberships')))
 			{
 				$members = array();
-				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $grp)
+				foreach ((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp)
 				{
-					$members = array_unique(array_merge($members, (array)$this->members($grp,true,$param['active'])));
+					$members = array_unique(array_merge($members, (array)$this->members($grp, true, $param['active'])));
 					if ($param['type'] == 'groupmembers+memberships') $members[] = $grp;
 				}
 				$param['type'] = $param['type'] == 'groupmembers+memberships' ? 'both' : 'accounts';
@@ -241,20 +241,20 @@ 
 			if ($app)
 			{
 				// we want the result merged, whatever it takes, as we only care for the ids
-				$valid = $this->split_accounts($app,!in_array($param['type'],array('accounts','groups')) ? 'merge' : $param['type'],$param['active']);
+				$valid = $this->split_accounts($app, !in_array($param['type'], array('accounts', 'groups')) ? 'merge' : $param['type'], $param['active']);
 			}
 			if (isset($members))
 			{
 				//error_log(__METHOD__.'() members='.array2string($members));
 				if (!$members) $members = array();
-				$valid = !$app ? $members : array_intersect($valid,$members);	// use the intersection
+				$valid = !$app ? $members : array_intersect($valid, $members); // use the intersection
 			}
 			//error_log(__METHOD__."() limiting result to app='$app' and/or group=$group valid-ids=".array2string($valid));
 			$n = 0;
 			$account_search[$serial]['data'] = array();
 			foreach ($full_search as $id => $data)
 			{
-				if (!in_array($id,$valid))
+				if (!in_array($id, $valid))
 				{
 					$this->total--;
 					continue;
@@ -274,7 +274,7 @@ 
 			$account_search[$serial]['data'] = $this->backend->search($param);
 			if ($param['type'] !== 'accounts')
 			{
-				foreach($account_search[$serial]['data'] as &$account)
+				foreach ($account_search[$serial]['data'] as &$account)
 				{
 					// add default description for Admins and Default group
 					if ($account['account_type'] === 'g' && empty($account['account_description']))
@@ -303,7 +303,7 @@ 
 		{
 			$options['filter'] = (array)$options['filter'];
 		}
-		switch($GLOBALS['egw_info']['user']['preferences']['common']['account_display'])
+		switch ($GLOBALS['egw_info']['user']['preferences']['common']['account_display'])
 		{
 			case 'firstname':
 			case 'firstall':
@@ -319,7 +319,7 @@ 
 		}
 		$only_own = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] === 'groupmembers' &&
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']);
-		switch($options['account_type'])
+		switch ($options['account_type'])
 		{
 			case 'accounts':
 				$type = $only_own ? 'groupmembers' : 'accounts';
@@ -340,7 +340,7 @@ 
 				break;
 		}
 		$accounts = array();
-		foreach(self::getInstance()->search(array(
+		foreach (self::getInstance()->search(array(
 			'type' => $options['filter']['group'] < 0 ? $options['filter']['group'] : $type,
 			'query' => $pattern,
 			'query_type' => 'all',
@@ -348,7 +348,7 @@ 
 		)) as $account)
 		{
 			$accounts[$account['account_id']] = self::format_username($account['account_lid'],
-				$account['account_firstname'],$account['account_lastname'],$account['account_id']);
+				$account['account_firstname'], $account['account_lastname'], $account['account_id']);
 		}
 		return $accounts;
 	}
@@ -364,7 +364,7 @@ 
 	 * @param boolean $set_depricated_names =false set _additionaly_ the depricated keys without 'account_' prefix
 	 * @return array/boolean array with account data (keys: account_id, account_lid, ...) or false if account not found
 	 */
-	function read($id=0,$set_depricated_names=false)
+	function read($id = 0, $set_depricated_names = false)
 	{
 		if (!$id)	// deprecated use!!!
 		{
@@ -386,9 +386,9 @@ 
 
 		if ($set_depricated_names && $data)
 		{
-			foreach($this->depricated_names as $name)
+			foreach ($this->depricated_names as $name)
 			{
-				$data[$name] =& $data['account_'.$name];
+				$data[$name] = & $data['account_'.$name];
 			}
 		}
 		return $data;
@@ -405,8 +405,8 @@ 
 	function json($id)
 	{
 		static $keys = array(
-			'account_id','account_lid','person_id','account_status',
-			'account_firstname','account_lastname','account_email','account_fullname','account_phone',
+			'account_id', 'account_lid', 'person_id', 'account_status',
+			'account_firstname', 'account_lastname', 'account_email', 'account_fullname', 'account_phone',
 		);
 		if (($account = $this->read($id)))
 		{
@@ -415,9 +415,9 @@ 
 		// for current user, add the apps available to him
 		if ($id == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			foreach((array)$GLOBALS['egw_info']['user']['apps'] as $app => $data)
+			foreach ((array)$GLOBALS['egw_info']['user']['apps'] as $app => $data)
 			{
-				unset($data['table_defs']);	// no need for that on the client
+				unset($data['table_defs']); // no need for that on the client
 				$account['apps'][$app] = $data;
 			}
 		}
@@ -432,7 +432,7 @@ 
 	 * @param $lastname ='' lastname
 	 * @param $accountid =0 id, to check if it's a user or group, otherwise the lid will be used
 	 */
-	static function format_username($lid = '', $firstname = '', $lastname = '', $accountid=0)
+	static function format_username($lid = '', $firstname = '', $lastname = '', $accountid = 0)
 	{
 		if (!$lid && !$firstname && !$lastname)
 		{
@@ -445,7 +445,7 @@ 
 		if (empty($firstname)) $firstname = $lid;
 		if (empty($lastname) || $is_group)
 		{
-			$lastname  = $is_group ? lang('Group') : lang('User');
+			$lastname = $is_group ? lang('Group') : lang('User');
 		}
 		$display = $GLOBALS['egw_info']['user']['preferences']['common']['account_display'];
 
@@ -459,30 +459,30 @@ 
 		}
 
 		$name = '';
-		switch($display)
+		switch ($display)
 		{
 			case 'firstname':
-				$name = $firstname . ' ' . $lastname;
+				$name = $firstname.' '.$lastname;
 				break;
 			case 'lastname':
-				$name = $lastname . $delimiter . $firstname;
+				$name = $lastname.$delimiter.$firstname;
 				break;
 			case 'username':
 				$name = $lid;
 				break;
 			case 'firstall':
-				$name = $firstname . ' ' . $lastname . ' ['.$lid.']';
+				$name = $firstname.' '.$lastname.' ['.$lid.']';
 				break;
 			case 'lastall':
-				$name = $lastname . $delimiter . $firstname . ' ['.$lid.']';
+				$name = $lastname.$delimiter.$firstname.' ['.$lid.']';
 				break;
 			case 'allfirst':
-				$name = '['.$lid.'] ' . $firstname . ' ' . $lastname;
+				$name = '['.$lid.'] '.$firstname.' '.$lastname;
 				break;
 			case 'all':
 				/* fall through */
 			default:
-				$name = '['.$lid.'] ' . $lastname . $delimiter . $firstname;
+				$name = '['.$lid.'] '.$lastname.$delimiter.$firstname;
 		}
 		return $name;
 	}
@@ -493,14 +493,14 @@ 
 	 * @param string $account_id =null account id
 	 * @return string full name of user or "#$accountid" if user not found
 	 */
-	static function username($account_id=null)
+	static function username($account_id = null)
 	{
 		if ($account_id && !($account = self::cache_read((int)$account_id)))
 		{
 			return '#'.$account_id;
 		}
 		return self::format_username($account['account_lid'],
-			$account['account_firstname'] , $account['account_lastname'], $account_id);
+			$account['account_firstname'], $account['account_lastname'], $account_id);
 	}
 
 	/**
@@ -514,9 +514,9 @@ 
 	 * @param string $domain =null domain-name or null to use eGW's default domain $GLOBALS['egw_info']['server']['mail_suffix]
 	 * @return string with email address
 	 */
-	static function email($first,$last,$account,$domain=null)
+	static function email($first, $last, $account, $domain = null)
 	{
-		foreach (array('first','last','account') as $name)
+		foreach (array('first', 'last', 'account') as $name)
 		{
 			$$name = Translation::to_ascii($$name);
 		}
@@ -537,8 +537,8 @@ 
 		}
 		if (!$domain) $domain = $GLOBALS['egw_info']['server']['mail_suffix'];
 
-		$email = str_replace(array('first','last','initial','account','dot','underscore','-'),
-			array($first,$last,substr($first,0,1),$account,$dot,$underscore,''),
+		$email = str_replace(array('first', 'last', 'initial', 'account', 'dot', 'underscore', '-'),
+			array($first, $last, substr($first, 0, 1), $account, $dot, $underscore, ''),
 			$GLOBALS['egw_info']['server']['email_address_format'] ? $GLOBALS['egw_info']['server']['email_address_format'] : 'first-dot-last').
 			($domain ? '@'.$domain : '');
 		//echo " = '$email'</p>\n";
@@ -552,7 +552,7 @@ 
 	 */
 	protected static function add_default_group_description(array &$data)
 	{
-		switch($data['account_lid'])
+		switch ($data['account_lid'])
 		{
 			case 'Default':
 				$data['account_description'] = lang('EGroupware all users group, do NOT delete');
@@ -575,15 +575,15 @@ 
 	 * @param boolean $check_depricated_names =false check _additionaly_ the depricated keys without 'account_' prefix
 	 * @return int|boolean the account_id or false on error
 	 */
-	function save(&$data,$check_depricated_names=false)
+	function save(&$data, $check_depricated_names = false)
 	{
 		if ($check_depricated_names)
 		{
-			foreach($this->depricated_names as $name)
+			foreach ($this->depricated_names as $name)
 			{
 				if (isset($data[$name]) && !isset($data['account_'.$name]))
 				{
-					$data['account_'.$name] =& $data[$name];
+					$data['account_'.$name] = & $data[$name];
 				}
 			}
 		}
@@ -596,7 +596,7 @@ 
 		{
 			// if we are not on a pure LDAP system, we have to write the account-date via the contacts class now
 			if (($this->config['account_repository'] == 'sql' || $this->config['contact_repository'] == 'sql-ldap') &&
-				(!($old = $this->read($data['account_id'])) ||	// only for new account or changed contact-data
+				(!($old = $this->read($data['account_id'])) || // only for new account or changed contact-data
 				$old['account_firstname'] != $data['account_firstname'] ||
 				$old['account_lastname'] != $data['account_lastname'] ||
 				$old['account_email'] != $data['account_email']))
@@ -611,14 +611,14 @@ 
 					'id'         => $data['person_id'],
 					'owner'      => 0,
 				);
-				$GLOBALS['egw']->contacts->save($contact,true);		// true = ignore addressbook acl
+				$GLOBALS['egw']->contacts->save($contact, true); // true = ignore addressbook acl
 			}
 			// save primary group if necessary
-			if ($data['account_primary_group'] && (!($memberships = $this->memberships($id,true)) ||
-				!in_array($data['account_primary_group'],$memberships)))
+			if ($data['account_primary_group'] && (!($memberships = $this->memberships($id, true)) ||
+				!in_array($data['account_primary_group'], $memberships)))
 			{
 				$memberships[] = $data['account_primary_group'];
-				$this->set_memberships($memberships, $id);	// invalidates cache for account_id and primary group
+				$this->set_memberships($memberships, $id); // invalidates cache for account_id and primary group
 			}
 		}
 		// as some backends set (group-)members in save, we need to invalidate their members too!
@@ -674,9 +674,9 @@ 
 	 * @param array $data =null array with account data, not specifying the account is depricated!!!
 	 * @return boolean true=expired (no more login possible), false otherwise
 	 */
-	function is_expired($data=null)
+	function is_expired($data = null)
 	{
-		if (is_null($data)) $data = $this->data;	// depricated use
+		if (is_null($data)) $data = $this->data; // depricated use
 
 		$expires = isset($data['account_expires']) ? $data['account_expires'] : $data['expires'];
 
@@ -710,10 +710,10 @@ 
 	 * @param string $account_type =null u = user or g = group, or default null = try both
 	 * @return int|false numeric account_id or false on error ($name not found)
 	 */
-	function name2id($name,$which='account_lid',$account_type=null)
+	function name2id($name, $which = 'account_lid', $account_type = null)
 	{
 		// Don't bother searching for empty or non-scalar account_lid
-		if(empty($name) || !is_scalar($name))
+		if (empty($name) || !is_scalar($name))
 		{
 			return False;
 		}
@@ -721,12 +721,12 @@ 
 		self::setup_cache();
 		$name_list = &self::$cache['name_list'];
 
-		if(@isset($name_list[$which][$name]) && $name_list[$which][$name])
+		if (@isset($name_list[$which][$name]) && $name_list[$which][$name])
 		{
 			return $name_list[$which][$name];
 		}
 
-		return $name_list[$which][$name] = $this->backend->name2id($name,$which,$account_type);
+		return $name_list[$which][$name] = $this->backend->name2id($name, $which, $account_type);
 	}
 
 	/**
@@ -738,7 +738,7 @@ 
 	 * @param string $which ='account_lid' type to convert to: account_lid (default), account_email, ...
 	 * @return string|boolean converted value or false on error ($account_id not found)
 	 */
-	static function id2name($account_id, $which='account_lid')
+	static function id2name($account_id, $which = 'account_lid')
 	{
 		if (!is_numeric($account_id) && !($account_id = self::getInstance()->name2id($account_id)))
 		{
@@ -810,13 +810,13 @@ 
 				$account_lid != $GLOBALS['egw_info']['user']['account_lid'] ||
 			// only allow group-members for account-selection is groupmembers
 			$GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
-				!array_intersect((array)$this->memberships($account_id,true),
-					(array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true))))
+				!array_intersect((array)$this->memberships($account_id, true),
+					(array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true))))
 		{
 			//error_log(__METHOD__."($account_id='$account_lid') returning FALSE");
-			return false;	// user is not allowed to see given account
+			return false; // user is not allowed to see given account
 		}
-		return true;	// user allowed to see given account
+		return true; // user allowed to see given account
 	}
 
 	/**
@@ -826,11 +826,11 @@ 
 	 * @param boolean $just_id =false return just account_id's or account_id => account_lid pairs
 	 * @return array with account_id's ($just_id) or account_id => account_lid pairs (!$just_id)
 	 */
-	function memberships($account_id, $just_id=false)
+	function memberships($account_id, $just_id = false)
 	{
 		if (!is_int($account_id) && !is_numeric($account_id))
 		{
-			$account_id = $this->name2id($account_id,'account_lid','u');
+			$account_id = $this->name2id($account_id, 'account_lid', 'u');
 		}
 		if ($account_id && ($data = self::cache_read($account_id)))
 		{
@@ -846,7 +846,7 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id uidnumber
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		if (!is_int($account_id) && !is_numeric($account_id))
 		{
@@ -874,7 +874,7 @@ 
 	 * @param boolean $active =false true: return only active (not expired or deactived) members, false: return all accounts
 	 * @return array with account_id ($just_id) or account_id => account_lid pairs (!$just_id)
 	 */
-	function members($account_id, $just_id=false, $active=true)
+	function members($account_id, $just_id = false, $active = true)
 	{
 		if (!is_int($account_id) && !is_numeric($account_id))
 		{
@@ -895,7 +895,7 @@ 
 	 * @param array $members array with uidnumber or uid's
 	 * @param int $gid gidnumber of group to set
 	 */
-	function set_members($members,$gid)
+	function set_members($members, $gid)
 	{
 		if (($old_members = $this->members($gid, true, false)) != $members)
 		{
@@ -919,7 +919,7 @@ 
 	 * @param boolean $active =false true: return only active (not expired or deactived) members, false: return all accounts
 	 * @return array/boolean see $use, false on error (wront $use)
 	 */
-	function split_accounts($app_users,$use='both',$active=true)
+	function split_accounts($app_users, $use = 'both', $active = true)
 	{
 		if (!is_array($app_users))
 		{
@@ -930,21 +930,21 @@ 
 			{
 				return $cache;
 			}
-			$app_users = $GLOBALS['egw']->acl->get_ids_for_location('run',1,$app_users);
+			$app_users = $GLOBALS['egw']->acl->get_ids_for_location('run', 1, $app_users);
 		}
 		$accounts = array(
 			'accounts' => array(),
 			'groups' => array(),
 		);
-		foreach($app_users as $id)
+		foreach ($app_users as $id)
 		{
 			$type = $this->get_type($id);
-			if($type == 'g')
+			if ($type == 'g')
 			{
 				$accounts['groups'][$id] = $id;
 				if ($use != 'groups')
 				{
-					foreach((array)$this->members($id, true, $active) as $id)
+					foreach ((array)$this->members($id, true, $active) as $id)
 					{
 						$accounts['accounts'][$id] = $id;
 					}
@@ -965,7 +965,7 @@ 
 			$cache = $accounts;
 		}
 
-		switch($use)
+		switch ($use)
 		{
 			case 'both':
 				return $accounts;
@@ -974,7 +974,7 @@ 
 			case 'accounts':
 				return $accounts['accounts'];
 			case 'merge':
-				return array_merge($accounts['accounts'],$accounts['groups']);
+				return array_merge($accounts['accounts'], $accounts['groups']);
 		}
 		return False;
 	}
@@ -992,21 +992,20 @@ 
 	function auto_add($account_lid, $passwd)
 	{
 		$expires = !isset($this->config['auto_create_expire']) ||
-			$this->config['auto_create_expire'] == 'never' ? -1 :
-			time() + $this->config['auto_create_expire'] + 2;
+			$this->config['auto_create_expire'] == 'never' ? -1 : time() + $this->config['auto_create_expire'] + 2;
 
 		$memberships = array();
 		$default_group_id = null;
 		// check if we have a comma or semicolon delimited list of groups --> add first as primary and rest as memberships
-		foreach(preg_split('/[,;] */',$this->config['default_group_lid']) as $group_lid)
+		foreach (preg_split('/[,;] */', $this->config['default_group_lid']) as $group_lid)
 		{
-			if (($group_id = $this->name2id($group_lid,'account_lid','g')))
+			if (($group_id = $this->name2id($group_lid, 'account_lid', 'g')))
 			{
 				if (!$default_group_id) $default_group_id = $group_id;
 				$memberships[] = $group_id;
 			}
 		}
-		if (!$default_group_id && ($default_group_id = $this->name2id('Default','account_lid','g')))
+		if (!$default_group_id && ($default_group_id = $this->name2id('Default', 'account_lid', 'g')))
 		{
 			$memberships[] = $default_group_id;
 		}
@@ -1043,25 +1042,25 @@ 
 		// set memberships if given
 		if ($memberships)
 		{
-			$this->set_memberships($memberships,$data['account_id']);
+			$this->set_memberships($memberships, $data['account_id']);
 		}
 		// set the appropriate value for the can change password flag (assume users can, if the admin requires users to change their password)
 		$data['changepassword'] = (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'];
-		if(!$data['changepassword'])
+		if (!$data['changepassword'])
 		{
-			$GLOBALS['egw']->acl->add_repository('preferences','nopasswordchange',$data['account_id'],1);
+			$GLOBALS['egw']->acl->add_repository('preferences', 'nopasswordchange', $data['account_id'], 1);
 		}
 		else
 		{
-			$GLOBALS['egw']->acl->delete_repository('preferences','nopasswordchange',$data['account_id']);
+			$GLOBALS['egw']->acl->delete_repository('preferences', 'nopasswordchange', $data['account_id']);
 		}
 		// call hook to notify interested apps about the new account
 		$GLOBALS['hook_values'] = $data;
-		Hooks::process($data+array(
+		Hooks::process($data + array(
 			'location' => 'addaccount',
 			// at login-time only the hooks from the following apps will be called
-			'order' => array('felamimail','fudforum'),
-		),False,True);  // called for every app now, not only enabled ones
+			'order' => array('felamimail', 'fudforum'),
+		), False, True); // called for every app now, not only enabled ones
 		unset($data['changepassword']);
 
 		return $data['account_id'];
@@ -1108,14 +1107,14 @@ 
 	 *
 	 * @param int|array $account_ids user- or group-id(s) for which cache should be invalidated, default 0 = only search/name2id cache
 	 */
-	static function cache_invalidate($account_ids=0)
+	static function cache_invalidate($account_ids = 0)
 	{
 		//error_log(__METHOD__.'('.array2string($account_ids).')');
 
 		// instance-wide cache
 		if ($account_ids)
 		{
-			foreach((array)$account_ids as $account_id)
+			foreach ((array)$account_ids as $account_id)
 			{
 				$instance = self::getInstance();
 
@@ -1127,11 +1126,11 @@ 
 
 		// session-cache
 		if (self::$cache) self::$cache = array();
-		Cache::unsetSession('accounts_cache','phpgwapi');
+		Cache::unsetSession('accounts_cache', 'phpgwapi');
 
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
-			Egw::invalidate_session_cache();	// invalidates whole egw-enviroment if stored in the session
+			Egw::invalidate_session_cache(); // invalidates whole egw-enviroment if stored in the session
 		}
 	}
 
@@ -1155,11 +1154,11 @@ 
 	 * @return array
 	 * @throws Exception\WrongParameter if no integer was passed as $account_id
 	 */
-	static function cache_read($account_id, $need_active=false)
+	static function cache_read($account_id, $need_active = false)
 	{
 		if (!is_numeric($account_id)) throw new Exception\WrongParameter('Not an integer!');
 
-		$account =& self::$request_cache[$account_id];
+		$account = & self::$request_cache[$account_id];
 
 		if (!isset($account))	// not in request cache --> try instance cache
 		{
@@ -1190,7 +1189,7 @@ 
 		{
 			$instance = self::getInstance();
 			$account['members-active'] = array();
-			foreach((array)$account['members'] as $id => $lid)
+			foreach ((array)$account['members'] as $id => $lid)
 			{
 				if ($instance->is_active($id)) $account['members-active'][$id] = $lid;
 			}
@@ -1216,11 +1215,11 @@ 
 	 */
 	private static function setup_cache()
 	{
-		if (is_array(self::$cache)) return;	// cache is already setup
+		if (is_array(self::$cache)) return; // cache is already setup
 
 		if (self::$use_session_cache && is_object($GLOBALS['egw']->session))
 		{
-			self::$cache =& Cache::getSession('accounts_cache','phpgwapi');
+			self::$cache = & Cache::getSession('accounts_cache', 'phpgwapi');
 		}
 		//error_log(__METHOD__."() use_session_cache=".array2string(self::$use_session_cache).", is_array(self::\$cache)=".array2string(is_array(self::$cache)));
 

Braces +117 added lines, -29 removed lines

@@ -148,7 +148,10 @@ 
 		{
 			$this->config =& $GLOBALS['egw_info']['server'];
 
-			if (!isset(self::$_instance)) self::$_instance = $this;
+			if (!isset(self::$_instance))
+			{
+				self::$_instance = $this;
+			}
 		}
 		if (is_null($backend))
 		{
@@ -195,7 +198,11 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__.'('.array2string($param).') '.function_backtrace());
-		if (!isset($param['active'])) $param['active'] = true;	// default is true = only return active accounts
+		if (!isset($param['active']))
+		{
+			$param['active'] = true;
+		}
+		// default is true = only return active accounts
 
 		self::setup_cache();
 		$account_search = &self::$cache['account_search'];
@@ -229,7 +236,10 @@ 
 				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $grp)
 				{
 					$members = array_unique(array_merge($members, (array)$this->members($grp,true,$param['active'])));
-					if ($param['type'] == 'groupmembers+memberships') $members[] = $grp;
+					if ($param['type'] == 'groupmembers+memberships')
+					{
+						$members[] = $grp;
+					}
 				}
 				$param['type'] = $param['type'] == 'groupmembers+memberships' ? 'both' : 'accounts';
 			}
@@ -246,7 +256,10 @@ 
 			if (isset($members))
 			{
 				//error_log(__METHOD__.'() members='.array2string($members));
-				if (!$members) $members = array();
+				if (!$members)
+				{
+					$members = array();
+				}
 				$valid = !$app ? $members : array_intersect($valid,$members);	// use the intersection
 			}
 			//error_log(__METHOD__."() limiting result to app='$app' and/or group=$group valid-ids=".array2string($valid));
@@ -366,15 +379,21 @@ 
 	 */
 	function read($id=0,$set_depricated_names=false)
 	{
-		if (!$id)	// deprecated use!!!
+		if (!$id)
+		{
+			// deprecated use!!!
 		{
 			return $this->data ? $this->data : $this->read_repository();
 		}
+		}
 		if (!is_int($id) && !is_numeric($id))
 		{
 			$id = $this->name2id($id);
 		}
-		if (!$id) return false;
+		if (!$id)
+		{
+			return false;
+		}
 
 		$data = self::cache_read($id);
 
@@ -442,7 +461,10 @@ 
 		}
 		$is_group = $GLOBALS['egw']->accounts->get_type($accountid ? $accountid : $lid) == 'g';
 
-		if (empty($firstname)) $firstname = $lid;
+		if (empty($firstname))
+		{
+			$firstname = $lid;
+		}
 		if (empty($lastname) || $is_group)
 		{
 			$lastname  = $is_group ? lang('Group') : lang('User');
@@ -521,9 +543,12 @@ 
 			$$name = Translation::to_ascii($$name);
 		}
 		//echo " --> ('$first', '$last', '$account')";
-		if (!$first && !$last)	// fallback to the account-name, if real names contain only special chars
+		if (!$first && !$last)
+		{
+			// fallback to the account-name, if real names contain only special chars
 		{
 			$first = '';
+		}
 			$last = $account;
 		}
 		if (!$first || !$last)
@@ -535,7 +560,10 @@ 
 			$dot = '.';
 			$underscore = '_';
 		}
-		if (!$domain) $domain = $GLOBALS['egw_info']['server']['mail_suffix'];
+		if (!$domain)
+		{
+			$domain = $GLOBALS['egw_info']['server']['mail_suffix'];
+		}
 
 		$email = str_replace(array('first','last','initial','account','dot','underscore','-'),
 			array($first,$last,substr($first,0,1),$account,$dot,$underscore,''),
@@ -601,7 +629,10 @@ 
 				$old['account_lastname'] != $data['account_lastname'] ||
 				$old['account_email'] != $data['account_email']))
 			{
-				if (!$data['person_id']) $data['person_id'] = $old['person_id'];
+				if (!$data['person_id'])
+				{
+					$data['person_id'] = $old['person_id'];
+				}
 
 				$contact = array(
 					'n_given'    => $data['account_firstname'],
@@ -641,7 +672,10 @@ 
 		{
 			$id = $this->name2id($id);
 		}
-		if (!$id) return false;
+		if (!$id)
+		{
+			return false;
+		}
 
 		if ($this->get_type($id) == 'u')
 		{
@@ -676,7 +710,11 @@ 
 	 */
 	function is_expired($data=null)
 	{
-		if (is_null($data)) $data = $this->data;	// depricated use
+		if (is_null($data))
+		{
+			$data = $this->data;
+		}
+		// depricated use
 
 		$expires = isset($data['account_expires']) ? $data['account_expires'] : $data['expires'];
 
@@ -693,7 +731,10 @@ 
 	 */
 	function is_active($data)
 	{
-		if (!is_array($data)) $data = $this->read($data);
+		if (!is_array($data))
+		{
+			$data = $this->read($data);
+		}
 
 		return $data && !(self::is_expired($data) || $data['account_status'] != 'A');
 	}
@@ -745,7 +786,10 @@ 
 			return false;
 		}
 		try {
-			if (!($data = self::cache_read($account_id))) return false;
+			if (!($data = self::cache_read($account_id)))
+			{
+				return false;
+			}
 		}
 		catch (Exception $e) {
 			unset($e);
@@ -795,14 +839,23 @@ 
 	 */
 	function visible($account_id)
 	{
-		if (!is_numeric($account_id))	// account_lid given
+		if (!is_numeric($account_id))
+		{
+			// account_lid given
 		{
 			$account_lid = $account_id;
-			if (!($account_id = $this->name2id($account_lid))) return null;
+		}
+			if (!($account_id = $this->name2id($account_lid)))
+			{
+				return null;
+			}
 		}
 		else
 		{
-			if (!($account_lid = $this->id2name($account_id))) return null;
+			if (!($account_lid = $this->id2name($account_id)))
+			{
+				return null;
+			}
 		}
 		if (!isset($GLOBALS['egw_info']['user']['apps']['admin']) &&
 			// do NOT allow other user, if account-selection is none
@@ -856,7 +909,10 @@ 
 		{
 			$this->backend->set_memberships($groups, $account_id);
 
-			if (!$old_memberships) $old_memberships = array();
+			if (!$old_memberships)
+			{
+				$old_memberships = array();
+			}
 			self::cache_invalidate(array_unique(array_merge(
 				array($account_id),
 				array_diff($old_memberships, $groups),
@@ -1002,7 +1058,10 @@ 
 		{
 			if (($group_id = $this->name2id($group_lid,'account_lid','g')))
 			{
-				if (!$default_group_id) $default_group_id = $group_id;
+				if (!$default_group_id)
+				{
+					$default_group_id = $group_id;
+				}
 				$memberships[] = $group_id;
 			}
 		}
@@ -1087,7 +1146,10 @@ 
 	function change_account_lid_allowed()
 	{
 		$change_account_lid = constant(get_class($this->backend).'::CHANGE_ACCOUNT_LID');
-		if (!isset($change_account_lid)) $change_account_lid = true;
+		if (!isset($change_account_lid))
+		{
+			$change_account_lid = true;
+		}
 		return $change_account_lid;
 	}
 
@@ -1126,12 +1188,19 @@ 
 		}
 
 		// session-cache
-		if (self::$cache) self::$cache = array();
+		if (self::$cache)
+		{
+			self::$cache = array();
+		}
 		Cache::unsetSession('accounts_cache','phpgwapi');
 
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
 		{
-			Egw::invalidate_session_cache();	// invalidates whole egw-enviroment if stored in the session
+			// egw object in setup is limited
+		{
+			Egw::invalidate_session_cache();
+		}
+		// invalidates whole egw-enviroment if stored in the session
 		}
 	}
 
@@ -1157,27 +1226,39 @@ 
 	 */
 	static function cache_read($account_id, $need_active=false)
 	{
-		if (!is_numeric($account_id)) throw new Exception\WrongParameter('Not an integer!');
+		if (!is_numeric($account_id))
+		{
+			throw new Exception\WrongParameter('Not an integer!');
+		}
 
 		$account =& self::$request_cache[$account_id];
 
-		if (!isset($account))	// not in request cache --> try instance cache
+		if (!isset($account))
+		{
+			// not in request cache --> try instance cache
 		{
 			$instance = self::getInstance();
+		}
 
 			$account = Cache::getCache($instance->config['install_id'], __CLASS__, 'account-'.$account_id);
 
-			if (!isset($account))	// not in instance cache --> read from backend
+			if (!isset($account))
+			{
+				// not in instance cache --> read from backend
 			{
 				if (($account = $instance->backend->read($account_id)))
 				{
 					if ($instance->get_type($account_id) == 'u')
 					{
 						if (!isset($account['memberships'])) $account['memberships'] = $instance->backend->memberships($account_id);
+			}
 					}
 					else
 					{
-						if (!isset($account['members'])) $account['members'] = $instance->backend->members($account_id);
+						if (!isset($account['members']))
+						{
+							$account['members'] = $instance->backend->members($account_id);
+						}
 					}
 					Cache::setCache($instance->config['install_id'], __CLASS__, 'account-'.$account_id, $account, self::READ_CACHE_TIMEOUT);
 				}
@@ -1192,7 +1273,10 @@ 
 			$account['members-active'] = array();
 			foreach((array)$account['members'] as $id => $lid)
 			{
-				if ($instance->is_active($id)) $account['members-active'][$id] = $lid;
+				if ($instance->is_active($id))
+				{
+					$account['members-active'][$id] = $lid;
+				}
 			}
 			Cache::setCache($instance->config['install_id'], __CLASS__, 'account-'.$account_id, $account, self::READ_CACHE_TIMEOUT);
 		}
@@ -1216,7 +1300,11 @@ 
 	 */
 	private static function setup_cache()
 	{
-		if (is_array(self::$cache)) return;	// cache is already setup
+		if (is_array(self::$cache))
+		{
+			return;
+		}
+		// cache is already setup
 
 		if (self::$use_session_cache && is_object($GLOBALS['egw']->session))
 		{

api/src/Accounts/Ads.php

Doc Comments +5 added lines, -5 removed lines

@@ -129,7 +129,7 @@ 
 	/**
 	 * Factory method and singelton to get adLDAP object for given configuration or default server config
 	 *
-	 * @param array $config=null values for keys 'ads_domain', 'ads_host' (required) and optional 'ads_admin_user', 'ads_admin_passwd', 'ads_connection'
+	 * @param array $config values for keys 'ads_domain', 'ads_host' (required) and optional 'ads_admin_user', 'ads_admin_passwd', 'ads_connection'
 	 * @return adLDAP
 	 * @throws adLDAPException
 	 */
@@ -1138,7 +1138,7 @@ 
 	 *
 	 * @param int $_account_id
 	 * @param string $ip
-	 * @return int lastlogin time
+	 * @return boolean lastlogin time
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
@@ -1335,7 +1335,7 @@ 
 	 * - activate user
 	 *
 	 * @param array $attributes The attributes to set to the user account
-	 * @return bool
+	 * @return string|boolean
 	 */
 	public function create($attributes)
 	{
@@ -1525,7 +1525,7 @@ 
     * @param string $username The username to query
     * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
     * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return bool
+    * @return string|boolean
     */
     public function modify($username, $attributes, $isGUID = false)
     {
@@ -1590,7 +1590,7 @@ 
 	 * Extended to allow to specify $attribute["container"] as string, because array hardcodes "OU=", while Samba4 and win2008r2 uses "CN=Users"
 	 *
 	 * @param array $attributes Default attributes of the group
-	 * @return bool
+	 * @return string|boolean
 	 */
 	public function create($attributes)
 	{

Indentation +174 added lines, -174 removed lines

@@ -807,11 +807,11 @@ 
 	}
 
 	/**
-	* Add seconds between 1601-01-01 and 1970-01-01 and multiply by 10000000
-	*
-	* @param long $unixTime
-	* @return long windowsTime
-	*/
+	 * Add seconds between 1601-01-01 and 1970-01-01 and multiply by 10000000
+	 *
+	 * @param long $unixTime
+	 * @return long windowsTime
+	 */
 	public static function convertUnixTimeToWindowsTime($unixTime)
 	{
 		return ($unixTime + 11644477200) * 10000000;
@@ -1263,10 +1263,10 @@ 
 	}
 
 	/**
-    * Convert 8bit characters e.g. accented characters to UTF8 encoded characters
-    *
-    * Extended to use mbstring to convert from arbitrary charset to utf-8
-	*/
+	 * Convert 8bit characters e.g. accented characters to UTF8 encoded characters
+	 *
+	 * Extended to use mbstring to convert from arbitrary charset to utf-8
+	 */
 	protected function encode8Bit(&$item, $key)
 	{
 		if ($this->charset != 'utf-8' && $key != 'password')
@@ -1294,29 +1294,29 @@ 
 		return $this->userClass;
 	}
 
-    /**
-    * Get the group class interface
-    *
-    * @return adLDAPGroups
-    */
-    public function group() {
-        if (!$this->groupClass) {
-            $this->groupClass = new adLDAPGroups($this);
-        }
-        return $this->groupClass;
-    }
-
-    /**
-    * Get the utils class interface
-    *
-    * @return adLDAPUtils
-    */
-    public function utilities() {
-        if (!$this->utilClass) {
-            $this->utilClass = new adLDAPUtils($this);
-        }
-        return $this->utilClass;
-    }
+	/**
+	 * Get the group class interface
+	 *
+	 * @return adLDAPGroups
+	 */
+	public function group() {
+		if (!$this->groupClass) {
+			$this->groupClass = new adLDAPGroups($this);
+		}
+		return $this->groupClass;
+	}
+
+	/**
+	 * Get the utils class interface
+	 *
+	 * @return adLDAPUtils
+	 */
+	public function utilities() {
+		if (!$this->utilClass) {
+			$this->utilClass = new adLDAPUtils($this);
+		}
+		return $this->utilClass;
+	}
 }
 
 /**
@@ -1405,45 +1405,45 @@ 
 		return true;
 	}
 
-    /**
-    * Encode a password for transmission over LDAP
-    *
-    * Extended to use mbstring to convert from arbitrary charset to UTF-16LE
-    *
-    * @param string $password The password to encode
-    * @return string
-    */
-    public function encodePassword($password)
-    {
-        $password="\"".$password."\"";
-        if (function_exists('mb_convert_encoding'))
-        {
-            return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
-        }
-        $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
-        return $encoded;
-    }
-
-    /**
-     * Set a password
-     *
-     * Requires "Reset password" priviledges from bind user!
-     *
+	/**
+	 * Encode a password for transmission over LDAP
+	 *
+	 * Extended to use mbstring to convert from arbitrary charset to UTF-16LE
+	 *
+	 * @param string $password The password to encode
+	 * @return string
+	 */
+	public function encodePassword($password)
+	{
+		$password="\"".$password."\"";
+		if (function_exists('mb_convert_encoding'))
+		{
+			return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
+		}
+		$encoded="";
+		for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+		return $encoded;
+	}
+
+	/**
+	 * Set a password
+	 *
+	 * Requires "Reset password" priviledges from bind user!
+	 *
 	 * We can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2!
 	 *
-     * @param string $dn
-     * @param string $password
-     * @return boolean
-     */
-    public function setPassword($dn, $password)
-    {
-    	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
-    		'unicodePwd' => $this->encodePassword($password),
-    	));
-    	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
-    	return $result;
-    }
+	 * @param string $dn
+	 * @param string $password
+	 * @return boolean
+	 */
+	public function setPassword($dn, $password)
+	{
+		$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
+			'unicodePwd' => $this->encodePassword($password),
+		));
+		if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+		return $result;
+	}
 
 	/**
 	 * Check if we can to a real password change, not just a password reset
@@ -1457,30 +1457,30 @@ 
 		return function_exists('ldap_modify_batch');
 	}
 
-    /**
-    * Set the password of a user - This must be performed over SSL
-    *
-    * @param string $username The username to modify
-    * @param string $password The new password
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-	* @param string $old_password old password for password change, if supported
-    * @return bool
-    */
-    public function password($username, $password, $isGUID = false, $old_password=null)
-    {
-        if ($username === NULL) { return false; }
-        if ($password === NULL) { return false; }
-        if (!$this->adldap->getLdapBind()) { return false; }
-        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
-            throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
-        }
-
-        $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
-            return false;
-        }
-
-        $add=array();
+	/**
+	 * Set the password of a user - This must be performed over SSL
+	 *
+	 * @param string $username The username to modify
+	 * @param string $password The new password
+	 * @param bool $isGUID Is the username passed a GUID or a samAccountName
+	 * @param string $old_password old password for password change, if supported
+	 * @return bool
+	 */
+	public function password($username, $password, $isGUID = false, $old_password=null)
+	{
+		if ($username === NULL) { return false; }
+		if ($password === NULL) { return false; }
+		if (!$this->adldap->getLdapBind()) { return false; }
+		if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
+		}
+
+		$userDn = $this->dn($username, $isGUID);
+		if ($userDn === false) {
+			return false;
+		}
+
+		$add=array();
 
 		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
 			$add["unicodePwd"][0] = $this->encodePassword($password);
@@ -1502,76 +1502,76 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
-            $err = ldap_errno($this->adldap->getLdapConnection());
-            if ($err) {
-                $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
-                    $msg .= ' Your password might not match the password policy.';
-                }
-                throw new adLDAPException($msg);
-            }
-            else {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-    * Modify a user
-    *
-    * @param string $username The username to query
-    * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return bool
-    */
-    public function modify($username, $attributes, $isGUID = false)
-    {
-        if ($username === NULL) { return "Missing compulsory field [username]"; }
-        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
-            throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
-        }
-
-        // Find the dn of the user
-        $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
-            return false;
-        }
-
-        // Translate the update to the LDAP schema
-        $mod = $this->adldap->adldap_schema($attributes);
-
-        // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
-            return false;
-        }
-
-        // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
-                $controlOptions = array("NORMAL_ACCOUNT");
-            }
-            else {
-                $controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
-            }
-            $mod["userAccountControl"][0] = $this->accountControl($controlOptions);
-        }
+		if ($result === false){
+			$err = ldap_errno($this->adldap->getLdapConnection());
+			if ($err) {
+				$msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
+				if($err == 53) {
+					$msg .= ' Your password might not match the password policy.';
+				}
+				throw new adLDAPException($msg);
+			}
+			else {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Modify a user
+	 *
+	 * @param string $username The username to query
+	 * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
+	 * @param bool $isGUID Is the username passed a GUID or a samAccountName
+	 * @return bool
+	 */
+	public function modify($username, $attributes, $isGUID = false)
+	{
+		if ($username === NULL) { return "Missing compulsory field [username]"; }
+		if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+			throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
+		}
+
+		// Find the dn of the user
+		$userDn = $this->dn($username, $isGUID);
+		if ($userDn === false) {
+			return false;
+		}
+
+		// Translate the update to the LDAP schema
+		$mod = $this->adldap->adldap_schema($attributes);
+
+		// Check to see if this is an enabled status update
+		if (!$mod && !array_key_exists("enabled", $attributes)){
+			return false;
+		}
+
+		// Set the account control attribute (only if specified)
+		if (array_key_exists("enabled", $attributes)){
+			if ($attributes["enabled"]){
+				$controlOptions = array("NORMAL_ACCOUNT");
+			}
+			else {
+				$controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
+			}
+			$mod["userAccountControl"][0] = $this->accountControl($controlOptions);
+		}
 		// we can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2
 		unset($mod['unicodePwd']);
 
 		if ($mod)
 		{
-	        // Do the update
-	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
-	        if ($result == false) {
+			// Do the update
+			$result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
+			if ($result == false) {
 				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
-	        	return false;
-	        }
+				return false;
+			}
 		}
-        if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
+		if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
 		{
 			return false;
 		}
@@ -1636,23 +1636,23 @@ 
 		return $this->adldap->encode8bit($item, $key);
 	}
 
-    /**
-    * Escape strings for the use in LDAP filters
-    *
-    * DEVELOPERS SHOULD BE DOING PROPER FILTERING IF THEY'RE ACCEPTING USER INPUT
-    * Ported from Perl's Net::LDAP::Util escape_filter_value
-    *
-    * @param string $str The string the parse
-    * @author Port by Andreas Gohr <andi@splitbrain.org>
-    * @return string
-    */
-    public function ldapSlashes($str){
-        return preg_replace_callback(
-      		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
-            	return "\\".join("", unpack("H2", $matches[1]));
-        	},
-        	$str
-    	);
-    }
+	/**
+	 * Escape strings for the use in LDAP filters
+	 *
+	 * DEVELOPERS SHOULD BE DOING PROPER FILTERING IF THEY'RE ACCEPTING USER INPUT
+	 * Ported from Perl's Net::LDAP::Util escape_filter_value
+	 *
+	 * @param string $str The string the parse
+	 * @author Port by Andreas Gohr <andi@splitbrain.org>
+	 * @return string
+	 */
+	public function ldapSlashes($str){
+		return preg_replace_callback(
+	  		'/([\x00-\x1F\*\(\)\\\\])/',
+			function ($matches) {
+				return "\\".join("", unpack("H2", $matches[1]));
+			},
+			$str
+		);
+	}
 }

Spacing +113 added lines, -122 removed lines

@@ -133,10 +133,10 @@ 
 	 * @return adLDAP
 	 * @throws adLDAPException
 	 */
-	public static function get_adldap(array &$config=null)
+	public static function get_adldap(array &$config = null)
 	{
 		static $adldap = array();
-		if (!$config) $config =& $GLOBALS['egw_info']['server'];
+		if (!$config) $config = & $GLOBALS['egw_info']['server'];
 
 		if (!isset($adldap[$config['ads_domain']]))
 		{
@@ -144,7 +144,7 @@ 
 			if (empty($config['ads_domain'])) throw new Api\Exception("Required ADS domain missing!");
 
 			$base_dn_parts = array();
-			foreach(explode('.', $config['ads_domain']) as $dc)
+			foreach (explode('.', $config['ads_domain']) as $dc)
 			{
 				$base_dn_parts[] = 'DC='.$dc;
 			}
@@ -172,7 +172,7 @@ 
 	 * @param int $account_id
 	 * @return string|NULL
 	 */
-	protected function get_sid($account_id=null)
+	protected function get_sid($account_id = null)
 	{
 		static $domain_sid = null;
 		if (!isset($domain_sid))
@@ -207,14 +207,14 @@ 
 	 * @param boolean $set_if_empty =false true set from DN of "Domain Users" group #
 	 * @return string
 	 */
-	public function ads_context($set_if_empty=false)
+	public function ads_context($set_if_empty = false)
 	{
 		if (empty($this->frontend->config[self::ADS_CONTEXT]))
 		{
 			if ($set_if_empty && ($dn = $this->id2name(-self::DOMAIN_USERS_GROUP, 'account_dn')))
 			{
 				$dn = preg_replace('/^CN=.*?,(CN|OU)=/i', '$1=', $dn);
-				Api\Config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT]=$dn, 'phpgwapi');
+				Api\Config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT] = $dn, 'phpgwapi');
 			}
 			else
 			{
@@ -251,7 +251,7 @@ 
 	 * @param boolean $reconnect =false true: reconnect even if already connected
 	 * @return resource
 	 */
-	public function ldap_connection($reconnect=false)
+	public function ldap_connection($reconnect = false)
 	{
 		if (($reconnect || !($ds = $this->adldap->getLdapConnection())) &&
 			// call connect, thought I dont know how it can be not connected ...
@@ -415,8 +415,7 @@ 
 		$data = Api\Translation::convert($_data, 'utf-8');
 
 		// no need to calculate sid, if already calculated
-		$sid = is_string($data['objectsid']) ? $data['objectsid'] :
-			$this->adldap->utilities()->getTextSID($data['objectsid'][0]);
+		$sid = is_string($data['objectsid']) ? $data['objectsid'] : $this->adldap->utilities()->getTextSID($data['objectsid'][0]);
 		$account_id = -self::sid2account_id($sid);
 
 		$group = array(
@@ -430,10 +429,8 @@ 
 			'account_lastname'  => lang('Group'),
 			'account_fullname'  => lang('Group').' '.$data['samaccountname'][0],
 			'account_email'     => $data['mail'][0],
-			'account_created'   => !isset($data['whencreated'][0]) ? null :
-				self::_when2ts($data['whencreated'][0]),
-			'account_modified'  => !isset($data['whenchanged'][0]) ? null :
-				self::_when2ts($data['whenchanged'][0]),
+			'account_created'   => !isset($data['whencreated'][0]) ? null : self::_when2ts($data['whencreated'][0]),
+			'account_modified'  => !isset($data['whenchanged'][0]) ? null : self::_when2ts($data['whenchanged'][0]),
 			'account_description' => $data['description'][0],
 			'mailAllowed'       => true,
 		);
@@ -453,7 +450,7 @@ 
 	{
 		if (!($data = $this->filter(array('objectsid' => $this->get_sid($account_id)), 'g', self::$group_attributes)))
 		{
-			return false;	// group not found
+			return false; // group not found
 		}
 		$group = $this->_ldap2group(array_shift($data));
 
@@ -476,8 +473,7 @@ 
 		$data = Api\Translation::convert($_data, 'utf-8');
 
 		// no need to calculate sid, if already calculated
-		$sid = is_string($data['objectsid']) ? $data['objectsid'] :
-			$this->adldap->utilities()->getTextSID($data['objectsid'][0]);
+		$sid = is_string($data['objectsid']) ? $data['objectsid'] : $this->adldap->utilities()->getTextSID($data['objectsid'][0]);
 		$account_id = self::sid2account_id($sid);
 
 		$user = array(
@@ -493,22 +489,18 @@ 
 			'account_email'     => $data['mail'][0],
 			'account_fullname'  => $data['displayname'][0],
 			'account_phone'     => $data['telephonenumber'][0],
-			'account_status'    => $data['useraccountcontrol'][0] & 2 ? false : 'A',
-			'account_expires'   => !isset($data['accountexpires']) || $data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 :
-				$this->adldap->utilities()->convertWindowsTimeToUnixTime($data['accountexpires'][0]),
-			'account_lastpwd_change' => !isset($data['pwdlastset']) ? null : (!$data['pwdlastset'][0] ? 0 :
-				$this->adldap->utilities()->convertWindowsTimeToUnixTime($data['pwdlastset'][0])),
-			'account_created' => !isset($data['whencreated'][0]) ? null :
-				self::_when2ts($data['whencreated'][0]),
-			'account_modified' => !isset($data['whenchanged'][0]) ? null :
-				self::_when2ts($data['whenchanged'][0]),
+			'account_status'    => $data['useraccountcontrol'][0]&2 ? false : 'A',
+			'account_expires'   => !isset($data['accountexpires']) || $data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 : $this->adldap->utilities()->convertWindowsTimeToUnixTime($data['accountexpires'][0]),
+			'account_lastpwd_change' => !isset($data['pwdlastset']) ? null : (!$data['pwdlastset'][0] ? 0 : $this->adldap->utilities()->convertWindowsTimeToUnixTime($data['pwdlastset'][0])),
+			'account_created' => !isset($data['whencreated'][0]) ? null : self::_when2ts($data['whencreated'][0]),
+			'account_modified' => !isset($data['whenchanged'][0]) ? null : self::_when2ts($data['whenchanged'][0]),
 		);
 		// expired accounts are NOT active
 		if ($user['account_expires'] !== -1 && $user['account_expires'] < time())
 		{
 			$user['account_status'] = false;
 		}
-		$user['person_id'] = $user['account_guid'];	// id of contact
+		$user['person_id'] = $user['account_guid']; // id of contact
 		//error_log(__METHOD__."(".array2string($data).") returning ".array2string($user));
 		return $user;
 	}
@@ -538,7 +530,7 @@ 
 	{
 		if (!($data = $this->filter(array('objectsid' => $this->get_sid($account_id)), 'u', self::$user_attributes)))
 		{
-			return false;	// user not found
+			return false; // user not found
 		}
 		$user = $this->_ldap2user(array_shift($data));
 
@@ -561,10 +553,10 @@ 
 	 */
 	protected static function _when2ts($_when)
 	{
-		static $utc=null;
+		static $utc = null;
 		if (!isset($utc)) $utc = new \DateTimeZone('UTC');
 
-		list($when) = explode('.', $_when);	// remove .0Z not understood by createFromFormat
+		list($when) = explode('.', $_when); // remove .0Z not understood by createFromFormat
 		$datetime = Api\DateTime::createFromFormat(self::WHEN_FORMAT, $when, $utc);
 		if (Api\DateTime::$server_timezone) $datetime->setTimezone(Api\DateTime::$server_timezone);
 
@@ -579,7 +571,7 @@ 
 	 * @param array $old =null current data
 	 * @return int|false account_id or false on error
 	 */
-	protected function _save_group(array &$data, array $old=null)
+	protected function _save_group(array &$data, array $old = null)
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 
@@ -590,7 +582,7 @@ 
 				'account_description' => 'description',
 			);
 			$attributes = array();
-			foreach($new2adldap as $egw => $adldap)
+			foreach ($new2adldap as $egw => $adldap)
 			{
 				$attributes[$adldap] = (string)$data[$egw];
 			}
@@ -627,11 +619,11 @@ 
 			'account_description' => 'description',
 		);
 		$ldap = array();
-		foreach($egw2adldap as $egw => $adldap)
+		foreach ($egw2adldap as $egw => $adldap)
 		{
 			if (isset($data[$egw]) && (string)$data[$egw] != (string)$old[$egw])
 			{
-				switch($egw)
+				switch ($egw)
 				{
 					case 'account_description':
 						$ldap[$adldap] = !empty($data[$egw]) ? $data[$egw] : array();
@@ -644,7 +636,7 @@ 
 			}
 		}
 		// attributes not (yet) suppored by adldap
-		if ($ldap && !($ret = @ldap_modify($ds=$this->ldap_connection(), $old['account_dn'], $ldap)))
+		if ($ldap && !($ret = @ldap_modify($ds = $this->ldap_connection(), $old['account_dn'], $ldap)))
 		{
 			error_log(__METHOD__."(".array2string($data).") ldap_modify($ds, '$old[account_dn]', ".array2string($ldap).') returned '.array2string($ret));
 			return false;
@@ -660,7 +652,7 @@ 
 	 * @param array $old =null current data
 	 * @return int|false account_id or false on error
 	 */
-	protected function _save_user(array &$data, array $old=null)
+	protected function _save_user(array &$data, array $old = null)
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 		if (!isset($data['account_fullname']) && !empty($data['account_firstname']) && !empty($data['account_lastname']))
@@ -680,12 +672,12 @@ 
 				'account_status'    => 'enabled',
 			);
 			$attributes = array();
-			foreach($new2adldap as $egw => $adldap)
+			foreach ($new2adldap as $egw => $adldap)
 			{
 				if ($egw == 'account_passwd' && (empty($data[$egw]) ||
 					!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()))
 				{
-					continue;	// do not try to set password, if no SSL or TLS, whole user creation will fail
+					continue; // do not try to set password, if no SSL or TLS, whole user creation will fail
 				}
 				if (isset($data[$egw])) $attributes[$adldap] = $data[$egw];
 			}
@@ -722,7 +714,7 @@ 
 			'account_firstname' => 'firstname',
 			'account_lastname'  => 'surname',
 			'account_email'     => 'email',
-			'account_fullname'  => 'display_name',	// handeled currently in rename above, as not supported by adLDAP
+			'account_fullname'  => 'display_name', // handeled currently in rename above, as not supported by adLDAP
 			'account_passwd'    => 'password',
 			'account_status'    => 'enabled',
 			'account_primary_group' => 'primarygroupid',
@@ -735,7 +727,7 @@ 
 		// for a new entry set certain values (eg. profilePath) to in setup configured value
 		if ($new_entry)
 		{
-			foreach($this->frontend->config as $name => $value)
+			foreach ($this->frontend->config as $name => $value)
 			{
 				if (substr($name, 0, 8) == 'ads_new_')
 				{
@@ -743,22 +735,22 @@ 
 				}
 			}
 		}
-		foreach($egw2adldap as $egw => $adldap)
+		foreach ($egw2adldap as $egw => $adldap)
 		{
 			if (isset($data[$egw]) && (string)$data[$egw] != (string)$old[$egw])
 			{
-				switch($egw)
+				switch ($egw)
 				{
 					case 'account_passwd':
 						if (!empty($data[$egw]) && ($this->adldap->getUseSSL() || $this->adldap->getUseTLS()))
 						{
-							$attributes[$adldap] = $data[$egw];	// only try to set password, if no SSL or TLS
+							$attributes[$adldap] = $data[$egw]; // only try to set password, if no SSL or TLS
 						}
 						break;
 					case 'account_primary_group':
 						// setting a primary group seems to fail, if user is no member of that group
 						if (isset($old['memberships'][$data[$egw]]) ||
-							$this->adldap->group()->addUser($group=$this->id2name($data[$egw]), $data['account_id']))
+							$this->adldap->group()->addUser($group = $this->id2name($data[$egw]), $data['account_id']))
 						{
 							$old['memberships'][$data[$egw]] = $group;
 							$ldap[$adldap] = abs($data[$egw]);
@@ -769,11 +761,10 @@ 
 						$ldap['userPrincipalName'] = $data[$egw].'@'.$this->frontend->config['ads_domain'];
 						break;
 					case 'account_expires':
-						$attributes[$adldap] = $data[$egw] == -1 ? self::EXPIRES_NEVER :
-							self::convertUnixTimeToWindowsTime($data[$egw]);
+						$attributes[$adldap] = $data[$egw] == -1 ? self::EXPIRES_NEVER : self::convertUnixTimeToWindowsTime($data[$egw]);
 						break;
 					case 'account_status':
-						if ($new_entry && empty($data['account_passwd'])) continue;	// cant active new account without passwd!
+						if ($new_entry && empty($data['account_passwd'])) continue; // cant active new account without passwd!
 						$attributes[$adldap] = $data[$egw] == 'A';
 						break;
 					case 'account_lastpwd_change':
@@ -795,7 +786,7 @@ 
 		}
 		//elseif ($attributes) error_log(__METHOD__."(".array2string($data).") adldap->user()->modify('$data[account_lid]', ".array2string($attributes).') returned '.array2string($ret).' '.function_backtrace());
 		// attributes not (yet) suppored by adldap
-		if ($ldap && !($ret = @ldap_modify($ds=$this->ldap_connection(), $old['account_dn'], $ldap)))
+		if ($ldap && !($ret = @ldap_modify($ds = $this->ldap_connection(), $old['account_dn'], $ldap)))
 		{
 			error_log(__METHOD__."(".array2string($data).") ldap_modify($ds, '$old[account_dn]', ".array2string($ldap).') returned '.array2string($ret).' ('.ldap_error($ds).') '.function_backtrace());
 			return false;
@@ -868,11 +859,11 @@ 
 			$query = Api\Ldap::quote(strtolower($param['query']));
 
 			$accounts = array();
-			if($param['type'] !== 'groups')
+			if ($param['type'] !== 'groups')
 			{
 				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -903,14 +894,14 @@ 
 					$membership_filter = '(|(memberOf='.$this->id2name((int)$param['type'], 'account_dn').')(PrimaryGroupId='.abs($param['type']).'))';
 					$filter = $filter ? "(&$membership_filter$filter)" : $membership_filter;
 				}
-				foreach($this->filter($filter, 'u', self::$user_attributes) as $account_id => $data)
+				foreach ($this->filter($filter, 'u', self::$user_attributes) as $account_id => $data)
 				{
 					$account = $this->_ldap2user($data);
 					if ($param['active'] && !$this->frontend->is_active($account))
 					{
 						continue;
 					}
-					$account['account_fullname'] = Api\Accounts::format_username($account['account_lid'],$account['account_firstname'],$account['account_lastname'],$account['account_id']);
+					$account['account_fullname'] = Api\Accounts::format_username($account['account_lid'], $account['account_firstname'], $account['account_lastname'], $account['account_id']);
 					$accounts[$account_id] = $account;
 				}
 			}
@@ -919,9 +910,9 @@ 
 				$query = Api\Ldap::quote(strtolower($param['query']));
 
 				$filter = null;
-				if(!empty($query) && $query != '*')
+				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -935,23 +926,23 @@ 
 					}
 					$filter = "(|(cn=$query)(description=$query))";
 				}
-				foreach($this->filter($filter, 'g', self::$group_attributes) as $account_id => $data)
+				foreach ($this->filter($filter, 'g', self::$group_attributes) as $account_id => $data)
 				{
 					$accounts[$account_id] = $this->_ldap2group($data);
 				}
 			}
 			// sort the array
 			$this->_callback_sort = strtoupper($param['sort']);
-			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']);
+			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',', $param['order']);
 			$sortedAccounts = $accounts;
-			uasort($sortedAccounts,array($this,'_sort_callback'));
+			uasort($sortedAccounts, array($this, '_sort_callback'));
 			$account_search[$unl_serial]['data'] = $sortedAccounts;
 
 			$account_search[$unl_serial]['total'] = $this->total = count($accounts);
 		}
 		// return only the wanted accounts
 		reset($sortedAccounts);
-		if(is_numeric($start) && is_numeric($offset))
+		if (is_numeric($start) && is_numeric($offset))
 		{
 			$account_search[$serial]['data'] = array_slice($sortedAccounts, $start, $offset);
 			$account_search[$serial]['total'] = $this->total;
@@ -982,19 +973,19 @@ 
 	 * @param array $b
 	 * @return int
 	 */
-	protected function _sort_callback($a,$b)
+	protected function _sort_callback($a, $b)
 	{
-		foreach($this->_callback_order as $col )
+		foreach ($this->_callback_order as $col)
 		{
-			if($this->_callback_sort != 'DESC')
+			if ($this->_callback_sort != 'DESC')
 			{
-				$cmp = strcasecmp( $a[$col], $b[$col] );
+				$cmp = strcasecmp($a[$col], $b[$col]);
 			}
 			else
 			{
-				$cmp = strcasecmp( $b[$col], $a[$col] );
+				$cmp = strcasecmp($b[$col], $a[$col]);
 			}
-			if ( $cmp != 0 )
+			if ($cmp != 0)
 			{
 				return $cmp;
 			}
@@ -1013,9 +1004,9 @@ 
 	 * @param array $accounts =array() array to add filtered accounts too, default empty array
 	 * @return array account_id => account_lid or values for $attrs pairs
 	 */
-	protected function filter($attr_filter, $account_type=null, array $attrs=null, array $accounts=array())
+	protected function filter($attr_filter, $account_type = null, array $attrs = null, array $accounts = array())
 	{
-		switch($account_type)
+		switch ($account_type)
 		{
 			case 'u':
 				$type_filter = '(samaccounttype='.adLDAP::ADLDAP_NORMAL_ACCOUNT.')';
@@ -1040,25 +1031,25 @@ 
 			}
 			else
 			{
-				foreach($attr_filter as $attr => $value)
+				foreach ($attr_filter as $attr => $value)
 				{
 					$filter .= '('.$attr.'='.$this->adldap->utilities()->ldapSlashes($value).')';
 				}
 			}
 			$filter .= $type_filter.')';
 		}
-		$sri = ldap_search($ds=$this->ldap_connection(), $context=$this->ads_context(), $filter,
+		$sri = ldap_search($ds = $this->ldap_connection(), $context = $this->ads_context(), $filter,
 			$attrs ? $attrs : self::$default_attributes);
 		if (!$sri)
 		{
 			if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
-			$sri = ldap_search($ds=$this->ldap_connection(true), $context=$this->ads_context(), $filter,
+			$sri = ldap_search($ds = $this->ldap_connection(true), $context = $this->ads_context(), $filter,
 				$attrs ? $attrs : self::$default_attributes);
 		}
 
 		if ($sri && ($allValues = ldap_get_entries($ds, $sri)))
 		{
-			foreach($allValues as $key => $data)
+			foreach ($allValues as $key => $data)
 			{
 				if ($key === 'count') continue;
 
@@ -1072,7 +1063,7 @@ 
 
 				if ($data['samaccounttype'][0] == adLDAP::ADLDAP_NORMAL_ACCOUNT && $rid < self::MIN_ACCOUNT_ID)
 				{
-					continue;	// ignore system accounts incl. "Administrator"
+					continue; // ignore system accounts incl. "Administrator"
 				}
 				$accounts[($data['samaccounttype'][0] == adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP ? '-' : '').$rid] =
 					$attrs ? $data : Api\Translation::convert($data['samaccountname'][0], 'utf-8');
@@ -1096,7 +1087,7 @@ 
 	 * @param string $account_type u = user, g = group, default null = try both
 	 * @return int|false numeric account_id or false on error ($name not found)
 	 */
-	public function name2id($name, $which='account_lid', $account_type=null)
+	public function name2id($name, $which = 'account_lid', $account_type = null)
 	{
 		static $to_ldap = array(
 			'account_lid'   => 'samaccountname',
@@ -1108,7 +1099,7 @@ 
 		$ret = false;
 		if (isset($to_ldap[$which]))
 		{
-			foreach($this->filter(array($to_ldap[$which] => $name), $account_type) as $account_id => $account_lid)
+			foreach ($this->filter(array($to_ldap[$which] => $name), $account_type) as $account_id => $account_lid)
 			{
 				unset($account_lid);
 				$ret = $account_id;
@@ -1128,9 +1119,9 @@ 
 	 * @param string $which ='account_lid' type to convert to: account_lid (default), account_email, ...
 	 * @return string/false converted value or false on error ($account_id not found)
 	 */
-	public function id2name($account_id, $which='account_lid')
+	public function id2name($account_id, $which = 'account_lid')
 	{
-		return $this->frontend->id2name($account_id,$which);
+		return $this->frontend->id2name($account_id, $which);
 	}
 
 	/**
@@ -1142,9 +1133,9 @@ 
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
-		unset($_account_id, $ip);	// not used, but required by function signature
+		unset($_account_id, $ip); // not used, but required by function signature
 
-		return false;	// not longer supported
+		return false; // not longer supported
 	}
 
 	/**
@@ -1184,21 +1175,21 @@ 
 	 * @param int $account_id uidnumber
 	 * @return int number of added or removed memberships
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		if (!($account = $this->id2name($account_id))) return;
 		$current = array_keys($this->memberships($account_id));
 
 		$changed = 0;
-		foreach(array(
-			'add' => array_diff($groups, $current),		// add account to all groups he is currently not in
-			'remove' => array_diff($current, $groups),	// remove account from all groups he is only currently in
+		foreach (array(
+			'add' => array_diff($groups, $current), // add account to all groups he is currently not in
+			'remove' => array_diff($current, $groups), // remove account from all groups he is only currently in
 		) as $op => $memberships)
 		{
 			$func = $op.($account_id > 0 ? 'User' : 'Group');
-			foreach($memberships as $gid)
+			foreach ($memberships as $gid)
 			{
-				$ok = $this->adldap->group()->$func($group=$this->id2name($gid), $account);
+				$ok = $this->adldap->group()->$func($group = $this->id2name($gid), $account);
 				//error_log(__METHOD__.'('.array2string($groups).", $account_id) $func('$group', '$account') returned ".array2string($ok));
 				$changed += (int)$ok;
 			}
@@ -1220,15 +1211,15 @@ 
 		$current = array_keys($this->members($gid));
 
 		$changed = 0;
-		foreach(array(
-			'add' => array_diff($users, $current),	// add members currently not in
-			'remove' => array_diff($current, $users),	// remove members only currently in
+		foreach (array(
+			'add' => array_diff($users, $current), // add members currently not in
+			'remove' => array_diff($current, $users), // remove members only currently in
 		) as $op => $members)
 		{
-			foreach($members as $account_id)
+			foreach ($members as $account_id)
 			{
 				$func = $op.($account_id > 0 ? 'User' : 'Group');
-				$ok = $this->adldap->group()->$func($group, $account=$this->id2name($account_id));
+				$ok = $this->adldap->group()->$func($group, $account = $this->id2name($account_id));
 				//error_log(__METHOD__.'('.array2string($users).", $account_id) $func('$group', '$account') returned ".array2string($ok));
 				$changed += (int)$ok;
 			}
@@ -1253,7 +1244,7 @@ 
 	 */
 	public $charset = 'iso-8859-1';
 
-	function __construct(array $options=array())
+	function __construct(array $options = array())
 	{
 		if (isset($options['charset']))
 		{
@@ -1340,19 +1331,19 @@ 
 	public function create($attributes)
 	{
 		// Check for compulsory fields
-		if (!array_key_exists("username", $attributes)){ return "Missing compulsory field [username]"; }
-		if (!array_key_exists("firstname", $attributes)){ return "Missing compulsory field [firstname]"; }
-		if (!array_key_exists("surname", $attributes)){ return "Missing compulsory field [surname]"; }
-		if (!array_key_exists("email", $attributes)){ return "Missing compulsory field [email]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
-
-		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())){
+		if (!array_key_exists("username", $attributes)) { return "Missing compulsory field [username]"; }
+		if (!array_key_exists("firstname", $attributes)) { return "Missing compulsory field [firstname]"; }
+		if (!array_key_exists("surname", $attributes)) { return "Missing compulsory field [surname]"; }
+		if (!array_key_exists("email", $attributes)) { return "Missing compulsory field [email]"; }
+		if (!array_key_exists("container", $attributes)) { return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"])) { return "Container attribute must be an array or string."; }
+
+		if (array_key_exists("password", $attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())) {
 			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
 		}
 
 		if (!array_key_exists("display_name", $attributes)) {
-			$attributes["display_name"] = $attributes["firstname"] . " " . $attributes["surname"];
+			$attributes["display_name"] = $attributes["firstname"]." ".$attributes["surname"];
 		}
 
 		// Translate the schema
@@ -1375,20 +1366,20 @@ 
 		// Determine the container
 		if (is_array($attributes['container'])) {
 			$attributes["container"] = array_reverse($attributes["container"]);
-			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
+			$attributes["container"] = "OU=".implode(",OU=", $attributes["container"]);
 		}
 		// we can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2
 		unset($add['unicodePwd']);
 
 		// Add the entry
-		$result = ldap_add($ds=$this->adldap->getLdapConnection(), $dn="CN=" . $add["cn"][0] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
+		$result = ldap_add($ds = $this->adldap->getLdapConnection(), $dn = "CN=".$add["cn"][0].",".$attributes["container"].",".$this->adldap->getBaseDn(), $add);
 		if ($result != true) {
 			error_log(__METHOD__."(".array2string($attributes).") ldap_add($ds, '$dn', ".array2string($add).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 			return false;
 		}
 
 		// now password can be added to still disabled account
-		if (array_key_exists("password",$attributes))
+		if (array_key_exists("password", $attributes))
 		{
 			if (!$this->setPassword($dn, $attributes['password'])) return false;
 
@@ -1415,13 +1406,13 @@ 
     */
     public function encodePassword($password)
     {
-        $password="\"".$password."\"";
+        $password = "\"".$password."\"";
         if (function_exists('mb_convert_encoding'))
         {
             return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
         }
-        $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+        $encoded = "";
+        for ($i = 0; $i < strlen($password); $i++) { $encoded .= "{$password{$i}}\000"; }
         return $encoded;
     }
 
@@ -1438,7 +1429,7 @@ 
      */
     public function setPassword($dn, $password)
     {
-    	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
+    	$result = ldap_mod_replace($ds = $this->adldap->getLdapConnection(), $dn, array(
     		'unicodePwd' => $this->encodePassword($password),
     	));
     	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
@@ -1466,7 +1457,7 @@ 
 	* @param string $old_password old password for password change, if supported
     * @return bool
     */
-    public function password($username, $password, $isGUID = false, $old_password=null)
+    public function password($username, $password, $isGUID = false, $old_password = null)
     {
         if ($username === NULL) { return false; }
         if ($password === NULL) { return false; }
@@ -1480,7 +1471,7 @@ 
             return false;
         }
 
-        $add=array();
+        $add = array();
 
 		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
 			$add["unicodePwd"][0] = $this->encodePassword($password);
@@ -1502,11 +1493,11 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
+        if ($result === false) {
             $err = ldap_errno($this->adldap->getLdapConnection());
             if ($err) {
-                $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
+                $msg = 'Error '.$err.': '.ldap_err2str($err).'.';
+                if ($err == 53) {
                     $msg .= ' Your password might not match the password policy.';
                 }
                 throw new adLDAPException($msg);
@@ -1544,13 +1535,13 @@ 
         $mod = $this->adldap->adldap_schema($attributes);
 
         // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
+        if (!$mod && !array_key_exists("enabled", $attributes)) {
             return false;
         }
 
         // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
+        if (array_key_exists("enabled", $attributes)) {
+            if ($attributes["enabled"]) {
                 $controlOptions = array("NORMAL_ACCOUNT");
             }
             else {
@@ -1564,14 +1555,14 @@ 
 		if ($mod)
 		{
 	        // Do the update
-	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
+	        $result = @ldap_modify($ds = $this->adldap->getLdapConnection(), $userDn, $mod);
 	        if ($result == false) {
 				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 	        	return false;
 	        }
 		}
-        if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
+        if (array_key_exists("password", $attributes) && !$this->setPassword($userDn, $attributes['password']))
 		{
 			return false;
 		}
@@ -1594,10 +1585,10 @@ 
 	 */
 	public function create($attributes)
 	{
-		if (!is_array($attributes)){ return "Attributes must be an array"; }
-		if (!array_key_exists("group_name", $attributes)){ return "Missing compulsory field [group_name]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
+		if (!is_array($attributes)) { return "Attributes must be an array"; }
+		if (!array_key_exists("group_name", $attributes)) { return "Missing compulsory field [group_name]"; }
+		if (!array_key_exists("container", $attributes)) { return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"])) { return "Container attribute must be an array or string."; }
 
 		//$member_array = array();
 		//$member_array[0] = "cn=user1,cn=Users,dc=yourdomain,dc=com";
@@ -1613,9 +1604,9 @@ 
 		// Determine the container
 		if (is_array($attributes['container'])) {
 			$attributes["container"] = array_reverse($attributes["container"]);
-			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
+			$attributes["container"] = "OU=".implode(",OU=", $attributes["container"]);
 		}
-		$result = ldap_add($this->adldap->getLdapConnection(), "CN=" . $add["cn"] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
+		$result = ldap_add($this->adldap->getLdapConnection(), "CN=".$add["cn"].",".$attributes["container"].",".$this->adldap->getBaseDn(), $add);
 		if ($result != true) {
 			return false;
 		}
@@ -1646,10 +1637,10 @@ 
     * @author Port by Andreas Gohr <andi@splitbrain.org>
     * @return string
     */
-    public function ldapSlashes($str){
+    public function ldapSlashes($str) {
         return preg_replace_callback(
       		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
+        	function($matches) {
             	return "\\".join("", unpack("H2", $matches[1]));
         	},
         	$str

Braces +234 added lines, -78 removed lines

@@ -136,12 +136,21 @@ 
 	public static function get_adldap(array &$config=null)
 	{
 		static $adldap = array();
-		if (!$config) $config =& $GLOBALS['egw_info']['server'];
+		if (!$config)
+		{
+			$config =& $GLOBALS['egw_info']['server'];
+		}
 
 		if (!isset($adldap[$config['ads_domain']]))
 		{
-			if (empty($config['ads_host'])) throw new Api\Exception("Required ADS host name(s) missing!");
-			if (empty($config['ads_domain'])) throw new Api\Exception("Required ADS domain missing!");
+			if (empty($config['ads_host']))
+			{
+				throw new Api\Exception("Required ADS host name(s) missing!");
+			}
+			if (empty($config['ads_domain']))
+			{
+				throw new Api\Exception("Required ADS domain missing!");
+			}
 
 			$base_dn_parts = array();
 			foreach(explode('.', $config['ads_domain']) as $dc)
@@ -160,7 +169,10 @@ 
 				'charset' => Api\Translation::charset(),
 			);
 			$adldap[$config['ads_domain']] = new adLDAP($options);
-			if (self::$debug) error_log(__METHOD__."() new adLDAP(".array2string($options).") returned ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
+			if (self::$debug)
+			{
+				error_log(__METHOD__."() new adLDAP(".array2string($options).") returned ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
+			}
 		}
 		//else error_log(__METHOD__."() returning cached adLDAP ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
 		return $adldap[$config['ads_domain']];
@@ -241,7 +253,10 @@ 
 			throw new Api\Exception\WrongUserinput("Wrong or not configured ADS context '$context' (baseDN='$base')!");
 		}
 		$container = $matches[1];
-		if (self::$debug) error_log(__METHOD__."() context='$context', base='$base' returning ".array2string($container));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."() context='$context', base='$base' returning ".array2string($container));
+		}
 		return $container;
 	}
 
@@ -334,10 +349,16 @@ 
 	 */
 	public function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		$ret = $account_id < 0 ? $this->_read_group($account_id) : $this->_read_user($account_id);
-		if (self::$debug) error_log(__METHOD__."($account_id) returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."($account_id) returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -370,7 +391,10 @@ 
 		}
 		$ret = $is_group ? $this->_save_group($data, $old) : $this->_save_user($data, $old);
 
-		if (self::$debug) error_log(__METHOD__.'('.array2string($data).') returning '.array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($data).') returning '.array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -400,7 +424,10 @@ 
 		{
 			$ret = $this->adldap->user()->delete($account_lid);
 		}
-		if (self::$debug) error_log(__METHOD__."($account_id) account_lid='$account_lid' returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."($account_id) account_lid='$account_lid' returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -562,11 +589,17 @@ 
 	protected static function _when2ts($_when)
 	{
 		static $utc=null;
-		if (!isset($utc)) $utc = new \DateTimeZone('UTC');
+		if (!isset($utc))
+		{
+			$utc = new \DateTimeZone('UTC');
+		}
 
 		list($when) = explode('.', $_when);	// remove .0Z not understood by createFromFormat
 		$datetime = Api\DateTime::createFromFormat(self::WHEN_FORMAT, $when, $utc);
-		if (Api\DateTime::$server_timezone) $datetime->setTimezone(Api\DateTime::$server_timezone);
+		if (Api\DateTime::$server_timezone)
+		{
+			$datetime->setTimezone(Api\DateTime::$server_timezone);
+		}
 
 		return $datetime->getTimestamp();
 	}
@@ -583,12 +616,15 @@ 
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 
-		if (!$old)	// new entry
+		if (!$old)
+		{
+			// new entry
 		{
 			static $new2adldap = array(
 				'account_lid'       => 'group_name',
 				'account_description' => 'description',
 			);
+		}
 			$attributes = array();
 			foreach($new2adldap as $egw => $adldap)
 			{
@@ -668,7 +704,9 @@ 
 			$data['account_fullname'] = $data['account_firstname'].' '.$data['account_lastname'];
 		}
 
-		if (($new_entry = !$old))	// new entry
+		if (($new_entry = !$old))
+		{
+			// new entry
 		{
 			static $new2adldap = array(
 				'account_lid'       => 'username',
@@ -679,6 +717,7 @@ 
 				'account_passwd'    => 'password',
 				'account_status'    => 'enabled',
 			);
+		}
 			$attributes = array();
 			foreach($new2adldap as $egw => $adldap)
 			{
@@ -687,7 +726,10 @@ 
 				{
 					continue;	// do not try to set password, if no SSL or TLS, whole user creation will fail
 				}
-				if (isset($data[$egw])) $attributes[$adldap] = $data[$egw];
+				if (isset($data[$egw]))
+				{
+					$attributes[$adldap] = $data[$egw];
+				}
 			}
 			$attributes['enabled'] = !isset($data['account_status']) || $data['account_status'] === 'A';
 			$attributes['container'] = $this->_get_container();
@@ -773,7 +815,11 @@ 
 							self::convertUnixTimeToWindowsTime($data[$egw]);
 						break;
 					case 'account_status':
-						if ($new_entry && empty($data['account_passwd'])) continue;	// cant active new account without passwd!
+						if ($new_entry && empty($data['account_passwd']))
+						{
+							continue;
+						}
+						// cant active new account without passwd!
 						$attributes[$adldap] = $data[$egw] == 'A';
 						break;
 					case 'account_lastpwd_change':
@@ -853,8 +899,14 @@ 
 		}
 		// if it's a limited query, check if the unlimited query is cached
 		$start = $param['start'];
-		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $maxmatchs = 15;
-		if (!($offset = $param['offset'])) $offset = $maxmatchs;
+		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']))
+		{
+			$maxmatchs = 15;
+		}
+		if (!($offset = $param['offset']))
+		{
+			$offset = $maxmatchs;
+		}
 		unset($param['start']);
 		unset($param['offset']);
 		$unl_serial = serialize($param);
@@ -1051,7 +1103,10 @@ 
 			$attrs ? $attrs : self::$default_attributes);
 		if (!$sri)
 		{
-			if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
+			if (self::$debug)
+			{
+				error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
+			}
 			$sri = ldap_search($ds=$this->ldap_connection(true), $context=$this->ads_context(), $filter,
 				$attrs ? $attrs : self::$default_attributes);
 		}
@@ -1060,7 +1115,10 @@ 
 		{
 			foreach($allValues as $key => $data)
 			{
-				if ($key === 'count') continue;
+				if ($key === 'count')
+				{
+					continue;
+				}
 
 				if ($account_type && !($account_type == 'u' && $data['samaccounttype'][0] == adLDAP::ADLDAP_NORMAL_ACCOUNT ||
 					$account_type == 'g' && $data['samaccounttype'][0] == adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP))
@@ -1078,7 +1136,10 @@ 
 					$attrs ? $data : Api\Translation::convert($data['samaccountname'][0], 'utf-8');
 			}
 		}
-		else if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter')=$sri allValues=".array2string($allValues));
+		else if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter')=$sri allValues=".array2string($allValues));
+		}
 
 		//error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returning ".array2string($accounts).' '.function_backtrace());
 		return $accounts;
@@ -1115,7 +1176,10 @@ 
 				break;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__."('$name', '$which', '$account_type') returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."('$name', '$which', '$account_type') returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -1157,7 +1221,10 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!($data = $this->frontend->read($account_id)) || $data['account_id'] <= 0) return false;
+		if (!($data = $this->frontend->read($account_id)) || $data['account_id'] <= 0)
+		{
+			return false;
+		}
 
 		return $data['memberships'];
 	}
@@ -1172,7 +1239,10 @@ 
 	 */
 	function members($gid)
 	{
-		if (!($data = $this->frontend->read($gid)) || $data['account_id'] >= 0) return false;
+		if (!($data = $this->frontend->read($gid)) || $data['account_id'] >= 0)
+		{
+			return false;
+		}
 
 		return $data['members'];
 	}
@@ -1186,7 +1256,10 @@ 
 	 */
 	function set_memberships($groups,$account_id)
 	{
-		if (!($account = $this->id2name($account_id))) return;
+		if (!($account = $this->id2name($account_id)))
+		{
+			return;
+		}
 		$current = array_keys($this->memberships($account_id));
 
 		$changed = 0;
@@ -1203,7 +1276,10 @@ 
 				$changed += (int)$ok;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__.'('.array2string($groups).", $account_id) current=".array2string($current)." returning $changed");
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($groups).", $account_id) current=".array2string($current)." returning $changed");
+		}
 		return $changed;
 	}
 
@@ -1216,7 +1292,10 @@ 
 	 */
 	function set_members($users, $gid)
 	{
-		if (!($group = $this->id2name($gid))) return;
+		if (!($group = $this->id2name($gid)))
+		{
+			return;
+		}
 		$current = array_keys($this->members($gid));
 
 		$changed = 0;
@@ -1233,7 +1312,10 @@ 
 				$changed += (int)$ok;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__.'('.array2string($users).", $gid) current=".array2string($current)." returning $changed");
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($users).", $gid) current=".array2string($current)." returning $changed");
+		}
 		return $changed;
 	}
 }
@@ -1287,8 +1369,10 @@ 
 	 *
 	 * @return adLDAPUsers
 	 */
-	public function user() {
-		if (!$this->userClass) {
+	public function user()
+	{
+		if (!$this->userClass)
+		{
 			$this->userClass = new adLDAPUsers($this);
 		}
 		return $this->userClass;
@@ -1299,8 +1383,10 @@ 
     *
     * @return adLDAPGroups
     */
-    public function group() {
-        if (!$this->groupClass) {
+    public function group()
+    {
+        if (!$this->groupClass)
+        {
             $this->groupClass = new adLDAPGroups($this);
         }
         return $this->groupClass;
@@ -1311,8 +1397,10 @@ 
     *
     * @return adLDAPUtils
     */
-    public function utilities() {
-        if (!$this->utilClass) {
+    public function utilities()
+    {
+        if (!$this->utilClass)
+        {
             $this->utilClass = new adLDAPUtils($this);
         }
         return $this->utilClass;
@@ -1340,18 +1428,32 @@ 
 	public function create($attributes)
 	{
 		// Check for compulsory fields
-		if (!array_key_exists("username", $attributes)){ return "Missing compulsory field [username]"; }
-		if (!array_key_exists("firstname", $attributes)){ return "Missing compulsory field [firstname]"; }
-		if (!array_key_exists("surname", $attributes)){ return "Missing compulsory field [surname]"; }
-		if (!array_key_exists("email", $attributes)){ return "Missing compulsory field [email]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
-
-		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())){
+		if (!array_key_exists("username", $attributes))
+		{
+return "Missing compulsory field [username]"; }
+		if (!array_key_exists("firstname", $attributes))
+		{
+return "Missing compulsory field [firstname]"; }
+		if (!array_key_exists("surname", $attributes))
+		{
+return "Missing compulsory field [surname]"; }
+		if (!array_key_exists("email", $attributes))
+		{
+return "Missing compulsory field [email]"; }
+		if (!array_key_exists("container", $attributes))
+		{
+return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"]))
+		{
+return "Container attribute must be an array or string."; }
+
+		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()))
+		{
 			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
 		}
 
-		if (!array_key_exists("display_name", $attributes)) {
+		if (!array_key_exists("display_name", $attributes))
+		{
 			$attributes["display_name"] = $attributes["firstname"] . " " . $attributes["surname"];
 		}
 
@@ -1373,7 +1475,8 @@ 
 		$add["userAccountControl"][0] = $this->accountControl($control_options);
 
 		// Determine the container
-		if (is_array($attributes['container'])) {
+		if (is_array($attributes['container']))
+		{
 			$attributes["container"] = array_reverse($attributes["container"]);
 			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
 		}
@@ -1382,7 +1485,8 @@ 
 
 		// Add the entry
 		$result = ldap_add($ds=$this->adldap->getLdapConnection(), $dn="CN=" . $add["cn"][0] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
-		if ($result != true) {
+		if ($result != true)
+		{
 			error_log(__METHOD__."(".array2string($attributes).") ldap_add($ds, '$dn', ".array2string($add).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 			return false;
 		}
@@ -1390,7 +1494,10 @@ 
 		// now password can be added to still disabled account
 		if (array_key_exists("password",$attributes))
 		{
-			if (!$this->setPassword($dn, $attributes['password'])) return false;
+			if (!$this->setPassword($dn, $attributes['password']))
+			{
+				return false;
+			}
 
 			// now account can be enabled
 			if ($attributes["enabled"])
@@ -1398,7 +1505,10 @@ 
 				$control_options = array("NORMAL_ACCOUNT");
 				$mod = array("userAccountControl" => $this->accountControl($control_options));
 				$result = ldap_modify($ds, $dn, $mod);
-				if (!$result) error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$dn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
+				if (!$result)
+				{
+					error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$dn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
+				}
 			}
 		}
 
@@ -1421,7 +1531,9 @@ 
             return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
         }
         $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+        for ($i=0; $i <strlen($password); $i++)
+        {
+$encoded.="{$password{$i}}\000"; }
         return $encoded;
     }
 
@@ -1441,7 +1553,10 @@ 
     	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
     		'unicodePwd' => $this->encodePassword($password),
     	));
-    	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+    	if (!$result)
+    	{
+    		error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+    	}
     	return $result;
     }
 
@@ -1468,26 +1583,36 @@ 
     */
     public function password($username, $password, $isGUID = false, $old_password=null)
     {
-        if ($username === NULL) { return false; }
-        if ($password === NULL) { return false; }
-        if (!$this->adldap->getLdapBind()) { return false; }
-        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+        if ($username === NULL)
+        {
+return false; }
+        if ($password === NULL)
+        {
+return false; }
+        if (!$this->adldap->getLdapBind())
+        {
+return false; }
+        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())
+        {
             throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
         }
 
         $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
+        if ($userDn === false)
+        {
             return false;
         }
 
         $add=array();
 
-		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
+		if (empty($old_password) || !function_exists('ldap_modify_batch'))
+		{
 			$add["unicodePwd"][0] = $this->encodePassword($password);
 
 			$result = @ldap_mod_replace($this->adldap->getLdapConnection(), $userDn, $add);
 		}
-		else {
+		else
+		{
 			$mods = array(
 				array(
 					"attrib"  => "unicodePwd",
@@ -1502,16 +1627,20 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
+        if ($result === false)
+        {
             $err = ldap_errno($this->adldap->getLdapConnection());
-            if ($err) {
+            if ($err)
+            {
                 $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
+                if($err == 53)
+                {
                     $msg .= ' Your password might not match the password policy.';
                 }
                 throw new adLDAPException($msg);
             }
-            else {
+            else
+            {
                 return false;
             }
         }
@@ -1529,14 +1658,18 @@ 
     */
     public function modify($username, $attributes, $isGUID = false)
     {
-        if ($username === NULL) { return "Missing compulsory field [username]"; }
-        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+        if ($username === NULL)
+        {
+return "Missing compulsory field [username]"; }
+        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())
+        {
             throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
         }
 
         // Find the dn of the user
         $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
+        if ($userDn === false)
+        {
             return false;
         }
 
@@ -1544,16 +1677,20 @@ 
         $mod = $this->adldap->adldap_schema($attributes);
 
         // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
+        if (!$mod && !array_key_exists("enabled", $attributes))
+        {
             return false;
         }
 
         // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
+        if (array_key_exists("enabled", $attributes))
+        {
+            if ($attributes["enabled"])
+            {
                 $controlOptions = array("NORMAL_ACCOUNT");
             }
-            else {
+            else
+            {
                 $controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
             }
             $mod["userAccountControl"][0] = $this->accountControl($controlOptions);
@@ -1565,14 +1702,18 @@ 
 		{
 	        // Do the update
 	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
-	        if ($result == false) {
-				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
+	        if ($result == false)
+	        {
+				if (isset($mod['unicodePwd']))
+				{
+					$mod['unicodePwd'] = '***';
+				}
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 	        	return false;
 	        }
 		}
         if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
-		{
+        {
 			return false;
 		}
 		return true;
@@ -1594,10 +1735,18 @@ 
 	 */
 	public function create($attributes)
 	{
-		if (!is_array($attributes)){ return "Attributes must be an array"; }
-		if (!array_key_exists("group_name", $attributes)){ return "Missing compulsory field [group_name]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
+		if (!is_array($attributes))
+		{
+return "Attributes must be an array"; }
+		if (!array_key_exists("group_name", $attributes))
+		{
+return "Missing compulsory field [group_name]"; }
+		if (!array_key_exists("container", $attributes))
+		{
+return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"]))
+		{
+return "Container attribute must be an array or string."; }
 
 		//$member_array = array();
 		//$member_array[0] = "cn=user1,cn=Users,dc=yourdomain,dc=com";
@@ -1607,16 +1756,21 @@ 
 		$add["cn"] = $attributes["group_name"];
 		$add["samaccountname"] = $attributes["group_name"];
 		$add["objectClass"] = "Group";
-		if (!empty($attributes["description"])) $add["description"] = $attributes["description"];
+		if (!empty($attributes["description"]))
+		{
+			$add["description"] = $attributes["description"];
+		}
 		//$add["member"] = $member_array; UNTESTED
 
 		// Determine the container
-		if (is_array($attributes['container'])) {
+		if (is_array($attributes['container']))
+		{
 			$attributes["container"] = array_reverse($attributes["container"]);
 			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
 		}
 		$result = ldap_add($this->adldap->getLdapConnection(), "CN=" . $add["cn"] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
-		if ($result != true) {
+		if ($result != true)
+		{
 			return false;
 		}
 		return true;
@@ -1646,10 +1800,12 @@ 
     * @author Port by Andreas Gohr <andi@splitbrain.org>
     * @return string
     */
-    public function ldapSlashes($str){
+    public function ldapSlashes($str)
+    {
         return preg_replace_callback(
       		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
+        	function ($matches)
+        	{
             	return "\\".join("", unpack("H2", $matches[1]));
         	},
         	$str

api/src/Accounts/Ldap.php

Doc Comments +2 added lines, -3 removed lines

@@ -190,7 +190,7 @@ 
 	 * If no account_id is set in data the account is added and the new id is set in $data.
 	 *
 	 * @param array $data array with account-data
-	 * @return int|boolean the account_id or false on error
+	 * @return false|string the account_id or false on error
 	 */
 	function save(&$data)
 	{
@@ -995,7 +995,7 @@ 
 	 *
 	 * @param int $_account_id
 	 * @param string $ip
-	 * @return int lastlogin time
+	 * @return boolean lastlogin time
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
@@ -1097,7 +1097,6 @@ 
 	 * @param int $gid gidnumber of group to set
 	 * @param array $objectclass =null should we set the member and uniqueMember attributes (groupOf(Unique)Names|univentionGroup) (default detect it)
 	 * @param string $use_cn =null if set $cn is used instead $gid and the attributes are returned, not written to ldap
-	 * @param boolean $uniqueMember =null should we set the uniqueMember attribute (default detect it)
 	 * @return boolean/array false on failure, array or true otherwise
 	 */
 	function set_members($members, $gid, array $objectclass=null, $use_cn=null)

Indentation +1 added lines, -1 removed lines

@@ -962,7 +962,7 @@
 			'account_fullname' => 'cn',
 		);
 		if (!isset($to_ldap[$which]) || $account_type === 'g') {
-		    return False;
+			return False;
 		}
 
 		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . $name . ')(objectclass=posixaccount))', array('uidNumber'));

Spacing +138 added lines, -141 removed lines

@@ -89,14 +89,14 @@ 
 	 */
 	var $requiredObjectClasses = array(
 		'user' => array(
-			'top','person','organizationalperson','inetorgperson','posixaccount','shadowaccount'
+			'top', 'person', 'organizationalperson', 'inetorgperson', 'posixaccount', 'shadowaccount'
 		),
 		'user-if-supported' => array(	// these classes get added, if server supports them
 			'mozillaabpersonalpha', 'mozillaorgperson', 'evolutionperson',
 			'univentionperson', 'univentionmail', array('univentionobject', 'univentionObjectType' => 'users/user'),
 		),
 		'group' => array(
-			'top','posixgroup','groupofnames'
+			'top', 'posixgroup', 'groupofnames'
 		),
 		'group-if-supported' => array(	// these classes get added, if servers supports them
 			'univentiongroup', array('univentionobject', 'univentionObjectType' => 'groups/group'),
@@ -115,8 +115,8 @@ 
 	 */
 	var $group_mail_classes = array(
 		'dbmailforwardingaddress' => 'mailforwardingaddress',
-		'dbmailuser' => array('mailforwardingaddress','uid'),
-		'qmailuser' => array('mailforwardingaddress','uid'),
+		'dbmailuser' => array('mailforwardingaddress', 'uid'),
+		'qmailuser' => array('mailforwardingaddress', 'uid'),
 		'mailaccount' => 'mailalias',
 		'univentiongroup' => array(false, false, true),
 	);
@@ -158,7 +158,7 @@ 
 		$this->use_session_cache = true;
 
 		$this->ldap = Api\Ldap::factory(false, $this->frontend->config['ldap_host'],
-			$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
+			$this->frontend->config['ldap_root_dn'], $this->frontend->config['ldap_root_pw']);
 		$this->ds = $this->ldap->ds;
 
 		$this->user_context  = $this->frontend->config['ldap_context'];
@@ -196,7 +196,7 @@ 
 	{
 		$is_group = $data['account_id'] < 0 || $data['account_type'] === 'g';
 
-		$data_utf8 = Api\Translation::convert($data,Api\Translation::charset(),'utf-8');
+		$data_utf8 = Api\Translation::convert($data, Api\Translation::charset(), 'utf-8');
 		$members = $data['account_members'];
 
 		if (!is_object($this->ldapServerInfo))
@@ -208,8 +208,7 @@ 
 		if ($data_utf8['account_id'] && $data_utf8['account_lid'])
 		{
 			// read the entry first, to check if the dn (account_lid) has changed
-			$sri = $is_group ? ldap_search($this->ds,$this->group_context,'gidnumber='.abs($data['account_id'])) :
-				ldap_search($this->ds,$this->user_context,'uidnumber='.$data['account_id']);
+			$sri = $is_group ? ldap_search($this->ds, $this->group_context, 'gidnumber='.abs($data['account_id'])) : ldap_search($this->ds, $this->user_context, 'uidnumber='.$data['account_id']);
 			$old = ldap_get_entries($this->ds, $sri);
 
 			if (!$old['count'])
@@ -221,9 +220,9 @@ 
 				$old = Api\Ldap::result2array($old[0]);
 				$old['objectclass'] = array_map('strtolower', $old['objectclass']);
 				$key = false;
-				if ($is_group && ($key = array_search('namedobject',$old['objectclass'])) !== false ||
-					$is_group && ($old['cn'] != $data_utf8['account_lid'] || substr($old['dn'],0,3) != 'cn=') ||
-					!$is_group && ($old['uid'] != $data_utf8['account_lid'] || substr($old['dn'],0,4) != 'uid='))
+				if ($is_group && ($key = array_search('namedobject', $old['objectclass'])) !== false ||
+					$is_group && ($old['cn'] != $data_utf8['account_lid'] || substr($old['dn'], 0, 3) != 'cn=') ||
+					!$is_group && ($old['uid'] != $data_utf8['account_lid'] || substr($old['dn'], 0, 4) != 'uid='))
 				{
 					// query the memberships to set them again later
 					if (!$is_group)
@@ -252,7 +251,7 @@ 
 			}
 		}
 		// check if we need to write the objectclass: new entry or required object classes are missing
-		if (!$old || array_diff($this->requiredObjectClasses[$is_group ? 'group' : 'user'],$old['objectclass']))
+		if (!$old || array_diff($this->requiredObjectClasses[$is_group ? 'group' : 'user'], $old['objectclass']))
 		{
 			// additional objectclasse might be already set in $to_write or $old
 			if (!is_array($to_write['objectclass']))
@@ -261,7 +260,7 @@ 
 			}
 			if (!$old)	// for new accounts add additional addressbook object classes, if supported by server
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
-				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
+				foreach ($this->requiredObjectClasses[$is_group ? 'group-if-supported' : 'user-if-supported'] as $additional)
 				{
 					$add = array();
 					if (is_array($additional))
@@ -283,8 +282,7 @@ 
 		{
 			if (!$data['account_lid']) return false;
 
-			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context :
-				'uid='.$data_utf8['account_lid'].','.$this->user_context;
+			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context : 'uid='.$data_utf8['account_lid'].','.$this->user_context;
 		}
 		// now we merge the user or group data
 		if ($is_group)
@@ -293,23 +291,23 @@ 
 			$data['account_type'] = 'g';
 
 			$objectclass = $old ? $old['objectclass'] : $to_write['objectclass'];
-			if ($members || !$old && array_intersect(array('groupofnames','groupofuniquenames','univentiongroup'), $objectclass))
+			if ($members || !$old && array_intersect(array('groupofnames', 'groupofuniquenames', 'univentiongroup'), $objectclass))
 			{
 				$to_write = array_merge($to_write, $this->set_members($members, $data['account_id'], $objectclass, $dn));
 			}
 			// check if we should set a mail address and forwards for each member
-			foreach($this->group_mail_classes as $objectclass => $forward)
+			foreach ($this->group_mail_classes as $objectclass => $forward)
 			{
 				$extra_attr = false;
 				$keep_objectclass = false;
-				if (is_array($forward)) list($forward,$extra_attr,$keep_objectclass) = $forward;
+				if (is_array($forward)) list($forward, $extra_attr, $keep_objectclass) = $forward;
 
 				if ($this->ldapServerInfo->supportsObjectClass($objectclass) &&
-					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
+					($old && in_array($objectclass, $old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
 				{
 					if ($data_utf8['account_email'])	// setting an email
 					{
-						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
+						if (!in_array($objectclass, $old ? $old['objectclass'] : $to_write['objectclass']))
 						{
 							if ($old) $to_write['objectclass'] = $old['objectclass'];
 							$to_write['objectclass'][] = $objectclass;
@@ -323,19 +321,19 @@ 
 							$to_write[$forward] = array();
 							foreach (array_keys($members) as $member)
 							{
-								if (($email = $this->id2name($member,'account_email')))
+								if (($email = $this->id2name($member, 'account_email')))
 								{
 									$to_write[$forward][] = $email;
 								}
 							}
 						}
 					}
-					elseif($old)	// remove the mail and forwards only for existing entries
+					elseif ($old)	// remove the mail and forwards only for existing entries
 					{
 						$to_write[static::MAIL_ATTR] = array();
 						if ($forward) $to_write[$forward] = array();
 						if ($extra_attr) $to_write[$extra_attr] = array();
-						if (!$keep_objectclass && ($key = array_search($objectclass,$old['objectclass'])))
+						if (!$keep_objectclass && ($key = array_search($objectclass, $old['objectclass'])))
 						{
 							$to_write['objectclass'] = $old['objectclass'];
 							unset($to_write['objectclass'][$key]);
@@ -349,7 +347,7 @@ 
 		}
 		else
 		{
-			$to_write = $this->_merge_user($to_write,$data_utf8,!$old);
+			$to_write = $this->_merge_user($to_write, $data_utf8, !$old);
 			// make sure multiple email-addresses in the mail attribute "survive"
 			if (isset($to_write[static::MAIL_ATTR]) && count($old[static::MAIL_ATTR]) > 1)
 			{
@@ -368,21 +366,21 @@ 
 		}
 
 		// remove memberuid when adding a group
-		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
+		if (!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
 			unset($to_write['memberuid']);
 		}
 		// modifying or adding the entry
-		if ($old && !@ldap_modify($this->ds,$dn,$to_write) ||
-			!$old && !@ldap_add($this->ds,$dn,$to_write))
+		if ($old && !@ldap_modify($this->ds, $dn, $to_write) ||
+			!$old && !@ldap_add($this->ds, $dn, $to_write))
 		{
 			$err = true;
-			if ($is_group && ($key = array_search('groupofnames',$to_write['objectclass'])) !== false)
+			if ($is_group && ($key = array_search('groupofnames', $to_write['objectclass'])) !== false)
 			{
 				// try again with removed groupOfNames stuff, as I cant detect if posixGroup is a structural object
 				unset($to_write['objectclass'][$key]);
 				$to_write['objectclass'] = array_values($to_write['objectclass']);
 				unset($to_write['member']);
-				$err = $old ? !ldap_modify($this->ds,$dn,$to_write) : !ldap_add($this->ds,$dn,$to_write);
+				$err = $old ? !ldap_modify($this->ds, $dn, $to_write) : !ldap_add($this->ds, $dn, $to_write);
 			}
 			if ($err)
 			{
@@ -392,7 +390,7 @@ 
 		}
 		if ($memberships)
 		{
-			$this->set_memberships($memberships,$data['account_id']);
+			$this->set_memberships($memberships, $data['account_id']);
 		}
 		return $data['account_id'];
 	}
@@ -409,14 +407,14 @@ 
 
 		if ($account_id < 0)
 		{
-			$sri = ldap_search($this->ds, $this->group_context, 'gidnumber=' . abs($account_id));
+			$sri = ldap_search($this->ds, $this->group_context, 'gidnumber='.abs($account_id));
 		}
 		else
 		{
 			// remove the user's memberships
-			$this->set_memberships(array(),$account_id);
+			$this->set_memberships(array(), $account_id);
 
-			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . $account_id);
+			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber='.$account_id);
 		}
 		if (!$sri) return false;
 
@@ -440,7 +438,7 @@ 
 		{
 			$this->ldapServerInfo = $this->ldap->getLDAPServerInfo($this->frontend->config['ldap_host']);
 		}
-		foreach(array_keys($this->group_mail_classes) as $objectclass)
+		foreach (array_keys($this->group_mail_classes) as $objectclass)
 		{
 			if ($this->ldapServerInfo->supportsObjectClass($objectclass))
 			{
@@ -448,15 +446,15 @@ 
 				break;
 			}
 		}
-		$sri = ldap_search($this->ds, $this->group_context,'(&(objectClass=posixGroup)(gidnumber=' . abs($account_id).'))',
+		$sri = ldap_search($this->ds, $this->group_context, '(&(objectClass=posixGroup)(gidnumber='.abs($account_id).'))',
 			array('dn', 'gidnumber', 'cn', 'objectclass', static::MAIL_ATTR, 'memberuid', 'description'));
 
 		$ldap_data = ldap_get_entries($this->ds, $sri);
 		if (!$ldap_data['count'])
 		{
-			return false;	// group not found
+			return false; // group not found
 		}
-		$data = Api\Translation::convert($ldap_data[0],'utf-8');
+		$data = Api\Translation::convert($ldap_data[0], 'utf-8');
 		unset($data['objectclass']['count']);
 
 		$group += array(
@@ -477,7 +475,7 @@ 
 		{
 			unset($data['memberuid']['count']);
 
-			foreach($data['memberuid'] as $lid)
+			foreach ($data['memberuid'] as $lid)
 			{
 				if (($id = $this->name2id($lid, 'account_lid', 'u')))
 				{
@@ -498,16 +496,16 @@ 
 	 */
 	protected function _read_user($account_id)
 	{
-		$sri = ldap_search($this->ds, $this->user_context, '(&(objectclass=posixAccount)(uidnumber=' . (int)$account_id.'))',
-			array('dn','uidnumber','uid','gidnumber','givenname','sn','cn',static::MAIL_ATTR,'userpassword','telephonenumber',
-				'shadowexpire','shadowlastchange','homedirectory','loginshell','createtimestamp','modifytimestamp'));
+		$sri = ldap_search($this->ds, $this->user_context, '(&(objectclass=posixAccount)(uidnumber='.(int)$account_id.'))',
+			array('dn', 'uidnumber', 'uid', 'gidnumber', 'givenname', 'sn', 'cn', static::MAIL_ATTR, 'userpassword', 'telephonenumber',
+				'shadowexpire', 'shadowlastchange', 'homedirectory', 'loginshell', 'createtimestamp', 'modifytimestamp'));
 
 		$ldap_data = ldap_get_entries($this->ds, $sri);
 		if (!$ldap_data['count'])
 		{
-			return false;	// user not found
+			return false; // user not found
 		}
-		$data = Api\Translation::convert($ldap_data[0],'utf-8');
+		$data = Api\Translation::convert($ldap_data[0], 'utf-8');
 
 		$utc_diff = date('Z');
 		$user = array(
@@ -527,13 +525,13 @@ 
 			// - if it's set to 0, the account is disabled
 			// - if it's set to > 0, it will or already has expired --> acount is active if it not yet expired
 			// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
-			'account_status'    => isset($data['shadowexpire']) && $data['shadowexpire'][0]*24*3600+$utc_diff < time() ? false : 'A',
-			'account_expires'   => isset($data['shadowexpire']) && $data['shadowexpire'][0] ? $data['shadowexpire'][0]*24*3600+$utc_diff : -1, // LDAP date is in UTC
-			'account_lastpwd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0]*24*3600+($data['shadowlastchange'][0]!=0?$utc_diff:0) : null,
+			'account_status'    => isset($data['shadowexpire']) && $data['shadowexpire'][0] * 24 * 3600 + $utc_diff < time() ? false : 'A',
+			'account_expires'   => isset($data['shadowexpire']) && $data['shadowexpire'][0] ? $data['shadowexpire'][0] * 24 * 3600 + $utc_diff : -1, // LDAP date is in UTC
+			'account_lastpwd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0] * 24 * 3600 + ($data['shadowlastchange'][0] != 0 ? $utc_diff : 0) : null,
 			// lastlogin and lastlogin from are not availible via the shadowAccount object class
 			// 'account_lastlogin' => $data['phpgwaccountlastlogin'][0],
 			// 'account_lastloginfrom' => $data['phpgwaccountlastloginfrom'][0],
-			'person_id'         => $data['uid'][0],	// id of associated contact
+			'person_id'         => $data['uid'][0], // id of associated contact
 			'account_created' => isset($data['createtimestamp'][0]) ? self::accounts_ldap2ts($data['createtimestamp'][0]) : null,
 			'account_modified' => isset($data['modifytimestamp'][0]) ? self::accounts_ldap2ts($data['modifytimestamp'][0]) : null,
 		);
@@ -554,7 +552,7 @@ 
 	 * @param array $data array with account-data in utf-8
 	 * @return array merged data
 	 */
-	protected function _merge_group($to_write,$data,$old=null)
+	protected function _merge_group($to_write, $data, $old = null)
 	{
 		$to_write['gidnumber'] = abs($data['account_id']);
 		$to_write['cn'] = $data['account_lid'];
@@ -574,7 +572,7 @@ 
 	 * @param boolean $new_entry
 	 * @return array merged data
 	 */
-	protected function _merge_user($to_write,$data,$new_entry)
+	protected function _merge_user($to_write, $data, $new_entry)
 	{
 		$to_write['uidnumber'] = $data['account_id'];
 		$to_write['uid']       = $data['account_lid'];
@@ -583,12 +581,12 @@ 
 		{
 			$to_write['givenname'] = $data['account_firstname'] ? $data['account_firstname'] : array();
 		}
-		$to_write['sn']        = $data['account_lastname'];
+		$to_write['sn'] = $data['account_lastname'];
 		if (!$new_entry || $data['account_email'])
 		{
-			$to_write[static::MAIL_ATTR]  = $data['account_email'] ? $data['account_email'] : array();
+			$to_write[static::MAIL_ATTR] = $data['account_email'] ? $data['account_email'] : array();
 		}
-		$to_write['cn']        = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
+		$to_write['cn'] = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
 
 		$utc_diff = date('Z');
 		if (isset($data['account_passwd']) && $data['account_passwd'])
@@ -597,47 +595,46 @@ 
 			{
 				$data['account_passwd'] = setup_cmd_ldap::hash_sql2ldap($data['account_passwd']);
 			}
-			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
+			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i', $data['account_passwd']))	// if it's not already entcrypted, do so now
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_ldap($data['account_passwd']);
 			}
 			$to_write['userpassword'] = $data['account_passwd'];
-			$to_write['shadowlastchange'] = round((time()-$utc_diff) / (24*3600));
+			$to_write['shadowlastchange'] = round((time() - $utc_diff) / (24 * 3600));
 		}
 		// both status and expires are encoded in the single shadowexpire value in LDAP
 		// - if it's unset an account is enabled AND does never expire
 		// - if it's set to 0, the account is disabled
 		// - if it's set to > 0, it will or already has expired --> acount is active if it not yet expired
 		// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
-		$shadowexpire = ($data['account_expires']-$utc_diff) / (24*3600);
+		$shadowexpire = ($data['account_expires'] - $utc_diff) / (24 * 3600);
 
 		$to_write['shadowexpire'] = !$data['account_status'] ?
-			($data['account_expires'] != -1 && $data['account_expires'] < time() ? round($shadowexpire) : 0) :
-			($data['account_expires'] != -1 ? round($shadowexpire) : array());	// array() = unset value
+			($data['account_expires'] != -1 && $data['account_expires'] < time() ? round($shadowexpire) : 0) : ($data['account_expires'] != -1 ? round($shadowexpire) : array()); // array() = unset value
 
 		if ($new_entry && is_array($to_write['shadowexpire']) && !count($to_write['shadowexpire']))
 		{
-			unset($to_write['shadowexpire']);	// gives protocoll error otherwise
+			unset($to_write['shadowexpire']); // gives protocoll error otherwise
 		}
 		//error_log(__METHOD__.__LINE__.$data['account_lid'].'#'.$data['account_lastpwd_change'].'#');
-		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
-		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0) $to_write['shadowlastchange'] = 0;
+		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change'] - $utc_diff) / (24 * 3600));
+		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change'] == 0) $to_write['shadowlastchange'] = 0;
 		// lastlogin and lastlogin from are not availible via the shadowAccount object class
 		// $to_write['phpgwaccountlastlogin'] = $data['lastlogin'];
 		// $to_write['phpgwaccountlastloginfrom'] = $data['lastloginfrom'];
 
 		if ($this->frontend->config['ldap_extra_attributes'])
 		{
-			if (isset($data['homedirectory'])) $to_write['homedirectory']  = $data['homedirectory'];
+			if (isset($data['homedirectory'])) $to_write['homedirectory'] = $data['homedirectory'];
 			if (isset($data['loginshell'])) $to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
 		}
 		if (($new_entry || isset($to_write['homedirectory'])) && empty($to_write['homedirectory']))
 		{
-			$to_write['homedirectory']  = '/dev/null';	// is a required attribute of posixAccount
+			$to_write['homedirectory'] = '/dev/null'; // is a required attribute of posixAccount
 		}
 		if ($new_entry && empty($to_write['loginshell']))
 		{
-			unset($to_write['loginshell']);	// setting array() for new entry gives "Protocol error", must not set it
+			unset($to_write['loginshell']); // setting array() for new entry gives "Protocol error", must not set it
 		}
 		return $to_write;
 	}
@@ -665,7 +662,7 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__."(".array2string($param).")");
-		$account_search =& Api\Accounts::$cache['account_search'];
+		$account_search = & Api\Accounts::$cache['account_search'];
 
 		// check if the query is cached
 		$serial = serialize($param);
@@ -691,12 +688,12 @@ 
 			$query = Api\Ldap::quote(strtolower($param['query']));
 
 			$accounts = array();
-			if($param['type'] != 'groups')
+			if ($param['type'] != 'groups')
 			{
 				$filter = "(&(objectclass=posixaccount)";
 				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -723,7 +720,7 @@ 
 					}
 				}
 				// add account_filter to filter (user has to be '*', as we otherwise only search uid's)
-				$filter .= str_replace(array('%user','%domain'),array('*',$GLOBALS['egw_info']['user']['domain']),$this->account_filter);
+				$filter .= str_replace(array('%user', '%domain'), array('*', $GLOBALS['egw_info']['user']['domain']), $this->account_filter);
 				$filter .= ')';
 
 				if ($param['type'] != 'both')
@@ -742,9 +739,9 @@ 
 						'account_fullname'  => 'cn',
 						'account_primary_group' => 'gidnumber',
 					);
-					$orders = explode(',',$param['order']);
+					$orders = explode(',', $param['order']);
 					$order = isset($propertyMap[$orders[0]]) ? $propertyMap[$orders[0]] : 'uid';
-					$sri = ldap_search($this->ds, $this->user_context, $filter,array('uid', $order));
+					$sri = ldap_search($this->ds, $this->user_context, $filter, array('uid', $order));
 					$fullSet = array();
 					foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $entry)
 					{
@@ -754,7 +751,7 @@ 
 					if (is_numeric($param['type'])) // return only group-members
 					{
 						$relevantAccounts = array();
-						$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid'));
+						$sri = ldap_search($this->ds, $this->group_context, "(&(objectClass=posixGroup)(gidnumber=".abs($param['type'])."))", array('memberuid'));
 						$group = ldap_get_entries($this->ds, $sri);
 						$fullSet = $group[0]['memberuid'] ? array_intersect_key($fullSet, array_flip($group[0]['memberuid'])) : array();
 					}
@@ -763,26 +760,26 @@ 
 					$sortFn = $param['sort'] == 'DESC' ? 'arsort' : 'asort';
 					$sortFn($fullSet);
 					$relevantAccounts = is_numeric($start) ? array_slice(array_keys($fullSet), $start, $offset) : array_keys($fullSet);
-					$filter = '(&(objectclass=posixaccount)(|(uid='.implode(')(uid=',$relevantAccounts).'))' . $this->account_filter.')';
-					$filter = str_replace(array('%user','%domain'),array('*',$GLOBALS['egw_info']['user']['domain']),$filter);
+					$filter = '(&(objectclass=posixaccount)(|(uid='.implode(')(uid=', $relevantAccounts).'))'.$this->account_filter.')';
+					$filter = str_replace(array('%user', '%domain'), array('*', $GLOBALS['egw_info']['user']['domain']), $filter);
 				}
-				$sri = ldap_search($this->ds, $this->user_context, $filter,array('uid','uidNumber','givenname','sn',static::MAIL_ATTR,'shadowExpire','createtimestamp','modifytimestamp','objectclass','gidNumber'));
+				$sri = ldap_search($this->ds, $this->user_context, $filter, array('uid', 'uidNumber', 'givenname', 'sn', static::MAIL_ATTR, 'shadowExpire', 'createtimestamp', 'modifytimestamp', 'objectclass', 'gidNumber'));
 
 				$utc_diff = date('Z');
-				foreach(ldap_get_entries($this->ds, $sri) as $allVals)
+				foreach (ldap_get_entries($this->ds, $sri) as $allVals)
 				{
-					settype($allVals,'array');
+					settype($allVals, 'array');
 					$test = @$allVals['uid'][0];
 					if (!$this->frontend->config['global_denied_users'][$test] && $allVals['uid'][0])
 					{
 						$account = Array(
 							'account_id'        => $allVals['uidnumber'][0],
-							'account_lid'       => Api\Translation::convert($allVals['uid'][0],'utf-8'),
+							'account_lid'       => Api\Translation::convert($allVals['uid'][0], 'utf-8'),
 							'account_type'      => 'u',
-							'account_firstname' => Api\Translation::convert($allVals['givenname'][0],'utf-8'),
-							'account_lastname'  => Api\Translation::convert($allVals['sn'][0],'utf-8'),
-							'account_status'    => isset($allVals['shadowexpire'][0]) && $allVals['shadowexpire'][0]*24*3600-$utc_diff < time() ? false : 'A',
-							'account_expires'   => isset($allVals['shadowexpire']) && $allVals['shadowexpire'][0] ? $allVals['shadowexpire'][0]*24*3600+$utc_diff : -1, // LDAP date is in UTC
+							'account_firstname' => Api\Translation::convert($allVals['givenname'][0], 'utf-8'),
+							'account_lastname'  => Api\Translation::convert($allVals['sn'][0], 'utf-8'),
+							'account_status'    => isset($allVals['shadowexpire'][0]) && $allVals['shadowexpire'][0] * 24 * 3600 - $utc_diff < time() ? false : 'A',
+							'account_expires'   => isset($allVals['shadowexpire']) && $allVals['shadowexpire'][0] ? $allVals['shadowexpire'][0] * 24 * 3600 + $utc_diff : -1, // LDAP date is in UTC
 							'account_email'     => $allVals[static::MAIL_ATTR][0],
 							'account_created' => isset($allVals['createtimestamp'][0]) ? self::accounts_ldap2ts($allVals['createtimestamp'][0]) : null,
 							'account_modified' => isset($allVals['modifytimestamp'][0]) ? self::accounts_ldap2ts($allVals['modifytimestamp'][0]) : null,
@@ -808,13 +805,13 @@ 
 			}
 			if ($param['type'] == 'groups' || $param['type'] == 'both')
 			{
-				if(empty($query) || $query == '*')
+				if (empty($query) || $query == '*')
 				{
 					$filter = '(objectclass=posixgroup)';
 				}
 				else
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -828,21 +825,21 @@ 
 					}
 					$filter = "(&(objectclass=posixgroup)(cn=$query))";
 				}
-				$sri = ldap_search($this->ds, $this->group_context, $filter,array('cn','gidNumber'));
-				foreach((array)ldap_get_entries($this->ds, $sri) as $allVals)
+				$sri = ldap_search($this->ds, $this->group_context, $filter, array('cn', 'gidNumber'));
+				foreach ((array)ldap_get_entries($this->ds, $sri) as $allVals)
 				{
-					settype($allVals,'array');
+					settype($allVals, 'array');
 					$test = $allVals['cn'][0];
 					if (!$this->frontend->config['global_denied_groups'][$test] && $allVals['cn'][0])
 					{
 						$accounts[(string)-$allVals['gidnumber'][0]] = Array(
 							'account_id'        => -$allVals['gidnumber'][0],
-							'account_lid'       => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_lid'       => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 							'account_type'      => 'g',
-							'account_firstname' => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_firstname' => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 							'account_lastname'  => lang('Group'),
 							'account_status'    => 'A',
-							'account_fullname'  => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_fullname'  => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 						);
 						if (isset($totalcount)) ++$totalcount;
 					}
@@ -850,9 +847,9 @@ 
 			}
 			// sort the array
 			$this->_callback_sort = strtoupper($param['sort']);
-			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']);
+			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',', $param['order']);
 			$sortedAccounts = $accounts;
-			uasort($sortedAccounts,array($this,'_sort_callback'));
+			uasort($sortedAccounts, array($this, '_sort_callback'));
 			$this->total = isset($totalcount) ? $totalcount : count($accounts);
 
 			// if totalcount is set, $sortedAccounts is NOT the full set, but already a limited set!
@@ -864,7 +861,7 @@ 
 		}
 		// return only the wanted accounts
 		reset($sortedAccounts);
-		if(is_numeric($start) && is_numeric($offset))
+		if (is_numeric($start) && is_numeric($offset))
 		{
 			$account_search[$serial]['total'] = $this->total;
 			return $account_search[$serial]['data'] = isset($totalcount) ? $sortedAccounts : array_slice($sortedAccounts, $start, $offset);
@@ -892,19 +889,19 @@ 
 	 * @param array $b
 	 * @return int
 	 */
-	function _sort_callback($a,$b)
+	function _sort_callback($a, $b)
 	{
-		foreach($this->_callback_order as $col )
+		foreach ($this->_callback_order as $col)
 		{
-			if($this->_callback_sort != 'DESC')
+			if ($this->_callback_sort != 'DESC')
 			{
-				$cmp = strcasecmp( $a[$col], $b[$col] );
+				$cmp = strcasecmp($a[$col], $b[$col]);
 			}
 			else
 			{
-				$cmp = strcasecmp( $b[$col], $a[$col] );
+				$cmp = strcasecmp($b[$col], $a[$col]);
 			}
-			if ( $cmp != 0 )
+			if ($cmp != 0)
 			{
 				return $cmp;
 			}
@@ -923,8 +920,8 @@ 
 	{
 		if (!empty($date))
 		{
-			return gmmktime(substr($date,8,2),substr($date,10,2),substr($date,12,2),
-				substr($date,4,2),substr($date,6,2),substr($date,0,4));
+			return gmmktime(substr($date, 8, 2), substr($date, 10, 2), substr($date, 12, 2),
+				substr($date, 4, 2), substr($date, 6, 2), substr($date, 0, 4));
 		}
 		return NULL;
 	}
@@ -941,14 +938,14 @@ 
 	 * @param string $account_type u = user, g = group, default null = try both
 	 * @return int|false numeric account_id or false on error ($name not found)
 	 */
-	function name2id($_name,$which='account_lid',$account_type=null)
+	function name2id($_name, $which = 'account_lid', $account_type = null)
 	{
-		$name = Api\Ldap::quote(Api\Translation::convert($_name,Api\Translation::charset(),'utf-8'));
+		$name = Api\Ldap::quote(Api\Translation::convert($_name, Api\Translation::charset(), 'utf-8'));
 
 		if ($which == 'account_lid' && $account_type !== 'u') // groups only support account_lid
 		{
 
-			$sri = ldap_search($this->ds, $this->group_context, '(&(cn=' . $name . ')(objectclass=posixgroup))', array('gidNumber'));
+			$sri = ldap_search($this->ds, $this->group_context, '(&(cn='.$name.')(objectclass=posixgroup))', array('gidNumber'));
 			$allValues = ldap_get_entries($this->ds, $sri);
 
 			if (@$allValues[0]['gidnumber'][0])
@@ -965,7 +962,7 @@ 
 		    return False;
 		}
 
-		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . $name . ')(objectclass=posixaccount))', array('uidNumber'));
+		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'='.$name.')(objectclass=posixaccount))', array('uidNumber'));
 
 		$allValues = ldap_get_entries($this->ds, $sri);
 
@@ -985,9 +982,9 @@ 
 	 * @param string $which ='account_lid' type to convert to: account_lid (default), account_email, ...
 	 * @return string/false converted value or false on error ($account_id not found)
 	 */
-	function id2name($account_id,$which='account_lid')
+	function id2name($account_id, $which = 'account_lid')
 	{
-		return $this->frontend->id2name($account_id,$which);
+		return $this->frontend->id2name($account_id, $which);
 	}
 
 	/**
@@ -1000,7 +997,7 @@ 
 	function update_lastlogin($_account_id, $ip)
 	{
 		unset($_account_id, $ip);
-		return false;	// not longer supported
+		return false; // not longer supported
 	}
 
 	/**
@@ -1011,11 +1008,11 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int) $account_id || !($account_lid = $this->id2name($account_id))) return false;
+		if (!(int)$account_id || !($account_lid = $this->id2name($account_id))) return false;
 
-		$sri = ldap_search($this->ds,$this->group_context,'(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))',array('cn','gidnumber'));
+		$sri = ldap_search($this->ds, $this->group_context, '(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))', array('cn', 'gidnumber'));
 		$memberships = array();
-		foreach((array)ldap_get_entries($this->ds, $sri) as $key => $data)
+		foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $data)
 		{
 			if ($key === 'count') continue;
 
@@ -1035,13 +1032,13 @@ 
 		if (!is_numeric($_gid))
 		{
 			// try to recover
-			$_gid = $this->name2id($_gid,'account_lid','g');
+			$_gid = $this->name2id($_gid, 'account_lid', 'g');
 			if (!is_numeric($_gid)) return false;
 		}
 
-		$gid = abs($_gid);	// our gid is negative!
+		$gid = abs($_gid); // our gid is negative!
 
-		$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=$gid))",array('memberuid'));
+		$sri = ldap_search($this->ds, $this->group_context, "(&(objectClass=posixGroup)(gidnumber=$gid))", array('memberuid'));
 		$group = ldap_get_entries($this->ds, $sri);
 
 		$members = array();
@@ -1049,7 +1046,7 @@ 
 		{
 			unset($group[0]['memberuid']['count']);
 
-			foreach($group[0]['memberuid'] as $lid)
+			foreach ($group[0]['memberuid'] as $lid)
 			{
 				if (($id = $this->name2id($lid, 'account_lid', 'u')))
 				{
@@ -1066,27 +1063,27 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id uidnumber
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		// remove not longer existing memberships
 		if (($old_memberships = $this->memberships($account_id)))
 		{
 			$old_memberships = array_keys($old_memberships);
-			foreach(array_diff($old_memberships,$groups) as $gid)
+			foreach (array_diff($old_memberships, $groups) as $gid)
 			{
 				if (($members = $this->members($gid)))
 				{
 					unset($members[$account_id]);
-					$this->set_members($members,$gid);
+					$this->set_members($members, $gid);
 				}
 			}
 		}
 		// adding new memberships
-		foreach($old_memberships ? array_diff($groups,$old_memberships) : $groups as $gid)
+		foreach ($old_memberships ? array_diff($groups, $old_memberships) : $groups as $gid)
 		{
 			$members = $this->members($gid);
 			$members[$account_id] = $this->id2name($account_id);
-			$this->set_members($members,$gid);
+			$this->set_members($members, $gid);
 		}
 	}
 
@@ -1100,15 +1097,15 @@ 
 	 * @param boolean $uniqueMember =null should we set the uniqueMember attribute (default detect it)
 	 * @return boolean/array false on failure, array or true otherwise
 	 */
-	function set_members($members, $gid, array $objectclass=null, $use_cn=null)
+	function set_members($members, $gid, array $objectclass = null, $use_cn = null)
 	{
 		if (!($cn = $use_cn) && !($cn = $this->id2name($gid))) return false;
 
 		// do that group is a groupOf(Unique)Names or univentionGroup?
-		if (is_null($objectclass)) $objectclass = $this->id2name($gid,'objectclass');
+		if (is_null($objectclass)) $objectclass = $this->id2name($gid, 'objectclass');
 
 		$to_write = array('memberuid' => array());
-		foreach((array)$members as $key => $member)
+		foreach ((array)$members as $key => $member)
 		{
 			$member_dn = $this->id2name($member, 'account_dn');
 			if (is_numeric($member)) $member = $this->id2name($member);
@@ -1120,7 +1117,7 @@ 
 				{
 					$to_write['member'][] = $member_dn;
 				}
-				if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass))
+				if (array_intersect(array('groupofuniquenames', 'univentiongroup'), $objectclass))
 				{
 					$to_write['uniquemember'][] = $member_dn;
 				}
@@ -1131,31 +1128,31 @@ 
 		{
 			$to_write['member'][] = 'uid=dummy'.','.$this->user_context;
 		}
-		if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass) && !$to_write['uniquemember'])
+		if (array_intersect(array('groupofuniquenames', 'univentiongroup'), $objectclass) && !$to_write['uniquemember'])
 		{
 			$to_write['uniquemember'][] = 'uid=dummy'.','.$this->user_context;
 		}
 		if ($use_cn) return $to_write;
 
 		// set the member email addresses as forwards
-		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
+		if ($this->id2name($gid, 'account_email') && ($objectclass = $this->id2name($gid, 'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-			if (is_array($forward)) list($forward,$extra_attr) = $forward;
+			if (is_array($forward)) list($forward, $extra_attr) = $forward;
 			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
 
 			if ($forward)
 			{
 				$to_write[$forward] = array();
-				foreach($members as $key => $member)
+				foreach ($members as $key => $member)
 				{
-					if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+					if (($email = $this->id2name($member, 'account_email')))	$to_write[$forward][] = $email;
 				}
 			}
 		}
-		if (!ldap_modify($this->ds,'cn='.Api\Ldap::quote($cn).','.$this->group_context,$to_write))
+		if (!ldap_modify($this->ds, 'cn='.Api\Ldap::quote($cn).','.$this->group_context, $to_write))
 		{
-			echo "ldap_modify(,'cn=$cn,$this->group_context',".print_r($to_write,true)."))\n";
+			echo "ldap_modify(,'cn=$cn,$this->group_context',".print_r($to_write, true)."))\n";
 			return false;
 		}
 		return true;
@@ -1168,7 +1165,7 @@ 
 	 * @param string $account_type ='u' (optional, default to 'u')
 	 * @return int|boolean integer account_id (negative for groups) or false if none is free anymore
 	 */
-	protected function _get_nextid($account_type='u')
+	protected function _get_nextid($account_type = 'u')
 	{
 		$min = $this->frontend->config['account_min_id'] ? $this->frontend->config['account_min_id'] : 0;
 		$max = $this->frontend->config['account_max_id'] ? $this->frontend->config['account_max_id'] : 0;
@@ -1190,15 +1187,15 @@ 
 		/* Loop until we find a free id */
 		do
 		{
-			$account_id = (int) self::next_id($type,$min,$max);
+			$account_id = (int)self::next_id($type, $min, $max);
 		}
-		while ($account_id && ($this->frontend->exists($sign * $account_id) ||	// check need to include the sign!
+		while ($account_id && ($this->frontend->exists($sign * $account_id) || // check need to include the sign!
 			$this->frontend->exists(-1 * $sign * $account_id) ||
 			// if sambaadmin is installed, call it to check there's not yet a relative id (last part of SID) with that number
 			// to ease migration to AD or Samba4
 			$GLOBALS['egw_info']['apps']['sambaadmin'] && ExecMethod2('sambaadmin.sosambaadmin.sidExists', $account_id)));
 
-		if	(!$account_id || $max && $account_id > $max)
+		if (!$account_id || $max && $account_id > $max)
 		{
 			return False;
 		}
@@ -1213,14 +1210,14 @@ 
 	 * @param int $max =0 if != 0 maximum id allowed, if it would be exceeded we return false
 	 * @return int|boolean the next id or false if $max given and exceeded
 	 */
-	static function next_id($location,$min=0,$max=0)
+	static function next_id($location, $min = 0, $max = 0)
 	{
 		if (!$location)
 		{
 			return -1;
 		}
 
-		$id = (int)$GLOBALS['egw_info']['server'][$key='last_id_'.$location];
+		$id = (int)$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location];
 
 		if ($max && $id >= $max)
 		{
@@ -1228,10 +1225,10 @@ 
 		}
 		++$id;
 
-		if($id < $min) $id = $min;
+		if ($id < $min) $id = $min;
 
 		Api\Config::save_value($key, $id, 'phpgwapi', true);
-		$GLOBALS['egw_info']['server'][$key='last_id_'.$location] = $id;
+		$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location] = $id;
 
 		return (int)$id;
 	}
@@ -1244,18 +1241,18 @@ 
 	 * @param int $max =0 if != 0 maximum id allowed, if it would be exceeded we return false
 	 * @return int|boolean current id in the next_id table for a particular app/class or -1 for no app and false if $max is exceeded.
 	 */
-	static function last_id($location,$min=0,$max=0)
+	static function last_id($location, $min = 0, $max = 0)
 	{
 		if (!$location)
 		{
 			return -1;
 		}
 
-		$id = (int)$GLOBALS['egw_info']['server'][$key='last_id_'.$location];
+		$id = (int)$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location];
 
 		if (!$id || $id < $min)
 		{
-			return self::next_id($location,$min,$max);
+			return self::next_id($location, $min, $max);
 		}
 		if ($max && $id > $max)
 		{
@@ -1270,6 +1267,6 @@ 
 	function __wakeup()
 	{
 		$this->ds = Api\Ldap::factory(true, $this->frontend->config['ldap_host'],
-			$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
+			$this->frontend->config['ldap_root_dn'], $this->frontend->config['ldap_root_pw']);
 	}
 }

Braces +168 added lines, -43 removed lines

@@ -175,7 +175,10 @@ 
 	 */
 	function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id < 0)
 		{
@@ -238,17 +241,23 @@ 
 					$this->delete($data['account_id']);
 					unset($old['dn']);
 					// removing the namedObject object-class, if it's included
-					if ($key !== false) unset($old['objectclass'][$key]);
+					if ($key !== false)
+					{
+						unset($old['objectclass'][$key]);
+					}
 					$to_write = $old;
 					unset($old);
 				}
 			}
 		}
-		if (!$data['account_id'])	// new account
+		if (!$data['account_id'])
+		{
+			// new account
 		{
 			if (!($data['account_id'] = $data_utf8['account_id'] = $this->_get_nextid($is_group ? 'g' : 'u')))
 			{
 				return false;
+		}
 			}
 		}
 		// check if we need to write the objectclass: new entry or required object classes are missing
@@ -259,11 +268,14 @@ 
 			{
 				$to_write['objectclass'] = $old ? $old['objectclass'] : array();
 			}
-			if (!$old)	// for new accounts add additional addressbook object classes, if supported by server
+			if (!$old)
+			{
+				// for new accounts add additional addressbook object classes, if supported by server
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
 				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
 				{
 					$add = array();
+			}
 					if (is_array($additional))
 					{
 						$add = $additional;
@@ -272,7 +284,10 @@ 
 					if ($this->ldapServerInfo->supportsObjectClass($additional))
 					{
 						$to_write['objectclass'][] = $additional;
-						if ($add) $to_write += $add;
+						if ($add)
+						{
+							$to_write += $add;
+						}
 					}
 				}
 			}
@@ -281,7 +296,10 @@ 
 		}
 		if (!($dn = $old['dn']))
 		{
-			if (!$data['account_lid']) return false;
+			if (!$data['account_lid'])
+			{
+				return false;
+			}
 
 			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context :
 				'uid='.$data_utf8['account_lid'].','.$this->user_context;
@@ -302,24 +320,36 @@ 
 			{
 				$extra_attr = false;
 				$keep_objectclass = false;
-				if (is_array($forward)) list($forward,$extra_attr,$keep_objectclass) = $forward;
+				if (is_array($forward))
+				{
+					list($forward,$extra_attr,$keep_objectclass) = $forward;
+				}
 
 				if ($this->ldapServerInfo->supportsObjectClass($objectclass) &&
 					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
 				{
-					if ($data_utf8['account_email'])	// setting an email
+					if ($data_utf8['account_email'])
+					{
+						// setting an email
 					{
 						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
 						{
 							if ($old) $to_write['objectclass'] = $old['objectclass'];
+					}
 							$to_write['objectclass'][] = $objectclass;
 						}
-						if ($extra_attr) $to_write[$extra_attr] = $data_utf8['account_lid'];
+						if ($extra_attr)
+						{
+							$to_write[$extra_attr] = $data_utf8['account_lid'];
+						}
 						$to_write[static::MAIL_ATTR] = $data_utf8['account_email'];
 
 						if ($forward)
 						{
-							if (!$members) $members = $this->members($data['account_id']);
+							if (!$members)
+							{
+								$members = $this->members($data['account_id']);
+							}
 							$to_write[$forward] = array();
 							foreach (array_keys($members) as $member)
 							{
@@ -330,11 +360,20 @@ 
 							}
 						}
 					}
-					elseif($old)	// remove the mail and forwards only for existing entries
+					elseif($old)
+					{
+						// remove the mail and forwards only for existing entries
 					{
 						$to_write[static::MAIL_ATTR] = array();
-						if ($forward) $to_write[$forward] = array();
-						if ($extra_attr) $to_write[$extra_attr] = array();
+					}
+						if ($forward)
+						{
+							$to_write[$forward] = array();
+						}
+						if ($extra_attr)
+						{
+							$to_write[$extra_attr] = array();
+						}
 						if (!$keep_objectclass && ($key = array_search($objectclass,$old['objectclass'])))
 						{
 							$to_write['objectclass'] = $old['objectclass'];
@@ -368,7 +407,8 @@ 
 		}
 
 		// remove memberuid when adding a group
-		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
+		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid']))
+		{
 			unset($to_write['memberuid']);
 		}
 		// modifying or adding the entry
@@ -405,7 +445,10 @@ 
 	 */
 	function delete($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id < 0)
 		{
@@ -418,10 +461,16 @@ 
 
 			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . $account_id);
 		}
-		if (!$sri) return false;
+		if (!$sri)
+		{
+			return false;
+		}
 
 		$allValues = ldap_get_entries($this->ds, $sri);
-		if (!$allValues['count']) return false;
+		if (!$allValues['count'])
+		{
+			return false;
+		}
 
 		return ldap_delete($this->ds, $allValues[0]['dn']);
 	}
@@ -593,14 +642,20 @@ 
 		$utc_diff = date('Z');
 		if (isset($data['account_passwd']) && $data['account_passwd'])
 		{
-			if (preg_match('/^[a-f0-9]{32}$/', $data['account_passwd']))	// md5 --> ldap md5
+			if (preg_match('/^[a-f0-9]{32}$/', $data['account_passwd']))
+			{
+				// md5 --> ldap md5
 			{
 				$data['account_passwd'] = setup_cmd_ldap::hash_sql2ldap($data['account_passwd']);
 			}
-			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
+			}
+			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))
+			{
+				// if it's not already entcrypted, do so now
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_ldap($data['account_passwd']);
 			}
+			}
 			$to_write['userpassword'] = $data['account_passwd'];
 			$to_write['shadowlastchange'] = round((time()-$utc_diff) / (24*3600));
 		}
@@ -620,16 +675,28 @@ 
 			unset($to_write['shadowexpire']);	// gives protocoll error otherwise
 		}
 		//error_log(__METHOD__.__LINE__.$data['account_lid'].'#'.$data['account_lastpwd_change'].'#');
-		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
-		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0) $to_write['shadowlastchange'] = 0;
+		if ($data['account_lastpwd_change'])
+		{
+			$to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
+		}
+		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0)
+		{
+			$to_write['shadowlastchange'] = 0;
+		}
 		// lastlogin and lastlogin from are not availible via the shadowAccount object class
 		// $to_write['phpgwaccountlastlogin'] = $data['lastlogin'];
 		// $to_write['phpgwaccountlastloginfrom'] = $data['lastloginfrom'];
 
 		if ($this->frontend->config['ldap_extra_attributes'])
 		{
-			if (isset($data['homedirectory'])) $to_write['homedirectory']  = $data['homedirectory'];
-			if (isset($data['loginshell'])) $to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
+			if (isset($data['homedirectory']))
+			{
+				$to_write['homedirectory']  = $data['homedirectory'];
+			}
+			if (isset($data['loginshell']))
+			{
+				$to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
+			}
 		}
 		if (($new_entry || isset($to_write['homedirectory'])) && empty($to_write['homedirectory']))
 		{
@@ -676,8 +743,14 @@ 
 		}
 		// if it's a limited query, check if the unlimited query is cached
 		$start = $param['start'];
-		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $maxmatchs = 15;
-		if (!($offset = $param['offset'])) $offset = $maxmatchs;
+		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']))
+		{
+			$maxmatchs = 15;
+		}
+		if (!($offset = $param['offset']))
+		{
+			$offset = $maxmatchs;
+		}
 		unset($param['start']);
 		unset($param['offset']);
 		$unl_serial = serialize($param);
@@ -748,12 +821,18 @@ 
 					$fullSet = array();
 					foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $entry)
 					{
-						if ($key !== 'count') $fullSet[$entry['uid'][0]] = $entry[$order][0];
+						if ($key !== 'count')
+						{
+							$fullSet[$entry['uid'][0]] = $entry[$order][0];
+						}
 					}
 
-					if (is_numeric($param['type'])) // return only group-members
+					if (is_numeric($param['type']))
+					{
+						// return only group-members
 					{
 						$relevantAccounts = array();
+					}
 						$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid'));
 						$group = ldap_get_entries($this->ds, $sri);
 						$fullSet = $group[0]['memberuid'] ? array_intersect_key($fullSet, array_flip($group[0]['memberuid'])) : array();
@@ -791,7 +870,10 @@ 
 						//error_log(__METHOD__."() ldap=".array2string($allVals)." --> account=".array2string($account));
 						if ($param['active'] && !$this->frontend->is_active($account))
 						{
-							if (isset($totalcount)) --$totalcount;
+							if (isset($totalcount))
+							{
+								--$totalcount;
+							}
 							continue;
 						}
 						$account['account_fullname'] = Api\Accounts::format_username($account['account_lid'],
@@ -844,7 +926,10 @@ 
 							'account_status'    => 'A',
 							'account_fullname'  => Api\Translation::convert($allVals['cn'][0],'utf-8'),
 						);
-						if (isset($totalcount)) ++$totalcount;
+						if (isset($totalcount))
+						{
+							++$totalcount;
+						}
 					}
 				}
 			}
@@ -945,10 +1030,13 @@ 
 	{
 		$name = Api\Ldap::quote(Api\Translation::convert($_name,Api\Translation::charset(),'utf-8'));
 
-		if ($which == 'account_lid' && $account_type !== 'u') // groups only support account_lid
+		if ($which == 'account_lid' && $account_type !== 'u')
+		{
+			// groups only support account_lid
 		{
 
 			$sri = ldap_search($this->ds, $this->group_context, '(&(cn=' . $name . ')(objectclass=posixgroup))', array('gidNumber'));
+		}
 			$allValues = ldap_get_entries($this->ds, $sri);
 
 			if (@$allValues[0]['gidnumber'][0])
@@ -961,7 +1049,8 @@ 
 			'account_email' => static::MAIL_ATTR,
 			'account_fullname' => 'cn',
 		);
-		if (!isset($to_ldap[$which]) || $account_type === 'g') {
+		if (!isset($to_ldap[$which]) || $account_type === 'g')
+		{
 		    return False;
 		}
 
@@ -1011,13 +1100,19 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int) $account_id || !($account_lid = $this->id2name($account_id))) return false;
+		if (!(int) $account_id || !($account_lid = $this->id2name($account_id)))
+		{
+			return false;
+		}
 
 		$sri = ldap_search($this->ds,$this->group_context,'(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))',array('cn','gidnumber'));
 		$memberships = array();
 		foreach((array)ldap_get_entries($this->ds, $sri) as $key => $data)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$memberships[(string) -$data['gidnumber'][0]] = $data['cn'][0];
 		}
@@ -1036,7 +1131,10 @@ 
 		{
 			// try to recover
 			$_gid = $this->name2id($_gid,'account_lid','g');
-			if (!is_numeric($_gid)) return false;
+			if (!is_numeric($_gid))
+			{
+				return false;
+			}
 		}
 
 		$gid = abs($_gid);	// our gid is negative!
@@ -1102,16 +1200,25 @@ 
 	 */
 	function set_members($members, $gid, array $objectclass=null, $use_cn=null)
 	{
-		if (!($cn = $use_cn) && !($cn = $this->id2name($gid))) return false;
+		if (!($cn = $use_cn) && !($cn = $this->id2name($gid)))
+		{
+			return false;
+		}
 
 		// do that group is a groupOf(Unique)Names or univentionGroup?
-		if (is_null($objectclass)) $objectclass = $this->id2name($gid,'objectclass');
+		if (is_null($objectclass))
+		{
+			$objectclass = $this->id2name($gid,'objectclass');
+		}
 
 		$to_write = array('memberuid' => array());
 		foreach((array)$members as $key => $member)
 		{
 			$member_dn = $this->id2name($member, 'account_dn');
-			if (is_numeric($member)) $member = $this->id2name($member);
+			if (is_numeric($member))
+			{
+				$member = $this->id2name($member);
+			}
 
 			if ($member)
 			{
@@ -1135,21 +1242,33 @@ 
 		{
 			$to_write['uniquemember'][] = 'uid=dummy'.','.$this->user_context;
 		}
-		if ($use_cn) return $to_write;
+		if ($use_cn)
+		{
+			return $to_write;
+		}
 
 		// set the member email addresses as forwards
 		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-			if (is_array($forward)) list($forward,$extra_attr) = $forward;
-			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
+			if (is_array($forward))
+			{
+				list($forward,$extra_attr) = $forward;
+			}
+			if ($extra_attr && ($uid = $this->id2name($gid)))
+			{
+				$to_write[$extra_attr] = $uid;
+			}
 
 			if ($forward)
 			{
 				$to_write[$forward] = array();
 				foreach($members as $key => $member)
 				{
-					if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+					if (($email = $this->id2name($member,'account_email')))
+					{
+						$to_write[$forward][] = $email;
+					}
 				}
 			}
 		}
@@ -1175,7 +1294,10 @@ 
 
 		// prefer ids above 1000 (below reserved for system users under AD or Linux),
 		// if that's possible within what is configured, or nothing is configured
-		if ($min < 1000 && (!$max || $max > 1000)) $min = 1000;
+		if ($min < 1000 && (!$max || $max > 1000))
+		{
+			$min = 1000;
+		}
 
 		if ($account_type == 'g')
 		{
@@ -1228,7 +1350,10 @@ 
 		}
 		++$id;
 
-		if($id < $min) $id = $min;
+		if($id < $min)
+		{
+			$id = $min;
+		}
 
 		Api\Config::save_value($key, $id, 'phpgwapi', true);
 		$GLOBALS['egw_info']['server'][$key='last_id_'.$location] = $id;

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

@@ -775,7 +775,7 @@ 
 					$test = @$allVals['uid'][0];
 					if (!$this->frontend->config['global_denied_users'][$test] && $allVals['uid'][0])
 					{
-						$account = Array(
+						$account = array(
 							'account_id'        => $allVals['uidnumber'][0],
 							'account_lid'       => Api\Translation::convert($allVals['uid'][0],'utf-8'),
 							'account_type'      => 'u',
@@ -835,7 +835,7 @@ 
 					$test = $allVals['cn'][0];
 					if (!$this->frontend->config['global_denied_groups'][$test] && $allVals['cn'][0])
 					{
-						$accounts[(string)-$allVals['gidnumber'][0]] = Array(
+						$accounts[(string)-$allVals['gidnumber'][0]] = array(
 							'account_id'        => -$allVals['gidnumber'][0],
 							'account_lid'       => Api\Translation::convert($allVals['cn'][0],'utf-8'),
 							'account_type'      => 'g',

api/src/Accounts/Univention.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 * If no account_id is set in data the account is added and the new id is set in $data.
 	 *
 	 * @param array $data array with account-data
-	 * @return int|boolean the account_id or false on error
+	 * @return false|string the account_id or false on error
 	 */
 	function save(&$data)
 	{

Spacing +6 added lines, -7 removed lines

@@ -62,7 +62,7 @@ 
 			if (!$data['account_id'] && $data['account_type'] !== 'g')
 			{
 				$params = array(
-					'users/user','create',
+					'users/user', 'create',
 					'--binddn', $config['ldap_root_dn'],
 					'--bindpwd', 5=>$config['ldap_root_pw'],
 					'--position', $config['ldap_context'],
@@ -87,7 +87,7 @@ 
 						}
 						$hostname = $account->acc_imap_host;
 					}
-					catch(Exception $e) {
+					catch (Exception $e) {
 						unset($e);
 					}
 					if (empty($hostname)) $hostname = trim(system('hostname -f'));
@@ -99,14 +99,14 @@ 
 				$output = implode("\n", $output_arr);
 				if ($ret || !preg_match('/^Object created: (uid=.*)$/mui', $output, $matches))
 				{
-					$params[5] = '********';	// mask out password!
+					$params[5] = '********'; // mask out password!
 					$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
 					throw new Api\Exception\WrongUserinput($cmd."\nreturned\n".$output);
 				}
 				$data['account_dn'] = $matches[1];
 				$data['account_id'] = $this->name2id($data['account_lid'], 'account_lid', 'u');
 			}
-			elseif($data['account_id'] && ($data['old_loginid'] || ($data['old_loginid'] = $this->id2name($data['account_id']))) &&
+			elseif ($data['account_id'] && ($data['old_loginid'] || ($data['old_loginid'] = $this->id2name($data['account_id']))) &&
 				$data['account_lid'] != $data['old_loginid'] &&
 				($data['account_dn'] = $this->id2name($data['account_id'], 'account_dn')))
 			{
@@ -123,12 +123,11 @@ 
 				$output = implode("\n", $output_arr);
 				if ($ret || !preg_match('/^Object modified: ((uid|cn)=.*)$/mui', $output, $matches))
 				{
-					$params[5] = '********';	// mask out password!
+					$params[5] = '********'; // mask out password!
 					$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
 					throw new Api\Exception\WrongUserinput($cmd."\nreturned\n".$output);
 				}
-				$data['account_dn'] = $data['account_type'] !== 'g' ? $matches[1] :
-					// duno why but directory-manager returns old dn for groups ...
+				$data['account_dn'] = $data['account_type'] !== 'g' ? $matches[1] : // duno why but directory-manager returns old dn for groups ...
 					preg_replace('/^cn=[^,]+,/', 'cn='.$data['account_lid'].',', $data['account_dn']);
 			}
 		}

Braces +4 added lines, -1 removed lines

@@ -90,7 +90,10 @@
 					catch(Exception $e) {
 						unset($e);
 					}
-					if (empty($hostname)) $hostname = trim(system('hostname -f'));
+					if (empty($hostname))
+					{
+						$hostname = trim(system('hostname -f'));
+					}
 					$params[] = '--set'; $params[] = 'mailHomeServer='.$hostname;
 				}
 				$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));

api/src/Acl.php

Doc Comments +3 added lines, -3 removed lines

@@ -166,7 +166,7 @@ 
 	 * Delete ACL record in the repository of the class
 	 *
 	 * @param string $appname appname or '' for $GLOBALS['egw_info']['flags']['currentapp']
-	 * @param string/boolean $location location or false for all locations
+	 * @param boolean $location location or false for all locations
 	 * @return array all ACL records from $this->data.
 	 */
 	function delete($appname,$location)
@@ -267,8 +267,8 @@ 
 	/**
 	 * check required rights agains the internal repository (included rights of $this->account_id and all it's memberships)
 	 *
-	 * @param $location app location
-	 * @param $required required right to check against
+	 * @param string $location app location
+	 * @param integer $required required right to check against
 	 * @param $appname optional defaults to currentapp
 	 * @return boolean
 	 */

Spacing +98 added lines, -98 removed lines

@@ -51,15 +51,15 @@ 
 	/**
 	 * Constants for acl rights, like old EGW_ACL_* defines
 	 */
-	const READ      = 1;	// EGW_ACL_READ
-	const ADD       = 2;	// EGW_ACL_ADD
-	const EDIT      = 4;	// EGW_ACL_EDIT
-	const DELETE    = 8;	// EGW_ACL_DELETE
-	const PRIVAT    = 16;	// EGW_ACL_PRIVATE can NOT use PRIVATE as it is a PHP keyword, using German PRIVAT instead!
-	const GROUPMGRS = 32;	// EGW_ACL_GROUP_MANAGERS
-	const CUSTOM1  = 64;		// EGW_ACL_CUSTOM_1
-	const CUSTOM2  = 128;	// EGW_ACL_CUSTOM_2
-	const CUSTOM3  = 256;	// EGW_ACL_CUSTOM_3
+	const READ      = 1; // EGW_ACL_READ
+	const ADD       = 2; // EGW_ACL_ADD
+	const EDIT      = 4; // EGW_ACL_EDIT
+	const DELETE    = 8; // EGW_ACL_DELETE
+	const PRIVAT    = 16; // EGW_ACL_PRIVATE can NOT use PRIVATE as it is a PHP keyword, using German PRIVAT instead!
+	const GROUPMGRS = 32; // EGW_ACL_GROUP_MANAGERS
+	const CUSTOM1  = 64; // EGW_ACL_CUSTOM_1
+	const CUSTOM2  = 128; // EGW_ACL_CUSTOM_2
+	const CUSTOM3  = 256; // EGW_ACL_CUSTOM_3
 
 	/**
 	 * ACL constructor for setting account id
@@ -82,7 +82,7 @@ 
 		}
 		if ((int)$this->account_id != (int)$account_id)
 		{
-			$this->account_id = get_account_id((int)$account_id,@$GLOBALS['egw_info']['user']['account_id']);
+			$this->account_id = get_account_id((int)$account_id, @$GLOBALS['egw_info']['user']['account_id']);
 		}
 	}
 
@@ -96,7 +96,7 @@ 
 	 * @param boolean|array $no_groups = false if true, do not use memberships, if array do not use given groups
 	 * @return array along with storing it in $acl->data.  <br>
 	 */
-	function read_repository($no_groups=false)
+	function read_repository($no_groups = false)
 	{
 		// For some reason, calling this via XML-RPC doesn't call the constructor.
 		// Here is yet another work around(tm) (jengo)
@@ -111,14 +111,14 @@ 
 		else
 		{
 			$acl_acc_list = (array)$GLOBALS['egw']->accounts->memberships($this->account_id, true);
-			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list,$no_groups);
-			array_unshift($acl_acc_list,$this->account_id);
+			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list, $no_groups);
+			array_unshift($acl_acc_list, $this->account_id);
 		}
 
 		$this->data = Array();
-		foreach($this->db->select(self::TABLE,'*',array('acl_account' => $acl_acc_list ),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select(self::TABLE, '*', array('acl_account' => $acl_acc_list), __LINE__, __FILE__) as $row)
 		{
-			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row,'acl_');
+			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row, 'acl_');
 		}
 		return $this->data;
 	}
@@ -147,15 +147,15 @@ 
 	 * @param int $rights rights
 	 * @return array all ACL records from $this->data.
 	 */
-	function add($appname,$location,$rights)
+	function add($appname, $location, $rights)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$row = array(
 			'appname'  => $appname,
 			'location' => $location,
-			'account'  => (int) $this->account_id,
-			'rights'   => (int) $rights
+			'account'  => (int)$this->account_id,
+			'rights'   => (int)$rights
 		);
 		$this->data[$row['appname'].'-'.$row['location'].'-'.$row['account']] = $row;
 
@@ -169,11 +169,11 @@ 
 	 * @param string/boolean $location location or false for all locations
 	 * @return array all ACL records from $this->data.
 	 */
-	function delete($appname,$location)
+	function delete($appname, $location)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
-		foreach($this->data as $idx => $value)
+		foreach ($this->data as $idx => $value)
 		{
 			if ($value['appname'] == $appname &&
 				($location === false || $value['location'] == $location) &&
@@ -192,24 +192,24 @@ 
 	 */
 	function save_repository()
 	{
-		$this->db->delete(self::TABLE,array(
+		$this->db->delete(self::TABLE, array(
 			'acl_account' => $this->account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['account'] == $this->account_id)
 			{
-				$this->db->insert(self::TABLE,array(
+				$this->db->insert(self::TABLE, array(
 					'acl_appname'  => $value['appname'],
 					'acl_location' => $value['location'],
 					'acl_account'  => $this->account_id,
 					'acl_rights'   => $value['rights'],
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 			}
 		}
 		if ($this->account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -227,7 +227,7 @@ 
 	 * @param string $appname optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return int all rights or'ed together
 	 */
-	function get_rights($location,$appname = '')
+	function get_rights($location, $appname = '')
 	{
 		// For XML-RPC, change this once its working correctly for passing parameters (jengo)
 		if (is_array($location))
@@ -247,7 +247,7 @@ 
 			return True;
 		}
 		$rights = 0;
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['appname'] == $appname)
 			{
@@ -274,9 +274,9 @@ 
 	 */
 	function check($location, $required, $appname = False)
 	{
-		$rights = $this->get_rights($location,$appname);
+		$rights = $this->get_rights($location, $appname);
 
-		return !!($rights & $required);
+		return !!($rights&$required);
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 * @param array $memberships = array() additional account_id, eg. memberships to match beside $this->account_id, default none
 	 * @return int $rights
 	 */
-	function get_specific_rights($location, $appname = '', $memberships=array())
+	function get_specific_rights($location, $appname = '', $memberships = array())
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -297,10 +297,10 @@ 
 		}
 		$rights = 0;
 
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['appname'] == $appname &&
-				($value['location'] == $location ||	$value['location'] == 'everywhere') &&
+				($value['location'] == $location || $value['location'] == 'everywhere') &&
 				($value['account'] == $this->account_id || $memberships && in_array($value['account'], $memberships)))
 			{
 				if ($value['rights'] == 0)
@@ -323,9 +323,9 @@ 
 	 */
 	function check_specific($location, $required, $appname = '')
 	{
-		$rights = $this->get_specific_rights($location,$appname);
+		$rights = $this->get_specific_rights($location, $appname);
 
-		return !!($rights & $required);
+		return !!($rights&$required);
 	}
 
 	/**************************************************************************\
@@ -344,16 +344,16 @@ 
 	function add_repository($app, $location, $account_id, $rights)
 	{
 		//echo "<p>self::add_repository('$app','$location',$account_id,$rights);</p>\n";
-		$this->db->insert(self::TABLE,array(
+		$this->db->insert(self::TABLE, array(
 			'acl_rights' => $rights,
-		),array(
+		), array(
 			'acl_appname' => $app,
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		if ($account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -368,7 +368,7 @@ 
 	 * @param int/boolean $accountid = '' account id, default 0=$this->account_id, or false to delete all entries for $app/$location
 	 * @return int number of rows deleted
 	 */
-	function delete_repository($app, $location, $accountid='')
+	function delete_repository($app, $location, $accountid = '')
 	{
 		static $cache_accountid = array();
 
@@ -378,22 +378,22 @@ 
 		);
 		if ($accountid !== false)
 		{
-			if(isset($cache_accountid[$accountid]) && $cache_accountid[$accountid])
+			if (isset($cache_accountid[$accountid]) && $cache_accountid[$accountid])
 			{
 				$where['acl_account'] = $cache_accountid[$accountid];
 			}
 			else
 			{
-				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
+				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid, $this->account_id);
 			}
 		}
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
 		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
 
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -406,15 +406,15 @@ 
 	 * @param string $appname = '' defaults to current app
 	 * @return int/boolean rights or false if none exist
 	 */
-	function get_specific_rights_for_account($account_id,$location,$appname='')
+	function get_specific_rights_for_account($account_id, $location, $appname = '')
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
-		return $this->db->select(self::TABLE,'acl_rights',array(
+		return $this->db->select(self::TABLE, 'acl_rights', array(
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
 			'acl_appname'  => $appname,
-		),__LINE__,__FILE__)->fetchColumn();
+		), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -424,15 +424,15 @@ 
 	 * @param string $appname = '' defaults to current app
 	 * @return array with account => rights pairs
 	 */
-	function get_all_rights($location,$appname='')
+	function get_all_rights($location, $appname = '')
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$rights = array();
-		foreach($this->db->select(self::TABLE,'acl_account,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_account,acl_rights', array(
 			'acl_location' => $location,
 			'acl_appname'  => $appname,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$rights[$row['acl_account']] = $row['acl_rights'];
 		}
@@ -447,7 +447,7 @@ 
 	 * @param boolean $use_memberships = true
 	 * @return array with location => rights pairs
 	 */
-	function get_all_location_rights($account_id,$appname='',$use_memberships=true)
+	function get_all_location_rights($account_id, $appname = '', $use_memberships = true)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -458,10 +458,10 @@ 
 			$accounts[] = $account_id;
 		}
 		$rights = array();
-		foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_rights', array(
 			'acl_account' => $accounts,
 			'acl_appname' => $appname,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$rights[$row['acl_location']] |= $row['acl_rights'];
 		}
@@ -480,28 +480,28 @@ 
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$account_id = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$account_id = get_account_id($accountid,$this->account_id);
+			$account_id = get_account_id($accountid, $this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
 		$rights = 0;
 		$apps = false;
-		foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_appname', 'acl_rights'), array(
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if ($row['acl_rights'] == 0)
 			{
 				return False;
 			}
 			$rights |= $row['acl_rights'];
-			if (!!($rights & $required))
+			if (!!($rights&$required))
 			{
 				$apps[] = $row['acl_appname'];
 			}
@@ -521,21 +521,21 @@ 
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$accountid = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$accountid = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
+			$accountid = $cache_accountid[$accountid] = get_account_id($accountid, $this->account_id);
 		}
 		$locations = false;
-		foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_rights', array(
 			'acl_appname' => $app,
 			'acl_account' => $accountid,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
-			if ($row['acl_rights'] & $required)
+			if ($row['acl_rights']&$required)
 			{
 				$locations[] = $row['acl_location'];
 			}
@@ -556,14 +556,14 @@ 
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$accounts = false;
-		foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_account', 'acl_rights'), array(
 			'acl_appname'  => $app,
 			'acl_location' => $location,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
-			if (!!($row['acl_rights'] & $required))
+			if (!!($row['acl_rights']&$required))
 			{
-				$accounts[] = (int) $row['acl_account'];
+				$accounts[] = (int)$row['acl_account'];
 			}
 		}
 		return $accounts;
@@ -575,14 +575,14 @@ 
 	 * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return boolean/array false if there are no matching location in the db or array of locations
 	 */
-	function get_locations_for_app($app='')
+	function get_locations_for_app($app = '')
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$locations = false;
-		foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
+		foreach ($this->db->select(self::TABLE, 'DISTINCT '.'acl_location', array(
 			'acl_appname'  => $app,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if (($location = $row['acl_location']) != 'run')
 			{
@@ -600,38 +600,38 @@ 
 	 * @param boolean $add_implicit_apps = true true: add apps every user has implicit rights
 	 * @return array containing list of apps
 	 */
-	function get_user_applications($accountid = '', $use_memberships=true, $add_implicit_apps=true)
+	function get_user_applications($accountid = '', $use_memberships = true, $add_implicit_apps = true)
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$account_id = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$account_id = get_account_id($accountid,$this->account_id);
+			$account_id = get_account_id($accountid, $this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
 		if ($use_memberships && (int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
 		$memberships[] = (int)$account_id;
 
 		$apps = array();
-		foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_appname', 'acl_rights'), array(
 			'acl_location' => 'run',
 			'acl_account'  => $memberships,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$app = $row['acl_appname'];
-			if(!isset($apps[$app]))
+			if (!isset($apps[$app]))
 			{
 				$apps[$app] = 0;
 			}
-			$apps[$app] |= (int) $row['acl_rights'];
+			$apps[$app] |= (int)$row['acl_rights'];
 		}
 		if ($add_implicit_apps)
 		{
-			$apps['api'] = 1;	// give everyone implicit rights for the home app
+			$apps['api'] = 1; // give everyone implicit rights for the home app
 		}
 		return $apps;
 	}
@@ -645,29 +645,29 @@ 
 	 * @param int $user = null user whos grants to return, default current user
 	 * @return array with account-ids (of owners) and granted rights as values
 	 */
-	function get_grants($app='',$enum_group_acls=true,$user=null)
+	function get_grants($app = '', $enum_group_acls = true, $user = null)
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 		if (!$user) $user = $this->account_id;
 
-		static $cache = array();	// some caching withing the request
+		static $cache = array(); // some caching withing the request
 
-		$grants =& $cache[$app][$user];
+		$grants = & $cache[$app][$user];
 		if (!isset($grants))
 		{
 			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$memberships[] = $user;
 
 			$grants = $accounts = Array();
-			foreach($this->db->select(self::TABLE,array('acl_account','acl_rights','acl_location'),array(
+			foreach ($this->db->select(self::TABLE, array('acl_account', 'acl_rights', 'acl_location'), array(
 				'acl_appname'  => $app,
 				'acl_location' => $memberships,
-			),__LINE__,__FILE__) as $row)
+			), __LINE__, __FILE__) as $row)
 			{
 				$grantor    = $row['acl_account'];
 				$rights     = $row['acl_rights'];
 
-				if(!isset($grants[$grantor]))
+				if (!isset($grants[$grantor]))
 				{
 					$grants[$grantor] = 0;
 				}
@@ -675,17 +675,17 @@ 
 
 				// if the right is granted from a group and we enummerated group ACL's
 				if ($GLOBALS['egw']->accounts->get_type($grantor) == 'g' && $enum_group_acls &&
-					(!is_array($enum_group_acls) || !in_array($grantor,$enum_group_acls)))
+					(!is_array($enum_group_acls) || !in_array($grantor, $enum_group_acls)))
 				{
 					// return the grant for each member of the group (false = also for no longer active users)
-					foreach((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
+					foreach ((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
 					{
-						if (!$grantor) continue;	// can happen if group has no members
+						if (!$grantor) continue; // can happen if group has no members
 
 						// Don't allow to override private with group ACL's!
 						$rights &= ~self::PRIVAT;
 
-						if(!isset($grants[$grantor]))
+						if (!isset($grants[$grantor]))
 						{
 							$grants[$grantor] = 0;
 						}
@@ -707,21 +707,21 @@ 
 	 */
 	function delete_account($account_id)
 	{
-		if ((int) $account_id)
+		if ((int)$account_id)
 		{
 			// Delete all grants from this account
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_account' => $account_id
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 			// Delete all grants to this account
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_location' => $account_id
-			),__LINE__, __FILE__);
+			), __LINE__, __FILE__);
 			// delete all memberships in account_id (if it is a group)
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_appname' => 'phpgw_group',
 				'acl_location' => $account_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 	}
 
@@ -732,15 +732,15 @@ 
 	 * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return array with location => array(account => rights) pairs
 	 */
-	function get_location_grants($location,$app='')
+	function get_location_grants($location, $app = '')
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$locations = array();
-		foreach($this->db->select(self::TABLE,'acl_location,acl_account,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_account,acl_rights', array(
 			'acl_appname'  => $app,
 			'acl_location LIKE '.$this->db->quote($location),
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if (($location = $row['acl_location']) != 'run')
 			{

Braces +81 added lines, -20 removed lines

@@ -111,7 +111,10 @@ 
 		else
 		{
 			$acl_acc_list = (array)$GLOBALS['egw']->accounts->memberships($this->account_id, true);
-			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			if (is_array($no_groups))
+			{
+				$acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			}
 			array_unshift($acl_acc_list,$this->account_id);
 		}
 
@@ -149,7 +152,10 @@ 
 	 */
 	function add($appname,$location,$rights)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$row = array(
 			'appname'  => $appname,
@@ -171,7 +177,10 @@ 
 	 */
 	function delete($appname,$location)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		foreach($this->data as $idx => $value)
 		{
@@ -209,10 +218,13 @@ 
 			}
 		}
 		if ($this->account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return $this->data;
 	}
 
@@ -240,7 +252,10 @@ 
 		{
 			$this->read_repository();
 		}
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -289,7 +304,10 @@ 
 	 */
 	function get_specific_rights($location, $appname = '', $memberships=array())
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -353,10 +371,13 @@ 
 		),__LINE__,__FILE__);
 
 		if ($account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return True;
 	}
 
@@ -387,11 +408,17 @@ 
 				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
 			}
 		}
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
-		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
+		}
+		if ($app == '%' || $app == '%%')
+		{
+			unset($where['acl_appname']);
+		}
 
 		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
 
@@ -408,7 +435,10 @@ 
 	 */
 	function get_specific_rights_for_account($account_id,$location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		return $this->db->select(self::TABLE,'acl_rights',array(
 			'acl_location' => $location,
@@ -426,7 +456,10 @@ 
 	 */
 	function get_all_rights($location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$rights = array();
 		foreach($this->db->select(self::TABLE,'acl_account,acl_rights',array(
@@ -449,7 +482,10 @@ 
 	 */
 	function get_all_location_rights($account_id,$appname='',$use_memberships=true)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = array($account_id);
 		if ($use_memberships && (int)$account_id > 0)
@@ -553,7 +589,10 @@ 
 	 */
 	function get_ids_for_location($location, $required, $app = '')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = false;
 		foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
@@ -577,7 +616,10 @@ 
 	 */
 	function get_locations_for_app($app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = false;
 		foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
@@ -613,7 +655,10 @@ 
 			$account_id = get_account_id($accountid,$this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
-		if ($use_memberships && (int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		if ($use_memberships && (int)$account_id > 0)
+		{
+			$memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		}
 		$memberships[] = (int)$account_id;
 
 		$apps = array();
@@ -647,15 +692,24 @@ 
 	 */
 	function get_grants($app='',$enum_group_acls=true,$user=null)
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
-		if (!$user) $user = $this->account_id;
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
+		if (!$user)
+		{
+			$user = $this->account_id;
+		}
 
 		static $cache = array();	// some caching withing the request
 
 		$grants =& $cache[$app][$user];
 		if (!isset($grants))
 		{
-			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			if ((int)$user > 0)
+			{
+				$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			}
 			$memberships[] = $user;
 
 			$grants = $accounts = Array();
@@ -680,7 +734,11 @@ 
 					// return the grant for each member of the group (false = also for no longer active users)
 					foreach((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
 					{
-						if (!$grantor) continue;	// can happen if group has no members
+						if (!$grantor)
+						{
+							continue;
+						}
+						// can happen if group has no members
 
 						// Don't allow to override private with group ACL's!
 						$rights &= ~self::PRIVAT;
@@ -734,7 +792,10 @@ 
 	 */
 	function get_location_grants($location,$app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = array();
 		foreach($this->db->select(self::TABLE,'acl_location,acl_account,acl_rights',array(

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

@@ -36,7 +36,7 @@ 
 	/**
 	 * @var array $data internal repository with acl rows for the given app and account-id (incl. memberships)
 	 */
-	var $data = Array();
+	var $data = array();
 	/**
 	 * internal copy of the db-object
 	 *
@@ -115,7 +115,7 @@ 
 			array_unshift($acl_acc_list,$this->account_id);
 		}
 
-		$this->data = Array();
+		$this->data = array();
 		foreach($this->db->select(self::TABLE,'*',array('acl_account' => $acl_acc_list ),__LINE__,__FILE__) as $row)
 		{
 			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row,'acl_');
@@ -658,7 +658,7 @@ 
 			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$memberships[] = $user;
 
-			$grants = $accounts = Array();
+			$grants = $accounts = array();
 			foreach($this->db->select(self::TABLE,array('acl_account','acl_rights','acl_location'),array(
 				'acl_appname'  => $app,
 				'acl_location' => $memberships,

api/src/Asyncservice.php

Doc Comments +3 added lines, -3 removed lines

@@ -324,7 +324,7 @@ 
 	 * cancels a timer
 	 *
 	 * @param string $id has to be the one used to set it.
-	 * @return boolean True if the timer exists and is not expired.
+	 * @return integer True if the timer exists and is not expired.
 	 */
 	function cancel_timer($id)
 	{
@@ -470,7 +470,7 @@ 
 	/**
 	 * reads all matching db-rows / jobs
 	 *
-	 * @param string $id =0 reads all expired rows / jobs ready to run\
+	 * @param integer $id =0 reads all expired rows / jobs ready to run\
 	 * 	!= 0 reads all rows/jobs matching $id (sql-wildcards '%' and '_' can be used)
 	 * @param array|string $cols ='*' string or array of column-names / select-expressions
 	 * @param int|bool $offset =False offset for a limited query or False (default)
@@ -558,7 +558,7 @@ 
 	/**
 	 * delete db-row / job with $id
 	 *
-	 * @return boolean False if $id not found else True
+	 * @return integer False if $id not found else True
 	 */
 	function delete($id)
 	{

Spacing +74 added lines, -76 removed lines

@@ -49,9 +49,9 @@ 
 		{
 			$this->db = $GLOBALS['egw_setup']->db;
 		}
-		$this->cronline = EGW_SERVER_ROOT . '/api/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
+		$this->cronline = EGW_SERVER_ROOT.'/api/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
 
-		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows";	// atm cron-jobs dont work on win
+		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows"; // atm cron-jobs dont work on win
 	}
 
 	/**
@@ -71,10 +71,10 @@ 
 	 * @param boolean $debug =false
 	 * @return boolean False if $id already exists, else True
 	 */
-	function set_timer($times,$id,$method,$data=null,$account_id=False,$debug=false)
+	function set_timer($times, $id, $method, $data = null, $account_id = False, $debug = false)
 	{
 		if (empty($id) || empty($method) || $this->read($id) ||
-				!($next = $this->next_run($times,$debug)))
+				!($next = $this->next_run($times, $debug)))
 		{
 			return False;
 		}
@@ -107,14 +107,14 @@ 
 	 * @param int $now Use this time to calculate then next run from.  Defaults to time().
 	 * @return int a unix timestamp of the next execution time or False if no more executions
 	 */
-	function next_run($times,$debug=False, $now = null)
+	function next_run($times, $debug = False, $now = null)
 	{
 		if ($this->debug)
 		{
-			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
-			$debug = True;	// enable syntax-error messages too
+			echo "<p>next_run("; print_r($times); echo ",'$debug', ".date('Y-m-d H:i', $now).")</p>\n";
+			$debug = True; // enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if (is_null($now)) {
 			$now = time();
 		}
 
@@ -142,7 +142,7 @@ 
 			'dow'   => 6,
 			'day'   => 31,
 			'month' => 12,
-			'year'  => date('Y')+10	// else */[0-9] would never stop returning numbers
+			'year'  => date('Y') + 10	// else */[0-9] would never stop returning numbers
 		);
 		$min_unit = array(
 			'min'   => 0,
@@ -158,7 +158,7 @@ 
 		// get set to the minimum after
 		//
 		$i = $first_set = $last_set = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$i;
 			if (isset($times[$u]))
@@ -176,24 +176,24 @@ 
 		// (as descript above), enumerations are arrays with unit-values as keys
 		//
 		$n = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u]) ? 'True' : 'False')."</p>\n"; }
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if (is_array($times[$u])) {
 					$time = array_keys($times[$u]);
 				} else {
-					$time = explode(',',$times[$u]);
+					$time = explode(',', $times[$u]);
 				}
 				$times[$u] = array();
 
-				foreach($time as $t)
+				foreach ($time as $t)
 				{
-					if (strpos($t,'-') !== False && strpos($t,'/') === False)
+					if (strpos($t, '-') !== False && strpos($t, '/') === False)
 					{
-						list($min,$max) = $arr = explode('-',$t);
+						list($min, $max) = $arr = explode('-', $t);
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
@@ -210,7 +210,7 @@ 
 					{
 						if ((string)$t == '*') 	$t = '*/1';
 
-						list($one,$inc) = $arr = explode('/',$t);
+						list($one, $inc) = $arr = explode('/', $t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
@@ -225,7 +225,7 @@ 
 						}
 						else
 						{
-							list($min,$max) = $arr = explode('-',$one);
+							list($min, $max) = $arr = explode('-', $one);
 							if (empty($one) || $one == '*')
 							{
 								$min = $min_unit[$u];
@@ -266,20 +266,19 @@ 
 		{
 			$future = False;
 
-			foreach($units as $u => $date_pattern)
+			foreach ($units as $u => $date_pattern)
 			{
-				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) :
-					(int)date($date_pattern,mktime(12,0,0,$found['month'],$found['day'],$found['year']));
+				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) : (int)date($date_pattern, mktime(12, 0, 0, $found['month'], $found['day'], $found['year']));
 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
 					if ($this->debug) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
-					continue;	// already set
+					continue; // already set
 				}
-				foreach(array_keys($times[$u]) as $unit_value)
+				foreach (array_keys($times[$u]) as $unit_value)
 				{
-					switch($u)
+					switch ($u)
 					{
 						case 'dow':
 							$valid = $unit_value == $unit_now;
@@ -302,12 +301,12 @@ 
 				if (!isset($found[$u]))		// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
-					if (!isset($nexts[count($found)-1]))
+					if (!isset($nexts[count($found) - 1]))
 					{
 						if ($this->debug) echo "<p>Nothing found, exiting !!!</p>\n";
 						return False;
 					}
-					$next = $nexts[count($found)-1];
+					$next = $nexts[count($found) - 1];
 					$over = $found[$next];
 					unset($found[$next]);
 					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
@@ -317,7 +316,7 @@ 
 		}
 		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
 
-		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
+		return mktime($found['hour'], $found['min'], 0, $found['month'], $found['day'], $found['year']);
 	}
 
 	/**
@@ -339,7 +338,7 @@ 
 	 * @return mixed if !$set array('start' => $start,'end' => $end) with timestamps of last check_run start and end,  \
 	 * 	!$end means check_run is just running. If $set returns True if it was able to get the semaphore, else False
 	 */
-	function last_check_run($semaphore=False,$release=False,$run_by='')
+	function last_check_run($semaphore = False, $release = False, $run_by = '')
 	{
 		//echo "<p>last_check_run(semaphore=".($semaphore?'True':'False').",release=".($release?'True':'False').")</p>\n";
 		if (($exists = $this->read('##last-check-run##')))
@@ -361,7 +360,7 @@ 
 		}
 		else
 		{
-			@set_time_limit(0);		// dont stop for an execution-time-limit
+			@set_time_limit(0); // dont stop for an execution-time-limit
 			ignore_user_abort(True);
 
 			$last_run = array(
@@ -377,7 +376,7 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('async_next=0 OR async_next<'.(time()-600));
+			if ($exists) $where = array('async_next=0 OR async_next<'.(time() - 600));
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -386,20 +385,20 @@ 
 	/**
 	 * checks if there are any jobs ready to run (timer expired) and executes them
 	 */
-	function check_run($run_by='')
+	function check_run($run_by = '')
 	{
 		if ($run_by === 'fallback') flush();
 
-		if (!$this->last_check_run(True,False,$run_by))
+		if (!$this->last_check_run(True, False, $run_by))
 		{
-			return False;	// cant obtain semaphore
+			return False; // cant obtain semaphore
 		}
 		// mark enviroment as async-service, check with isset()!
 		$GLOBALS['egw_info']['flags']['async-service'] = $run_by;
 
 		if (($jobs = $this->read()))
 		{
-			foreach($jobs as $job)
+			foreach ($jobs as $job)
 			{
 				// checking / setting up egw_info/user
 				//
@@ -408,7 +407,7 @@ 
 					// run notifications, before changing account_id of enviroment
 					Link::run_notifies();
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
-					foreach($GLOBALS as $name => $value)
+					foreach ($GLOBALS as $name => $value)
 					{
 						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
 					}
@@ -420,7 +419,7 @@ 
 					{
 						$GLOBALS['egw']->session->account_lid = $GLOBALS['egw']->accounts->id2name($job['account_id']);
 						$GLOBALS['egw']->session->account_domain = $domain;
-						$GLOBALS['egw_info']['user']  = $GLOBALS['egw']->session->read_repositories();
+						$GLOBALS['egw_info']['user'] = $GLOBALS['egw']->session->read_repositories();
 
 						if ($lang != $GLOBALS['egw_info']['user']['preferences']['common']['lang'])
 						{
@@ -435,12 +434,11 @@ 
 						$GLOBALS['egw_info']['user']['domain'] = $domain;
 					}
 				}
-				list($app) = strpos($job['method'],'::') !== false ? explode('_',$job['method']) :
-					explode('.',$job['method']);
+				list($app) = strpos($job['method'], '::') !== false ? explode('_', $job['method']) : explode('.', $job['method']);
 				Translation::add_app($app);
 				if (is_array($job['data']))
 				{
-					$job['data'] += array_diff_key($job,array('data' => false));
+					$job['data'] += array_diff_key($job, array('data' => false));
 				}
 				// update job before running it, to cope with jobs taking longer then async-frequency
 				if (($job['next'] = $this->next_run($job['times'])))
@@ -453,16 +451,16 @@ 
 				}
 				try
 				{
-					ExecMethod($job['method'],$job['data']);
+					ExecMethod($job['method'], $job['data']);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					// log the exception to error_log, but continue running other async jobs
 					_egw_log_exception($e);
 				}
 			}
 		}
-		$this->last_check_run(True,True,$run_by);	// release semaphore
+		$this->last_check_run(True, True, $run_by); // release semaphore
 
 		return $jobs ? count($jobs) : 0;
 	}
@@ -478,7 +476,7 @@ 
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @return array/boolean db-rows / jobs as array or False if no matches
 	 */
-	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
+	function read($id = 0, $cols = '*', $offset = False, $append = 'ORDER BY async_next', $num_rows = 0)
 	{
 		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return false;
 
@@ -486,7 +484,7 @@ 
 		{
 			$where = "async_id != '##last-check-run##'";
 		}
-		elseif (!is_array($id) && (strpos($id,'%') !== False || strpos($id,'_') !== False))
+		elseif (!is_array($id) && (strpos($id, '%') !== False || strpos($id, '_') !== False))
 		{
 			$id = $this->db->quote($id);
 			$where = "async_id LIKE $id AND async_id != '##last-check-run##'";
@@ -500,21 +498,21 @@ 
 			$where = array('async_id' => $id);
 		}
 		$jobs = array();
-		foreach($this->db->select($this->db_table,$cols,$where,__LINE__,__FILE__,$offset,$append,False,$num_rows) as $row)
+		foreach ($this->db->select($this->db_table, $cols, $where, __LINE__, __FILE__, $offset, $append, False, $num_rows) as $row)
 		{
 			$row['async_times'] = json_php_unserialize($row['async_times']);
 			// check for broken value during migration
 			if ($row['async_data'][0] == '"' && substr($row['async_data'], 0, 7) == '"\\"\\\\\\"')
 			{
 				$row['async_data'] = null;
-				$this->write(Db::strip_array_keys($row,'async_'), true);
+				$this->write(Db::strip_array_keys($row, 'async_'), true);
 			}
 			else
 			{
 				$row['async_data'] = !empty($row['async_data']) ?
-					json_php_unserialize($row['async_data'], true) : null;	// allow non-serialized data
+					json_php_unserialize($row['async_data'], true) : null; // allow non-serialized data
 			}
-			$jobs[$row['async_id']] = Db::strip_array_keys($row,'async_');
+			$jobs[$row['async_id']] = Db::strip_array_keys($row, 'async_');
 		}
 		if (!count($jobs))
 		{
@@ -531,7 +529,7 @@ 
 	 * @param array $where additional where statemetn to update only if a certain condition is met, used for the semaphore
 	 * @return int affected rows, can be 0 if an additional where statement is given
 	 */
-	function write($job, $exists = False, $where=array())
+	function write($job, $exists = False, $where = array())
 	{
 		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return 0;
 
@@ -562,7 +560,7 @@ 
 	 */
 	function delete($id)
 	{
-		$this->db->delete($this->db_table,array('async_id' => $id),__LINE__,__FILE__);
+		$this->db->delete($this->db_table, array('async_id' => $id), __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -587,38 +585,38 @@ 
 		{
 			$binarys = array(
 				'php'  => '/usr/bin/php',
-				'php5' => '/usr/bin/php5',		// SuSE 9.3 with php5
+				'php5' => '/usr/bin/php5', // SuSE 9.3 with php5
 				'crontab' => '/usr/bin/crontab'
 			);
 			foreach ($binarys as $name => $path)
 			{
-				$this->$name = $path;	// a reasonable default for *nix
+				$this->$name = $path; // a reasonable default for *nix
 
 				if (!($Ok = @is_executable($this->$name)))
 				{
 					if (file_exists($this->$name))
 					{
-						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
+						echo '<p>'.lang('%1 is not executable by the webserver !!!', $this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms&0x0001) && ($perms&0x0008) && function_exists('posix_getuid'))	// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
-							$webserver = posix_getpwuid(posix_getuid ());
-							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
+							$webserver = posix_getpwuid(posix_getuid());
+							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.", $webserver['name'], $group['name'])."</p>\n"; }
 					}
-					if (($fd = popen('/bin/sh -c "type -p '.$name.'"','r')))
+					if (($fd = popen('/bin/sh -c "type -p '.$name.'"', 'r')))
 					{
-						$this->$name = fgets($fd,256);
+						$this->$name = fgets($fd, 256);
 						@pclose($fd);
 					}
-					if (($pos = strpos($this->$name,"\n")))
+					if (($pos = strpos($this->$name, "\n")))
 					{
-						$this->$name = substr($this->$name,0,$pos);
+						$this->$name = substr($this->$name, 0, $pos);
 					}
 				}
 				if (!$Ok && !@is_executable($this->$name))
 				{
-					$this->$name = $name;	// hopefully its in the path
+					$this->$name = $name; // hopefully its in the path
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
@@ -649,15 +647,15 @@ 
 		}
 		$times = False;
 		$this->other_cronlines = array();
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1','r')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1', 'r')) !== False)
 		{
 			$n = 0;
-			while ($line = fgets($crontab,256))
+			while ($line = fgets($crontab, 256))
 			{
 				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
-				$parts = explode(' ',$line,6);
+				$parts = explode(' ', $line, 6);
 
-				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
+				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5], 0, 3) != 'php'))
 				{
 					// ignore comments
 					if ($line{0} != '#')
@@ -665,12 +663,12 @@ 
 						$times['error'] .= $line;
 					}
 				}
-				elseif (strpos($line,$this->cronline) !== False ||
+				elseif (strpos($line, $this->cronline) !== False ||
 					// also check of old phpgwapi/cron path
 					strpos($line, str_replace('/api/', '/phpgwapi/cron/', $this->cronline)) !== False)
 				{
-					$cron_units = array('min','hour','day','month','dow');
-					foreach($cron_units as $n => $u)
+					$cron_units = array('min', 'hour', 'day', 'month', 'dow');
+					foreach ($cron_units as $n => $u)
 					{
 						$times[$u] = $parts[$n];
 					}
@@ -701,29 +699,29 @@ 
 		if ($this->only_fallback && $times !== False) {
 			return 0;
 		}
-		$this->installed();	// find other installed cronlines
+		$this->installed(); // find other installed cronlines
 
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1','w')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1', 'w')) !== False)
 		{
 			if (is_array($this->other_cronlines))
 			{
 				foreach ($this->other_cronlines as $cronline)
 				{
-					fwrite($crontab,$cronline);		// preserv the other lines on install
+					fwrite($crontab, $cronline); // preserv the other lines on install
 				}
 			}
 			if ($times !== False)
 			{
-				$cron_units = array('min','hour','day','month','dow');
+				$cron_units = array('min', 'hour', 'day', 'month', 'dow');
 				$cronline = '';
-				foreach($cron_units as $cu)
+				foreach ($cron_units as $cu)
 				{
-					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*') . ' ';
+					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*').' ';
 				}
 				// -d memory_limit=-1 --> no memory limit
 				$cronline .= $this->php.' -q -d memory_limit=-1 '.$this->cronline."\n";
 				//echo "<p>Installing: '$cronline'</p>\n";
-				fwrite($crontab,$cronline);
+				fwrite($crontab, $cronline);
 			}
 			@pclose($crontab);
 		}

Braces +98 added lines, -28 removed lines

@@ -114,7 +114,8 @@ 
 			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
 			$debug = True;	// enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if(is_null($now))
+		{
 			$now = time();
 		}
 
@@ -179,12 +180,17 @@ 
 		foreach($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug)
+			{
+echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if(is_array($times[$u]))
+				{
 					$time = array_keys($times[$u]);
-				} else {
+				}
+				else
+				{
 					$time = explode(',',$times[$u]);
 				}
 				$times[$u] = array();
@@ -197,7 +203,10 @@ 
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
-							if ($debug) echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							}
 
 							return False;
 						}
@@ -208,14 +217,20 @@ 
 					}
 					else
 					{
-						if ((string)$t == '*') 	$t = '*/1';
+						if ((string)$t == '*')
+						{
+							$t = '*/1';
+						}
 
 						list($one,$inc) = $arr = explode('/',$t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
 						{
-							if ($debug) echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							}
 
 							return False;
 						}
@@ -233,7 +248,10 @@ 
 							}
 							elseif (count($arr) != 2 || $min > $max)
 							{
-								if ($debug) echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								if ($debug)
+								{
+									echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								}
 								return False;
 							}
 							for ($i = $min; $i <= $max; $i += $inc)
@@ -244,9 +262,13 @@ 
 					}
 				}
 			}
-			elseif ($n < $last_set || $u == 'dow')	// before last value set (or dow) => empty gets enumerated
+			elseif ($n < $last_set || $u == 'dow')
+			{
+				// before last value set (or dow) => empty gets enumerated
 			{
-				for ($i = $min_unit[$u]; $i <= $max_unit[$u]; ++$i)
+				for ($i = $min_unit[$u];
+			}
+			$i <= $max_unit[$u]; ++$i)
 				{
 					$times[$u][$i] = True;
 				}
@@ -256,7 +278,9 @@ 
 				$times[$u][$min_unit[$u]] = True;
 			}
 		}
-		if ($this->debug) { echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
+		if ($this->debug)
+		{
+echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
 
 		// now we have the times enumerated, lets find the first not expired one
 		//
@@ -274,7 +298,10 @@ 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
-					if ($this->debug) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					if ($this->debug)
+					{
+						echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					}
 					continue;	// already set
 				}
 				foreach(array_keys($times[$u]) as $unit_value)
@@ -292,30 +319,44 @@ 
 							break;
 
 					}
-					if ($valid && ($u != $next || $unit_value > $over))	 // valid and not over
+					if ($valid && ($u != $next || $unit_value > $over))
+					{
+						// valid and not over
 					{
 						$found[$u] = $unit_value;
+					}
 						$future = $future || $unit_value > $unit_now;
 						break;
 					}
 				}
-				if (!isset($found[$u]))		// we have to try the next one, if it exists
+				if (!isset($found[$u]))
+				{
+					// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
+				}
 					if (!isset($nexts[count($found)-1]))
 					{
-						if ($this->debug) echo "<p>Nothing found, exiting !!!</p>\n";
+						if ($this->debug)
+						{
+							echo "<p>Nothing found, exiting !!!</p>\n";
+						}
 						return False;
 					}
 					$next = $nexts[count($found)-1];
 					$over = $found[$next];
 					unset($found[$next]);
-					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					if ($this->debug)
+					{
+						echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					}
 					break;
 				}
 			}
 		}
-		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
+		if ($this->debug)
+		{
+echo "<p>next="; print_r($found); echo "</p>\n"; }
 
 		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
 	}
@@ -377,7 +418,10 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('async_next=0 OR async_next<'.(time()-600));
+			if ($exists)
+			{
+				$where = array('async_next=0 OR async_next<'.(time()-600));
+			}
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -388,7 +432,10 @@ 
 	 */
 	function check_run($run_by='')
 	{
-		if ($run_by === 'fallback') flush();
+		if ($run_by === 'fallback')
+		{
+			flush();
+		}
 
 		if (!$this->last_check_run(True,False,$run_by))
 		{
@@ -410,7 +457,10 @@ 
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
 					foreach($GLOBALS as $name => $value)
 					{
-						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
+						if ($name !== 'egw' && is_object($value))
+						{
+							unset($GLOBALS[$name]);
+						}
 					}
 					$domain = $GLOBALS['egw_info']['user']['domain'];
 					$lang   = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
@@ -480,7 +530,10 @@ 
 	 */
 	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
 	{
-		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return false;
+		if (!is_a($this->db, 'EGroupware\\Api\\Db'))
+		{
+			return false;
+		}
 
 		if ($id === '%')
 		{
@@ -533,9 +586,15 @@ 
 	 */
 	function write($job, $exists = False, $where=array())
 	{
-		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return 0;
+		if (!is_a($this->db, 'EGroupware\\Api\\Db'))
+		{
+			return 0;
+		}
 
-		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next'])) $job['data']['next'] = $job['next'];
+		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next']))
+		{
+			$job['data']['next'] = $job['next'];
+		}
 		$data = array(
 			'async_next'      => $job['next'],
 			'async_times'     => json_encode($job['times']),
@@ -600,9 +659,12 @@ 
 					{
 						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))
+						{
+							// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
+						}
 							$webserver = posix_getpwuid(posix_getuid ());
 							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
 					}
@@ -622,10 +684,13 @@ 
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
-			if ($this->php5[0] == '/')	// we found a php5 binary
+			if ($this->php5[0] == '/')
+			{
+				// we found a php5 binary
 			{
 				$this->php = $this->php5;
 			}
+			}
 		}
 	}
 
@@ -637,7 +702,8 @@ 
 	 */
 	function installed()
 	{
-		if ($this->only_fallback) {
+		if ($this->only_fallback)
+		{
 			return 0;
 		}
 		$this->find_binarys();
@@ -654,7 +720,10 @@ 
 			$n = 0;
 			while ($line = fgets($crontab,256))
 			{
-				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
+				if ($this->debug)
+				{
+					echo 'line '.++$n.": $line<br>\n";
+				}
 				$parts = explode(' ',$line,6);
 
 				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
@@ -698,7 +767,8 @@ 
 	 */
 	function install($times)
 	{
-		if ($this->only_fallback && $times !== False) {
+		if ($this->only_fallback && $times !== False)
+		{
 			return 0;
 		}
 		$this->installed();	// find other installed cronlines