EGroupware / egroupware

infolog/inc/class.infolog_groupdav.inc.php

Braces +76 added lines, -19 removed lines

@@ -91,7 +91,10 @@ 
 		}
 		else
 		{
-			if (!is_array($info)) $info = $this->bo->read($info);
+			if (!is_array($info))
+			{
+				$info = $this->bo->read($info);
+			}
 			$name = $info[self::$path_attr];
 		}
 		return $name.self::$path_extension;
@@ -159,7 +162,11 @@ 
 		// enable time-range filter for tests via propfind / autoindex
 		//$filter[] = $sql = $this->_time_range_filter(array('end' => '20001231T000000Z'));
 
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id)
+		{
+			$path = dirname($path).'/';
+		}
+		// caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -226,7 +233,10 @@ 
 	 */
 	function &propfind_callback($path,array $filter,$start=false)
 	{
-		if ($this->debug) $starttime = microtime(true);
+		if ($this->debug)
+		{
+			$starttime = microtime(true);
+		}
 
 		if (($calendar_data = $filter['calendar_data']))
 		{
@@ -242,7 +252,10 @@ 
 		if (preg_match('/^([a-z0-9_]+)( DESC| ASC)?$/i', $filter['order'], $matches))
 		{
 			$order = $matches[1];
-			if ($matches[2]) $sort = $matches[2];
+			if ($matches[2])
+			{
+				$sort = $matches[2];
+			}
 			unset($filter['order']);
 		}
 		$query = array(
@@ -325,7 +338,10 @@ 
 				--$this->sync_collection_token;
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."($path) took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($path) took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		}
 		return $files;
 	}
 
@@ -347,7 +363,10 @@ 
 				switch($filter['name'])
 				{
 					case 'comp-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						}
 
 						switch($filter['attrs']['name'])
 						{
@@ -359,14 +378,23 @@ 
 						}
 						break;
 					case 'prop-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						}
 						$prop_filter = $filter['attrs']['name'];
 						break;
 					case 'text-match':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						}
 						if (!isset($this->filter_prop2infolog[strtoupper($prop_filter)]))
 						{
-							if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							if ($this->debug)
+							{
+								error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							}
 						}
 						else
 						{
@@ -375,13 +403,19 @@ 
 						unset($prop_filter);
 						break;
 					case 'param-filter':
-						if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						}
 						break;
 					case 'time-range':
 						$cal_filters[] = $this->_time_range_filter($filter['attrs']);
 						break;
 					default:
-						if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						}
 						break;
 				}
 			}
@@ -450,7 +484,10 @@ 
 					}
 				}
 			}
-			if ($this->debug > 1) error_log(__METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids));
+			if ($this->debug > 1)
+			{
+				error_log(__METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids));
+			}
 		}
 		return true;
 	}
@@ -511,7 +548,10 @@ 
  			"NOT info_datecompleted > 0". (isset($end) ? " AND info_created < $end" : '').
 		')';
 		$sql = '('.implode(' OR ', $to_or).')';
-		if ($this->debug > 1) error_log(__FILE__ . __METHOD__.'('.array2string($attrs).") time-range=$attrs[start]-$attrs[end] --> $sql");
+		if ($this->debug > 1)
+		{
+			error_log(__FILE__ . __METHOD__.'('.array2string($attrs).") time-range=$attrs[start]-$attrs[end] --> $sql");
+		}
 		return $sql;
 	}
 
@@ -552,7 +592,10 @@ 
 	{
 		unset($prefix);	// not used, but required by function signature
 
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($id, $user)".print_r($options,true));
+		}
 
 		$oldTask = $this->_common_get_put_delete('PUT',$options,$id);
 		if (!is_null($oldTask) && !is_array($oldTask))
@@ -580,7 +623,10 @@ 
 		}
 		if (!($infoId = $handler->importVTODO($vTodo, $taskId, false, $user, null, $id, $callback_data)))
 		{
-			if ($this->debug) error_log(__METHOD__."(,$id) import_vtodo($options[content]) returned false");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,$id) import_vtodo($options[content]) returned false");
+			}
 			return '403 Forbidden';
 		}
 
@@ -592,11 +638,13 @@ 
 		// send evtl. necessary respose headers: Location, etag, ...
 		// but only for new entries, as X-INFOLOG-STATUS get's not updated on client, if we confirm with an etag
 		if ($retval !== true)
-			// POST with add-member query parameter
+		{
+					// POST with add-member query parameter
 			//$_SERVER['REQUEST_METHOD'] == 'POST' && isset($_GET['add-member'])))
 		{
 			$this->put_response_headers($infoId, $options['path'], $retval, self::$path_attr == 'caldav_name');
 		}
+		}
 		return $retval;
 	}
 
@@ -607,7 +655,10 @@ 
 	 */
 	public function update_tags($entry)
 	{
-		if (!is_array($entry)) $entry = $this->read($entry);
+		if (!is_array($entry))
+		{
+			$entry = $this->read($entry);
+		}
 
 		$this->bo->write($entry, true);
 	}
@@ -729,7 +780,10 @@ 
 	 */
 	function check_access($acl,$task)
 	{
-		if (is_null($task)) return true;
+		if (is_null($task))
+		{
+			return true;
+		}
 
 		$access = $this->bo->check_access($task,$acl);
 
@@ -737,7 +791,10 @@ 
 		{
 			$access = true;	// access limited to $this->bo->responsible_edit fields (handled in infolog_bo::write())
 		}
-		if ($this->debug > 1) error_log(__METHOD__."($acl, ".array2string($task).') returning '.array2string($access));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."($acl, ".array2string($task).') returning '.array2string($access));
+		}
 		return $access;
 	}
 

Doc Comments +6 added lines, -6 removed lines

