EGroupware / egroupware

filemanager/inc/class.filemanager_collab.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
 	/**
 	 * Check if session is valid
 	 *
-	 * @param type $es_id
+	 * @param string $es_id
 	 *
 	 * @return boolean return true if session is valid otherwise false
 	 */

Braces +20 added lines, -7 removed lines

@@ -12,7 +12,8 @@ 
 
 use EGroupware\Api;
 
-class filemanager_collab extends filemanager_collab_bo {
+class filemanager_collab extends filemanager_collab_bo
+{
 
 	/**
 	 * Methods callable via menuaction
@@ -77,7 +78,10 @@ 
 	 */
 	function leave_session ($es_id, $member_id)
 	{
-		if (!$this->is_sessionValid($es_id) || !$this->is_memberValid($es_id, $member_id)) throw new Exception ('Session is not valid!');
+		if (!$this->is_sessionValid($es_id) || !$this->is_memberValid($es_id, $member_id))
+		{
+			throw new Exception ('Session is not valid!');
+		}
 		$this->MEMBER_UpdateActiveMember($es_id, $member_id, 0);
 		return array (
 			'session_id' => $es_id,
@@ -138,7 +142,8 @@ 
 						// we need to inform clients about session changes to update themselves
 						// based on that. For instance, after discarding changes other participants
 						// should get notified to reload their session.
-						if (!$this->is_memberValid($es_id, $memberid)) {
+						if (!$this->is_memberValid($es_id, $memberid))
+						{
 							$response = array (
 								'result' => 'error',
 								'error' => 'ENOSESSION'
@@ -150,7 +155,8 @@ 
 						{
 							$client_ops = $params['args']['client_ops']? $params['args']['client_ops']: [];
 							$current_seq_head = $this->OP_getHeadSeq($es_id);
-							if ($seq_head == $current_seq_head) {
+							if ($seq_head == $current_seq_head)
+							{
 
 								if (count($client_ops)>0)
 								{
@@ -183,7 +189,8 @@ 
 						{
 							throw new Exception('Invalid seq head!');
 						}
-					} catch (Exception $ex) {
+					}
+					catch (Exception $ex) {
 						error_log($ex->getMessage());
 					}
 
@@ -259,7 +266,10 @@ 
 			case 'save':
 				$this->SESSION_Save($params['es_id']);
 				//update genesis file after save happened
-				if ($params['file_path']) self::generateGenesis ($params['file_path'], $params['es_id']);
+				if ($params['file_path'])
+				{
+					self::generateGenesis ($params['file_path'], $params['es_id']);
+				}
 				break;
 			case 'delete':
 				$this->SESSION_cleanup($params['es_id']);
@@ -349,7 +359,10 @@ 
 		if ($session && $session['genesis_url'] !== '')
 		{
 			$gen_file = explode('/webdav.php',$session['genesis_url']);
-			if (!Api\Vfs::file_exists($gen_file[1])) self::generateGenesis ($file_path, $es_id);
+			if (!Api\Vfs::file_exists($gen_file[1]))
+			{
+				self::generateGenesis ($file_path, $es_id);
+			}
 			$result = array (
 				'es_id' => $session['es_id'],
 				'genesis_url' => $session['genesis_url']

Spacing +37 added lines, -37 removed lines

@@ -45,7 +45,7 @@ 
 	 *
 	 * @return array returns an array consists of session data
 	 */
-	function join_session ($es_id)
+	function join_session($es_id)
 	{
 		if ($es_id === self::NEW_FILE_ES_ID)
 		{
@@ -58,7 +58,7 @@ 
 		{
 			$response = $this->initSession($es_id);
 		}
-		$response += array (
+		$response += array(
 			'id' => $GLOBALS['egw_info']['user']['account_id'],
 			'full_name' => $GLOBALS['egw_info']['user']['account_fullname'],
 			'success' => true
@@ -75,11 +75,11 @@ 
 	 *
 	 * @return array returns an array of data as response for client-side
 	 */
-	function leave_session ($es_id, $member_id)
+	function leave_session($es_id, $member_id)
 	{
-		if (!$this->is_sessionValid($es_id) || !$this->is_memberValid($es_id, $member_id)) throw new Exception ('Session is not valid!');
+		if (!$this->is_sessionValid($es_id) || !$this->is_memberValid($es_id, $member_id)) throw new Exception('Session is not valid!');
 		$this->MEMBER_UpdateActiveMember($es_id, $member_id, 0);
-		return array (
+		return array(
 			'session_id' => $es_id,
 			'memberid' => $member_id,
 			'success' => $this->OP_removeMember($es_id, $member_id)
@@ -91,26 +91,26 @@ 
 	 *
 	 * @throws Exception
 	 */
-	function poll ()
+	function poll()
 	{
 		// Get POST request payload
 		$payload = file_get_contents('php://input');
-		$params = $payload? json_decode ($payload, true): null;
+		$params = $payload ? json_decode ($payload, true) : null;
 		$response = array();
 		if (is_array($params))
 		{
 			switch ($params['command'])
 			{
 				case 'join_session':
-					$response = $this->join_session($params['args']['es_id'],$params['args']['user_id']);
+					$response = $this->join_session($params['args']['es_id'], $params['args']['user_id']);
 					break;
 				case 'leave_session':
 					if ($params['args']['es_id'] === self::NEW_FILE_ES_ID)
 					{
-						$response = array ('success' => true,'memberid' => '0','session_id'=>self::NEW_FILE_ES_ID);
+						$response = array('success' => true, 'memberid' => '0', 'session_id'=>self::NEW_FILE_ES_ID);
 						break;
 					}
-					$response = $this->leave_session($params['args']['es_id'],$params['args']['member_id']);
+					$response = $this->leave_session($params['args']['es_id'], $params['args']['member_id']);
 					break;
 				case 'sync_ops':
 					try
@@ -132,27 +132,27 @@ 
 							break;
 						}
 
-						$memberid = $params['args']['member_id']? $params['args']['member_id']: '';
+						$memberid = $params['args']['member_id'] ? $params['args']['member_id'] : '';
 						$es_id = $params['args']['es_id'];
-						$seq_head = (string) isset($params['args']['seq_head'])? $params['args']['seq_head']: null;
+						$seq_head = (string)isset($params['args']['seq_head']) ? $params['args']['seq_head'] : null;
 						// we need to inform clients about session changes to update themselves
 						// based on that. For instance, after discarding changes other participants
 						// should get notified to reload their session.
 						if (!$this->is_memberValid($es_id, $memberid)) {
-							$response = array (
+							$response = array(
 								'result' => 'error',
 								'error' => 'ENOSESSION'
 							);
 							throw new Exception('Session is not valid!');
 						}
 
-						if(!is_null($seq_head))
+						if (!is_null($seq_head))
 						{
-							$client_ops = $params['args']['client_ops']? $params['args']['client_ops']: [];
+							$client_ops = $params['args']['client_ops'] ? $params['args']['client_ops'] : [];
 							$current_seq_head = $this->OP_getHeadSeq($es_id);
 							if ($seq_head == $current_seq_head) {
 
-								if (count($client_ops)>0)
+								if (count($client_ops) > 0)
 								{
 									$newHead = $this->get_newHead($es_id, $memberid, $client_ops);
 									$response = array(
@@ -172,7 +172,7 @@ 
 							else
 							{
 								$response = array(
-									'result' => count($client_ops)>0 ? 'conflict' : 'new_ops',
+									'result' => count($client_ops) > 0 ? 'conflict' : 'new_ops',
 									'ops' => $this->OP_getOPSECS($es_id, $seq_head),
 									'head_seq' => $current_seq_head,
 								);
@@ -208,10 +208,10 @@ 
 	{
 		$date = new Api\DateTime();
 		$use_id = $GLOBALS['egw_info']['user']['account_id'];
-		$response = array (
+		$response = array(
 			'result' => 'new_ops',
-			'ops'=> array (
-				0 => array (
+			'ops'=> array(
+				0 => array(
 					'optype' => 'AddMember',
 					'memberid' => '0',
 					'timestamp' => $date->getTimestamp(),
@@ -237,7 +237,7 @@ 
 	 *
 	 * @return string return a seq head number
 	 */
-	function get_newHead ($es_id, $member_id, $client_ops)
+	function get_newHead($es_id, $member_id, $client_ops)
 	{
 		$this->OP_addOPS($es_id, $member_id, $client_ops);
 
@@ -251,7 +251,7 @@ 
 	 * @param array $params
 	 * @param string $action
 	 */
-	function ajax_actions ($params, $action)
+	function ajax_actions($params, $action)
 	{
 		$response = Api\Json\Response::get();
 		switch ($action)
@@ -259,7 +259,7 @@ 
 			case 'save':
 				$this->SESSION_Save($params['es_id']);
 				//update genesis file after save happened
-				if ($params['file_path']) self::generateGenesis ($params['file_path'], $params['es_id']);
+				if ($params['file_path']) self::generateGenesis($params['file_path'], $params['es_id']);
 				break;
 			case 'delete':
 				$this->SESSION_cleanup($params['es_id']);
@@ -269,7 +269,7 @@ 
 				break;
 			case 'checkLastMember':
 				$activeMembers = $this->MEMBER_getActiveMembers($params['es_id']);
-				$response->data(is_array($activeMembers) && count($activeMembers) > 1?false:true);
+				$response->data(is_array($activeMembers) && count($activeMembers) > 1 ?false:true);
 				break;
 			default:
 				//
@@ -285,11 +285,11 @@ 
 	 *
 	 * @return boolean returns true if allowed
 	 */
-	function is_collabAllowed ($file_path, $_right=null)
+	function is_collabAllowed($file_path, $_right = null)
 	{
 		$paths = explode('/webdav.php', $file_path);
 		$right = $_right ? $_right : Api\Vfs::WRITABLE;
-		$allowed =	Api\Vfs::check_access($paths[1], $right) &&
+		$allowed = Api\Vfs::check_access($paths[1], $right) &&
 					!preg_match('/\/api\/js\/webodf\/template.odf$/', $file_path);
 		return $allowed;
 	}
@@ -301,10 +301,10 @@ 
 	 *
 	 * @return boolean return true if session is valid otherwise false
 	 */
-	function is_sessionValid ($es_id)
+	function is_sessionValid($es_id)
 	{
 		$session = $this->SESSION_Get($es_id);
-		return $session? true : false;
+		return $session ? true : false;
 	}
 
 	/**
@@ -315,7 +315,7 @@ 
 	 * @param type $member_id
 	 * @return boolean returns true if it's valid
 	 */
-	function is_memberValid ($es_id, $member_id)
+	function is_memberValid($es_id, $member_id)
 	{
 		$member = $this->MEMBER_getMember($es_id, $member_id);
 		return $member && $member['status'] != 0 ? true: false;
@@ -330,7 +330,7 @@ 
 	 * @param boolean $_isNew true means this is an empty doc opened as new file
 	 * in client-side and not stored yet therefore no genesis file should get generated for it.
 	 */
-	function ajax_getGenesisUrl ($file_path, $_isNew)
+	function ajax_getGenesisUrl($file_path, $_isNew)
 	{
 		$result = array();
 		$es_id = md5($file_path);
@@ -338,7 +338,7 @@ 
 		// handle new empty file
 		if ($_isNew)
 		{
-			$response->data(array (
+			$response->data(array(
 				'es_id' => self::NEW_FILE_ES_ID,
 				'genesis_url' => $GLOBALS['egw_info']['server']['webserver_url'].'/api/js/webodf/template.odt'
 			));
@@ -348,16 +348,16 @@ 
 
 		if ($session && $session['genesis_url'] !== '')
 		{
-			$gen_file = explode('/webdav.php',$session['genesis_url']);
-			if (!Api\Vfs::file_exists($gen_file[1])) self::generateGenesis ($file_path, $es_id);
-			$result = array (
+			$gen_file = explode('/webdav.php', $session['genesis_url']);
+			if (!Api\Vfs::file_exists($gen_file[1])) self::generateGenesis($file_path, $es_id);
+			$result = array(
 				'es_id' => $session['es_id'],
 				'genesis_url' => $session['genesis_url']
 			);
 		}
 		else if ($this->is_collabAllowed($file_path, Api\Vfs::WRITABLE))
 		{
-			$result = array (
+			$result = array(
 				'es_id' => $es_id,
 				'genesis_url' => self::generateGenesis($file_path, $es_id)
 			);
@@ -374,10 +374,10 @@ 
 	 *
 	 * @return string returns genesis url
 	 */
-	static function generateGenesis ($file_path, $es_id)
+	static function generateGenesis($file_path, $es_id)
 	{
 		$paths = explode('/webdav.php', $file_path);
-		$dir_parts = explode('/',$paths[1]);
+		$dir_parts = explode('/', $paths[1]);
 		array_pop($dir_parts);
 		$dir = join('/', $dir_parts);
 		$genesis_file = $dir.'/.'.$es_id.'.webodf.odt';

api/src/Accounts.php

Doc Comments +2 added lines, -3 removed lines

@@ -799,7 +799,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)
 	{
@@ -994,7 +994,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)
@@ -1114,7 +1113,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)
 	{

Braces +118 added lines, -30 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
 
 		// Check for lang(Group) in search - if there, we search all groups
 		$group_index = array_search(strtolower(lang('Group')), array_map('strtolower', $query = explode(' ',$param['query'])));
@@ -247,7 +254,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';
 			}
@@ -264,7 +274,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));
@@ -387,7 +400,10 @@ 
 		{
 			$id = $this->name2id($id);
 		}
-		if (!$id) return false;
+		if (!$id)
+		{
+			return false;
+		}
 
 		$data = self::cache_read($id);
 
@@ -455,7 +471,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');
@@ -534,9 +553,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)
@@ -548,8 +570,14 @@ 
 			$dot = '.';
 			$underscore = '_';
 		}
-		if (!$domain) $domain = $GLOBALS['egw_info']['server']['mail_suffix'];
-		if (!$domain) $domain = $_SERVER['SERVER_NAME'];
+		if (!$domain)
+		{
+			$domain = $GLOBALS['egw_info']['server']['mail_suffix'];
+		}
+		if (!$domain)
+		{
+			$domain = $_SERVER['SERVER_NAME'];
+		}
 
 		$email = str_replace(array('first','last','initial','account','dot','underscore','-'),
 			array($first,$last,substr($first,0,1),$account,$dot,$underscore,''),
@@ -622,7 +650,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'],
@@ -662,7 +693,10 @@ 
 		{
 			$id = $this->name2id($id);
 		}
-		if (!$id) return false;
+		if (!$id)
+		{
+			return false;
+		}
 
 		if ($this->get_type($id) == 'u')
 		{
@@ -699,7 +733,10 @@ 
 		{
 			throw new Exception\WrongParameter('Missing parameter to Accounts::is_active()');
 		}
-		if (!is_array($data)) $data = self::getInstance()->read($data);
+		if (!is_array($data))
+		{
+			$data = self::getInstance()->read($data);
+		}
 
 		$expires = isset($data['account_expires']) ? $data['account_expires'] : $data['expires'];
 
@@ -714,7 +751,10 @@ 
 	 */
 	static function is_active($data)
 	{
-		if (!is_array($data)) $data = self::getInstance()->read($data);
+		if (!is_array($data))
+		{
+			$data = self::getInstance()->read($data);
+		}
 
 		return $data && !(self::is_expired($data) || $data['account_status'] != 'A');
 	}
@@ -767,7 +807,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);
@@ -821,14 +864,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
@@ -882,7 +934,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),
@@ -1028,7 +1083,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;
 			}
 		}
@@ -1113,7 +1171,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;
 	}
 
@@ -1152,12 +1213,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 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
 		}
 	}
 
@@ -1183,27 +1251,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);
 				}
@@ -1218,7 +1298,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);
 		}
@@ -1242,7 +1325,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))
 		{
@@ -1256,7 +1343,8 @@ 
 		}
 	}
 
-	public function __destruct() {
+	public function __destruct()
+	{
 		if (self::$_instance === $this)
 		{
 			self::$_instance = NULL;

Spacing +102 added lines, -104 removed lines

@@ -55,8 +55,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
@@ -64,11 +64,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
 	);
 
 	/**
@@ -133,18 +133,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;
 		}
@@ -193,11 +193,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
 
 		// Check for lang(Group) in search - if there, we search all groups
-		$group_index = array_search(strtolower(lang('Group')), array_map('strtolower', $query = explode(' ',$param['query'])));
-		if($group_index !== FALSE && !(
+		$group_index = array_search(strtolower(lang('Group')), array_map('strtolower', $query = explode(' ', $param['query'])));
+		if ($group_index !== FALSE && !(
 				in_array($param['type'], array('accounts', 'groupmembers')) || is_int($param['type'])
 		))
 		{
@@ -225,8 +225,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']);
@@ -238,15 +238,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';
@@ -259,20 +259,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;
@@ -292,7 +292,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')
@@ -321,7 +321,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':
@@ -337,7 +337,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';
@@ -358,7 +358,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',
@@ -366,7 +366,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;
 	}
@@ -381,7 +381,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, $set_depricated_names=false)
+	function read($id, $set_depricated_names = false)
 	{
 		if (!is_int($id) && !is_numeric($id))
 		{
@@ -399,9 +399,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;
@@ -418,8 +418,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)))
 		{
@@ -428,9 +428,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;
 			}
 		}
@@ -445,7 +445,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)
 		{
@@ -458,7 +458,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'];
 
@@ -472,30 +472,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;
 	}
@@ -506,14 +506,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);
 	}
 
 	/**
@@ -527,13 +527,13 @@ 
 	 * @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)
 	{
 		if ($GLOBALS['egw_info']['server']['email_address_format'] === 'none')
 		{
 			return null;
 		}
-		foreach (array('first','last','account') as $name)
+		foreach (array('first', 'last', 'account') as $name)
 		{
 			$$name = Translation::to_ascii($$name);
 		}
@@ -555,8 +555,8 @@ 
 		if (!$domain) $domain = $GLOBALS['egw_info']['server']['mail_suffix'];
 		if (!$domain) $domain = $_SERVER['SERVER_NAME'];
 
-		$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 : '');
 
@@ -577,7 +577,7 @@ 
 	{
 		if (empty($data['account_description']))
 		{
-			switch($data['account_lid'])
+			switch ($data['account_lid'])
 			{
 				case 'Default':
 					$data['account_description'] = lang('EGroupware all users group, do NOT delete');
@@ -605,15 +605,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];
 				}
 			}
 		}
@@ -626,7 +626,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']))
@@ -641,14 +641,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!
@@ -740,10 +740,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;
 		}
@@ -751,12 +751,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);
 	}
 
 	/**
@@ -769,7 +769,7 @@ 
 	 * @param boolean $generate_email =false true: generate an email address, if user has none
 	 * @return string|boolean converted value or false on error ($account_id not found)
 	 */
-	static function id2name($account_id, $which='account_lid', $generate_email=false)
+	static function id2name($account_id, $which = 'account_lid', $generate_email = false)
 	{
 		if (!is_numeric($account_id) && !($account_id = self::getInstance()->name2id($account_id)))
 		{
@@ -819,8 +819,7 @@ 
 			if (is_a($this->backend, __CLASS__.'\\Univention'))
 			{
 				if (!is_numeric($account_id) ?
-					($account_id = $this->backend->name2id($account_id)) :
-					$this->backend->id2name($account_id))
+					($account_id = $this->backend->name2id($account_id)) : $this->backend->id2name($account_id))
 				{
 					return $account_id > 0 ? 1 : 2;
 				}
@@ -855,13 +854,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
 	}
 
 	/**
@@ -871,11 +870,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)))
 		{
@@ -891,7 +890,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))
 		{
@@ -919,7 +918,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))
 		{
@@ -940,7 +939,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)
 		{
@@ -964,7 +963,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))
 		{
@@ -975,21 +974,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;
 					}
@@ -1010,7 +1009,7 @@ 
 			$cache = $accounts;
 		}
 
-		switch($use)
+		switch ($use)
 		{
 			case 'both':
 				return $accounts;
@@ -1019,7 +1018,7 @@ 
 			case 'accounts':
 				return $accounts['accounts'];
 			case 'merge':
-				return array_merge($accounts['accounts'],$accounts['groups']);
+				return array_merge($accounts['accounts'], $accounts['groups']);
 		}
 		return False;
 	}
@@ -1037,21 +1036,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;
 		}
@@ -1088,25 +1086,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'];
@@ -1153,7 +1151,7 @@ 
 	 *
 	 * @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).')');
 
@@ -1162,7 +1160,7 @@ 
 		{
 			$instance = self::getInstance();
 
-			foreach((array)$account_ids as $account_id)
+			foreach ((array)$account_ids as $account_id)
 			{
 				Cache::unsetCache($instance->config['install_id'], __CLASS__, 'account-'.$account_id);
 
@@ -1176,11 +1174,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
 		}
 	}
 
@@ -1204,11 +1202,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
 		{
@@ -1239,7 +1237,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;
 			}
@@ -1265,11 +1263,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)));
 

filemanager/inc/class.filemanager_collab_bo.inc.php

Doc Comments +1 added lines, -3 removed lines

@@ -448,7 +448,6 @@ 
 	/**
 	 * Function to get member record of specific member id
 	 *
-	 * @param string $member_id member id
 	 *
 	 * @return string member id or null
 	 * @throws Exception throws exception if no member id is given
@@ -470,7 +469,6 @@ 
 	/**
 	 * Function to get member record of specific member id
 	 *
-	 * @param string $member_id member id
 	 *
 	 * @return string member id or null
 	 * @throws Exception throws exception if no member id is given
@@ -517,7 +515,7 @@ 
 	 * Utility function to map DB fields to ids
 	 *
 	 * @param array $data
-	 * @return array|boolean returns an array contains of mapped DB data, otherwise false
+	 * @return string returns an array contains of mapped DB data, otherwise false
 	 */
 	protected static function db2id($data)
 	{

Braces +47 added lines, -12 removed lines

@@ -122,7 +122,10 @@ 
 	 */
 	public function SESSION_cleanup ($es_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id)
+		{
+			throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		}
 
 		$this->db->delete(
 				self::OP_TABLE,
@@ -154,7 +157,10 @@ 
 	 */
 	public function SESSION_Save ($es_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id)
+		{
+			throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		}
 		$query = $this->db->update(
 				self::SESSION_TABLE,
 				array('collab_last_save' => self::getTimeStamp()),
@@ -186,7 +192,10 @@ 
 	 */
 	public function SESSION_Get($es_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id)
+		{
+			throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		}
 		$query = $this->db->select(
 				self::SESSION_TABLE,
 				'*',
@@ -299,7 +308,10 @@ 
 	 */
 	protected function OP_getHeadSeq($es_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id)
+		{
+			throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		}
 
 		$query = $this->db->select(
 				self::OP_TABLE,
@@ -357,7 +369,10 @@ 
 	 */
 	protected function OP_addOPS ($es_id, $member_id, $client_ops)
 	{
-		if (count($client_ops)<= 0) throw new Exception (self::EXCEPTION_MESSAGE_NO_OPS);
+		if (count($client_ops)<= 0)
+		{
+			throw new Exception (self::EXCEPTION_MESSAGE_NO_OPS);
+		}
 
 		foreach ($client_ops as $op)
 		{
@@ -411,7 +426,10 @@ 
 	 */
 	protected function MEMBER_UpdateActiveMember ($es_id, $member_id, $is_active = 0)
 	{
-		if (!$es_id || !$member_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id || !$member_id)
+		{
+			throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		}
 		$this->db->update(
 				self::MEMBER_TABLE,
 				array('collab_is_active' => $is_active),
@@ -432,7 +450,10 @@ 
 	 */
 	protected function MEMBER_getActiveMembers ($es_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id)
+		{
+			throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		}
 		$query = $this->db->select(
 				self::MEMBER_TABLE,
 				'*',
@@ -455,7 +476,10 @@ 
 	 */
 	protected function MEMBER_getUserMemberId ($es_id, $user_id)
 	{
-		if (!$es_id || !$user_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id || !$user_id)
+		{
+			throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		}
 		$query = $this->db->select(
 				self::MEMBER_TABLE,
 				'collab_member_id',
@@ -477,7 +501,10 @@ 
 	 */
 	protected function MEMBER_getUserLastMemberId ($es_id, $user_id)
 	{
-		if (!$es_id || !$user_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id || !$user_id)
+		{
+			throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		}
 		$query = $this->db->select(
 				self::MEMBER_TABLE,
 				'collab_member_id',
@@ -501,7 +528,10 @@ 
 	 */
 	protected function MEMBER_getMember ($es_id, $member_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id)
+		{
+			throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		}
 		$query = $this->db->select(
 				self::MEMBER_TABLE,
 				'*',
@@ -521,9 +551,14 @@ 
 	 */
 	protected static function db2id($data)
 	{
-		if (!is_array($data)) return false;
+		if (!is_array($data))
+		{
+			return false;
+		}
 		$keys = array_keys($data);
-		array_walk($keys,function (&$key){$key = str_replace(self::DB_FILEDS_PREFIX, '', $key);});
+		array_walk($keys,function (&$key)
+		{
+$key = str_replace(self::DB_FILEDS_PREFIX, '', $key);});
 		return array_combine ($keys, $data);
 	}
 

Spacing +51 added lines, -51 removed lines

@@ -66,9 +66,9 @@ 
 	 *
 	 * @return array returns an array contains of mapped session data
 	 */
-	protected function initSession ($es_id)
+	protected function initSession($es_id)
 	{
-		$query = $this->db->select(self::SESSION_TABLE,'*', array('collab_es_id' => $es_id),__LINE__,__FILE__);
+		$query = $this->db->select(self::SESSION_TABLE, '*', array('collab_es_id' => $es_id), __LINE__, __FILE__);
 		$full_name = $GLOBALS['egw_info']['user']['account_fullname'];
 		$color = $GLOBALS['egw_info']['user']['preferences']['filemanager']['collab_user_color'];
 		$user_id = $GLOBALS['egw_info']['user']['account_id'];
@@ -97,18 +97,18 @@ 
 	 * @param string $genesis_url generated url out of genesis temp file
 	 * @return array returns an array contains of session data
 	 */
-	protected function SESSION_add2Db ($es_id, $genesis_url='')
+	protected function SESSION_add2Db($es_id, $genesis_url = '')
 	{
 		if ($es_id)
 		{
-			$data = array (
+			$data = array(
 				'collab_es_id' => $es_id,
 				'collab_genesis_url' => $genesis_url,
 				'collab_last_save' => self::getTimeStamp(),
 				'account_id' => $GLOBALS['egw_info']['user']['account_id']
 			);
 
-			$this->db->insert(self::SESSION_TABLE, $data,false,__LINE__, __FILE__,'filemanager');
+			$this->db->insert(self::SESSION_TABLE, $data, false, __LINE__, __FILE__, 'filemanager');
 		}
 		return $data;
 	}
@@ -120,9 +120,9 @@ 
 	 *
 	 * @throws Exception
 	 */
-	public function SESSION_cleanup ($es_id)
+	public function SESSION_cleanup($es_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id) throw new Exception(self::EXCEPTION_MESSAGE_NO_SESSION);
 
 		$this->db->delete(
 				self::OP_TABLE,
@@ -152,9 +152,9 @@ 
 	 * @return boolean returns true if update is successful otherwise false
 	 * @throws Exception
 	 */
-	public function SESSION_Save ($es_id)
+	public function SESSION_Save($es_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id) throw new Exception(self::EXCEPTION_MESSAGE_NO_SESSION);
 		$query = $this->db->update(
 				self::SESSION_TABLE,
 				array('collab_last_save' => self::getTimeStamp()),
@@ -173,7 +173,7 @@ 
 				__FILE__,
 				'filemanager'
 		);
-		return !$query? false: true;
+		return !$query ? false: true;
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 */
 	public function SESSION_Get($es_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id) throw new Exception(self::EXCEPTION_MESSAGE_NO_SESSION);
 		$query = $this->db->select(
 				self::SESSION_TABLE,
 				'*',
@@ -195,7 +195,7 @@ 
 				__FILE__
 		);
 		$session = $query->fetchrow();
-		return is_array($session)? self::db2id($session): false;
+		return is_array($session) ? self::db2id($session) : false;
 	}
 
 	/**
@@ -208,11 +208,11 @@ 
 	 * @param string $color
 	 * @param string $imageUrl
 	 */
-	protected function OP_addMember($es_id, $member_id, $full_name, $user_id, $color='', $imageUrl='')
+	protected function OP_addMember($es_id, $member_id, $full_name, $user_id, $color = '', $imageUrl = '')
 	{
 		$op = array(
 			'optype' => 'AddMember',
-			'memberid' => (string) $member_id,
+			'memberid' => (string)$member_id,
 			'timestamp' => self::getTimeStamp(),
 			'setProperties' => array(
 				'fullName' => $full_name,
@@ -230,11 +230,11 @@ 
 	 * @param string $es_id session id
 	 * @param string $member_id member id
 	 */
-	protected function OP_removeCursor ($es_id, $member_id)
+	protected function OP_removeCursor($es_id, $member_id)
 	{
 		$op = array(
 			'optype' => 'RemoveCursor',
-			'memberid' => (string) $member_id,
+			'memberid' => (string)$member_id,
 			'reason' => 'server-idle',
 			'timestamp' => self::getTimeStamp()
 		);
@@ -246,7 +246,7 @@ 
 	 * Function to discard all changes applied to a session
 	 * @param type $es_id
 	 */
-	public function OP_Discard ($es_id)
+	public function OP_Discard($es_id)
 	{
 		$this->db->update(
 				self::MEMBER_TABLE,
@@ -279,14 +279,14 @@ 
 	 *
 	 * @return boolean returns true if remove member is successful otherwise false
 	 */
-	function OP_removeMember ($es_id, $member_id)
+	function OP_removeMember($es_id, $member_id)
 	{
-		$op = array (
+		$op = array(
 			'optype' => 'RemoveMember',
-			'memberid' => (string) $member_id,
+			'memberid' => (string)$member_id,
 			'timestamp' => self::getTimeStamp()
 		);
-		return $this->OP_add2Db($op, $es_id)?true:false;
+		return $this->OP_add2Db($op, $es_id) ?true:false;
 	}
 
 	/**
@@ -299,7 +299,7 @@ 
 	 */
 	protected function OP_getHeadSeq($es_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id) throw new Exception(self::EXCEPTION_MESSAGE_NO_SESSION);
 
 		$query = $this->db->select(
 				self::OP_TABLE,
@@ -312,7 +312,7 @@ 
 				'filemanager'
 		);
 		$head_seq = $query->fetchRow();
-		return is_array($head_seq)? $head_seq['collab_seq']: '';
+		return is_array($head_seq) ? $head_seq['collab_seq'] : '';
 	}
 
 	/**
@@ -333,10 +333,10 @@ 
 		$query = $this->db->select(
 				self::OP_TABLE,
 				'collab_opspec',
-				'collab_es_id ="'. $es_id.'" AND collab_seq >'.$seq_head,
+				'collab_es_id ="'.$es_id.'" AND collab_seq >'.$seq_head,
 				__LINE__,
 				__FILE__,
-				false, 'ORDER BY collab_seq ASC','filemanager');
+				false, 'ORDER BY collab_seq ASC', 'filemanager');
 
 		foreach ($query as $spec)
 		{
@@ -355,9 +355,9 @@ 
 	 * @param array $client_ops array of ops
 	 * @throws Exception if no array of ops given
 	 */
-	protected function OP_addOPS ($es_id, $member_id, $client_ops)
+	protected function OP_addOPS($es_id, $member_id, $client_ops)
 	{
-		if (count($client_ops)<= 0) throw new Exception (self::EXCEPTION_MESSAGE_NO_OPS);
+		if (count($client_ops) <= 0) throw new Exception(self::EXCEPTION_MESSAGE_NO_OPS);
 
 		foreach ($client_ops as $op)
 		{
@@ -371,15 +371,15 @@ 
 	 * @param array $op op data
 	 * @param string $es_id session id
 	 */
-	protected function OP_add2Db ($op, $es_id)
+	protected function OP_add2Db($op, $es_id)
 	{
-		$data = array (
+		$data = array(
 			'collab_es_id' => $es_id,
 			'collab_member' => $op['memberid'],
 			'collab_optype' => $op['optype'],
 			'collab_opspec' => json_encode($op)
 		);
-		return $this->db->insert(self::OP_TABLE, $data,false,__LINE__, __FILE__,'filemanager');
+		return $this->db->insert(self::OP_TABLE, $data, false, __LINE__, __FILE__, 'filemanager');
 	}
 
 	/**
@@ -389,15 +389,15 @@ 
 	 * @param int $user_id user id
 	 * @param string $color user color code
 	 */
-	protected function MEMBER_add2Db ($es_id, $user_id, $color)
+	protected function MEMBER_add2Db($es_id, $user_id, $color)
 	{
-		$data = array (
+		$data = array(
 			'collab_es_id' => $es_id,
 			'collab_uid' => $user_id,
 			'collab_color' => $color,
 			'collab_is_active' => 1
 		);
-		$this->db->insert(self::MEMBER_TABLE, $data,false,__LINE__, __FILE__,'filemanager');
+		$this->db->insert(self::MEMBER_TABLE, $data, false, __LINE__, __FILE__, 'filemanager');
 	}
 
 	/**
@@ -409,9 +409,9 @@ 
 	 *
 	 * @throws Exception throws exception if no es_id or member id is given
 	 */
-	protected function MEMBER_UpdateActiveMember ($es_id, $member_id, $is_active = 0)
+	protected function MEMBER_UpdateActiveMember($es_id, $member_id, $is_active = 0)
 	{
-		if (!$es_id || !$member_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id || !$member_id) throw new Exception(self::EXCEPTION_MESSAGE_NO_SESSION);
 		$this->db->update(
 				self::MEMBER_TABLE,
 				array('collab_is_active' => $is_active),
@@ -430,9 +430,9 @@ 
 	 * @return array returns array of members records
 	 * @throws Exception throws exception if no es_id is given
 	 */
-	protected function MEMBER_getActiveMembers ($es_id)
+	protected function MEMBER_getActiveMembers($es_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id) throw new Exception(self::EXCEPTION_MESSAGE_NO_SESSION);
 		$query = $this->db->select(
 				self::MEMBER_TABLE,
 				'*',
@@ -442,7 +442,7 @@ 
 				'filemanager'
 		);
 		$members = $query->getRows();
-		return is_array($members)?self::db2id($members):true;
+		return is_array($members) ?self::db2id($members) : true;
 	}
 
 	/**
@@ -453,9 +453,9 @@ 
 	 * @return string member id or null
 	 * @throws Exception throws exception if no member id is given
 	 */
-	protected function MEMBER_getUserMemberId ($es_id, $user_id)
+	protected function MEMBER_getUserMemberId($es_id, $user_id)
 	{
-		if (!$es_id || !$user_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id || !$user_id) throw new Exception(self::EXCEPTION_MESSAGE_NO_SESSION);
 		$query = $this->db->select(
 				self::MEMBER_TABLE,
 				'collab_member_id',
@@ -464,7 +464,7 @@ 
 				__FILE__
 		);
 		$member = $query->fetchRow();
-		return is_array($member)? $member['collab_member_id']: null;
+		return is_array($member) ? $member['collab_member_id'] : null;
 	}
 
 	/**
@@ -475,9 +475,9 @@ 
 	 * @return string member id or null
 	 * @throws Exception throws exception if no member id is given
 	 */
-	protected function MEMBER_getUserLastMemberId ($es_id, $user_id)
+	protected function MEMBER_getUserLastMemberId($es_id, $user_id)
 	{
-		if (!$es_id || !$user_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id || !$user_id) throw new Exception(self::EXCEPTION_MESSAGE_NO_SESSION);
 		$query = $this->db->select(
 				self::MEMBER_TABLE,
 				'collab_member_id',
@@ -488,7 +488,7 @@ 
 				"ORDER BY `collab_member_id` DESC LIMIT 1;"
 		);
 		$member = $query->fetchRow();
-		return is_array($member)? $member['collab_member_id']: null;
+		return is_array($member) ? $member['collab_member_id'] : null;
 	}
 
 	/**
@@ -499,9 +499,9 @@ 
 	 * @return array array of records or null
 	 * @throws Exception throws exception if no member id is given
 	 */
-	protected function MEMBER_getMember ($es_id, $member_id)
+	protected function MEMBER_getMember($es_id, $member_id)
 	{
-		if (!$es_id) throw new Exception (self::EXCEPTION_MESSAGE_NO_SESSION);
+		if (!$es_id) throw new Exception(self::EXCEPTION_MESSAGE_NO_SESSION);
 		$query = $this->db->select(
 				self::MEMBER_TABLE,
 				'*',
@@ -510,7 +510,7 @@ 
 				__FILE__
 		);
 		$member = $query->fetchRow();
-		return is_array($member)? self::db2id($member): null;
+		return is_array($member) ? self::db2id($member) : null;
 	}
 
 	/**
@@ -523,8 +523,8 @@ 
 	{
 		if (!is_array($data)) return false;
 		$keys = array_keys($data);
-		array_walk($keys,function (&$key){$key = str_replace(self::DB_FILEDS_PREFIX, '', $key);});
-		return array_combine ($keys, $data);
+		array_walk($keys, function(&$key) {$key = str_replace(self::DB_FILEDS_PREFIX, '', $key); });
+		return array_combine($keys, $data);
 	}
 
 	/**
@@ -544,14 +544,14 @@ 
 				"ORDER BY `collab_member_id` DESC LIMIT 1;"
 		);
 		$last_row = $query->fetchRow();
-		return is_array($last_row)? $last_row['collab_member_id']: 0;
+		return is_array($last_row) ? $last_row['collab_member_id'] : 0;
 	}
 
 	/**
 	 * Get timestamp
 	 * @return int returns current time as timestamp
 	 */
-	static function getTimeStamp ()
+	static function getTimeStamp()
 	{
 		$date = new DateTime();
 		return $date->getTimestamp();

filemanager/setup/tables_current.inc.php

Spacing +16 added lines, -16 removed lines

@@ -14,14 +14,14 @@ 
 $phpgw_baseline = array(
 	'egw_collab_member' => array(
 		'fd' => array(
-			'collab_member_id' => array('type' => 'auto','nullable' => False, 'comment' => 'Unique per user and session'),
-			'collab_es_id' => array('type' => 'varchar','precision' => '64','nullable' => False, 'comment' => 'Related editing session id'),
-			'collab_uid' => array('type' => 'varchar','precision' => '64'),
-			'collab_color' => array('type' => 'varchar','precision' => '32'),
-			'collab_is_active' => array('type' => 'int','precision' => '2', 'default'=>'0','nullable' => False),
-			'collab_is_guest' => array('type' => 'int','precision' => '2','default' => '0','nullable' => False),
-			'collab_token' => array('type' => 'varchar','precision' => '32'),
-			'collab_status' => array('type' => 'int','precision' => '2','default' => '1','nullable' => False)
+			'collab_member_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'Unique per user and session'),
+			'collab_es_id' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False, 'comment' => 'Related editing session id'),
+			'collab_uid' => array('type' => 'varchar', 'precision' => '64'),
+			'collab_color' => array('type' => 'varchar', 'precision' => '32'),
+			'collab_is_active' => array('type' => 'int', 'precision' => '2', 'default'=>'0', 'nullable' => False),
+			'collab_is_guest' => array('type' => 'int', 'precision' => '2', 'default' => '0', 'nullable' => False),
+			'collab_token' => array('type' => 'varchar', 'precision' => '32'),
+			'collab_status' => array('type' => 'int', 'precision' => '2', 'default' => '1', 'nullable' => False)
 		),
 		'pk' => array('collab_member_id'),
 		'fk' => array(),
@@ -30,10 +30,10 @@ 
 	),
 	'egw_collab_op' => array(
 		'fd' => array(
-			'collab_seq' => array('type' => 'auto','nullable' => False, 'comment' => 'Sequence number'),
-			'collab_es_id' => array('type' => 'varchar','precision' => '64','nullable' => False, 'comment' => 'Editing session id'),
-			'collab_member' => array('type' => 'int','precision' => '4','default' => '1','nullable' => False, 'comment' => 'User and time specific'),
-			'collab_optype' => array('type' => 'varchar','precision' => '64', 'comment' => 'Operation type'),
+			'collab_seq' => array('type' => 'auto', 'nullable' => False, 'comment' => 'Sequence number'),
+			'collab_es_id' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False, 'comment' => 'Editing session id'),
+			'collab_member' => array('type' => 'int', 'precision' => '4', 'default' => '1', 'nullable' => False, 'comment' => 'User and time specific'),
+			'collab_optype' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Operation type'),
 			'collab_opspec' => array('type' => 'longtext', 'comment' => 'json-string')
 		),
 		'pk' => array('collab_seq'),
@@ -43,10 +43,10 @@ 
 	),
 	'egw_collab_session' => array(
 		'fd' => array(
-			'collab_es_id' => array('type' => 'varchar','precision' => '64','nullable' => False, 'comment' => 'Editing session id'),
-			'collab_genesis_url' => array('type' => 'varchar','precision' => '512', 'comment' => 'Relative to owner documents storage /template.odt'),
-			'account_id' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False, 'comment' => 'user who created the session'),
-			'collab_last_save' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'timestamp of the last save')
+			'collab_es_id' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False, 'comment' => 'Editing session id'),
+			'collab_genesis_url' => array('type' => 'varchar', 'precision' => '512', 'comment' => 'Relative to owner documents storage /template.odt'),
+			'account_id' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'user who created the session'),
+			'collab_last_save' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'timestamp of the last save')
 		),
 		'pk' => array('collab_es_id'),
 		'fk' => array(),

filemanager/setup/tables_update.inc.php

Spacing +16 added lines, -16 removed lines

@@ -17,14 +17,14 @@ 
 {
 	$GLOBALS['egw_setup']->oProc->CreateTable('egw_collab_member', array(
 		'fd' => array(
-			'collab_member_id' => array('type' => 'auto','nullable' => False, 'comment' => 'Unique per user and session'),
-			'collab_es_id' => array('type' => 'varchar','precision' => '64','nullable' => False, 'comment' => 'Related editing session id'),
-			'collab_uid' => array('type' => 'varchar','precision' => '64'),
-			'collab_color' => array('type' => 'varchar','precision' => '32'),
-			'collab_is_active' => array('type' => 'int','precision' => '2', 'default'=>'0','nullable' => False),
-			'collab_is_guest' => array('type' => 'int','precision' => '2','default' => '0','nullable' => False),
-			'collab_token' => array('type' => 'varchar','precision' => '32'),
-			'collab_status' => array('type' => 'int','precision' => '2','default' => '1','nullable' => False)
+			'collab_member_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'Unique per user and session'),
+			'collab_es_id' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False, 'comment' => 'Related editing session id'),
+			'collab_uid' => array('type' => 'varchar', 'precision' => '64'),
+			'collab_color' => array('type' => 'varchar', 'precision' => '32'),
+			'collab_is_active' => array('type' => 'int', 'precision' => '2', 'default'=>'0', 'nullable' => False),
+			'collab_is_guest' => array('type' => 'int', 'precision' => '2', 'default' => '0', 'nullable' => False),
+			'collab_token' => array('type' => 'varchar', 'precision' => '32'),
+			'collab_status' => array('type' => 'int', 'precision' => '2', 'default' => '1', 'nullable' => False)
 		),
 		'pk' => array('collab_member_id'),
 		'fk' => array(),
@@ -34,10 +34,10 @@ 
 
 	$GLOBALS['egw_setup']->oProc->CreateTable('egw_collab_op', array(
 		'fd' => array(
-			'collab_seq' => array('type' => 'auto','nullable' => False, 'comment' => 'Sequence number'),
-			'collab_es_id' => array('type' => 'varchar','precision' => '64','nullable' => False, 'comment' => 'Editing session id'),
-			'collab_member' => array('type' => 'int','precision' => '4','default' => '1','nullable' => False, 'comment' => 'User and time specific'),
-			'collab_optype' => array('type' => 'varchar','precision' => '64', 'comment' => 'Operation type'),
+			'collab_seq' => array('type' => 'auto', 'nullable' => False, 'comment' => 'Sequence number'),
+			'collab_es_id' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False, 'comment' => 'Editing session id'),
+			'collab_member' => array('type' => 'int', 'precision' => '4', 'default' => '1', 'nullable' => False, 'comment' => 'User and time specific'),
+			'collab_optype' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Operation type'),
 			'collab_opspec' => array('type' => 'longtext', 'comment' => 'json-string')
 		),
 		'pk' => array('collab_seq'),
@@ -48,10 +48,10 @@ 
 
 	$GLOBALS['egw_setup']->oProc->CreateTable('egw_collab_session', array(
 		'fd' => array(
-			'collab_es_id' => array('type' => 'varchar','precision' => '64','nullable' => False, 'comment' => 'Editing session id'),
-			'collab_genesis_url' => array('type' => 'varchar','precision' => '512', 'comment' => 'Relative to owner documents storage /template.odt'),
-			'account_id' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False, 'comment' => 'user who created the session'),
-			'collab_last_save' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'timestamp of the last save')
+			'collab_es_id' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False, 'comment' => 'Editing session id'),
+			'collab_genesis_url' => array('type' => 'varchar', 'precision' => '512', 'comment' => 'Relative to owner documents storage /template.odt'),
+			'account_id' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'user who created the session'),
+			'collab_last_save' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'timestamp of the last save')
 		),
 		'pk' => array('collab_es_id'),
 		'fk' => array(),

api/src/avatar.php

Spacing +20 added lines, -20 removed lines

@@ -23,14 +23,14 @@ 
 {
 	// background colors
 	private static $BG_COLORS = array(
-		array(90,135,112), array(178,183,187), array(111,169,171), array(245,175,41),
-		array(0,136,185), array(241,134,54), array(217,58,55), array(166,177,46),
-		array(0,136,185), array(241,134,54), array(217,58,55), array(166,177,46),
-		array(92,155,188), array(245,136,141), array(154,137,181), array(64,120,135),
-		array(154,137,181),array(90,135,112), array(211,63,51),	array(162,176,31),
-		array(240,177,38),array(0,135,191), array(241,134,54), array(0,135,191),
-		array(178,183,187),array(114,172,174), array(156,138,180), array(90,135,112),
-		array(238,180,36),array(64,120,135)
+		array(90, 135, 112), array(178, 183, 187), array(111, 169, 171), array(245, 175, 41),
+		array(0, 136, 185), array(241, 134, 54), array(217, 58, 55), array(166, 177, 46),
+		array(0, 136, 185), array(241, 134, 54), array(217, 58, 55), array(166, 177, 46),
+		array(92, 155, 188), array(245, 136, 141), array(154, 137, 181), array(64, 120, 135),
+		array(154, 137, 181), array(90, 135, 112), array(211, 63, 51), array(162, 176, 31),
+		array(240, 177, 38), array(0, 135, 191), array(241, 134, 54), array(0, 135, 191),
+		array(178, 183, 187), array(114, 172, 174), array(156, 138, 180), array(90, 135, 112),
+		array(238, 180, 36), array(64, 120, 135)
 	);
 
 	// ratio of font size to size
@@ -39,7 +39,7 @@ 
 	// ratio of text Y position to size
 	private static $_TEXT_Y_RATIO = 1.6;
 
-	private static $_TEXT_COLOR = array (255, 255, 255);
+	private static $_TEXT_COLOR = array(255, 255, 255);
 	// font path
 	private static $_FONT_PATH = '/api/templates/default/fonts/arial.ttf';
 
@@ -67,14 +67,14 @@ 
 	 *		)
 	 * @param int $_size = 128 image size, default size is 128
 	 */
-	public static function lavatar ($_content = null, $_color = null, $_size = 128)
+	public static function lavatar($_content = null, $_color = null, $_size = 128)
 	{
 		// firstname
-		$firstname = isset($_content['firstname'])? $_content['firstname'] : '';
+		$firstname = isset($_content['firstname']) ? $_content['firstname'] : '';
 		//lastname
-		$lastname = isset($_content['lastname'])? $_content['lastname'] : '';
+		$lastname = isset($_content['lastname']) ? $_content['lastname'] : '';
 		// id
-		$id = isset($_content['id'])? $_content['id']: '';
+		$id = isset($_content['id']) ? $_content['id'] : '';
 
 		// Array of RGB color as background color
 		$bgcolor = $_color ? $_color : self::_getBgColor($firstname.$lastname.$id);
@@ -89,7 +89,7 @@ 
 		$bg = imagecolorallocate($image, $bgcolor[0], $bgcolor[1], $bgcolor[2]);
 
 		// allocate an image color as textcolor
-		$textcolor = imagecolorallocate($image, self::$_TEXT_COLOR[0],self::$_TEXT_COLOR[1],self::$_TEXT_COLOR[2]);
+		$textcolor = imagecolorallocate($image, self::$_TEXT_COLOR[0], self::$_TEXT_COLOR[1], self::$_TEXT_COLOR[2]);
 
 		// create a rectangle
 		imagefilledrectangle($image, 0, 0, $_size, $_size, $bg);
@@ -98,16 +98,16 @@ 
 
 		$box = imagettfbbox($fontsize, 0, EGW_SERVER_ROOT.self::$_FONT_PATH, $text);
 
-		$x = floor(($_size - ($box[2] - $box[0]))/2);
+		$x = floor(($_size - ($box[2] - $box[0])) / 2);
 
-		$y = floor ($_size / self::$_TEXT_Y_RATIO);
+		$y = floor($_size / self::$_TEXT_Y_RATIO);
 
 		// write a ttf text
-		$ttf = imagettftext($image,	$fontsize, 0, $x, $y, $textcolor, EGW_SERVER_ROOT.self::$_FONT_PATH, $text);
+		$ttf = imagettftext($image, $fontsize, 0, $x, $y, $textcolor, EGW_SERVER_ROOT.self::$_FONT_PATH, $text);
 		if ($ttf)
 		{
 			ob_start();
-			imagejpeg($image, null,100);
+			imagejpeg($image, null, 100);
 			$result = ob_get_contents();
 			ob_clean();
 			imagedestroy($image);
@@ -127,10 +127,10 @@ 
 	 *
 	 * @return string color code
 	 */
-	private static function _getBgColor ($_str)
+	private static function _getBgColor($_str)
 	{
 		$hash = 0;
-		for ($i=0; $i< strlen($_str); $i++)
+		for ($i = 0; $i < strlen($_str); $i++)
 		{
 			$hash = ord($_str[$i]) + $hash;
 		}

Braces +2 added lines, -1 removed lines

@@ -43,7 +43,8 @@
 	// font path
 	private static $_FONT_PATH = '/api/templates/default/fonts/arial.ttf';
 
-	public function __construct() {
+	public function __construct()
+	{
 	}
 
 	/**

timesheet/inc/class.timesheet_wizard_import_csv.inc.php

Indentation +3 added lines, -3 removed lines

@@ -35,9 +35,9 @@
 		$this->mapping_fields = array('ts_id' => lang('Timesheet ID')) + $bo->field2label;
 
 		// These aren't in the list
-                $this->mapping_fields += array(
-                        'ts_modified'   => lang('Modified'),
-                );
+				$this->mapping_fields += array(
+						'ts_modified'   => lang('Modified'),
+				);
 
 		// List each custom field
 		unset($this->mapping_fields['customfields']);

Spacing +19 added lines, -19 removed lines

@@ -42,7 +42,7 @@ 
 		// List each custom field
 		unset($this->mapping_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('timesheet');
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 
@@ -72,7 +72,7 @@ 
 
 	function wizard_step45(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.'->$content '.print_r($content,true));
+		if ($this->debug) error_log(__METHOD__.'->$content '.print_r($content, true));
 
 		// return from step45
 		if ($content['step'] == 'wizard_step45')
@@ -80,13 +80,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step45($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step45($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step45
@@ -101,11 +101,11 @@ 
 				'~skip~' => lang('Skip record'),
 				'add' => lang('Add'),
 			);
-			$set_to = lang('Set to') . ':';
-			$categories = new Api\Categories('','timesheet');
+			$set_to = lang('Set to').':';
+			$categories = new Api\Categories('', 'timesheet');
 			$cat_list = array();
-			foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat) {
-				$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
+			foreach ((array)$categories->return_sorted_array(0, False, '', '', '', true) as $cat) {
+				$s = str_repeat(' ', $cat['level']).stripslashes($cat['name']);
 
 				$cat_list[$cat['id']] = empty($cat['description']) ? $s : array(
 					'label' => $s,
@@ -117,8 +117,8 @@ 
 					'translate_cat_id'	=> $options + array($set_to => $cat_list),
 			);
 			$preserv = $content;
-			foreach($sel_options as $field => $options) {
-				if(!array_key_exists($field,$content)) $content[$field] = $content['plugin_options'][$field];
+			foreach ($sel_options as $field => $options) {
+				if (!array_key_exists($field, $content)) $content[$field] = $content['plugin_options'][$field];
 			}
 			unset ($preserv['button']);
 			return $this->step_templates['wizard_step45'];
@@ -134,7 +134,7 @@ 
 	
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.'->$content '.print_r($content,true));
+		if ($this->debug) error_log(__METHOD__.'->$content '.print_r($content, true));
 		unset($content['no_owner_map']);
 
 		// return from step60
@@ -143,13 +143,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step60($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step60($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step60
@@ -158,17 +158,17 @@ 
 			$content['message'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
 			$preserv = $content;
-			if(!array_key_exists('record_owner', $content) && $content['plugin_options']) {
+			if (!array_key_exists('record_owner', $content) && $content['plugin_options']) {
 				$content['record_owner'] = $content['plugin_options']['record_owner'];
 			}
-			if(!array_key_exists('owner_from_csv', $content) && $content['plugin_options']) {
+			if (!array_key_exists('owner_from_csv', $content) && $content['plugin_options']) {
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists('change_owner', $content) && $content['plugin_options']) {
+			if (!array_key_exists('change_owner', $content) && $content['plugin_options']) {
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
-			if(!in_array('ts_owner', $content['field_mapping'])) {
+			if (!in_array('ts_owner', $content['field_mapping'])) {
 				$content['no_owner_map'] = true;
 			}
 

Braces +26 added lines, -10 removed lines

@@ -42,7 +42,8 @@ 
 		// List each custom field
 		unset($this->mapping_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('timesheet');
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 
@@ -72,7 +73,10 @@ 
 
 	function wizard_step45(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.'->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(__METHOD__.'->$content '.print_r($content,true));
+		}
 
 		// return from step45
 		if ($content['step'] == 'wizard_step45')
@@ -104,7 +108,8 @@ 
 			$set_to = lang('Set to') . ':';
 			$categories = new Api\Categories('','timesheet');
 			$cat_list = array();
-			foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat) {
+			foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat)
+			{
 				$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
 
 				$cat_list[$cat['id']] = empty($cat['description']) ? $s : array(
@@ -117,8 +122,12 @@ 
 					'translate_cat_id'	=> $options + array($set_to => $cat_list),
 			);
 			$preserv = $content;
-			foreach($sel_options as $field => $options) {
-				if(!array_key_exists($field,$content)) $content[$field] = $content['plugin_options'][$field];
+			foreach($sel_options as $field => $options)
+			{
+				if(!array_key_exists($field,$content))
+				{
+					$content[$field] = $content['plugin_options'][$field];
+				}
 			}
 			unset ($preserv['button']);
 			return $this->step_templates['wizard_step45'];
@@ -134,7 +143,10 @@ 
 	
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.'->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(__METHOD__.'->$content '.print_r($content,true));
+		}
 		unset($content['no_owner_map']);
 
 		// return from step60
@@ -158,17 +170,21 @@ 
 			$content['message'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
 			$preserv = $content;
-			if(!array_key_exists('record_owner', $content) && $content['plugin_options']) {
+			if(!array_key_exists('record_owner', $content) && $content['plugin_options'])
+			{
 				$content['record_owner'] = $content['plugin_options']['record_owner'];
 			}
-			if(!array_key_exists('owner_from_csv', $content) && $content['plugin_options']) {
+			if(!array_key_exists('owner_from_csv', $content) && $content['plugin_options'])
+			{
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists('change_owner', $content) && $content['plugin_options']) {
+			if(!array_key_exists('change_owner', $content) && $content['plugin_options'])
+			{
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
-			if(!in_array('ts_owner', $content['field_mapping'])) {
+			if(!in_array('ts_owner', $content['field_mapping']))
+			{
 				$content['no_owner_map'] = true;
 			}
 

timesheet/inc/class.timesheet_import_csv.inc.php

Indentation +25 added lines, -25 removed lines

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

Braces +53 added lines, -14 removed lines

@@ -137,9 +137,12 @@ 
 		$import_csv->conversion_class = $this;
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0)
+		{
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		}
+		elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line'])
+		{
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -163,7 +166,10 @@ 
 		foreach($lookups['ts_status'] as $id => &$label)
 		{
 			$label = str_replace(' ', '',trim($label));
-			if($label == '') unset($lookups['ts_status'][$id]);
+			if($label == '')
+			{
+				unset($lookups['ts_status'][$id]);
+			}
 		}
 
 		// Start counting successes
@@ -178,10 +184,16 @@ 
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
 			$result = importexport_import_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $lookups, $_definition->plugin_options['convert']);
-			if($result) $this->warnings[$import_csv->get_current_position()] = $result;
+			if($result)
+			{
+				$this->warnings[$import_csv->get_current_position()] = $result;
+			}
 
 			// Automatically handle text Api\Categories without explicit Api\Translation
 			foreach(array('ts_status','cat_id') as $field)
@@ -329,8 +341,14 @@ 
 									$record['ts_id'] = $result['ts_id'];
 									if ( $_definition->plugin_options['update_cats'] == 'add' )
 									{
-										if ( !is_array( $result['cat_id'] ) ) $result['cat_id'] = explode( ',', $result['cat_id'] );
-										if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
+										if ( !is_array( $result['cat_id'] ) )
+										{
+											$result['cat_id'] = explode( ',', $result['cat_id'] );
+										}
+										if ( !is_array( $record['cat_id'] ) )
+										{
+											$record['cat_id'] = explode( ',', $record['cat_id'] );
+										}
 										$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $result['cat_id'] ) ) );
 									}
 									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
@@ -348,7 +366,10 @@ 
 							die('condition / action not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
 			}
 			else
@@ -356,7 +377,10 @@ 
 				// unconditional insert
 				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 			}
-			if($success) $count++;
+			if($success)
+			{
+				$count++;
+			}
 		}
 		return $count;
 	}
@@ -448,7 +472,10 @@ 
 		$_link_id = false;
 		foreach(self::$special_fields as $field => $desc)
 		{
-			if(!$_data[$field]) continue;
+			if(!$_data[$field])
+			{
+				continue;
+			}
 
 			// Links
 			if(strpos($field, 'link') === 0)
@@ -577,28 +604,40 @@ 
 			list($n_family, $n_given, $org_name) = explode(',', $n_family);
 		}
 		$n_family = trim($n_family);
-		if(!is_null($n_given)) $n_given = trim($n_given);
+		if(!is_null($n_given))
+		{
+			$n_given = trim($n_given);
+		}
 		if (!is_object($contacts))
 		{
 			$contacts =& CreateObject('phpgwapi.contacts');
 		}
-		if (!is_null($org_name))        // org_name given?
+		if (!is_null($org_name))
+		{
+			// org_name given?
 		{
 			$org_name = trim($org_name);
+		}
 			$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
 			if (!count($addrs))
 			{
 				$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name",'','n_family,org_name');
 			}
 		}
-		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))       // first name given and no result so far
+		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))
+		{
+			// first name given and no result so far
 		{
 			$addrs = $contacts->search(array('n_family' => $n_family, 'n_given' => $n_given));
 		}
-		if (is_null($n_given) && is_null($org_name))    // just one name given, check against fn (= full name)
+		}
+		if (is_null($n_given) && is_null($org_name))
+		{
+			// just one name given, check against fn (= full name)
 		{
 			$addrs = $contacts->read( 0,0,array('id'),'',"n_fn=$n_family",'','n_fn' );
 		}
+		}
 		if (count($addrs))
 		{
 			return $addrs[0]['id'];

Doc Comments +1 added lines, -2 removed lines

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

Spacing +76 added lines, -76 removed lines

@@ -20,15 +20,15 @@ 
 class timesheet_import_csv implements importexport_iface_import_plugin
 {
 	private static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 			// string
-		'update_cats', 			// string {override|add} overides record
+		'fieldsep', // char
+		'charset', // string
+		'update_cats', // string {override|add} overides record
 								// with cat(s) from csv OR add the cat from
 								// csv file to exeisting cat(s) of record
 		'num_header_lines', // int number of header lines
 		'field_conversion', // array( $csv_col_num => conversion)
-		'field_mapping',	// array( $csv_col_num => adb_filed)
-		'conditions',		/* => array containing condition arrays:
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -52,14 +52,14 @@ 
 	/**
 	 * actions wich could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'insert', 'delete', );
+	protected static $actions = array('none', 'update', 'insert', 'delete',);
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * @var definition
@@ -107,9 +107,9 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition )
+	public function import($_stream, importexport_definition $_definition)
 	{
-		$import_csv = new importexport_import_csv( $_stream, array(
+		$import_csv = new importexport_import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -119,7 +119,7 @@ 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		// fetch the bo
 		$this->bo = new timesheet_bo();
@@ -137,16 +137,16 @@ 
 		$import_csv->conversion_class = $this;
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if (isset($_definition->plugin_options['num_header_lines']) && $_definition->plugin_options['num_header_lines'] > 0) {
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		} elseif (isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
 
 		// set Owner
 		$plugin_options = $_definition->plugin_options;
-		$plugin_options['record_owner'] = isset( $_definition->plugin_options['record_owner'] ) ?
+		$plugin_options['record_owner'] = isset($_definition->plugin_options['record_owner']) ?
 			$_definition->plugin_options['record_owner'] : $this->user;
 		$_definition->plugin_options = $plugin_options;
 
@@ -160,10 +160,10 @@ 
 		);
 
 		// Status need leading spaces removed
-		foreach($lookups['ts_status'] as $id => &$label)
+		foreach ($lookups['ts_status'] as $id => &$label)
 		{
-			$label = str_replace(' ', '',trim($label));
-			if($label == '') unset($lookups['ts_status'][$id]);
+			$label = str_replace(' ', '', trim($label));
+			if ($label == '') unset($lookups['ts_status'][$id]);
 		}
 
 		// Start counting successes
@@ -173,27 +173,27 @@ 
 		// Failures
 		$this->errors = array();
 
-		while ( $record = $import_csv->get_record() )
+		while ($record = $import_csv->get_record())
 		{
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
 			$result = importexport_import_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $lookups, $_definition->plugin_options['convert']);
-			if($result) $this->warnings[$import_csv->get_current_position()] = $result;
+			if ($result) $this->warnings[$import_csv->get_current_position()] = $result;
 
 			// Automatically handle text Api\Categories without explicit Api\Translation
-			foreach(array('ts_status','cat_id') as $field)
+			foreach (array('ts_status', 'cat_id') as $field)
 			{
-				if(!is_numeric($record[$field]))
+				if (!is_numeric($record[$field]))
 				{
-					$translate_key = 'translate'.(substr($field,0,2) == 'ts' ? substr($field,2) : '_cat_id');
-					if(!is_null($lookups[$field]) && ($key = array_search($record[$field], $lookups[$field])))
+					$translate_key = 'translate'.(substr($field, 0, 2) == 'ts' ? substr($field, 2) : '_cat_id');
+					if (!is_null($lookups[$field]) && ($key = array_search($record[$field], $lookups[$field])))
 					{
 						$record[$field] = $key;
 					}
-					elseif(array_key_exists($translate_key, $_definition->plugin_options))
+					elseif (array_key_exists($translate_key, $_definition->plugin_options))
 					{
 						$t_field = $_definition->plugin_options[$translate_key];
 						switch ($t_field)
@@ -206,35 +206,35 @@ 
 							case '~skip~':
 								continue 2;
 							default:
-								if(strpos($t_field, 'add') === 0)
+								if (strpos($t_field, 'add') === 0)
 								{
 									// Check for a parent
-									list($name, $parent_name) = explode('~',$t_field);
-									if($parent_name)
+									list($name, $parent_name) = explode('~', $t_field);
+									if ($parent_name)
 									{
 										$parent = importexport_helper_functions::cat_name2id($parent_name);
 									}
 
-									if($field == 'cat_id')
+									if ($field == 'cat_id')
 									{
 										$record[$field] = importexport_helper_functions::cat_name2id($record[$field], $parent);
 									}
 									elseif ($field == 'ts_status')
 									{
 										end($this->bo->status_labels);
-										$id = key($this->bo->status_labels)+1;
+										$id = key($this->bo->status_labels) + 1;
 										$this->bo->status_labels[$id] = $record[$field];
 										$this->bo->status_labels_config[$id] = array(
 											'name'   => $record[$field],
 											'parent' => $parent,
 											'admin'  => false
 										);
-										Api\Config::save_value('status_labels',$this->bo->status_labels_config,TIMESHEET_APP);
+										Api\Config::save_value('status_labels', $this->bo->status_labels_config, TIMESHEET_APP);
 										$lookups[$field][$id] = $name;
 										$record[$field] = $id;
 									}
 								}
-								elseif(!is_null($lookups[$field]) && ($key = array_search($t_field, $lookups[$field])))
+								elseif (!is_null($lookups[$field]) && ($key = array_search($t_field, $lookups[$field])))
 								{
 									$record[$field] = $key;
 								}
@@ -249,13 +249,13 @@ 
 			}
 
 			// Set creator, unless it's supposed to come from CSV file
-			if($_definition->plugin_options['owner_from_csv'] && $record['ts_owner'])
+			if ($_definition->plugin_options['owner_from_csv'] && $record['ts_owner'])
 			{
-				if(!is_numeric($record['ts_owner']))
+				if (!is_numeric($record['ts_owner']))
 				{
 					// Automatically handle text owner without explicit Api\Translation
 					$new_owner = importexport_helper_functions::account_name2id($record['ts_owner']);
-					if($new_owner == '')
+					if ($new_owner == '')
 					{
 						$this->errors[$import_csv->get_current_position()] = lang(
 							'Unable to convert "%1" to account ID.  Using plugin setting (%2) for %3.',
@@ -277,13 +277,13 @@ 
 			}
 
 			// Check account IDs
-			foreach(array('ts_modifier') as $field)
+			foreach (array('ts_modifier') as $field)
 			{
-				if($record[$field] && !is_numeric($record[$field]))
+				if ($record[$field] && !is_numeric($record[$field]))
 				{
 					// Try an automatic conversion
 					$account_id = importexport_helper_functions::account_name2id($record[$field]);
-					if($account_id && strtoupper(Api\Accounts::username($account_id)) == strtoupper($record[$field]))
+					if ($account_id && strtoupper(Api\Accounts::username($account_id)) == strtoupper($record[$field]))
 					{
 						$record[$field] = $account_id;
 					}
@@ -302,49 +302,49 @@ 
 			// Special values
 			if ($record['addressbook'] && !is_numeric($record['addressbook']))
 			{
-				list($lastname,$firstname,$org_name) = explode(',',$record['addressbook']);
-				$record['addressbook'] = self::addr_id($lastname,$firstname,$org_name);
+				list($lastname, $firstname, $org_name) = explode(',', $record['addressbook']);
+				$record['addressbook'] = self::addr_id($lastname, $firstname, $org_name);
 			}
 			if ($record['pm_id'] && !is_numeric($record['pm_id']))
 			{
-				$pms = Link::query('projectmanager',$record['pm_id']);
+				$pms = Link::query('projectmanager', $record['pm_id']);
 				$record['pm_id'] = key($pms);
 			}
 
-			if ( $_definition->plugin_options['conditions'] )
+			if ($_definition->plugin_options['conditions'])
 			{
-				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				foreach ($_definition->plugin_options['conditions'] as $condition)
 				{
 					$results = array();
-					switch ( $condition['type'] )
+					switch ($condition['type'])
 					{
 						// exists
 						case 'exists' :
-							if($record[$condition['string']])
+							if ($record[$condition['string']])
 							{
 								$results = $this->bo->search(array($condition['string'] => $record[$condition['string']]));
 							}
 
-							if ( is_array( $results ) && count( array_keys( $results )) >= 1 )
+							if (is_array($results) && count(array_keys($results)) >= 1)
 							{
 								// apply action to all records matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$results as $result )
+								foreach ((array)$results as $result)
 								{
 									$record['ts_id'] = $result['ts_id'];
-									if ( $_definition->plugin_options['update_cats'] == 'add' )
+									if ($_definition->plugin_options['update_cats'] == 'add')
 									{
-										if ( !is_array( $result['cat_id'] ) ) $result['cat_id'] = explode( ',', $result['cat_id'] );
-										if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
-										$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $result['cat_id'] ) ) );
+										if (!is_array($result['cat_id'])) $result['cat_id'] = explode(',', $result['cat_id']);
+										if (!is_array($record['cat_id'])) $record['cat_id'] = explode(',', $record['cat_id']);
+										$record['cat_id'] = implode(',', array_unique(array_merge($record['cat_id'], $result['cat_id'])));
 									}
-									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+									$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 								}
 							}
 							else
 							{
 								$action = $condition['false'];
-								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+								$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 							}
 							break;
 
@@ -359,9 +359,9 @@ 
 			else
 			{
 				// unconditional insert
-				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+				$success = $this->action('insert', $record, $import_csv->get_current_position());
 			}
-			if($success) $count++;
+			if ($success) $count++;
 		}
 		return $count;
 	}
@@ -373,7 +373,7 @@ 
 	 * @param array $_data tracker data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 )
+	private function action($_action, $_data, $record_num = 0)
 	{
 		$result = true;
 		switch ($_action)
@@ -385,7 +385,7 @@ 
 				$old_record = new timesheet_egw_record($_data['ts_id']);
 				$old = $old_record->get_record_array();
 
-				if(!$this->definition->plugin_options['change_owner'])
+				if (!$this->definition->plugin_options['change_owner'])
 				{
 					// Don't change creator of an existing ticket
 					unset($_data['ts_owner']);
@@ -394,7 +394,7 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp'])
+				if (count($changed) == 0 && !$this->definition->plugin_options['update_timestamp'])
 				{
 					break;
 				}
@@ -402,12 +402,12 @@ 
 				// Clear old link, if different
 				if ($_data['ts_id'] && array_key_exists('pm_id', $_data) && $_data['pm_id'] != $old['pm_id'])
 				{
-					Link::unlink2(0,TIMESHEET_APP,$_data['ts_id'],0,'projectmanager',$old['pm_id']);
+					Link::unlink2(0, TIMESHEET_APP, $_data['ts_id'], 0, 'projectmanager', $old['pm_id']);
 				}
 
 				// Fall through
 			case 'insert' :
-				if ( $this->dry_run )
+				if ($this->dry_run)
 				{
 					//print_r($_data);
 					$this->results[$_action]++;
@@ -415,24 +415,24 @@ 
 				}
 				else
 				{
-					$result = $this->bo->save( $_data);
+					$result = $this->bo->save($_data);
 					$_data['ts_id'] = $this->bo->data['ts_id'];
 
 					// Set projectmanager link
 					if ($_data['pm_id'])
 					{
-						Link::link(TIMESHEET_APP,$_data['ts_id'],'projectmanager',$_data['pm_id']);
+						Link::link(TIMESHEET_APP, $_data['ts_id'], 'projectmanager', $_data['pm_id']);
 
 						// notify the link-class about the update, as other apps may be subscribed to it
-						Link::notify_update(TIMESHEET_APP,$this->data['ts_id'],$this->data);
+						Link::notify_update(TIMESHEET_APP, $this->data['ts_id'], $this->data);
 					}
 
-					if($result)
+					if ($result)
 					{
 						$this->errors[$record_num] = lang('Permissions error - %1 could not %2',
 							$GLOBALS['egw']->accounts->id2name($_data['owner']),
 							lang($_action)
-						) . ' ' . $result;
+						).' '.$result;
 					}
 					else
 					{
@@ -446,17 +446,17 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result))
+		if (!is_numeric($result))
 		{
 			return $result;
 		}
 		$_link_id = false;
-		foreach(self::$special_fields as $field => $desc)
+		foreach (self::$special_fields as $field => $desc)
 		{
-			if(!$_data[$field]) continue;
+			if (!$_data[$field]) continue;
 
 			// Links
-			if(strpos($field, 'link') === 0)
+			if (strpos($field, 'link') === 0)
 			{
 				list($app, $app_id) = explode(':', $_data[$field]);
 			}
@@ -467,7 +467,7 @@ 
 			}
 			if ($app && $app_id)
 			{
-				$link_id = Link::link('timesheet',$_data['ts_id'],$app,$app_id);
+				$link_id = Link::link('timesheet', $_data['ts_id'], $app, $app_id);
 			}
 		}
 		return true;
@@ -515,7 +515,7 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl(importexport_definition &$definition=null)
+	public function get_options_etpl(importexport_definition &$definition = null)
 	{
 		// lets do it!
 	}
@@ -571,7 +571,7 @@ 
 	// end of iface_export_plugin
 
 	// Extra conversion functions - must be static
-	public static function addr_id( $n_family,$n_given=null,$org_name=null )
+	public static function addr_id($n_family, $n_given = null, $org_name = null)
 	{
 
 		// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
@@ -582,18 +582,18 @@ 
 			list($n_family, $n_given, $org_name) = explode(',', $n_family);
 		}
 		$n_family = trim($n_family);
-		if(!is_null($n_given)) $n_given = trim($n_given);
+		if (!is_null($n_given)) $n_given = trim($n_given);
 		if (!is_object($contacts))
 		{
-			$contacts =& CreateObject('phpgwapi.contacts');
+			$contacts = & CreateObject('phpgwapi.contacts');
 		}
 		if (!is_null($org_name))        // org_name given?
 		{
 			$org_name = trim($org_name);
-			$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
+			$addrs = $contacts->read(0, 0, array('id'), '', "n_family=$n_family,n_given=$n_given,org_name=$org_name");
 			if (!count($addrs))
 			{
-				$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name",'','n_family,org_name');
+				$addrs = $contacts->read(0, 0, array('id'), '', "n_family=$n_family,org_name=$org_name", '', 'n_family,org_name');
 			}
 		}
 		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))       // first name given and no result so far
@@ -602,7 +602,7 @@ 
 		}
 		if (is_null($n_given) && is_null($org_name))    // just one name given, check against fn (= full name)
 		{
-			$addrs = $contacts->read( 0,0,array('id'),'',"n_fn=$n_family",'','n_fn' );
+			$addrs = $contacts->read(0, 0, array('id'), '', "n_fn=$n_family", '', 'n_fn');
 		}
 		if (count($addrs))
 		{

api/src/Html/htmLawed/htmLawedTest.php

Indentation +5 added lines, -5 removed lines

@@ -119,7 +119,7 @@ 
    $j = 0;  
    // Add newline   
    if ($i !== $len-1){
-    echo "\n";
+	echo "\n";
    }
   }
  }
@@ -544,12 +544,12 @@ 
   if(!empty($v[4])){ // + input text box
    echo '<input type="radio" name="h', $k, '" value="', $j, '"', (((isset($_POST['h'. $k]) && $_POST['h'. $k] == $j) or (!isset($_POST['h'. $k]) && $j == $v[1])) ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
    if(!is_array($v[4])){
-    echo $v[6], ': <input type="text" size="', $v[4], '" name="h', $k. $j, '" value="', htmlspecialchars(isset($_POST['h'. $k. $j][0]) ? $_POST['h'. $k. $j] : $v[5]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
+	echo $v[6], ': <input type="text" size="', $v[4], '" name="h', $k. $j, '" value="', htmlspecialchars(isset($_POST['h'. $k. $j][0]) ? $_POST['h'. $k. $j] : $v[5]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
    }
    else{
-    foreach($v[4] as $z){
-     echo ' ', $z[3], ': <input type="text" size="', $z[0], '" name="h', $k. $j. $z[1], '" value="', htmlspecialchars(isset($_POST['h'. $k. $j. $z[1]][0]) ? $_POST['h'. $k. $j. $z[1]] : $z[2]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
-    }    
+	foreach($v[4] as $z){
+	 echo ' ', $z[3], ': <input type="text" size="', $z[0], '" name="h', $k. $j. $z[1], '" value="', htmlspecialchars(isset($_POST['h'. $k. $j. $z[1]][0]) ? $_POST['h'. $k. $j. $z[1]] : $z[2]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
+	}    
    }
   }
  }

Spacing +61 added lines, -61 removed lines

@@ -22,7 +22,7 @@ 
 $_slife = 30; // session life in min.
 
 // errors
-error_reporting(E_ALL | (defined('E_STRICT') ? E_STRICT : 0));
+error_reporting(E_ALL|(defined('E_STRICT') ? E_STRICT : 0));
 ini_set('display_errors', $_errs);
 
 // session
@@ -33,60 +33,60 @@ 
 ini_set('session.use_only_cookies', 1);
 ini_set('session.cookie_lifetime', 0);
 session_start();
-if(!isset($_SESSION['token'])){
+if (!isset($_SESSION['token'])) {
  $_SESSION['token'] = md5(uniqid(rand(), 1));
 }
 
 // slashes
-if(get_magic_quotes_gpc()){
- foreach($_POST as $k => $v){
+if (get_magic_quotes_gpc()) {
+ foreach ($_POST as $k => $v) {
   $_POST[$k] = stripslashes($v);
  }
  ini_set('magic_quotes_gpc', 0);
 }
-if(get_magic_quotes_runtime()){
+if (get_magic_quotes_runtime()) {
  set_magic_quotes_runtime(0);
 }
 
 $_POST['enc'] = (isset($_POST['enc']) and preg_match('`^[-\w]+$`', $_POST['enc'])) ? $_POST['enc'] : 'utf-8';
 
 // token for anti-CSRF
-if(count($_POST)){
- if((empty($_GET['pre']) and ((!empty($_POST['token']) and !empty($_SESSION['token']) and $_POST['token'] != $_SESSION['token']) or empty($_POST[$_sid]) or $_POST[$_sid] != session_id() or empty($_COOKIE[$_sid]) or $_COOKIE[$_sid] != session_id())) or ($_POST[$_sid] != session_id())){
+if (count($_POST)) {
+ if ((empty($_GET['pre']) and ((!empty($_POST['token']) and !empty($_SESSION['token']) and $_POST['token'] != $_SESSION['token']) or empty($_POST[$_sid]) or $_POST[$_sid] != session_id() or empty($_COOKIE[$_sid]) or $_COOKIE[$_sid] != session_id())) or ($_POST[$_sid] != session_id())) {
   $_POST = array('enc'=>'utf-8');
  }
 }
-if(empty($_GET['pre'])){
+if (empty($_GET['pre'])) {
  $_SESSION['token'] = md5(uniqid(rand(), 1));
  $token = $_SESSION['token'];
  session_regenerate_id(1);
 }
 
 // compress
-if(function_exists('gzencode') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && preg_match('`gzip|deflate`i', $_SERVER['HTTP_ACCEPT_ENCODING']) && !ini_get('zlib.output_compression')){
+if (function_exists('gzencode') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && preg_match('`gzip|deflate`i', $_SERVER['HTTP_ACCEPT_ENCODING']) && !ini_get('zlib.output_compression')) {
  ob_start('ob_gzhandler');
 }
 
 // HTM for unprocessed
-if(isset($_POST['inputH'])){
+if (isset($_POST['inputH'])) {
  echo '<html><head><title>htmLawed test: HTML view of unprocessed input</title></head><body style="margin:0; padding: 0;"><p style="background-color: black; color: white; padding: 2px;">&nbsp; Rendering of unprocessed input without an HTML doctype or charset declaration &nbsp; &nbsp; <small><a style="color: white; text-decoration: none;" href="1" onclick="javascript:window.close(this); return false;">close window</a> | <a style="color: white; text-decoration: none;" href="htmLawedTest.php" onclick="javascript: window.open(\'htmLawedTest.php\', \'hlmain\'); window.close(this); return false;">htmLawed test page</a></small></p><div>', $_POST['inputH'], '</div></body></html>';
  exit;
 }
 
 // main
-$_POST['text'] = isset($_POST['text']) ? $_POST['text'] : 'text to process; < '. $_limit. ' characters'. ($_hlimit ? ' (for binary hexdump view, < '. $_hlimit. ')' : '');
+$_POST['text'] = isset($_POST['text']) ? $_POST['text'] : 'text to process; < '.$_limit.' characters'.($_hlimit ? ' (for binary hexdump view, < '.$_hlimit.')' : '');
 $do = (!empty($_POST[$_sid]) && isset($_POST['text'][0]) && !isset($_POST['text'][$_limit])) ? 1 : 0;
 $limit_exceeded = isset($_POST['text'][$_limit]) ? 1 : 0;
 $pre_mem = memory_get_usage();
 $validation = (!empty($_POST[$_sid]) and isset($_POST['w3c_validate'][0])) ? 1 : 0;
 include './htmLawed.php';
 
-function format($t){
- $t = "\n". str_replace(array("\t", "\r\n", "\r", '&', '<', '>', "\n"), array('    ', "\n", "\n", '&amp;', '&lt;', '&gt;', "<span class=\"newline\">&#172;</span><br />\n"), $t);
+function format($t) {
+ $t = "\n".str_replace(array("\t", "\r\n", "\r", '&', '<', '>', "\n"), array('    ', "\n", "\n", '&amp;', '&lt;', '&gt;', "<span class=\"newline\">&#172;</span><br />\n"), $t);
  return str_replace(array('<br />', "\n ", '  '), array("\n<br />\n", "\n&nbsp;", ' &nbsp;'), $t);
 }
 
-function hexdump($d){
+function hexdump($d) {
 // Mainly by Aidan Lister <aidan@php.net>, Peter Waller <iridum@php.net>
  $hexi = '';
  $ascii = '';
@@ -94,23 +94,23 @@ 
  echo '<pre>';
  $offset = 0;
  $len = strlen($d);
- for($i=$j=0; $i<$len; $i++)
+ for ($i = $j = 0; $i < $len; $i++)
  {
   // Convert to hexidecimal
   $hexi .= sprintf("%02X ", ord($d[$i]));
   // Replace non-viewable bytes with '.'
-  if(ord($d[$i]) >= 32){
+  if (ord($d[$i]) >= 32) {
    $ascii .= htmlspecialchars($d[$i]);
-  }else{
+  } else {
    $ascii .= '.';
   } 
   // Add extra column spacing
-  if($j == 7){
+  if ($j == 7) {
    $hexi .= ' ';
    $ascii .= '  ';
   }
   // Add row
-  if(++$j == 16 || $i == $len-1){
+  if (++$j == 16 || $i == $len - 1) {
    // Join the hexi / ascii output
    echo sprintf("%04X   %-49s   %s", $offset, $hexi, $ascii);   
    // Reset vars
@@ -118,7 +118,7 @@ 
    $offset += 16;
    $j = 0;  
    // Add newline   
-   if ($i !== $len-1){
+   if ($i !== $len - 1) {
     echo "\n";
    }
   }
@@ -135,7 +135,7 @@ 
 <html lang="en" xml:lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta name="description" content="htmLawed <?php echo hl_version();?> test page" />
+<meta name="description" content="htmLawed <?php echo hl_version(); ?> test page" />
 <style type="text/css"><!--/*--><![CDATA[/*><!--*/
 a, a.resizer{text-decoration:none;}
 a:hover, a.resizer:hover{color:red;}
@@ -169,7 +169,7 @@ 
 <script type="text/javascript"><!--//--><![CDATA[//><!-- 
 window.name = 'hlmain';
 function hl(i){
- <?php if(!$_hilite){echo 'return;'; }?>
+ <?php if (!$_hilite) {echo 'return;'; }?>
  var e = document.getElementById(i);
  if(!e){return;}
  run(e, '</[a-z1-6]+>', 'ctag');
@@ -432,27 +432,27 @@ 
 var dmp = new diff_match_patch(); function diffLaunch(){var text1 = document.getElementById('text').value; var text2 = document.getElementById('text2').value; dmp.Diff_Timeout = 0; dmp.Diff_EditCost = 4; var d = dmp.diff_main(text1, text2); var ds = dmp.diff_prettyHtml(d); document.getElementById('diff').innerHTML = ds;
 }
 //--><!]]></script>
-<title>htmLawed (<?php echo hl_version();?>) test</title>
+<title>htmLawed (<?php echo hl_version(); ?>) test</title>
 </head>
 <body>
 <div id="topmost">
 
-<h5 style="float: left; display: inline; margin-top: 0; margin-bottom: 5px;"><a href="http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/index.php" title="htmLawed home">HTM<big><big>L</big></big>AWED</a> <?php echo hl_version();?> <a href="htmLawedTest.php" title="test home">TEST</a></h5>
+<h5 style="float: left; display: inline; margin-top: 0; margin-bottom: 5px;"><a href="http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/index.php" title="htmLawed home">HTM<big><big>L</big></big>AWED</a> <?php echo hl_version(); ?> <a href="htmLawedTest.php" title="test home">TEST</a></h5>
 <span style="float: right;" class="help"><a href="htmLawed_README.htm"><span class="notice">htm</span></a> / <a href="htmLawed_README.txt"><span class="notice">txt</span></a> documentation</span><br style="clear:both;" />
 
-<a href="htmLawedTest.php" title="[toggle visibility] type or copy-paste" onclick="javascript:toggle('inputF'); return false;"><span class="notice">Input &raquo;</span> <span class="help" title="limit lower with multibyte characters<?php echo (($_hlimit < $_limit && $_hlimit)? '; limit is '. $_hlimit. ' for viewing binaries' : ''); ?>"><small>(max. <?php echo htmlspecialchars($_limit);?> chars)</small></span></a>
+<a href="htmLawedTest.php" title="[toggle visibility] type or copy-paste" onclick="javascript:toggle('inputF'); return false;"><span class="notice">Input &raquo;</span> <span class="help" title="limit lower with multibyte characters<?php echo (($_hlimit < $_limit && $_hlimit) ? '; limit is '.$_hlimit.' for viewing binaries' : ''); ?>"><small>(max. <?php echo htmlspecialchars($_limit); ?> chars)</small></span></a>
 
 <form id="testform" name="testform" action="htmLawedTest.php" method="post" accept-charset="<?php echo htmlspecialchars($_POST['enc']); ?>" style="padding:0; margin: 0; display:inline;">
 
 <div id="inputF" style="display: block;">
 
 <input type="hidden" name="token" id="token" value="<?php echo $token; ?>" />
-<div><textarea id="text" class="textarea" name="text" rows="5" cols="100" style="width: 100%;"><?php echo htmlspecialchars($_POST['text']);?></textarea></div>
+<div><textarea id="text" class="textarea" name="text" rows="5" cols="100" style="width: 100%;"><?php echo htmlspecialchars($_POST['text']); ?></textarea></div>
 <input type="submit" id="submitF" name="submitF" value="Process" style="float:left;" title="filter using htmLawed" onclick="javascript: sndProc(); return false;" onkeypress="javascript: sndProc(); return false;" />
 
 <?php
-if($do){
- if($validation){
+if ($do) {
+ if ($validation) {
   echo '<input type="hidden" value="1" name="w3c_validate" id="w3c_validate" />';
  }
 ?>
@@ -461,7 +461,7 @@ 
 <button type="button" onclick="javascript:document.getElementById('text').focus();document.getElementById('text').select()" title="select all to copy" style="float:right;">Select all</button>
 
 <?php
-if($_w3c_validate && $validation){
+if ($_w3c_validate && $validation) {
 ?>
   
 <button type="button" title="HTML 4.01 W3C online validation" style="float: right;" onclick="javascript: sndValidn('text', 'html401'); return false;" onkeypress="javascript: sndValidn('text', 'html401'); return false;">Check HTML</button>
@@ -470,8 +470,8 @@ 
 <?php
  }
 }
-else{
- if($_w3c_validate){
+else {
+ if ($_w3c_validate) {
   echo '<span style="float: right;" class="help" title="for direct submission of input or output code to W3C validator for (X)HTML validation"><span style="font-size: 85%;">&nbsp;Validator tools: </span><input type="checkbox" value="1" name="w3c_validate" id="w3c_validate" style="vertical-align: middle;"', ($validation ? ' checked="checked"' : ''), ' /></span>';
  }
 }
@@ -483,7 +483,7 @@ 
 <br style="clear:both;" />
 
 <?php
-if($limit_exceeded){
+if ($limit_exceeded) {
  echo '<br /><strong>Input text is too long!</strong><br />';
 }
 ?>
@@ -531,32 +531,32 @@ 
 'valid_xhtml'=>array('2', 'nil', 'auto-set various parameters for most valid XHTML', 'nil'),
 'xml:lang'=>array('3', 'nil', 'auto-add <em>xml:lang</em> attribute', '0'),
 );
-foreach($cfg as $k=>$v){
+foreach ($cfg as $k=>$v) {
  echo '<li>', $k, ': ';
- if(!empty($v[0])){ // input radio
+ if (!empty($v[0])) { // input radio
   $j = $v[3];
-  for($i = $j-1; ++$i < $v[0]+$v[3];++$j){
-   echo '<input type="radio" name="h', $k, '" value="', $i, '"', (!isset($_POST['h'. $k]) ? ($v[1] == $i ? ' checked="checked"' : '') : ($_POST['h'. $k] == $i ? ' checked="checked"' : '')), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />', $i, ' ';
+  for ($i = $j - 1; ++$i < $v[0] + $v[3]; ++$j) {
+   echo '<input type="radio" name="h', $k, '" value="', $i, '"', (!isset($_POST['h'.$k]) ? ($v[1] == $i ? ' checked="checked"' : '') : ($_POST['h'.$k] == $i ? ' checked="checked"' : '')), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />', $i, ' ';
   }
-  if($v[1] == 'nil'){
-   echo '<input type="radio" name="h', $k, '" value="nil"', ((!isset($_POST['h'. $k]) or $_POST['h'. $k] == 'nil') ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />not set ';
+  if ($v[1] == 'nil') {
+   echo '<input type="radio" name="h', $k, '" value="nil"', ((!isset($_POST['h'.$k]) or $_POST['h'.$k] == 'nil') ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />not set ';
   }
-  if(!empty($v[4])){ // + input text box
-   echo '<input type="radio" name="h', $k, '" value="', $j, '"', (((isset($_POST['h'. $k]) && $_POST['h'. $k] == $j) or (!isset($_POST['h'. $k]) && $j == $v[1])) ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
-   if(!is_array($v[4])){
-    echo $v[6], ': <input type="text" size="', $v[4], '" name="h', $k. $j, '" value="', htmlspecialchars(isset($_POST['h'. $k. $j][0]) ? $_POST['h'. $k. $j] : $v[5]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
+  if (!empty($v[4])) { // + input text box
+   echo '<input type="radio" name="h', $k, '" value="', $j, '"', (((isset($_POST['h'.$k]) && $_POST['h'.$k] == $j) or (!isset($_POST['h'.$k]) && $j == $v[1])) ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
+   if (!is_array($v[4])) {
+    echo $v[6], ': <input type="text" size="', $v[4], '" name="h', $k.$j, '" value="', htmlspecialchars(isset($_POST['h'.$k.$j][0]) ? $_POST['h'.$k.$j] : $v[5]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
    }
-   else{
-    foreach($v[4] as $z){
-     echo ' ', $z[3], ': <input type="text" size="', $z[0], '" name="h', $k. $j. $z[1], '" value="', htmlspecialchars(isset($_POST['h'. $k. $j. $z[1]][0]) ? $_POST['h'. $k. $j. $z[1]] : $z[2]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
+   else {
+    foreach ($v[4] as $z) {
+     echo ' ', $z[3], ': <input type="text" size="', $z[0], '" name="h', $k.$j.$z[1], '" value="', htmlspecialchars(isset($_POST['h'.$k.$j.$z[1]][0]) ? $_POST['h'.$k.$j.$z[1]] : $z[2]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
     }    
    }
   }
  }
- elseif(ctype_digit($v[3])){ // input text
-  echo '<input type="text" size="', $v[3], '" name="h', $k, '" value="', htmlspecialchars(isset($_POST['h'. $k][0]) ? $_POST['h'. $k] : $v[1]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';  
+ elseif (ctype_digit($v[3])) { // input text
+  echo '<input type="text" size="', $v[3], '" name="h', $k, '" value="', htmlspecialchars(isset($_POST['h'.$k][0]) ? $_POST['h'.$k] : $v[1]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';  
  }
- else{} // text-area
+ else {} // text-area
  echo ' <span class="help">', $v[2], '</span></li>';
 }
 echo '</ul></td></tr><tr><td><span style="vertical-align: top;" class="help" title="$spec argument: element-specific attribute rules">Spec:</span></td><td><textarea name="spec" id="spec" cols="70" rows="3" style="width:80%;">', htmlspecialchars((isset($_POST['spec']) ? $_POST['spec'] : '')), '</textarea></td></tr></table>';
@@ -566,31 +566,31 @@ 
 </form>
 
 <?php
-if($do){
+if ($do) {
  $cfg = array();
- foreach($_POST as $k=>$v){
-  if($k[0] == 'h' && $v != 'nil'){
+ foreach ($_POST as $k=>$v) {
+  if ($k[0] == 'h' && $v != 'nil') {
    $cfg[substr($k, 1)] = $v;
   }
  }
 
- if(isset($cfg['anti_link_spam']) && $cfg['anti_link_spam'] && (!empty($cfg['anti_link_spam11']) or !empty($cfg['anti_link_spam12']))){
+ if (isset($cfg['anti_link_spam']) && $cfg['anti_link_spam'] && (!empty($cfg['anti_link_spam11']) or !empty($cfg['anti_link_spam12']))) {
   $cfg['anti_link_spam'] = array($cfg['anti_link_spam11'], $cfg['anti_link_spam12']);
  }
  unset($cfg['anti_link_spam11'], $cfg['anti_link_spam12']);
- if(isset($cfg['anti_mail_spam']) && $cfg['anti_mail_spam'] == 1){
+ if (isset($cfg['anti_mail_spam']) && $cfg['anti_mail_spam'] == 1) {
   $cfg['anti_mail_spam'] = isset($cfg['anti_mail_spam1'][0]) ? $cfg['anti_mail_spam1'] : 0;
  }
  unset($cfg['anti_mail_spam11']);
- if(isset($cfg['deny_attribute']) && $cfg['deny_attribute'] == 1){
+ if (isset($cfg['deny_attribute']) && $cfg['deny_attribute'] == 1) {
   $cfg['deny_attribute'] = isset($cfg['deny_attribute1'][0]) ? $cfg['deny_attribute1'] : 0;
  }
  unset($cfg['deny_attribute1']);
- if(isset($cfg['tidy']) && $cfg['tidy'] == 2){
+ if (isset($cfg['tidy']) && $cfg['tidy'] == 2) {
   $cfg['tidy'] = isset($cfg['tidy2'][0]) ? $cfg['tidy2'] : 0;
  }
  unset($cfg['tidy2']);
- if(isset($cfg['unique_ids']) && $cfg['unique_ids'] == 2){
+ if (isset($cfg['unique_ids']) && $cfg['unique_ids'] == 2) {
   $cfg['unique_ids'] = isset($cfg['unique_ids2'][0]) ? $cfg['unique_ids2'] : 1;
  }
  unset($cfg['unique_ids2']);
@@ -600,8 +600,8 @@ 
  $st = microtime(); 
  $out = htmLawed($_POST['text'], $cfg, $_POST['spec']);
  $et = microtime();
- echo '<br /><a href="htmLawedTest.php" title="[toggle visibility] syntax-highlighted" onclick="javascript:toggle(\'inputR\'); return false;"><span class="notice">Input code &raquo;</span></a> <span class="help" title="tags estimated as half of total &gt; and &lt; chars; values may be inaccurate for non-ASCII text"><small><big>', strlen($_POST['text']), '</big> chars, ~<big>', ($tag = round((substr_count($_POST['text'], '>') + substr_count($_POST['text'], '<'))/2)), '</big> tag', ($tag > 1 ? 's' : ''), '</small>&nbsp;</span><div id="inputR" style="display: none;">', format($_POST['text']), '</div><script type="text/javascript">hl(\'inputR\');</script>', (!isset($_POST['text'][$_hlimit]) ? ' <a href="htmLawedTest.php" title="[toggle visibility] hexdump; non-viewable characters like line-returns are shown as dots" onclick="javascript:toggle(\'inputD\'); return false;"><span class="notice">Input binary &raquo;&nbsp;</span></a><div id="inputD" style="display: none;">'. hexdump($_POST['text']). '</div>' : ''), ' <a href="htmLawedTest.php" title="[toggle visibility] finalized internal settings as interpreted by htmLawed; for developers" onclick="javascript:toggle(\'settingF\'); return false;"><span class="notice">Finalized internal settings &raquo;&nbsp;</span></a> <div id="settingF" style="display: none;">$config: ', str_replace(array('    ', "\t", '  '), array('  ', '&nbsp;  ', '&nbsp; '), nl2br(htmlspecialchars(print_r($GLOBALS['hlcfg']['config'], true)))), '<br />$spec: ', str_replace(array('    ', "\t", '  '), array('  ', '&nbsp;  ', '&nbsp; '), nl2br(htmlspecialchars(print_r($GLOBALS['hlcfg']['spec'], true)))), '</div><script type="text/javascript">hl(\'settingF\');</script>', '<br /><a href="htmLawedTest.php" title="[toggle visibility] suitable for copy-paste" onclick="javascript:toggle(\'outputF\'); return false;"><span class="notice">Output &raquo;</span></a> <span class="help" title="approx., server-specific value excluding the \'include()\' call"><small>htmLawed processing time <big>', number_format(((substr($et,0,9)) + (substr($et,-10)) - (substr($st,0,9)) - (substr($st,-10))),4), '</big> s</small></span>', (($mem = memory_get_peak_usage()) !== false ? '<span class="help"><small>, peak memory usage <big>'. round(($mem-$pre_mem)/1048576, 2). '</big> <small>MB</small>' : ''), '</small></span><div id="outputF"  style="display: block;"><div><textarea id="text2" class="textarea" name="text2" rows="5" cols="100" style="width: 100%;">', htmlspecialchars($out), '</textarea></div><button type="button" onclick="javascript:document.getElementById(\'text2\').focus();document.getElementById(\'text2\').select()" title="select all to copy" style="float:right;">Select all</button>';
- if($_w3c_validate && $validation)
+ echo '<br /><a href="htmLawedTest.php" title="[toggle visibility] syntax-highlighted" onclick="javascript:toggle(\'inputR\'); return false;"><span class="notice">Input code &raquo;</span></a> <span class="help" title="tags estimated as half of total &gt; and &lt; chars; values may be inaccurate for non-ASCII text"><small><big>', strlen($_POST['text']), '</big> chars, ~<big>', ($tag = round((substr_count($_POST['text'], '>') + substr_count($_POST['text'], '<')) / 2)), '</big> tag', ($tag > 1 ? 's' : ''), '</small>&nbsp;</span><div id="inputR" style="display: none;">', format($_POST['text']), '</div><script type="text/javascript">hl(\'inputR\');</script>', (!isset($_POST['text'][$_hlimit]) ? ' <a href="htmLawedTest.php" title="[toggle visibility] hexdump; non-viewable characters like line-returns are shown as dots" onclick="javascript:toggle(\'inputD\'); return false;"><span class="notice">Input binary &raquo;&nbsp;</span></a><div id="inputD" style="display: none;">'.hexdump($_POST['text']).'</div>' : ''), ' <a href="htmLawedTest.php" title="[toggle visibility] finalized internal settings as interpreted by htmLawed; for developers" onclick="javascript:toggle(\'settingF\'); return false;"><span class="notice">Finalized internal settings &raquo;&nbsp;</span></a> <div id="settingF" style="display: none;">$config: ', str_replace(array('    ', "\t", '  '), array('  ', '&nbsp;  ', '&nbsp; '), nl2br(htmlspecialchars(print_r($GLOBALS['hlcfg']['config'], true)))), '<br />$spec: ', str_replace(array('    ', "\t", '  '), array('  ', '&nbsp;  ', '&nbsp; '), nl2br(htmlspecialchars(print_r($GLOBALS['hlcfg']['spec'], true)))), '</div><script type="text/javascript">hl(\'settingF\');</script>', '<br /><a href="htmLawedTest.php" title="[toggle visibility] suitable for copy-paste" onclick="javascript:toggle(\'outputF\'); return false;"><span class="notice">Output &raquo;</span></a> <span class="help" title="approx., server-specific value excluding the \'include()\' call"><small>htmLawed processing time <big>', number_format(((substr($et, 0, 9)) + (substr($et, -10)) - (substr($st, 0, 9)) - (substr($st, -10))), 4), '</big> s</small></span>', (($mem = memory_get_peak_usage()) !== false ? '<span class="help"><small>, peak memory usage <big>'.round(($mem - $pre_mem) / 1048576, 2).'</big> <small>MB</small>' : ''), '</small></span><div id="outputF"  style="display: block;"><div><textarea id="text2" class="textarea" name="text2" rows="5" cols="100" style="width: 100%;">', htmlspecialchars($out), '</textarea></div><button type="button" onclick="javascript:document.getElementById(\'text2\').focus();document.getElementById(\'text2\').select()" title="select all to copy" style="float:right;">Select all</button>';
+ if ($_w3c_validate && $validation)
  {
 ?>
   
@@ -610,9 +610,9 @@ 
   
 <?php
  }
- echo '</div><br /><a href="htmLawedTest.php" title="[toggle visibility] syntax-highlighted" onclick="javascript:toggle(\'outputR\'); return false;"><span class="notice">Output code &raquo;</span></a><div id="outputR" style="display: block;">', format($out), '</div><script type="text/javascript">hl(\'outputR\');</script>', (!isset($_POST['text'][$_hlimit]) ? ' <a href="htmLawedTest.php" title="[toggle visibility] hexdump; non-viewable characters like line-returns are shown as dots" onclick="javascript:toggle(\'outputD\'); return false;"><span class="notice">Output binary &raquo;</span></a><div id="outputD" style="display: none;">'. hexdump($out). '</div>' : ''), ' <a href="htmLawedTest.php" title="[toggle visibility] inline output-input diff; might not be perfectly accurate, semantically or otherwise " onclick="javascript:toggle(\'diff\'); diffLaunch(); return false;"><span class="notice">Diff &raquo;</span></a> <div id="diff" style="display: none;"></div><br /><a href="htmLawedTest.php" title="[toggle visibility] XHTML 1 Transitional doctype" onclick="javascript:toggle(\'outputH\'); return false;"><span class="notice">Output rendered &raquo;</span></a><div id="outputH" style="display: block;">', $out, '</div>';
+ echo '</div><br /><a href="htmLawedTest.php" title="[toggle visibility] syntax-highlighted" onclick="javascript:toggle(\'outputR\'); return false;"><span class="notice">Output code &raquo;</span></a><div id="outputR" style="display: block;">', format($out), '</div><script type="text/javascript">hl(\'outputR\');</script>', (!isset($_POST['text'][$_hlimit]) ? ' <a href="htmLawedTest.php" title="[toggle visibility] hexdump; non-viewable characters like line-returns are shown as dots" onclick="javascript:toggle(\'outputD\'); return false;"><span class="notice">Output binary &raquo;</span></a><div id="outputD" style="display: none;">'.hexdump($out).'</div>' : ''), ' <a href="htmLawedTest.php" title="[toggle visibility] inline output-input diff; might not be perfectly accurate, semantically or otherwise " onclick="javascript:toggle(\'diff\'); diffLaunch(); return false;"><span class="notice">Diff &raquo;</span></a> <div id="diff" style="display: none;"></div><br /><a href="htmLawedTest.php" title="[toggle visibility] XHTML 1 Transitional doctype" onclick="javascript:toggle(\'outputH\'); return false;"><span class="notice">Output rendered &raquo;</span></a><div id="outputH" style="display: block;">', $out, '</div>';
 }
-else{
+else {
 ?>
 
 <br />
@@ -630,7 +630,7 @@ 
 <br /><br />Hovering the mouse over some of the text can provide additional information in some browsers.</small>
 
 <?php
-if($_w3c_validate){
+if ($_w3c_validate) {
 ?>
 
 <small><br /><br />Because of character-encoding issues, the W3C validator (anyway not perfect) may reject validation requests or invalidate otherwise-valid code, esp. if text was copy-pasted in the input box. Local applications like the <em>HTML Validator</em> Firefox browser add-on may be useful in such cases.</small>

Braces +92 added lines, -43 removed lines

@@ -33,42 +33,51 @@ 
 ini_set('session.use_only_cookies', 1);
 ini_set('session.cookie_lifetime', 0);
 session_start();
-if(!isset($_SESSION['token'])){
+if(!isset($_SESSION['token']))
+{
  $_SESSION['token'] = md5(uniqid(rand(), 1));
 }
 
 // slashes
-if(get_magic_quotes_gpc()){
- foreach($_POST as $k => $v){
+if(get_magic_quotes_gpc())
+{
+ foreach($_POST as $k => $v)
+ {
   $_POST[$k] = stripslashes($v);
  }
  ini_set('magic_quotes_gpc', 0);
 }
-if(get_magic_quotes_runtime()){
+if(get_magic_quotes_runtime())
+{
  set_magic_quotes_runtime(0);
 }
 
 $_POST['enc'] = (isset($_POST['enc']) and preg_match('`^[-\w]+$`', $_POST['enc'])) ? $_POST['enc'] : 'utf-8';
 
 // token for anti-CSRF
-if(count($_POST)){
- if((empty($_GET['pre']) and ((!empty($_POST['token']) and !empty($_SESSION['token']) and $_POST['token'] != $_SESSION['token']) or empty($_POST[$_sid]) or $_POST[$_sid] != session_id() or empty($_COOKIE[$_sid]) or $_COOKIE[$_sid] != session_id())) or ($_POST[$_sid] != session_id())){
+if(count($_POST))
+{
+ if((empty($_GET['pre']) and ((!empty($_POST['token']) and !empty($_SESSION['token']) and $_POST['token'] != $_SESSION['token']) or empty($_POST[$_sid]) or $_POST[$_sid] != session_id() or empty($_COOKIE[$_sid]) or $_COOKIE[$_sid] != session_id())) or ($_POST[$_sid] != session_id()))
+ {
   $_POST = array('enc'=>'utf-8');
  }
 }
-if(empty($_GET['pre'])){
+if(empty($_GET['pre']))
+{
  $_SESSION['token'] = md5(uniqid(rand(), 1));
  $token = $_SESSION['token'];
  session_regenerate_id(1);
 }
 
 // compress
-if(function_exists('gzencode') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && preg_match('`gzip|deflate`i', $_SERVER['HTTP_ACCEPT_ENCODING']) && !ini_get('zlib.output_compression')){
+if(function_exists('gzencode') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && preg_match('`gzip|deflate`i', $_SERVER['HTTP_ACCEPT_ENCODING']) && !ini_get('zlib.output_compression'))
+{
  ob_start('ob_gzhandler');
 }
 
 // HTM for unprocessed
-if(isset($_POST['inputH'])){
+if(isset($_POST['inputH']))
+{
  echo '<html><head><title>htmLawed test: HTML view of unprocessed input</title></head><body style="margin:0; padding: 0;"><p style="background-color: black; color: white; padding: 2px;">&nbsp; Rendering of unprocessed input without an HTML doctype or charset declaration &nbsp; &nbsp; <small><a style="color: white; text-decoration: none;" href="1" onclick="javascript:window.close(this); return false;">close window</a> | <a style="color: white; text-decoration: none;" href="htmLawedTest.php" onclick="javascript: window.open(\'htmLawedTest.php\', \'hlmain\'); window.close(this); return false;">htmLawed test page</a></small></p><div>', $_POST['inputH'], '</div></body></html>';
  exit;
 }
@@ -81,12 +90,14 @@ 
 $validation = (!empty($_POST[$_sid]) and isset($_POST['w3c_validate'][0])) ? 1 : 0;
 include './htmLawed.php';
 
-function format($t){
+function format($t)
+{
  $t = "\n". str_replace(array("\t", "\r\n", "\r", '&', '<', '>', "\n"), array('    ', "\n", "\n", '&amp;', '&lt;', '&gt;', "<span class=\"newline\">&#172;</span><br />\n"), $t);
  return str_replace(array('<br />', "\n ", '  '), array("\n<br />\n", "\n&nbsp;", ' &nbsp;'), $t);
 }
 
-function hexdump($d){
+function hexdump($d)
+{
 // Mainly by Aidan Lister <aidan@php.net>, Peter Waller <iridum@php.net>
  $hexi = '';
  $ascii = '';
@@ -99,18 +110,23 @@ 
   // Convert to hexidecimal
   $hexi .= sprintf("%02X ", ord($d[$i]));
   // Replace non-viewable bytes with '.'
-  if(ord($d[$i]) >= 32){
+  if(ord($d[$i]) >= 32)
+  {
    $ascii .= htmlspecialchars($d[$i]);
-  }else{
+  }
+  else
+  {
    $ascii .= '.';
   } 
   // Add extra column spacing
-  if($j == 7){
+  if($j == 7)
+  {
    $hexi .= ' ';
    $ascii .= '  ';
   }
   // Add row
-  if(++$j == 16 || $i == $len-1){
+  if(++$j == 16 || $i == $len-1)
+  {
    // Join the hexi / ascii output
    echo sprintf("%04X   %-49s   %s", $offset, $hexi, $ascii);   
    // Reset vars
@@ -118,7 +134,8 @@ 
    $offset += 16;
    $j = 0;  
    // Add newline   
-   if ($i !== $len-1){
+   if ($i !== $len-1)
+   {
     echo "\n";
    }
   }
@@ -169,7 +186,9 @@ 
 <script type="text/javascript"><!--//--><![CDATA[//><!-- 
 window.name = 'hlmain';
 function hl(i){
- <?php if(!$_hilite){echo 'return;'; }?>
+ <?php if(!$_hilite)
+{
+echo 'return;'; }?>
  var e = document.getElementById(i);
  if(!e){return;}
  run(e, '</[a-z1-6]+>', 'ctag');
@@ -451,8 +470,10 @@ 
 <input type="submit" id="submitF" name="submitF" value="Process" style="float:left;" title="filter using htmLawed" onclick="javascript: sndProc(); return false;" onkeypress="javascript: sndProc(); return false;" />
 
 <?php
-if($do){
- if($validation){
+if($do)
+{
+ if($validation)
+ {
   echo '<input type="hidden" value="1" name="w3c_validate" id="w3c_validate" />';
  }
 ?>
@@ -461,7 +482,8 @@ 
 <button type="button" onclick="javascript:document.getElementById('text').focus();document.getElementById('text').select()" title="select all to copy" style="float:right;">Select all</button>
 
 <?php
-if($_w3c_validate && $validation){
+if($_w3c_validate && $validation)
+{
 ?>
   
 <button type="button" title="HTML 4.01 W3C online validation" style="float: right;" onclick="javascript: sndValidn('text', 'html401'); return false;" onkeypress="javascript: sndValidn('text', 'html401'); return false;">Check HTML</button>
@@ -470,8 +492,10 @@ 
 <?php
  }
 }
-else{
- if($_w3c_validate){
+else
+{
+ if($_w3c_validate)
+ {
   echo '<span style="float: right;" class="help" title="for direct submission of input or output code to W3C validator for (X)HTML validation"><span style="font-size: 85%;">&nbsp;Validator tools: </span><input type="checkbox" value="1" name="w3c_validate" id="w3c_validate" style="vertical-align: middle;"', ($validation ? ' checked="checked"' : ''), ' /></span>';
  }
 }
@@ -483,7 +507,8 @@ 
 <br style="clear:both;" />
 
 <?php
-if($limit_exceeded){
+if($limit_exceeded)
+{
  echo '<br /><strong>Input text is too long!</strong><br />';
 }
 ?>
@@ -531,32 +556,46 @@ 
 'valid_xhtml'=>array('2', 'nil', 'auto-set various parameters for most valid XHTML', 'nil'),
 'xml:lang'=>array('3', 'nil', 'auto-add <em>xml:lang</em> attribute', '0'),
 );
-foreach($cfg as $k=>$v){
+foreach($cfg as $k=>$v)
+{
  echo '<li>', $k, ': ';
- if(!empty($v[0])){ // input radio
+ if(!empty($v[0]))
+ {
+// input radio
   $j = $v[3];
-  for($i = $j-1; ++$i < $v[0]+$v[3];++$j){
+  for($i = $j-1; ++$i < $v[0]+$v[3];++$j)
+  {
    echo '<input type="radio" name="h', $k, '" value="', $i, '"', (!isset($_POST['h'. $k]) ? ($v[1] == $i ? ' checked="checked"' : '') : ($_POST['h'. $k] == $i ? ' checked="checked"' : '')), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />', $i, ' ';
   }
-  if($v[1] == 'nil'){
+  if($v[1] == 'nil')
+  {
    echo '<input type="radio" name="h', $k, '" value="nil"', ((!isset($_POST['h'. $k]) or $_POST['h'. $k] == 'nil') ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />not set ';
   }
-  if(!empty($v[4])){ // + input text box
+  if(!empty($v[4]))
+  {
+// + input text box
    echo '<input type="radio" name="h', $k, '" value="', $j, '"', (((isset($_POST['h'. $k]) && $_POST['h'. $k] == $j) or (!isset($_POST['h'. $k]) && $j == $v[1])) ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
-   if(!is_array($v[4])){
+   if(!is_array($v[4]))
+   {
     echo $v[6], ': <input type="text" size="', $v[4], '" name="h', $k. $j, '" value="', htmlspecialchars(isset($_POST['h'. $k. $j][0]) ? $_POST['h'. $k. $j] : $v[5]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
    }
-   else{
-    foreach($v[4] as $z){
+   else
+   {
+    foreach($v[4] as $z)
+    {
      echo ' ', $z[3], ': <input type="text" size="', $z[0], '" name="h', $k. $j. $z[1], '" value="', htmlspecialchars(isset($_POST['h'. $k. $j. $z[1]][0]) ? $_POST['h'. $k. $j. $z[1]] : $z[2]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
     }    
    }
   }
  }
- elseif(ctype_digit($v[3])){ // input text
+ elseif(ctype_digit($v[3]))
+ {
+// input text
   echo '<input type="text" size="', $v[3], '" name="h', $k, '" value="', htmlspecialchars(isset($_POST['h'. $k][0]) ? $_POST['h'. $k] : $v[1]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';  
  }
- else{} // text-area
+ else
+ {
+} // text-area
  echo ' <span class="help">', $v[2], '</span></li>';
 }
 echo '</ul></td></tr><tr><td><span style="vertical-align: top;" class="help" title="$spec argument: element-specific attribute rules">Spec:</span></td><td><textarea name="spec" id="spec" cols="70" rows="3" style="width:80%;">', htmlspecialchars((isset($_POST['spec']) ? $_POST['spec'] : '')), '</textarea></td></tr></table>';
@@ -566,31 +605,39 @@ 
 </form>
 
 <?php
-if($do){
+if($do)
+{
  $cfg = array();
- foreach($_POST as $k=>$v){
-  if($k[0] == 'h' && $v != 'nil'){
+ foreach($_POST as $k=>$v)
+ {
+  if($k[0] == 'h' && $v != 'nil')
+  {
    $cfg[substr($k, 1)] = $v;
   }
  }
 
- if(isset($cfg['anti_link_spam']) && $cfg['anti_link_spam'] && (!empty($cfg['anti_link_spam11']) or !empty($cfg['anti_link_spam12']))){
+ if(isset($cfg['anti_link_spam']) && $cfg['anti_link_spam'] && (!empty($cfg['anti_link_spam11']) or !empty($cfg['anti_link_spam12'])))
+ {
   $cfg['anti_link_spam'] = array($cfg['anti_link_spam11'], $cfg['anti_link_spam12']);
  }
  unset($cfg['anti_link_spam11'], $cfg['anti_link_spam12']);
- if(isset($cfg['anti_mail_spam']) && $cfg['anti_mail_spam'] == 1){
+ if(isset($cfg['anti_mail_spam']) && $cfg['anti_mail_spam'] == 1)
+ {
   $cfg['anti_mail_spam'] = isset($cfg['anti_mail_spam1'][0]) ? $cfg['anti_mail_spam1'] : 0;
  }
  unset($cfg['anti_mail_spam11']);
- if(isset($cfg['deny_attribute']) && $cfg['deny_attribute'] == 1){
+ if(isset($cfg['deny_attribute']) && $cfg['deny_attribute'] == 1)
+ {
   $cfg['deny_attribute'] = isset($cfg['deny_attribute1'][0]) ? $cfg['deny_attribute1'] : 0;
  }
  unset($cfg['deny_attribute1']);
- if(isset($cfg['tidy']) && $cfg['tidy'] == 2){
+ if(isset($cfg['tidy']) && $cfg['tidy'] == 2)
+ {
   $cfg['tidy'] = isset($cfg['tidy2'][0]) ? $cfg['tidy2'] : 0;
  }
  unset($cfg['tidy2']);
- if(isset($cfg['unique_ids']) && $cfg['unique_ids'] == 2){
+ if(isset($cfg['unique_ids']) && $cfg['unique_ids'] == 2)
+ {
   $cfg['unique_ids'] = isset($cfg['unique_ids2'][0]) ? $cfg['unique_ids2'] : 1;
  }
  unset($cfg['unique_ids2']);
@@ -612,7 +659,8 @@ 
  }
  echo '</div><br /><a href="htmLawedTest.php" title="[toggle visibility] syntax-highlighted" onclick="javascript:toggle(\'outputR\'); return false;"><span class="notice">Output code &raquo;</span></a><div id="outputR" style="display: block;">', format($out), '</div><script type="text/javascript">hl(\'outputR\');</script>', (!isset($_POST['text'][$_hlimit]) ? ' <a href="htmLawedTest.php" title="[toggle visibility] hexdump; non-viewable characters like line-returns are shown as dots" onclick="javascript:toggle(\'outputD\'); return false;"><span class="notice">Output binary &raquo;</span></a><div id="outputD" style="display: none;">'. hexdump($out). '</div>' : ''), ' <a href="htmLawedTest.php" title="[toggle visibility] inline output-input diff; might not be perfectly accurate, semantically or otherwise " onclick="javascript:toggle(\'diff\'); diffLaunch(); return false;"><span class="notice">Diff &raquo;</span></a> <div id="diff" style="display: none;"></div><br /><a href="htmLawedTest.php" title="[toggle visibility] XHTML 1 Transitional doctype" onclick="javascript:toggle(\'outputH\'); return false;"><span class="notice">Output rendered &raquo;</span></a><div id="outputH" style="display: block;">', $out, '</div>';
 }
-else{
+else
+{
 ?>
 
 <br />
@@ -630,7 +678,8 @@ 
 <br /><br />Hovering the mouse over some of the text can provide additional information in some browsers.</small>
 
 <?php
-if($_w3c_validate){
+if($_w3c_validate)
+{
 ?>
 
 <small><br /><br />Because of character-encoding issues, the W3C validator (anyway not perfect) may reject validation requests or invalidate otherwise-valid code, esp. if text was copy-pasted in the input box. Local applications like the <em>HTML Validator</em> Firefox browser add-on may be useful in such cases.</small>