@@ -141,7 +141,7 @@ 
 	 * @param array &$options
 	 * @param array &$files
 	 * @param int $user account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function propfind($path,&$options,&$files,$user,$id='')
 	{
@@ -221,7 +221,7 @@ 
 	 *
 	 * @param string $path
 	 * @param array $filter
-	 * @param array|boolean $start =false false=return all or array(start,num)
+	 * @param integer[] $start =false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
 	function &propfind_callback($path,array $filter,$start=false)
@@ -530,7 +530,7 @@ 
 	 * @param array &$options
 	 * @param int $id
 	 * @param int $user =null account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function get(&$options,$id,$user=null)
 	{
@@ -555,7 +555,7 @@ 
 	 * @param int $id
 	 * @param int $user =null account_id of owner, default null
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
@@ -694,7 +694,7 @@ 
 	 * @param array &$options
 	 * @param int $id
 	 * @param int $user account_id of collection owner
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function delete(&$options,$id,$user)
 	{
@@ -771,7 +771,7 @@ 
 	 * etag currently uses the modifcation time (info_datemodified), 1.9.002 adds etag column, but it's not yet used!
 	 *
 	 * @param array|int $info array with infolog entry or info_id
-	 * @return string|boolean string with etag or false
+	 * @return false|string string with etag or false
 	 */
 	function get_etag($info)
 	{

Spacing +71 added lines, -71 removed lines

@@ -112,7 +112,7 @@ 
 		}
 		if ($path == '/infolog/')
 		{
-			$task_filter= 'own';
+			$task_filter = 'own';
 		}
 		else
 		{
@@ -122,7 +122,7 @@ 
 			}
 			else
 			{
-				$task_filter = 'user' . $user;
+				$task_filter = 'user'.$user;
 			}
 		}
 
@@ -143,7 +143,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function propfind($path,&$options,&$files,$user,$id='')
+	function propfind($path, &$options, &$files, $user, $id = '')
 	{
 		// todo add a filter to limit how far back entries from the past get synced
 		$filter = $this->get_infolog_filter($path, $user);
@@ -159,7 +159,7 @@ 
 		// enable time-range filter for tests via propfind / autoindex
 		//$filter[] = $sql = $this->_time_range_filter(array('end' => '20001231T000000Z'));
 
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id) $path = dirname($path).'/'; // caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -171,7 +171,7 @@ 
 		if (!($filter['calendar_data'] = $options['props'] == 'all' &&
 			$options['root']['ns'] == Api\CalDAV::CALDAV) && is_array($options['props']))
 		{
-			foreach($options['props'] as $prop)
+			foreach ($options['props'] as $prop)
 			{
 				if ($prop['name'] == 'calendar-data')
 				{
@@ -191,7 +191,7 @@ 
 
 			$this->sync_collection_token = null;
 
-			$filter['order'] = 'info_datemodified ASC';	// return oldest modifications first
+			$filter['order'] = 'info_datemodified ASC'; // return oldest modifications first
 			$filter['sync-collection'] = true;
 		}
 
@@ -205,13 +205,13 @@ 
 			if ($options['root']['name'] == 'sync-collection' && $this->bo->total > $nresults)
 			{
 				--$this->sync_collection_token;
-				$files['sync-token-params'][] = true;	// tel get_sync_collection_token that we have more entries
+				$files['sync-token-params'][] = true; // tel get_sync_collection_token that we have more entries
 			}
 		}
 		else
 		{
 			// return iterator, calling ourself to return result in chunks
-			$files['files'] = new Api\CalDAV\PropfindIterator($this,$path,$filter,$files['files']);
+			$files['files'] = new Api\CalDAV\PropfindIterator($this, $path, $filter, $files['files']);
 		}
 		return true;
 	}
@@ -224,7 +224,7 @@ 
 	 * @param array|boolean $start =false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
-	function &propfind_callback($path,array $filter,$start=false)
+	function &propfind_callback($path, array $filter, $start = false)
 	{
 		if ($this->debug) $starttime = microtime(true);
 
@@ -251,7 +251,7 @@ 
 			'filter'    	=> $task_filter,
 			'date_format'	=> 'server',
 			'col_filter'	=> $filter,
-			'custom_fields' => true,	// otherwise custom fields get NOT loaded!
+			'custom_fields' => true, // otherwise custom fields get NOT loaded!
 		);
 		$check_responsible = false;
 		if (substr($task_filter, -8) == '+deleted')
@@ -279,10 +279,10 @@ 
 
 		$files = array();
 		// ToDo: add parameter to only return id & etag
-		$tasks =& $this->bo->search($query);
+		$tasks = & $this->bo->search($query);
 		if ($tasks && $offset == $query['start'])
 		{
-			foreach($tasks as $task)
+			foreach ($tasks as $task)
 			{
 				// remove task from requested multiget ids, to be able to report not found urls
 				if ($requested_multiget_ids && ($k = array_search($task[self::$path_attr], $requested_multiget_ids)) !== false)
@@ -299,15 +299,15 @@ 
 					continue;
 				}
 				$props = array(
-					'getcontenttype' => $this->agent != 'kde' ? 'text/calendar; charset=utf-8; component=VTODO' : 'text/calendar',	// Konqueror (3.5) dont understand it otherwise
+					'getcontenttype' => $this->agent != 'kde' ? 'text/calendar; charset=utf-8; component=VTODO' : 'text/calendar', // Konqueror (3.5) dont understand it otherwise
 					'getlastmodified' => $task['info_datemodified'],
 					'displayname' => $task['info_subject'],
 				);
 				if ($calendar_data)
 				{
-					$content = $handler->exportVTODO($task, '2.0', null);	// no METHOD:PUBLISH for CalDAV
+					$content = $handler->exportVTODO($task, '2.0', null); // no METHOD:PUBLISH for CalDAV
 					$props['getcontentlength'] = bytes($content);
-					$props[] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-data',$content);
+					$props[] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-data', $content);
 				}
 				$files[] = $this->add_resource($path, $task, $props);
 			}
@@ -315,13 +315,13 @@ 
 		// report not found multiget urls
 		if ($requested_multiget_ids)
 		{
-			foreach($requested_multiget_ids as $id)
+			foreach ($requested_multiget_ids as $id)
 			{
 				$files[] = array('path' => $path.$id.self::$path_extension);
 			}
 		}
 		// sync-collection report --> return modified of last contact as sync-token
-		$sync_collection_report =  $filter['sync-collection'];
+		$sync_collection_report = $filter['sync-collection'];
 		if ($sync_collection_report)
 		{
 			$this->sync_collection_token = $task['date_modified'];
@@ -347,18 +347,18 @@ 
 	 * @param int &$nresult on return limit for number or results or unchanged/null
 	 * @return boolean true if filter could be processed
 	 */
-	function _report_filters($options,&$cal_filters,$id, &$nresults)
+	function _report_filters($options, &$cal_filters, $id, &$nresults)
 	{
 		if ($options['filters'])
 		{
-			foreach($options['filters'] as $filter)
+			foreach ($options['filters'] as $filter)
 			{
-				switch($filter['name'])
+				switch ($filter['name'])
 				{
 					case 'comp-filter':
 						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
 
-						switch($filter['attrs']['name'])
+						switch ($filter['attrs']['name'])
 						{
 							case 'VTODO':
 							case 'VCALENDAR':
@@ -401,9 +401,9 @@ 
 		    <B:nresults>10</B:nresults>
 		  </B:limit>
 		*/
-		foreach((array)$options['other'] as $option)
+		foreach ((array)$options['other'] as $option)
 		{
-			switch($option['name'])
+			switch ($option['name'])
 			{
 				case 'nresults':
 					$nresults = (int)$option['data'];
@@ -412,7 +412,7 @@ 
 				case 'limit':
 					break;
 				case 'href':
-					break;	// from addressbook-multiget, handled below
+					break; // from addressbook-multiget, handled below
 				// rfc 6578 sync-report
 				case 'sync-token':
 					if (!empty($option['data']))
@@ -420,7 +420,7 @@ 
 						$parts = explode('/', $option['data']);
 						$sync_token = array_pop($parts);
 						$cal_filters[] = 'info_datemodified>'.(int)$sync_token;
-						$cal_filters['filter'] .= '+deleted';	// to return deleted entries too
+						$cal_filters['filter'] .= '+deleted'; // to return deleted entries too
 					}
 					break;
 				case 'sync-level':
@@ -442,24 +442,24 @@ 
 			if ($id)
 			{
 				$cal_filters[self::$path_attr] = self::$path_extension ?
-					basename($id,self::$path_extension) : $id;
+					basename($id, self::$path_extension) : $id;
 			}
 			else	// fetch all given url's
 			{
-				foreach($options['other'] as $option)
+				foreach ($options['other'] as $option)
 				{
 					if ($option['name'] == 'href')
 					{
-						$parts = explode('/',$option['data']);
+						$parts = explode('/', $option['data']);
 						if (($id = basename(urldecode(array_pop($parts)))))
 						{
 							$cal_filters[self::$path_attr][] = self::$path_extension ?
-								basename($id,self::$path_extension) : $id;
+								basename($id, self::$path_extension) : $id;
 						}
 					}
 				}
 			}
-			if ($this->debug > 1) error_log(__METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids));
+			if ($this->debug > 1) error_log(__METHOD__."($options[path],...,$id) calendar-multiget: ids=".implode(',', $ids));
 		}
 		return true;
 	}
@@ -487,7 +487,7 @@ 
 		elseif (empty($attrs['start']))
 		{
 			$this->caldav->log(__METHOD__.'('.array2string($attrs).') minimum one of start or end is required!');
-			return '1';	// to not give sql error, but simply not filter out anything
+			return '1'; // to not give sql error, but simply not filter out anything
 		}
 		// we dont need to care for DURATION line in rfc4791#section-9.9, as we always put that in DUE/info_enddate
 
@@ -517,10 +517,10 @@ 
 			"info_datecompleted > 0".(isset($start) ? " AND ($start <= info_datecompleted OR $start <= info_created)" : '').
 				(isset($end) ? " AND (info_datecompleted <= $end OR info_created <= $end)" : '').' OR '.
 			// we have no completed date, but always a created date
- 			"NOT info_datecompleted > 0". (isset($end) ? " AND info_created < $end" : '').
+ 			"NOT info_datecompleted > 0".(isset($end) ? " AND info_created < $end" : '').
 		')';
 		$sql = '('.implode(' OR ', $to_or).')';
-		if ($this->debug > 1) error_log(__FILE__ . __METHOD__.'('.array2string($attrs).") time-range=$attrs[start]-$attrs[end] --> $sql");
+		if ($this->debug > 1) error_log(__FILE__.__METHOD__.'('.array2string($attrs).") time-range=$attrs[start]-$attrs[end] --> $sql");
 		return $sql;
 	}
 
@@ -532,16 +532,16 @@ 
 	 * @param int $user =null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function get(&$options,$id,$user=null)
+	function get(&$options, $id, $user = null)
 	{
-		unset($user);	// not used, but required by function signature
+		unset($user); // not used, but required by function signature
 
-		if (!is_array($task = $this->_common_get_put_delete('GET',$options,$id)))
+		if (!is_array($task = $this->_common_get_put_delete('GET', $options, $id)))
 		{
 			return $task;
 		}
 		$handler = $this->_get_handler();
-		$options['data'] = $handler->exportVTODO($task, '2.0', null);	// no METHOD:PUBLISH for CalDAV
+		$options['data'] = $handler->exportVTODO($task, '2.0', null); // no METHOD:PUBLISH for CalDAV
 		$options['mimetype'] = 'text/calendar; charset=utf-8';
 		header('Content-Encoding: identity');
 		header('ETag: "'.$this->get_etag($task).'"');
@@ -557,13 +557,13 @@ 
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null,$prefix=null)
+	function put(&$options, $id, $user = null, $prefix = null)
 	{
-		unset($prefix);	// not used, but required by function signature
+		unset($prefix); // not used, but required by function signature
 
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options, true));
 
-		$oldTask = $this->_common_get_put_delete('PUT',$options,$id);
+		$oldTask = $this->_common_get_put_delete('PUT', $options, $id);
 		if (!is_null($oldTask) && !is_array($oldTask))
 		{
 			return $oldTask;
@@ -628,7 +628,7 @@ 
 	 * @param array $oldTask =null
 	 * @return array modified task data
 	 */
-	public function cat_action(array $task, $oldTask=null)
+	public function cat_action(array $task, $oldTask = null)
 	{
 		$action = $GLOBALS['egw_info']['user']['preferences']['groupdav']['infolog-cat-action'];
 
@@ -661,13 +661,13 @@ 
 			{
 				unset($task['info_responsible'][$key]);
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'set':
 					$task['info_responsible'] = array();
 					// fall through
 				case 'set-user':
-					foreach($task['info_responsible'] as $key => $account_id)
+					foreach ($task['info_responsible'] as $key => $account_id)
 					{
 						if ($GLOBALS['egw']->accounts->get_type($account_id) == 'u')
 						{
@@ -696,11 +696,11 @@ 
 	 * @param int $user account_id of collection owner
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id,$user)
+	function delete(&$options, $id, $user)
 	{
-		unset($user);	// not used, but required by function signature
+		unset($user); // not used, but required by function signature
 
-		if (!is_array($task = $this->_common_get_put_delete('DELETE',$options,$id)))
+		if (!is_array($task = $this->_common_get_put_delete('DELETE', $options, $id)))
 		{
 			return $task;
 		}
@@ -718,7 +718,7 @@ 
 	 */
 	function read($id)
 	{
-		return $this->bo->read(array(self::$path_attr => $id, "info_status!='deleted'"),false,'server');
+		return $this->bo->read(array(self::$path_attr => $id, "info_status!='deleted'"), false, 'server');
 	}
 
 	/**
@@ -741,15 +741,15 @@ 
 	 * @param array|int $task task-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$task)
+	function check_access($acl, $task)
 	{
 		if (is_null($task)) return true;
 
-		$access = $this->bo->check_access($task,$acl);
+		$access = $this->bo->check_access($task, $acl);
 
 		if (!$access && $acl == Acl::EDIT && $this->bo->is_responsible($task))
 		{
-			$access = true;	// access limited to $this->bo->responsible_edit fields (handled in infolog_bo::write())
+			$access = true; // access limited to $this->bo->responsible_edit fields (handled in infolog_bo::write())
 		}
 		if ($this->debug > 1) error_log(__METHOD__."($acl, ".array2string($task).') returning '.array2string($access));
 		return $access;
@@ -760,7 +760,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getctag($path,$user)
+	public function getctag($path, $user)
 	{
 		return $this->bo->getctag($this->get_infolog_filter($path, $user));
 	}
@@ -777,7 +777,7 @@ 
 	{
 		if (!is_array($info))
 		{
-			$info = $this->bo->read($info,true,'server');
+			$info = $this->bo->read($info, true, 'server');
 		}
 		if (!is_array($info) || !isset($info['info_id']) || !isset($info['info_datemodified']))
 		{
@@ -795,38 +795,38 @@ 
 	 * @param int $user =null account_id of owner of collection
 	 * @return array
 	 */
-	public function extra_properties(array $props, $displayname, $base_uri=null,$user=null)
+	public function extra_properties(array $props, $displayname, $base_uri = null, $user = null)
 	{
-		unset($base_uri);	// not used, but required by function signature
+		unset($base_uri); // not used, but required by function signature
 
 		// calendar description
-		$displayname = Api\Translation::convert(lang('Tasks of'),Api\Translation::charset(),'utf-8').' '.$displayname;
-		$props['calendar-description'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-description',$displayname);
+		$displayname = Api\Translation::convert(lang('Tasks of'), Api\Translation::charset(), 'utf-8').' '.$displayname;
+		$props['calendar-description'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-description', $displayname);
 		// supported components, currently only VTODO
-		$props['supported-calendar-component-set'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'supported-calendar-component-set',array(
-			Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'comp',array('name' => 'VTODO')),
+		$props['supported-calendar-component-set'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'supported-calendar-component-set', array(
+			Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'comp', array('name' => 'VTODO')),
 		));
 		// supported reports
 		$props['supported-report-set'] = array(
-			'calendar-query' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-query',''))))),
-			'calendar-multiget' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-multiget',''))))),
+			'calendar-query' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-query', ''))))),
+			'calendar-multiget' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-multiget', ''))))),
 		);
 		// only advertice rfc 6578 sync-collection report, if "delete-prevention" is switched on (deleted entries get marked deleted but not actualy deleted
 		$config = Api\Config::read('infolog');
 		if ($config['history'])
 		{
-			$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop('sync-collection','')))));
+			$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop('sync-collection', '')))));
 		}
 		// get timezone of calendar
 		if ($this->caldav->prop_requested('calendar-timezone'))
 		{
-			$props['calendar-timezone'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-timezone',
+			$props['calendar-timezone'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-timezone',
 				calendar_timezones::user_timezone($user));
 		}
 		return $props;
@@ -840,8 +840,8 @@ 
 	private function _get_handler()
 	{
 		$handler = new infolog_ical();
-		$handler->tzid = false;	//	as we read server-time timestamps (!= null=user-time), exports UTC times
-		$handler->setSupportedFields('GroupDAV',$this->agent);
+		$handler->tzid = false; //	as we read server-time timestamps (!= null=user-time), exports UTC times
+		$handler->setSupportedFields('GroupDAV', $this->agent);
 
 		return $handler;
 	}

doc/mail/dovecot_checkpassword_ads.php

Braces +66 added lines, -18 removed lines

@@ -41,7 +41,10 @@ 
  */
 
 // protect from being called via HTTP
-if (php_sapi_name() !== 'cli') die('This is a command line only script!');
+if (php_sapi_name() !== 'cli')
+{
+	die('This is a command line only script!');
+}
 
 // uncomment to write to log-file, otherwise errors go to stderr
 //$log = '/var/log/dovecot_checkpassword.log';
@@ -94,7 +97,10 @@ 
 
 ini_set('display_errors',false);
 error_reporting(E_ALL & ~E_NOTICE);
-if ($log) ini_set('error_log',$log);
+if ($log)
+{
+	ini_set('error_log',$log);
+}
 
 if ($_SERVER['argc'] < 2)
 {
@@ -115,8 +121,14 @@ 
 //error_log("dovecot_checkpassword '{$_SERVER['argv'][1]}': username='$username', password='$password', master='$master'");
 
 $ds = ldap_connect($ldap_uri);
-if ($version) ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
-if ($use_tls) ldap_start_tls($ds);
+if ($version)
+{
+	ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
+}
+if ($use_tls)
+{
+	ldap_start_tls($ds);
+}
 
 if (!@ldap_bind($ds, $bind_dn, $bind_pw))
 {
@@ -163,10 +175,16 @@ 
 		$dn = $d ? strtr($domain_master_dn,array('%d'=>$domain)) : $master_dn;
 		if (!@ldap_bind($ds, $dn, $password))
 		{
-			if ($log_verbose) error_log("Can't bind as '$dn' with password '$password'! Authentication as master '$master' for user '$username' failed!");
+			if ($log_verbose)
+			{
+				error_log("Can't bind as '$dn' with password '$password'! Authentication as master '$master' for user '$username' failed!");
+			}
 			exit(111);	// 111 = temporary problem
 		}
-		if ($log_verbose) error_log("Authentication as master '$master' for user '$username' succeeded!");
+		if ($log_verbose)
+		{
+			error_log("Authentication as master '$master' for user '$username' succeeded!");
+		}
 		$passdb_query = false;
 		$filter = $userdb_filter;
 	}
@@ -180,7 +198,10 @@ 
 
 // remove prefixes eg. "{quota:}proxyaddresses"
 $attrs = $user_attrs;
-foreach($attrs as &$a) if ($a[0] == '{') list(,$a) = explode('}', $a);
+foreach($attrs as &$a)
+{
+	if ($a[0] == '{') list(,$a) = explode('}', $a);
+}
 
 if (!($sr = ldap_search($ds, $base, $filter, array_values($attrs))))
 {
@@ -191,7 +212,10 @@ 
 
 if (!$entries['count'])
 {
-	if ($log_verbose) error_log("User '$username' NOT found!");
+	if ($log_verbose)
+	{
+		error_log("User '$username' NOT found!");
+	}
 	exit(3);
 }
 
@@ -208,26 +232,44 @@ 
 	// now authenticate user by trying to bind to found dn with given password
 	if (!@ldap_bind($ds, $entries[0]['dn'], $password))
 	{
-		if ($log_verbose) error_log("Can't bind as '{$entries[0]['dn']}' with password '$password'! Authentication for user '$username' failed!");
+		if ($log_verbose)
+		{
+			error_log("Can't bind as '{$entries[0]['dn']}' with password '$password'! Authentication for user '$username' failed!");
+		}
 		exit(1);
 	}
-	if ($log_verbose) error_log("Successfull authentication user '$username' dn='{$entries[0]['dn']}'.");
-}
+	if ($log_verbose)
+	{
+		error_log("Successfull authentication user '$username' dn='{$entries[0]['dn']}'.");
+	}
+	}
 else	// user-db query, no authentication
 {
-	if ($log_verbose) error_log("User-db query for user '$username' dn='{$entries[0]['dn']}'.");
-}
+	if ($log_verbose)
+	{
+		error_log("User-db query for user '$username' dn='{$entries[0]['dn']}'.");
+	}
+	}
 
 // add additional placeholders from $user_attrs
 foreach($user_attrs as $placeholder => $attr)
 {
-	if ($attr[0] == '{')	// prefix given --> ignore all values without and remove it
+	if ($attr[0] == '{')
+	{
+		// prefix given --> ignore all values without and remove it
 	{
 		list($prefix, $attr) = explode('}', substr($attr, 1));
+	}
 		foreach($entries[0][$attr] as $key => $value)
 		{
-			if ($key === 'count') continue;
-			if (strpos($value, $prefix) !== 0) continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
+			if (strpos($value, $prefix) !== 0)
+			{
+				continue;
+			}
 			$replace[$placeholder] = substr($value, strlen($prefix));
 			break;
 		}
@@ -251,7 +293,10 @@ 
 		$system_groups_user = array();
 		foreach($groups as $key => $group)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 			$system_groups_user[] = $group[$group_attr][0].$append;
 		}
 		$extra['system_groups_user'] = implode(',', $system_groups_user);	// todo: check separator
@@ -289,7 +334,10 @@ 
 
 // setting USER, HOME, EXTRA
 putenv('USER='.strtr($user_name, $replace));
-if ($user_home) putenv('HOME='.strtr($user_home, $replace));
+if ($user_home)
+{
+	putenv('HOME='.strtr($user_home, $replace));
+}
 if ($extra)
 {
 	foreach($extra as $name => $value)

Spacing +37 added lines, -37 removed lines

@@ -55,18 +55,18 @@ 
 //$bind_pw = 'secret';
 $version = 3;
 $use_tls = false;
-$search_base = $ldap_base;//'o=%d,dc=egroupware';
+$search_base = $ldap_base; //'o=%d,dc=egroupware';
 $passdb_filter = $userdb_filter = '(&(objectCategory=person)(sAMAccountName=%s))';
 // %d for domain and %s for username given by Dovecot is set automatic
 $user_attrs = array(
-	'%u' => 'samaccountname',	// do NOT remove!
+	'%u' => 'samaccountname', // do NOT remove!
 //	'%n' => 'uidnumber',
 //	'%h' => 'mailmessagestore',
 	'%q' => '{quota:}proxyaddresses',
 	'%x' => 'dn',
 );
-$user_name = '%u';	// '%u@%d';
-$user_home = '/var/dovecot/imap/gruene/%u';	//'/var/dovecot/imap/%d/%u';	// mailbox location
+$user_name = '%u'; // '%u@%d';
+$user_home = '/var/dovecot/imap/gruene/%u'; //'/var/dovecot/imap/%d/%u';	// mailbox location
 $extra = array(
 	'userdb_quota_rule' => '*:bytes=%q',
 /* only for director
@@ -87,26 +87,26 @@ 
 $group_base = $ldap_base;
 $group_filter = '(&(objectCategory=group)(member=%x))';
 $group_attr = 'cn';
-$group_append = '';	//'@%d';
+$group_append = ''; //'@%d';
 
-$master_dn = $bind_dn;	//"cn=admin,dc=egroupware";
+$master_dn = $bind_dn; //"cn=admin,dc=egroupware";
 //$domain_master_dn = "cn=admin,o=%d,dc=egroupware";
 
-ini_set('display_errors',false);
+ini_set('display_errors', false);
 error_reporting(E_ALL & ~E_NOTICE);
-if ($log) ini_set('error_log',$log);
+if ($log) ini_set('error_log', $log);
 
 if ($_SERVER['argc'] < 2)
 {
-	fwrite(STDERR,"\nUsage: {$_SERVER['argv'][0]} prog-to-exec\n\n");
-	fwrite(STDERR,"To test run:\n");
-	fwrite(STDERR,"echo -en 'username\\0000''password\\0000' | {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n");
-	fwrite(STDERR,"echo -en 'username\\0000' | AUTHORIZED=1 {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n");
-	fwrite(STDERR,"echo -en '(dovecode-admin@domain|dovecot|cyrus)\\0000''master-password\\0000' | AUTH_LOGIN_USER=username {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n\n");
+	fwrite(STDERR, "\nUsage: {$_SERVER['argv'][0]} prog-to-exec\n\n");
+	fwrite(STDERR, "To test run:\n");
+	fwrite(STDERR, "echo -en 'username\\0000''password\\0000' | {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n");
+	fwrite(STDERR, "echo -en 'username\\0000' | AUTHORIZED=1 {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n");
+	fwrite(STDERR, "echo -en '(dovecode-admin@domain|dovecot|cyrus)\\0000''master-password\\0000' | AUTH_LOGIN_USER=username {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n\n");
 	exit(2);
 }
 
-list($username,$password) = explode("\0",file_get_contents('php://fd/3'));
+list($username, $password) = explode("\0", file_get_contents('php://fd/3'));
 if (isset($_SERVER['AUTH_LOGIN_USER']))
 {
 	$master = $username;
@@ -121,16 +121,16 @@ 
 if (!@ldap_bind($ds, $bind_dn, $bind_pw))
 {
 	error_log("Can't connect to LDAP server $ldap_uri!");
-	exit(111);	// 111 = temporary problem
+	exit(111); // 111 = temporary problem
 }
-list(,$domain) = explode('@',$username);
-if (preg_match('/^(.*)\.imapc$/',$domain,$matches))
+list(,$domain) = explode('@', $username);
+if (preg_match('/^(.*)\.imapc$/', $domain, $matches))
 {
 	$domain = $matches[1];
 
 	$username = explode('.', $username);
 	array_pop($username);
-	$username = implode('.',$username);
+	$username = implode('.', $username);
 
 	$user_home = '/var/tmp/imapc-%d/%s';
 	$extra = array(
@@ -154,17 +154,17 @@ 
 	// master user name is hardcoded "dovecot", "cyrus" or "dovecot-admin@domain" and mapped currently to cn=admin,[o=domain,]dc=egroupware
 	if (isset($master))
 	{
-		list($n,$d) = explode('@', $master);
-		if (!($n === 'dovecot-admin' && $d === $domain || in_array($master,array('dovecot','cyrus'))))
+		list($n, $d) = explode('@', $master);
+		if (!($n === 'dovecot-admin' && $d === $domain || in_array($master, array('dovecot', 'cyrus'))))
 		{
 			// no valid master-user for given domain
 			exit(1);
 		}
-		$dn = $d ? strtr($domain_master_dn,array('%d'=>$domain)) : $master_dn;
+		$dn = $d ? strtr($domain_master_dn, array('%d'=>$domain)) : $master_dn;
 		if (!@ldap_bind($ds, $dn, $password))
 		{
 			if ($log_verbose) error_log("Can't bind as '$dn' with password '$password'! Authentication as master '$master' for user '$username' failed!");
-			exit(111);	// 111 = temporary problem
+			exit(111); // 111 = temporary problem
 		}
 		if ($log_verbose) error_log("Authentication as master '$master' for user '$username' succeeded!");
 		$passdb_query = false;
@@ -180,12 +180,12 @@ 
 
 // remove prefixes eg. "{quota:}proxyaddresses"
 $attrs = $user_attrs;
-foreach($attrs as &$a) if ($a[0] == '{') list(,$a) = explode('}', $a);
+foreach ($attrs as &$a) if ($a[0] == '{') list(,$a) = explode('}', $a);
 
 if (!($sr = ldap_search($ds, $base, $filter, array_values($attrs))))
 {
 	error_log("Error ldap_search(\$ds, '$base', '$filter')!");
-	exit(111);	// 111 = temporary problem
+	exit(111); // 111 = temporary problem
 }
 $entries = ldap_get_entries($ds, $sr);
 
@@ -199,7 +199,7 @@ 
 {
 	// should not happen for passdb, but could happen for aliases ...
 	error_log("Error ldap_search(\$ds, '$base', '$filter') returned more then one user!");
-	exit(111);	// 111 = temporary problem
+	exit(111); // 111 = temporary problem
 }
 //print_r($entries);
 
@@ -219,12 +219,12 @@ 
 }
 
 // add additional placeholders from $user_attrs
-foreach($user_attrs as $placeholder => $attr)
+foreach ($user_attrs as $placeholder => $attr)
 {
 	if ($attr[0] == '{')	// prefix given --> ignore all values without and remove it
 	{
 		list($prefix, $attr) = explode('}', substr($attr, 1));
-		foreach($entries[0][$attr] as $key => $value)
+		foreach ($entries[0][$attr] as $key => $value)
 		{
 			if ($key === 'count') continue;
 			if (strpos($value, $prefix) !== 0) continue;
@@ -249,12 +249,12 @@ 
 	{
 		//print_r($groups);
 		$system_groups_user = array();
-		foreach($groups as $key => $group)
+		foreach ($groups as $key => $group)
 		{
 			if ($key === 'count') continue;
 			$system_groups_user[] = $group[$group_attr][0].$append;
 		}
-		$extra['system_groups_user'] = implode(',', $system_groups_user);	// todo: check separator
+		$extra['system_groups_user'] = implode(',', $system_groups_user); // todo: check separator
 	}
 	else
 	{
@@ -265,10 +265,10 @@ 
 // set host attribute for director to old imap
 if (isset($host_base) && isset($host_filter))
 {
-	if (!($sr = ldap_search($ds, $host_base, $filter=strtr($host_filter, quote($replace)), array($host_attr))))
+	if (!($sr = ldap_search($ds, $host_base, $filter = strtr($host_filter, quote($replace)), array($host_attr))))
 	{
 		error_log("Error ldap_search(\$ds, '$host_base', '$filter')!");
-		exit(111);	// 111 = temporary problem
+		exit(111); // 111 = temporary problem
 	}
 	$entries = ldap_get_entries($ds, $sr);
 	if ($entries['count'] && !isset($entries[0][$host_attr]))
@@ -282,7 +282,7 @@ 
 // build command to run
 array_shift($_SERVER['argv']);
 $cmd = array_shift($_SERVER['argv']);
-foreach($_SERVER['argv'] as $arg)
+foreach ($_SERVER['argv'] as $arg)
 {
 	$cmd .= ' '.escapeshellarg($arg);
 }
@@ -292,17 +292,17 @@ 
 if ($user_home) putenv('HOME='.strtr($user_home, $replace));
 if ($extra)
 {
-	foreach($extra as $name => $value)
+	foreach ($extra as $name => $value)
 	{
-		if (($pos = strpos($value,'%')) !== false)
+		if (($pos = strpos($value, '%')) !== false)
 		{
 			// check if replacement is set, otherwise skip whole extra-value
-			if (!isset($replace[substr($value,$pos,2)]))
+			if (!isset($replace[substr($value, $pos, 2)]))
 			{
 				unset($extra[$name]);
 				continue;
 			}
-			$value = strtr($value,$replace);
+			$value = strtr($value, $replace);
 		}
 		putenv($name.'='.$value);
 	}
@@ -326,5 +326,5 @@ 
  */
 function quote($string)
 {
-	return str_replace(array('\\','*','(',')','\0',' '),array('\\\\','\*','\(','\)','\\0','\20'),$string);
+	return str_replace(array('\\', '*', '(', ')', '\0', ' '), array('\\\\', '\*', '\(', '\)', '\\0', '\20'), $string);
 }

doc/mail/postfix_tcp_map_ads.php

Braces +90 added lines, -23 removed lines

@@ -71,7 +71,10 @@ 
  */
 
 // protect from being called via HTTP
-if (php_sapi_name() !== 'cli') die('This is a command line only script!');
+if (php_sapi_name() !== 'cli')
+{
+	die('This is a command line only script!');
+}
 
 // our defaults
 $default_host = 'localhost';
@@ -122,14 +125,20 @@ 
 
 ini_set('display_errors',false);
 error_reporting(E_ALL & ~E_NOTICE);
-if ($log) ini_set('error_log',$log);
+if ($log)
+{
+	ini_set('error_log',$log);
+}
 
 function usage($extra=null)
 {
 	global $maps;
 	fwrite(STDERR, "\nUsage: $cmd [-v|--verbose] [-h|--help] [-l|--log (syslog|path)] [-q|--query <email-addresse> (mailboxes|alias|groups)] [host]\n\n");
 	fwrite(STDERR, print_r($maps,true)."\n");
-	if ($extra) fwrite(STDERR, "\n\n$extra\n\n");
+	if ($extra)
+	{
+		fwrite(STDERR, "\n\n$extra\n\n");
+	}
 	exit(2);
 }
 
@@ -152,9 +161,12 @@ 
 			break;
 
 		case '-q': case '--query':
-			if (count($_SERVER['argv']) == 2)       // need 2 arguments
+			if (count($_SERVER['argv']) == 2)
+			{
+				// need 2 arguments
 			{
 				$request = 'get '.array_shift($_SERVER['argv'])."\n";
+			}
 				$map = array_shift($_SERVER['argv']);
 				echo respond($request, $map)."\n";
 				exit;
@@ -166,7 +178,10 @@ 
 			usage("Unknown option '$arg'!");
 	}
 }
-if ($_SERVER['argv']) usage();
+if ($_SERVER['argv'])
+{
+	usage();
+}
 
 if ($arg)
 {
@@ -177,7 +192,10 @@ 
 	$host = $default_host;
 }
 
-if ($verbose) echo "using $host\n";
+if ($verbose)
+{
+	echo "using $host\n";
+}
 
 $servers = $clients = $buffers = array();
 
@@ -194,20 +212,36 @@ 
 	$servers[$data['port']] = $server;
 	$clients[$data['port']] = array();
 }
-while (true)	// mail loop of tcp server --> never exits
+while (true)
+{
+	// mail loop of tcp server --> never exits
 {
 	$read = $servers;
-	if ($clients) $read = array_merge($read, call_user_func_array('array_merge', array_values($clients)));
-	if ($verbose) print 'about to call socket_select(array('.implode(',',$read).', ...) waiting... ';
-	if (stream_select($read, $write=null, $except=null, null))	// null = block forever
+}
+	if ($clients)
+	{
+		$read = array_merge($read, call_user_func_array('array_merge', array_values($clients)));
+	}
+	if ($verbose)
+	{
+		print 'about to call socket_select(array('.implode(',',$read).', ...) waiting... ';
+	}
+	if (stream_select($read, $write=null, $except=null, null))
+	{
+		// null = block forever
 	{
 		foreach($read as $sock)
 		{
 			if (($port = array_search($sock, $servers)) !== false)
 			{
-				$client = stream_socket_accept($sock,$timeout,$client_addr);	// @ required to get not timeout warning!
+				$client = stream_socket_accept($sock,$timeout,$client_addr);
+	}
+	// @ required to get not timeout warning!
 
-				if ($verbose) echo "accepted connection $client from $client_addr on port $port\n";
+				if ($verbose)
+				{
+					echo "accepted connection $client from $client_addr on port $port\n";
+				}
 
 				if ($only_client && !preg_match($only_client,$client_addr))
 				{
@@ -218,9 +252,12 @@ 
 				}
 				$clients[$port][] = $client;
 			}
-			elseif (feof($sock))	// client connection closed
+			elseif (feof($sock))
+			{
+				// client connection closed
 			{
 				if ($verbose) echo "client $sock closed connection\n";
+			}
 
 				foreach($clients as $port => &$socks)
 				{
@@ -244,7 +281,10 @@ 
 					{
 						if (($key = array_search($sock, $clients[$data['port']], true)) !== false)
 						{
-							if ($verbose) echo date('Y-m-d H:i:s').": client send: $request for map $map\n";
+							if ($verbose)
+							{
+								echo date('Y-m-d H:i:s').": client send: $request for map $map\n";
+							}
 
 							// Respond to client
 							fwrite($sock,  respond($request, $map));
@@ -293,8 +333,14 @@ 
 	if (!isset($ds) || $reconnect)
 	{
 		$ds = ldap_connect($ldap_uri);
-		if ($version) ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
-		if ($use_tls) ldap_start_tls($ds);
+		if ($version)
+		{
+			ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
+		}
+		if ($use_tls)
+		{
+			ldap_start_tls($ds);
+		}
 
 		if (!@ldap_bind($ds, $bind_dn, $bind_pw))
 		{
@@ -329,7 +375,10 @@ 
 	// remove prefix like "{smtp:}proxyaddresses"
 	foreach($search_attrs as &$attr)
 	{
-		if ($attr[0] == '{') list(,$attr) = explode('}', $attr);
+		if ($attr[0] == '{')
+		{
+			list(,$attr) = explode('}', $attr);
+		}
 	}
 	unset($attr);
 
@@ -338,10 +387,13 @@ 
 		$errno = ldap_errno($ds);
 		$error = ldap_error($ds).' ('.$errno.')';
 
-		if ($errno == -1)		// eg. -1 lost connection to ldap
+		if ($errno == -1)
+		{
+			// eg. -1 lost connection to ldap
 		{
 			// as DC closes connections quickly, first try to reconnect once, before returning a temp. failure
 			if (!$reconnect) return respond($request, $map, $extra, true);
+		}
 
 			error_log("$map: get '$username' --> 400 $error: !ldap_search(\$ds, '$base', '$filter')");
 			ldap_close($ds);
@@ -350,7 +402,10 @@ 
 		}
 		else	// happens if base containing domain does not exist
 		{
-			if ($log_verbose) error_log("$map: get '$username' --> 500 Not found: $error: !ldap_search(\$ds, '$base', '$filter')");
+			if ($log_verbose)
+			{
+				error_log("$map: get '$username' --> 500 Not found: $error: !ldap_search(\$ds, '$base', '$filter')");
+			}
 			return "500 Not found: $error\n";	// 500 not found
 		}
 	}
@@ -358,13 +413,19 @@ 
 
 	if (!$entries['count'])
 	{
-		if ($log_verbose) error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no entries");
+		if ($log_verbose)
+		{
+			error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no entries");
+		}
 		return "500 Not found\n";	// 500: Query returned no result
 	}
 	$response = array();
 	foreach($entries as $key => $entry)
 	{
-		if ($key === 'count') continue;
+		if ($key === 'count')
+		{
+			continue;
+		}
 
 		foreach($attrs as $attr)
 		{
@@ -395,7 +456,10 @@ 
 	}
 	if (!$response)
 	{
-		if ($log_verbose) error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no response");
+		if ($log_verbose)
+		{
+			error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no response");
+		}
 		return "500 Not found\n";	// 500: Query returned no result
 	}
 	if (isset($maps[$map]['filter'.(1+$extra)]) && isset($maps[$map]['attrs'.(1+$extra)]))
@@ -403,6 +467,9 @@ 
 		return respond('get '.$response[0], $map, 1+$extra);
 	}
 	$response = '200 '.implode(',',$response)."\n";
-	if ($log_verbose) error_log("$map: get '$username' --> $response");
+	if ($log_verbose)
+	{
+		error_log("$map: get '$username' --> $response");
+	}
 	return $response;
 }

Spacing +38 added lines, -38 removed lines

@@ -98,14 +98,14 @@ 
 	'mailboxes' => array(
 		'base' => $base,
 		'filter' => '(&(objectCategory=person)(proxyAddresses=smtp:%s))',
-		'attrs' => 'samaccountname',	// result-attrs must be lowercase!
+		'attrs' => 'samaccountname', // result-attrs must be lowercase!
 		'port' => 2001,
 	),
 	// virtual alias maps
 	'aliases' => array(
 		'base' => $base,
 		'filter' => '(&(objectCategory=person)(proxyAddresses=smtp:%s))',
-		'attrs' => array('samaccountname','{forward:}proxyaddresses'),
+		'attrs' => array('samaccountname', '{forward:}proxyaddresses'),
 		'port' => 2002,
 	),
 	// groups as distribution list
@@ -115,20 +115,20 @@ 
 		'attrs' => 'dn',
 		// continue with resulting dn
 		'filter1' => '(&(objectCategory=person)(proxyAddresses=smtp:*)(memberOf=%s))',
-		'attrs1' => array('samaccountname','{forward:}proxyaddresses'),
+		'attrs1' => array('samaccountname', '{forward:}proxyaddresses'),
 		'port' => 2003,
 	),
 );
 
-ini_set('display_errors',false);
+ini_set('display_errors', false);
 error_reporting(E_ALL & ~E_NOTICE);
-if ($log) ini_set('error_log',$log);
+if ($log) ini_set('error_log', $log);
 
-function usage($extra=null)
+function usage($extra = null)
 {
 	global $maps;
 	fwrite(STDERR, "\nUsage: $cmd [-v|--verbose] [-h|--help] [-l|--log (syslog|path)] [-q|--query <email-addresse> (mailboxes|alias|groups)] [host]\n\n");
-	fwrite(STDERR, print_r($maps,true)."\n");
+	fwrite(STDERR, print_r($maps, true)."\n");
 	if ($extra) fwrite(STDERR, "\n\n$extra\n\n");
 	exit(2);
 }
@@ -137,7 +137,7 @@ 
 
 while (($arg = array_shift($_SERVER['argv'])) && $arg[0] == '-')
 {
-	switch($arg)
+	switch ($arg)
 	{
 		case '-v': case '--verbose':
 			$verbose = $log_verbose = true;
@@ -182,7 +182,7 @@ 
 $servers = $clients = $buffers = array();
 
 // Create the server socket
-foreach($maps as $map => $data)
+foreach ($maps as $map => $data)
 {
 	$addr = 'tcp://'.$host.':'.$data['port'];
 	if (!($server = stream_socket_server($addr, $errno, $errstr)))
@@ -198,20 +198,20 @@ 
 {
 	$read = $servers;
 	if ($clients) $read = array_merge($read, call_user_func_array('array_merge', array_values($clients)));
-	if ($verbose) print 'about to call socket_select(array('.implode(',',$read).', ...) waiting... ';
-	if (stream_select($read, $write=null, $except=null, null))	// null = block forever
+	if ($verbose) print 'about to call socket_select(array('.implode(',', $read).', ...) waiting... ';
+	if (stream_select($read, $write = null, $except = null, null))	// null = block forever
 	{
-		foreach($read as $sock)
+		foreach ($read as $sock)
 		{
 			if (($port = array_search($sock, $servers)) !== false)
 			{
-				$client = stream_socket_accept($sock,$timeout,$client_addr);	// @ required to get not timeout warning!
+				$client = stream_socket_accept($sock, $timeout, $client_addr); // @ required to get not timeout warning!
 
 				if ($verbose) echo "accepted connection $client from $client_addr on port $port\n";
 
-				if ($only_client && !preg_match($only_client,$client_addr))
+				if ($only_client && !preg_match($only_client, $client_addr))
 				{
-					fwrite($client,"Go away!\r\n");
+					fwrite($client, "Go away!\r\n");
 					fclose($client);
 					error_log(date('Y-m-d H:i:s').": Connection $client from wrong client $client_addr (does NOT match '$only_client') --> terminated");
 					continue;
@@ -222,7 +222,7 @@ 
 			{
 				if ($verbose) echo "client $sock closed connection\n";
 
-				foreach($clients as $port => &$socks)
+				foreach ($clients as $port => &$socks)
 				{
 					if (($key = array_search($sock, $socks, true)) !== false)
 					{
@@ -232,7 +232,7 @@ 
 			}
 			else	// client send something
 			{
-				$buffer =& $buffers[$sock];
+				$buffer = & $buffers[$sock];
 
 				$buffer .= fread($sock, 8096);
 
@@ -240,14 +240,14 @@ 
 				{
 					list($request, $buffer) = explode("\n", $buffer, 2);
 
-					foreach($maps as $map => $data)
+					foreach ($maps as $map => $data)
 					{
 						if (($key = array_search($sock, $clients[$data['port']], true)) !== false)
 						{
 							if ($verbose) echo date('Y-m-d H:i:s').": client send: $request for map $map\n";
 
 							// Respond to client
-							fwrite($sock,  respond($request, $map));
+							fwrite($sock, respond($request, $map));
 							break;
 						}
 					}
@@ -277,16 +277,16 @@ 
  */
 function quote($string)
 {
-	return str_replace(array('\\','*','(',')','\0',' '),array('\\\\','\*','\(','\)','\\0','\20'),$string);
+	return str_replace(array('\\', '*', '(', ')', '\0', ' '), array('\\\\', '\*', '\(', '\)', '\\0', '\20'), $string);
 }
 
-function respond($request, $map, $extra='', $reconnect=false)
+function respond($request, $map, $extra = '', $reconnect = false)
 {
 	static $ds;
 	global $ldap_uri, $version, $use_tls, $bind_dn, $bind_pw;
 	global $maps, $log_verbose;
 
-	if (($map == 'aliases' || $map == 'groups') && strpos($request,'@') === false && !$extra)
+	if (($map == 'aliases' || $map == 'groups') && strpos($request, '@') === false && !$extra)
 	{
 		return "500 No domain aliases yet\n";
 	}
@@ -300,17 +300,17 @@ 
 		{
 			error_log("$map: Can't connect to LDAP server $ldap_uri!");
 			$ds = null;
-			return "400 Can't connect to LDAP server $ldap_uri!\n";	// 400 (temp.) error
+			return "400 Can't connect to LDAP server $ldap_uri!\n"; // 400 (temp.) error
 		}
 	}
 	if (!preg_match('/^get ([^\n]+)\n?$/', $request, $matches))
 	{
 		error_log("$map: Wrong format '$request'!");
-		return "400 Wrong format '$request'!\n";	// 400 (temp.) error
+		return "400 Wrong format '$request'!\n"; // 400 (temp.) error
 	}
 	$username = $matches[1];
 
-	list($name,$domain) = explode('@',$username);
+	list($name, $domain) = explode('@', $username);
 
 	/* check if we are responsible for the given domain
 	if ($domain && $map != 'domains' && (int)($response = respond("get $domain", 'domains')) != 200)
@@ -324,10 +324,10 @@ 
 	);
 	$base = strtr($maps[$map]['base'], $replace);
 	$filter = strtr($maps[$map]['filter'.$extra], $replace);
-	$prefix = isset($maps[$map]['prefix'.$extra]) ? str_replace(array('%n','%d','%s'),array($name,$domain,$username),$maps[$map]['prefix']) : '';
+	$prefix = isset($maps[$map]['prefix'.$extra]) ? str_replace(array('%n', '%d', '%s'), array($name, $domain, $username), $maps[$map]['prefix']) : '';
 	$search_attrs = $attrs = (array)$maps[$map]['attrs'.$extra];
 	// remove prefix like "{smtp:}proxyaddresses"
-	foreach($search_attrs as &$attr)
+	foreach ($search_attrs as &$attr)
 	{
 		if ($attr[0] == '{') list(,$attr) = explode('}', $attr);
 	}
@@ -345,13 +345,13 @@ 
 
 			error_log("$map: get '$username' --> 400 $error: !ldap_search(\$ds, '$base', '$filter')");
 			ldap_close($ds);
-			$ds = null;	// force new connection on next lookup
-			return "400 $error\n";	// 400 (temp.) error
+			$ds = null; // force new connection on next lookup
+			return "400 $error\n"; // 400 (temp.) error
 		}
 		else	// happens if base containing domain does not exist
 		{
 			if ($log_verbose) error_log("$map: get '$username' --> 500 Not found: $error: !ldap_search(\$ds, '$base', '$filter')");
-			return "500 Not found: $error\n";	// 500 not found
+			return "500 Not found: $error\n"; // 500 not found
 		}
 	}
 	$entries = ldap_get_entries($ds, $sr);
@@ -359,21 +359,21 @@ 
 	if (!$entries['count'])
 	{
 		if ($log_verbose) error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no entries");
-		return "500 Not found\n";	// 500: Query returned no result
+		return "500 Not found\n"; // 500: Query returned no result
 	}
 	$response = array();
-	foreach($entries as $key => $entry)
+	foreach ($entries as $key => $entry)
 	{
 		if ($key === 'count') continue;
 
-		foreach($attrs as $attr)
+		foreach ($attrs as $attr)
 		{
 			unset($filter_prefix);
 			if ($attr[0] == '{')
 			{
 				list($filter_prefix, $attr) = explode('}', substr($attr, 1));
 			}
-			foreach((array)$entry[$attr] as $k => $mail)
+			foreach ((array)$entry[$attr] as $k => $mail)
 			{
 				if ($k !== 'count' && ($mail = trim($mail)))
 				{
@@ -396,13 +396,13 @@ 
 	if (!$response)
 	{
 		if ($log_verbose) error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no response");
-		return "500 Not found\n";	// 500: Query returned no result
+		return "500 Not found\n"; // 500: Query returned no result
 	}
-	if (isset($maps[$map]['filter'.(1+$extra)]) && isset($maps[$map]['attrs'.(1+$extra)]))
+	if (isset($maps[$map]['filter'.(1 + $extra)]) && isset($maps[$map]['attrs'.(1 + $extra)]))
 	{
-		return respond('get '.$response[0], $map, 1+$extra);
+		return respond('get '.$response[0], $map, 1 + $extra);
 	}
-	$response = '200 '.implode(',',$response)."\n";
+	$response = '200 '.implode(',', $response)."\n";
 	if ($log_verbose) error_log("$map: get '$username' --> $response");
 	return $response;
 }

home/inc/class.home_note_portlet.inc.php

Braces +4 added lines, -1 removed lines

@@ -32,7 +32,10 @@
 	 */
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 
 		// Title not set for new widgets created via context menu
 		if(!$context['title'])

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

@@ -30,7 +30,7 @@
 	/**
 	 * Context for this portlet
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 

Spacing +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
 		if (false) parent::__construct();
 
 		// Title not set for new widgets created via context menu
-		if(!$context['title'])
+		if (!$context['title'])
 		{
 			// Set initial size to 3x2, default is too small
 			$context['width'] = 3;
@@ -56,7 +56,7 @@ 
 		$id = $_GET['id'] ? $_GET['id'] : $content['id'];
 		$height = $_GET['height'] ? $_GET['height'] : $content['height'];
 
-		if($content['group'] && $GLOBALS['egw_info']['apps']['admin'])
+		if ($content['group'] && $GLOBALS['egw_info']['apps']['admin'])
 		{
 			$prefs = new Api\Preferences(is_numeric($content['group']) ? $content['group'] : $GLOBALS['egw_info']['user']['account_id']);
 		}
@@ -67,18 +67,18 @@ 
 		$type = is_numeric($content['group']) ? "user" : $content['group'];
 		$arr = $prefs->read_repository();
 		$portlets = $arr['home'];
-		if($content['button'])
+		if ($content['button'])
 		{
 			// Save updated Api\Preferences
 			$portlets[$id]['note'] = $content['note'];
-			$prefs->add('home', $id, $portlets[$id],$type);
-			$prefs->save_repository(True,$type);
+			$prefs->add('home', $id, $portlets[$id], $type);
+			$prefs->save_repository(True, $type);
 			// Yay for AJAX submit
-			Api\Json\Response::get()->apply('window.opener.app.home.refresh',array($id));
+			Api\Json\Response::get()->apply('window.opener.app.home.refresh', array($id));
 
-			if(key($content['button'])=='save')
+			if (key($content['button']) == 'save')
 			{
-				Api\Json\Response::get()->apply('window.close',array());
+				Api\Json\Response::get()->apply('window.close', array());
 			}
 		}
 		$etemplate = new Etemplate('home.note');
@@ -90,15 +90,15 @@ 
 			'height'	=>	$height,
 			'group'		=>	$portlets[$id]['group']
 		);
-		$etemplate->exec('home.home_note_portlet.edit',array(
+		$etemplate->exec('home.home_note_portlet.edit', array(
 			'note'	=> $portlets[$id]['note']
-		), array(),array('note'=>false,'save'=>false), $preserve);
+		), array(), array('note'=>false, 'save'=>false), $preserve);
 	}
 
 	public function exec($id = null, Etemplate &$etemplate = null)
 	{
 		// Allow to submit directly back here
-		if(is_array($id) && $id['id'])
+		if (is_array($id) && $id['id'])
 		{
 			$id = $id['id'];
 		}
@@ -107,13 +107,13 @@ 
 		$etemplate->set_dom_id($id);
 		$content = $this->context;
 
-		if(!$content['note'])
+		if (!$content['note'])
 		{
 			$content['note'] = '';
-			Api\Json\Response::get()->apply('app.home.note_edit',array($id));
+			Api\Json\Response::get()->apply('app.home.note_edit', array($id));
 		}
 
-		$etemplate->exec('home.home_note_portlet.exec',$content,array(),array('__ALL__'=>true),array('id' =>$id));
+		$etemplate->exec('home.home_note_portlet.exec', $content, array(), array('__ALL__'=>true), array('id' =>$id));
 	}
 
 	public function get_actions()

home/inc/class.home_weather_portlet.inc.php

Braces +12 added lines, -3 removed lines

@@ -36,7 +36,10 @@ 
 	 */
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 
 		// City not set for new widgets created via context menu
 		if(!$context['city'] || $context['height'] < 2)
@@ -144,14 +147,20 @@ 
 		$data = Api\Cache::getTree('home', json_encode($query), function($query)
 		{
 			$debug = false;
-			if($debug) error_log('Fetching fresh data from ' . static::API_URL);
+			if($debug)
+			{
+				error_log('Fetching fresh data from ' . static::API_URL);
+			}
 
 			$url = static::API_URL.'forecast/daily?'. http_build_query($query);
 			$forecast = file_get_contents($url);
 
 			$url = static::API_URL.'weather?'. http_build_query($query);
 			$current = file_get_contents($url);
-			if($debug) error_log(__METHOD__ . ' current: ' . $current);
+			if($debug)
+			{
+				error_log(__METHOD__ . ' current: ' . $current);
+			}
 
 			return array_merge(array('current' => json_decode($current,true)), json_decode($forecast,true));
 		}, array($query), self::CACHE_TIME);

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

@@ -34,7 +34,7 @@ 
 	/**
 	 * Context for this portlet
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 
@@ -130,7 +130,7 @@ 
 	 * @see http://openweathermap.org/api
 	 * @param array $query
 	 */
-	public function get_weather(Array $query, $api_url = '')
+	public function get_weather(array $query, $api_url = '')
 	{
 		static $debug = false;
 		if(!$api_url)

Spacing +40 added lines, -40 removed lines

@@ -39,7 +39,7 @@ 
 		if (false) parent::__construct();
 
 		// City not set for new widgets created via context menu
-		if(!$context['city'] || $context['height'] < 2)
+		if (!$context['city'] || $context['height'] < 2)
 		{
 			// Set initial size to 3x2, default is too small
 			$context['width'] = 3;
@@ -54,7 +54,7 @@ 
 	public function exec($id = null, Etemplate &$etemplate = null)
 	{
 		// Allow to submit directly back here
-		if(is_array($id) && $id['id'])
+		if (is_array($id) && $id['id'])
 		{
 			$id = $id['id'];
 		}
@@ -68,24 +68,24 @@ 
 			// Always get (& cache) 10 days, we'll cut down later
 			'cnt'	=> 10
 		);
-		if($this->context['city_id'])
+		if ($this->context['city_id'])
 		{
 			$request['id'] = $this->context['city_id'];
 			$content += $this->get_weather($request);
 		}
-		elseif($this->context['city'])
+		elseif ($this->context['city'])
 		{
 			$request['q'] = $this->context['city'];
 			$content += $this->get_weather($request);
 		}
 		elseif ($this->context['position'])
 		{
-			list($request['lat'],$request['lon']) = explode(',',$this->context['position']);
+			list($request['lat'], $request['lon']) = explode(',', $this->context['position']);
 			$content += $this->get_weather($request);
 		}
 
 		// Caching is best done by city ID, so store that
-		if($content['city_id'] && (!$this->context['city_id'] || $content['city_id'] != $this->context['city_id']))
+		if ($content['city_id'] && (!$this->context['city_id'] || $content['city_id'] != $this->context['city_id']))
 		{
 
 			$arr = $GLOBALS['egw']->preferences->read_repository();
@@ -101,7 +101,7 @@ 
 		}
 
 		// Adjust data to match portlet size
-		if($this->context['height'] <= 2 && $this->context['width'] <= 3)
+		if ($this->context['height'] <= 2 && $this->context['width'] <= 3)
 		{
 			// Too small for the other days
 			unset($content['list']);
@@ -112,16 +112,16 @@ 
 			unset($content['current']);
 		}
 		// Even too small for current high/low
-		if($this->context['width'] < 3)
+		if ($this->context['width'] < 3)
 		{
 			$content['current']['no_current_temp'] = true;
 		}
 
 
 		// Direct to full forecast page
-		$content['attribution'] ='http://openweathermap.org/city/'.$content['city_id'];
+		$content['attribution'] = 'http://openweathermap.org/city/'.$content['city_id'];
 
-		$etemplate->exec('home.home_weather_portlet.exec',$content,array(),array('__ALL__'=>true),array('id' =>$id));
+		$etemplate->exec('home.home_weather_portlet.exec', $content, array(), array('__ALL__'=>true), array('id' =>$id));
 	}
 
 	/**
@@ -133,27 +133,27 @@ 
 	public function get_weather(Array $query, $api_url = '')
 	{
 		static $debug = false;
-		if(!$api_url)
+		if (!$api_url)
 		{
-			$api_url = self::API_URL . '/weather?';
+			$api_url = self::API_URL.'/weather?';
 		}
-		if(self::API_KEY)
+		if (self::API_KEY)
 		{
 			$query['APPID'] = self::API_KEY;
 		}
 		$data = Api\Cache::getTree('home', json_encode($query), function($query)
 		{
 			$debug = false;
-			if($debug) error_log('Fetching fresh data from ' . static::API_URL);
+			if ($debug) error_log('Fetching fresh data from '.static::API_URL);
 
-			$url = static::API_URL.'forecast/daily?'. http_build_query($query);
+			$url = static::API_URL.'forecast/daily?'.http_build_query($query);
 			$forecast = file_get_contents($url);
 
-			$url = static::API_URL.'weather?'. http_build_query($query);
+			$url = static::API_URL.'weather?'.http_build_query($query);
 			$current = file_get_contents($url);
-			if($debug) error_log(__METHOD__ . ' current: ' . $current);
+			if ($debug) error_log(__METHOD__.' current: '.$current);
 
-			return array_merge(array('current' => json_decode($current,true)), json_decode($forecast,true));
+			return array_merge(array('current' => json_decode($current, true)), json_decode($forecast, true));
 		}, array($query), self::CACHE_TIME);
 
 		// Some sample data, if you need to test
@@ -161,22 +161,22 @@ 
 		//$weather = '{"coord":{"lon":-114.05,"lat":53.23},"sys":{"message":0.3098,"country":"Canada","sunrise":1420559329,"sunset":1420587344},"weather":[{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03n"}],"base":"cmc stations","main":{"temp":-21.414,"temp_min":-21.414,"temp_max":-21.414,"pressure":947.79,"sea_level":1050.73,"grnd_level":947.79,"humidity":69},"wind":{"speed":3,"deg":273.5},"clouds":{"all":32},"dt":1420502430,"id":0,"name":"Thorsby","cod":200}';
 		//$weather = '{"cod":"200","message":0.1743,"city":{"id":"5978233","name":"Thorsby","coord":{"lon":-114.051,"lat":53.2285},"country":"Canada","population":0},"cnt":6,"list":[{"dt":1420743600,"temp":{"day":-17.49,"min":-27.86,"max":-16.38,"night":-27.86,"eve":-19.91,"morn":-16.77},"pressure":966.21,"humidity":66,"weather":[{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"}],"speed":6.91,"deg":312,"clouds":0,"snow":0.02},{"dt":1420830000,"temp":{"day":-24.86,"min":-29.71,"max":-17.98,"night":-18.31,"eve":-18.32,"morn":-29.51},"pressure":948.46,"humidity":54,"weather":[{"id":801,"main":"Clouds","description":"few clouds","icon":"02d"}],"speed":3.21,"deg":166,"clouds":20},{"dt":1420916400,"temp":{"day":-18.51,"min":-25.57,"max":-17.86,"night":-23.83,"eve":-23.91,"morn":-19.28},"pressure":947.22,"humidity":74,"weather":[{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"}],"speed":1.97,"deg":314,"clouds":48},{"dt":1421002800,"temp":{"day":-26.69,"min":-29.86,"max":-20.19,"night":-21.82,"eve":-24.66,"morn":-28.85},"pressure":951.93,"humidity":22,"weather":[{"id":800,"main":"Clear","description":"sky is clear","icon":"02d"}],"speed":1.36,"deg":196,"clouds":8},{"dt":1421089200,"temp":{"day":0.9,"min":-8.24,"max":0.9,"night":-4.99,"eve":-0.21,"morn":-8.24},"pressure":929.31,"humidity":0,"weather":[{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"}],"speed":6.01,"deg":302,"clouds":5,"snow":0},{"dt":1421175600,"temp":{"day":-1.53,"min":-6.7,"max":2.23,"night":-3.65,"eve":2.23,"morn":-6.7},"pressure":934.51,"humidity":0,"weather":[{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"}],"speed":3.9,"deg":201,"clouds":78}]}';
 
-		if($debug)
+		if ($debug)
 		{
-			error_log(__METHOD__ .' weather info:');
-			foreach(array_keys($data) as $key)
+			error_log(__METHOD__.' weather info:');
+			foreach (array_keys($data) as $key)
 			{
-				error_log($key . ': ' .array2string($data[$key]));
+				error_log($key.': '.array2string($data[$key]));
 			}
 		}
-		if(is_string($data['message']))
+		if (is_string($data['message']))
 		{
 			$desc = $this->get_description();
-			Framework::message($desc['displayName'] . ': ' . $desc['title'] . "\n".$data['message'], 'warning');
+			Framework::message($desc['displayName'].': '.$desc['title']."\n".$data['message'], 'warning');
 			return array();
 		}
 
-		if(array_key_exists('city', $data))
+		if (array_key_exists('city', $data))
 		{
 			$data['city_id'] = $data['city']['id'];
 		}
@@ -184,23 +184,23 @@ 
 		{
 			$data['city_id'] = $data['id'];
 		}
-		if($data['list'])
+		if ($data['list'])
 		{
-			$massage =& $data['list'];
+			$massage = & $data['list'];
 
-			for($i = 0; $i <  min(count($massage), $this->context['width']); $i++)
+			for ($i = 0; $i < min(count($massage), $this->context['width']); $i++)
 			{
-				$forecast =& $massage[$i];
-				$forecast['day'] = Api\DateTime::to($forecast['dt'],'l');
+				$forecast = & $massage[$i];
+				$forecast['day'] = Api\DateTime::to($forecast['dt'], 'l');
 				self::format_forecast($forecast);
 			}
 			// Chop data to fit into portlet
-			for($i; $i < count($massage); $i++)
+			for ($i; $i < count($massage); $i++)
 			{
 				unset($massage[$i]);
 			}
 		}
-		if($data['current'] && is_array($data['current']))
+		if ($data['current'] && is_array($data['current']))
 		{
 			// Current weather
 			$data['current']['temp'] = $data['current']['main'];
@@ -210,7 +210,7 @@ 
 
 		if ($data['list'])
 		{
-			$data['current']['temp'] = array_merge($data['current']['temp'],$data['list'][0]['temp']);
+			$data['current']['temp'] = array_merge($data['current']['temp'], $data['list'][0]['temp']);
 		}
 		return $data;
 	}
@@ -220,22 +220,22 @@ 
 	 */
 	protected static function format_forecast(&$data)
 	{
-		$weather =& $data['weather'] ? $data['weather'] : $data;
-		$temp =& $data['temp'] ? $data['temp'] : $data;
+		$weather = & $data['weather'] ? $data['weather'] : $data;
+		$temp = & $data['temp'] ? $data['temp'] : $data;
 
 		// Full URL for icon
-		if(is_array($weather))
+		if (is_array($weather))
 		{
-			foreach($weather as &$w)
+			foreach ($weather as &$w)
 			{
-				$w['icon'] = static::ICON_URL . $w['icon'].'.png';
+				$w['icon'] = static::ICON_URL.$w['icon'].'.png';
 			}
 		}
 
 		// Round
-		foreach(array('temp','temp_min','temp_max','min','max') as $temp_name)
+		foreach (array('temp', 'temp_min', 'temp_max', 'min', 'max') as $temp_name)
 		{
-			if(array_key_exists($temp_name, $temp))
+			if (array_key_exists($temp_name, $temp))
 			{
 				$temp[$temp_name] = ''.round($temp[$temp_name]);
 			}

home/inc/class.home_favorite_portlet.inc.php

Braces +6 added lines, -2 removed lines

@@ -59,7 +59,10 @@ 
 	 */
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 
 		// Process dropped data (Should be [appname => <appname>, id => <favorite ID>]) into something useable
 		if($context['dropped_data'])
@@ -151,7 +154,8 @@ 
 		Etemplate\Widget::setElementAttribute('','','');
 	}
 
-	public function get_actions(){
+	public function get_actions()
+	{
 		return array();
 	}
 

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

@@ -57,7 +57,7 @@
 	 * @param context Array portlet settings such as size, as well as values for properties
 	 * @param boolean $need_reload Flag to indicate that the portlet needs to be reloaded (exec will be called)
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 

Spacing +19 added lines, -19 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	protected $nm_settings = array(
 		'lettersearch'	=> false,
-		'favorites'		=> false,	// Hide favorite control
+		'favorites'		=> false, // Hide favorite control
 		'actions'		=> array(),
 		'placeholder_actions' => array()
 	);
@@ -62,9 +62,9 @@ 
 		if (false) parent::__construct();
 
 		// Process dropped data (Should be [appname => <appname>, id => <favorite ID>]) into something useable
-		if($context['dropped_data'])
+		if ($context['dropped_data'])
 		{
-			foreach((Array)$context['dropped_data'] as $dropped)
+			foreach ((Array)$context['dropped_data'] as $dropped)
 			{
 				// Only handle one, but dropped is an array
 				$context['appname'] = $dropped['appname'];
@@ -77,7 +77,7 @@ 
 			$need_reload = true;
 		}
 		// Favorite not set for new widgets created via context menu
-		if(!$context['favorite'])
+		if (!$context['favorite'])
 		{
 			// Set initial size to 6x3, default is way too small
 			$context['width'] = max($context['width'], 6);
@@ -87,7 +87,7 @@ 
 		}
 
 		// Load and copy favorite
-		if($context['favorite'] && !is_array($context['favorite']))
+		if ($context['favorite'] && !is_array($context['favorite']))
 		{
 			$favorites = Framework\Favorites::get_favorites($context['appname']);
 			$context['favorite'] = $favorites[$context['favorite']];
@@ -95,12 +95,12 @@ 
 		}
 
 		$this->favorite = $context['favorite'];
-		$this->title = lang($context['appname']) . ': ' . $this->favorite['name'];
+		$this->title = lang($context['appname']).': '.$this->favorite['name'];
 		$this->context = $context;
-		if($this->favorite)
+		if ($this->favorite)
 		{
 			$this->nm_settings['favorite'] = $this->context['favorite'];
-			if(is_array($this->favorite['state']))
+			if (is_array($this->favorite['state']))
 			{
 				$this->nm_settings += $this->favorite['state'];
 			}
@@ -112,7 +112,7 @@ 
 
 	public function exec($id = null, Etemplate &$etemplate = null)
 	{
-		if($etemplate == null)
+		if ($etemplate == null)
 		{
 			$etemplate = new Etemplate();
 		}
@@ -124,34 +124,34 @@ 
 		$content['header_node'] = "home-index_{$id}_header";
 		$sel_options = $content['sel_options'] ? $content['sel_options'] : array();
 		unset($content['sel_options']);
-		$etemplate->setElementAttribute('nm', 'template',$this->nm_settings['template']);
+		$etemplate->setElementAttribute('nm', 'template', $this->nm_settings['template']);
 
 
 		// Always load app's css
 		Framework::includeCSS($this->context['appname'], 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
-			Framework::includeCSS($this->context['appname'],'app');
+			Framework::includeCSS($this->context['appname'], 'app');
 
 		// Always load app's javascript, so most actions have a chance of working
-		Framework::includeJS('.','app',$this->context['appname']);
+		Framework::includeJS('.', 'app', $this->context['appname']);
 
 		// Set this so app's JS gets initialized
 		$old_app = $GLOBALS['egw_info']['flags']['currentapp'];
 		$GLOBALS['egw_info']['flags']['currentapp'] = $this->context['appname'];
 
-		$etemplate->exec(get_called_class() .'::process',$content,$sel_options);
+		$etemplate->exec(get_called_class().'::process', $content, $sel_options);
 
 		$GLOBALS['egw_info']['flags']['currentapp'] = $old_app;
 	}
 
 	public static function process($content = array())
 	{
-		unset($content);	// not used, but required by function signature
+		unset($content); // not used, but required by function signature
 
 		// We need to keep the template going, thanks.
-		Etemplate\Widget::setElementAttribute('','','');
+		Etemplate\Widget::setElementAttribute('', '', '');
 	}
 
-	public function get_actions(){
+	public function get_actions() {
 		return array();
 	}
 
@@ -195,9 +195,9 @@ 
 		$properties = parent::get_properties();
 		$favorites = Framework\Favorites::get_favorites($this->context['appname']);
 		$favorite_list = array();
-		foreach($favorites as $id => $favorite)
+		foreach ($favorites as $id => $favorite)
 		{
-			if($favorite)
+			if ($favorite)
 			{
 				$favorite_list[$id] = $favorite['name'];
 			}
@@ -208,7 +208,7 @@ 
 			'type'	=>	'select',
 			'select_options' => $favorite_list
 		);
-		if($this->context['favorite'])
+		if ($this->context['favorite'])
 		{
 			$favorite['type'] = 'select_ro';
 		}

home/inc/class.home_legacy_portlet.inc.php

Braces +8 added lines, -2 removed lines

@@ -35,7 +35,10 @@ 
 	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		unset($need_reload);	// not used, but required by function signature
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 
 		$this->context = $context;
 
@@ -51,9 +54,12 @@ 
 		// Execute hook to get content
 		ob_start();
 		$_content = Api\Hooks::single('home',$appname);
-		if (!$_content || $_content == 1)   // content has been echoed and not returned
+		if (!$_content || $_content == 1)
+		{
+			// content has been echoed and not returned
 		{
 			$_content = ob_get_contents();
+		}
 			ob_end_clean();
 		}
 		if($_content)

Spacing +8 added lines, -8 removed lines

@@ -34,14 +34,14 @@ 
 
 	public function __construct(array &$context = array(), &$need_reload = false)
 	{
-		unset($need_reload);	// not used, but required by function signature
+		unset($need_reload); // not used, but required by function signature
 		if (false) parent::__construct();
 
 		$this->context = $context;
 
 		// Try to load content here, so all needed info is available
 		$appname = $this->context['app'];
-		if(!$appname || !Api\Hooks::exists('home', $appname))
+		if (!$appname || !Api\Hooks::exists('home', $appname))
 		{
 			return;
 		}
@@ -50,30 +50,30 @@ 
 
 		// Execute hook to get content
 		ob_start();
-		$_content = Api\Hooks::single('home',$appname);
+		$_content = Api\Hooks::single('home', $appname);
 		if (!$_content || $_content == 1)   // content has been echoed and not returned
 		{
 			$_content = ob_get_contents();
 			ob_end_clean();
 		}
-		if($_content)
+		if ($_content)
 		{
 			// Now we have to extract the actual content
 			$dom = new DOMDocument();
 			libxml_use_internal_errors(true);
-			$dom->loadHTML($_content,LIBXML_NOWARNING + LIBXML_NOERROR);
+			$dom->loadHTML($_content, LIBXML_NOWARNING + LIBXML_NOERROR);
 			$finder = new DOMXPath($dom);
 
 			// Find header for title
 			$title = $finder->query("//div[contains(@class,'divSideboxHeader')]/descendant::strong");
-			if($title->length)
+			if ($title->length)
 			{
 				$this->title = $title->item(0)->textContent;
 			}
 
 			// Remove header
 			$content = $finder->query("//div[contains(@class,'divSideboxHeader')]/descendant::strong/ancestor::tr");
-			for($i = 0; $i < $content->length; $i++)
+			for ($i = 0; $i < $content->length; $i++)
 			{
 				$content->item($i)->parentNode->removeChild($content->item($i));
 			}
@@ -101,7 +101,7 @@ 
 
 		$etemplate->set_dom_id($id);
 
-		$etemplate->exec('home.home_link_portlet.exec',array('legacy' => $this->content), array(),array(),array(),2);
+		$etemplate->exec('home.home_link_portlet.exec', array('legacy' => $this->content), array(), array(), array(), 2);
 	}
 
 	/**

home/inc/class.home_portlet.inc.php

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

@@ -34,7 +34,7 @@
 	 * @param context Array portlet settings such as size, as well as values for properties
 	 * @param boolean $need_reload Flag to indicate that the portlet needs to be reloaded (exec will be called)
 	 */
-	public abstract function __construct(Array &$context = array(), &$need_reload = false);
+	public abstract function __construct(array &$context = array(), &$need_reload = false);
 
 	/**
 	 * Some descriptive information about the portlet, so that users can decide if

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 	{
 		// Include the common attributes, or they won't get saved
 		$properties = array();
-		foreach(self::$common_attributes as $prop)
+		foreach (self::$common_attributes as $prop)
 		{
 			$properties[$prop] = array('name' => $prop);
 		}
@@ -123,6 +123,6 @@ 
 
 	public function __toString()
 	{
-		return get_called_class() . ' Context:' . array2string($this->context);
+		return get_called_class().' Context:'.array2string($this->context);
 	}
 }

home/inc/class.home_list_portlet.inc.php

Braces +12 added lines, -3 removed lines

@@ -40,9 +40,15 @@ 
 	 */
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 
-		if(!is_array($context['list'])) $context['list'] = array();
+		if(!is_array($context['list']))
+		{
+			$context['list'] = array();
+		}
 
 		// Process dropped data (Should be GUIDs) into something useable
 		if($context['dropped_data'])
@@ -118,7 +124,10 @@ 
 		// Filemanager support - links need app = 'file' and type set
 		foreach($content['list'] as &$list)
 		{
-			if($list['app'] == 'filemanager') $list['app'] = 'file';
+			if($list['app'] == 'filemanager')
+			{
+				$list['app'] = 'file';
+			}
 			if($list['app'] == 'file')
 			{
 				$list['app'] = 'file';

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

@@ -38,7 +38,7 @@ 
 	 * Construct the portlet
 	 *
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 
@@ -113,7 +113,7 @@ 
 		$content = $this->context;
 		if(!is_array($content['list']))
 		{
-			$content['list'] = Array();
+			$content['list'] = array();
 		}
 		// Filemanager support - links need app = 'file' and type set
 		foreach($content['list'] as &$list)

Spacing +14 added lines, -14 removed lines

@@ -42,16 +42,16 @@ 
 	{
 		if (false) parent::__construct();
 
-		if(!is_array($context['list'])) $context['list'] = array();
+		if (!is_array($context['list'])) $context['list'] = array();
 
 		// Process dropped data (Should be GUIDs) into something useable
-		if($context['dropped_data'])
+		if ($context['dropped_data'])
 		{
-			foreach((Array)$context['dropped_data'] as $dropped)
+			foreach ((Array)$context['dropped_data'] as $dropped)
 			{
 				$add = array();
 				list($add['app'], $add['id']) = explode('::', $dropped, 2);
-				if($add['app'] && $add['id'])
+				if ($add['app'] && $add['id'])
 				{
 					$context['list'][] = $add;
 				}
@@ -60,13 +60,13 @@ 
 			unset($context['dropped_data']);
 			$need_reload = true;
 		}
-		if($context['title'])
+		if ($context['title'])
 		{
 			$this->title = $context['title'];
 		}
-		foreach($context['list'] as &$item)
+		foreach ($context['list'] as &$item)
 		{
-			if($item['app'] == 'filemanager' || $item['app'] == 'file')
+			if ($item['app'] == 'filemanager' || $item['app'] == 'file')
 			{
 				$item['app'] = 'file';
 				$item['type'] = Vfs::mime_content_type($item['id']);
@@ -111,15 +111,15 @@ 
 
 		$etemplate->set_dom_id($id);
 		$content = $this->context;
-		if(!is_array($content['list']))
+		if (!is_array($content['list']))
 		{
 			$content['list'] = Array();
 		}
 		// Filemanager support - links need app = 'file' and type set
-		foreach($content['list'] as &$list)
+		foreach ($content['list'] as &$list)
 		{
-			if($list['app'] == 'filemanager') $list['app'] = 'file';
-			if($list['app'] == 'file')
+			if ($list['app'] == 'filemanager') $list['app'] = 'file';
+			if ($list['app'] == 'file')
 			{
 				$list['app'] = 'file';
 				$list['path'] = $list['title'] = $list['icon'] = $list['id'];
@@ -127,7 +127,7 @@ 
 			}
 		}
 
-		$etemplate->exec('home.home_list_portlet.exec',$content);
+		$etemplate->exec('home.home_list_portlet.exec', $content);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 				'type' => 'drop',
 				'caption' => lang('add'),
 				'onExecute' => 'javaScript:app.home.add_link',
-				'acceptedTypes' => array('file','link') + array_keys($GLOBALS['egw_info']['apps']),
+				'acceptedTypes' => array('file', 'link') + array_keys($GLOBALS['egw_info']['apps']),
 			)
 		);
 		return $actions;
@@ -202,6 +202,6 @@ 
 	 */
 	public function accept_drop()
 	{
-		return array('file','link');
+		return array('file', 'link');
 	}
 }