EGroupware / egroupware

api/src/Json/Tail.php

Spacing +18 added lines, -18 removed lines

@@ -68,15 +68,15 @@ 
 	 *
 	 * @param string $filename =null if not starting with as slash relative to EGw files dir (this is strongly prefered for security reasons)
 	 */
-	public function __construct($filename=null)
+	public function __construct($filename = null)
 	{
-		$this->filenames =& Api\Cache::getSession('phpgwapi', __CLASS__);
+		$this->filenames = & Api\Cache::getSession('phpgwapi', __CLASS__);
 
 		if ($filename)
 		{
 			$this->filename = $filename;
 
-			if (!$this->filenames || !in_array($filename,$this->filenames)) $this->filenames[] = $filename;
+			if (!$this->filenames || !in_array($filename, $this->filenames)) $this->filenames[] = $filename;
 		}
 	}
 
@@ -87,9 +87,9 @@ 
 	 * @param int $start =0 last position in log-file
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public function ajax_chunk($filename,$start=0)
+	public function ajax_chunk($filename, $start = 0)
 	{
-		if (!in_array($filename,$this->filenames))
+		if (!in_array($filename, $this->filenames))
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
@@ -98,9 +98,9 @@ 
 		if (file_exists($filename))
 		{
 			$size = filesize($filename);
-			if (!$start || $start < 0 || $start > $size || $size-$start > 4*self::MAX_CHUNK_SIZE)
+			if (!$start || $start < 0 || $start > $size || $size - $start > 4 * self::MAX_CHUNK_SIZE)
 			{
-				$start = $size - 4*self::MAX_CHUNK_SIZE;
+				$start = $size - 4 * self::MAX_CHUNK_SIZE;
 				if ($start < 0) $start = 0;
 			}
 			$hsize = Api\Vfs::hsize($size);
@@ -131,9 +131,9 @@ 
 	 * @param boolean $truncate =false true: truncate file, false: delete file
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public function ajax_delete($filename,$truncate=false)
+	public function ajax_delete($filename, $truncate = false)
 	{
-		if (!in_array($filename,$this->filenames))
+		if (!in_array($filename, $this->filenames))
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
@@ -155,7 +155,7 @@ 
 	 * @return string
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public function show($header=null)
+	public function show($header = null)
 	{
 		if (!isset($this->filename))
 		{
@@ -167,11 +167,11 @@ 
 <p style="float: left; margin: 5px"><b>'.htmlspecialchars($header).'</b></p>
 <div style="float: right; margin: 2px; margin-right: 5px">
 	'.Api\Html::form(
-		Api\Html::input('clear_log',lang('Clear window'),'button','id="clear_log"')."\n".
-		Api\Html::input('delete_log',lang('Delete file'),'button','id="purge_log"')."\n".
-		Api\Html::input('empty_log',lang('Empty file'),'button','id="empty_log"')."\n".
-		Api\Html::input('download_log',lang('Download'),'submit','id="download_log"'),
-		'','/index.php',array(
+		Api\Html::input('clear_log', lang('Clear window'), 'button', 'id="clear_log"')."\n".
+		Api\Html::input('delete_log', lang('Delete file'), 'button', 'id="purge_log"')."\n".
+		Api\Html::input('empty_log', lang('Empty file'), 'button', 'id="empty_log"')."\n".
+		Api\Html::input('download_log', lang('Download'), 'submit', 'id="download_log"'),
+		'', '/index.php', array(
 		'menuaction' => 'api.'.__CLASS__.'.download',
 		'filename' => $this->filename,
 	)).'
@@ -187,15 +187,15 @@ 
 	public function download()
 	{
 		$filename = $_GET['filename'];
-		if (!in_array($filename,$this->filenames))
+		if (!in_array($filename, $this->filenames))
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to download '$filename'!");
 		}
 		Api\Header\Content::type(basename($filename), 'text/plain');
 		if ($filename[0] != '/') $filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
-		for($n=ob_get_level(); $n > 0; --$n)
+		for ($n = ob_get_level(); $n > 0; --$n)
 		{
-			ob_end_clean();	// stop all output buffering, to NOT run into memory_limit
+			ob_end_clean(); // stop all output buffering, to NOT run into memory_limit
 		}
 		readfile($filename);
 		exit;

api/src/CalDAV/PropfindIterator.php

Spacing +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
 	 *
 	 * @var int
 	 */
-	protected $start=0;
+	protected $start = 0;
 
 	/**
 	 * Number of entries queried from callback in one call
@@ -95,7 +95,7 @@ 
 	 * @param array $filter filter for propfind call
 	 * @param array $files =array() extra files/responses to return too
 	 */
-	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
+	public function __construct(Handler $handler, $path, array $filter, array &$files = array())
 	{
 		if ($this->debug) error_log(__METHOD__."('$path', ".array2string($filter).",)");
 		$this->path    = $path;
@@ -126,7 +126,7 @@ 
 		$current = current($this->files);
 
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string($current['path']));
-		return $current['path'];	// we return path as key
+		return $current['path']; // we return path as key
 	}
 
 	/**
@@ -146,11 +146,11 @@ 
 			return false;
 		}
 		// try query further files via propfind callback of handler and store result in $this->files
-		$this->files = $this->handler->propfind_callback($this->path,$this->filter,array($this->start,self::CHUNK_SIZE));
+		$this->files = $this->handler->propfind_callback($this->path, $this->filter, array($this->start, self::CHUNK_SIZE));
 		if (!is_array($this->files) || !($entries = count($this->files)))
 		{
 			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
-			return false;	// no further entries
+			return false; // no further entries
 		}
 		$this->start += self::CHUNK_SIZE;
 		reset($this->files);
@@ -169,7 +169,7 @@ 
 
 		$this->start = 0;
 		$this->files = $this->common_files;
-		if (!$this->files) $this->next();	// otherwise valid will return false and nothing get returned
+		if (!$this->files) $this->next(); // otherwise valid will return false and nothing get returned
 		reset($this->files);
 	}
 
@@ -178,7 +178,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
 		return current($this->files) !== false;

api/src/CalDAV/IcalIterator.php

Spacing +22 added lines, -22 removed lines

@@ -106,7 +106,7 @@ 
 	 * @param array $callback_params =array() further parameters for the callback, 1. parameter is component
 	 * @param boolean $add_container =false true, add container / $this as last parameter to callback
 	 */
-	public function __construct($ical_file,$base='VCALENDAR',$charset=null,$callback=null,array $callback_params=array(), $add_container=false)
+	public function __construct($ical_file, $base = 'VCALENDAR', $charset = null, $callback = null, array $callback_params = array(), $add_container = false)
 	{
 		// call parent constructor
 		parent::__construct();
@@ -131,7 +131,7 @@ 
 		}
 		if (!is_resource($this->ical_file))
 		{
-			throw new Api\Exception\WrongParameter(__METHOD__.'($ical_file, ...) NO resource! $ical_file='.substr(array2string($ical_file),0,100));
+			throw new Api\Exception\WrongParameter(__METHOD__.'($ical_file, ...) NO resource! $ical_file='.substr(array2string($ical_file), 0, 100));
 		}
 	}
 
@@ -155,7 +155,7 @@ 
 		{
 			$line = array_shift($this->unread_lines);
 		}
-		elseif(feof($this->ical_file))
+		elseif (feof($this->ical_file))
 		{
 			$line = false;
 		}
@@ -164,9 +164,9 @@ 
 			$line = fgets($this->ical_file);
 		}
 		// check if end of container reached
-		if ($this->container && $line && substr($line,0,4+strlen($this->base)) === 'END:'.$this->base)
+		if ($this->container && $line && substr($line, 0, 4 + strlen($this->base)) === 'END:'.$this->base)
 		{
-			$this->unread_line($line);	// put back end-of-container, to continue to return false
+			$this->unread_line($line); // put back end-of-container, to continue to return false
 			$line = false;
 		}
 		//error_log(__METHOD__."() returning ".($line === false ? 'FALSE' : "'$line'"));
@@ -182,7 +182,7 @@ 
 	protected function unread_line($line)
 	{
 		//error_log(__METHOD__."('$line')");
-		array_unshift($this->unread_lines,$line);
+		array_unshift($this->unread_lines, $line);
 	}
 
 	/**
@@ -195,14 +195,14 @@ 
 		//error_log(__METHOD__."() returning a ".gettype($this->component));
 		if ($this->callback)
 		{
-			$ret = is_a($this->component,'Horde_Icalendar');
+			$ret = is_a($this->component, 'Horde_Icalendar');
 			do {
 				if ($ret === false) $this->next();
-				if (!is_a($this->component,'Horde_Icalendar')) return false;
+				if (!is_a($this->component, 'Horde_Icalendar')) return false;
 				$params = $this->callback_params;
-				array_unshift($params,$this->component);
+				array_unshift($params, $this->component);
 			}
-			while(($ret = call_user_func_array($this->callback,$params)) === false);
+			while (($ret = call_user_func_array($this->callback, $params)) === false);
 
 			return $ret;
 		}
@@ -227,7 +227,7 @@ 
 	{
 		unset($this->component);
 
-		while (($line = $this->read_line()) && substr($line,0,6) !== 'BEGIN:')
+		while (($line = $this->read_line()) && substr($line, 0, 6) !== 'BEGIN:')
 		{
 			// ignore it
 		}
@@ -236,12 +236,12 @@ 
 			$this->component = false;
 			return;
 		}
-		$type = substr(trim($line),6);
+		$type = substr(trim($line), 6);
 
 		//error_log(__METHOD__."() found $type component");
 
 		$data = $line;
-		while (($line = $this->read_line()) && substr($line,0,4+strlen($type)) !== 'END:'.$type)
+		while (($line = $this->read_line()) && substr($line, 0, 4 + strlen($type)) !== 'END:'.$type)
 		{
 			$data .= $line;
 		}
@@ -276,23 +276,23 @@ 
 	 */
 	public function rewind()
 	{
-		@fseek($this->ical_file,0,SEEK_SET);
+		@fseek($this->ical_file, 0, SEEK_SET);
 
 		// advance to begin of container
-		while(($line = $this->read_line()) && substr($line,0,6+strlen($this->base)) !== 'BEGIN:'.$this->base)
+		while (($line = $this->read_line()) && substr($line, 0, 6 + strlen($this->base)) !== 'BEGIN:'.$this->base)
 		{
 
 		}
 		// if no container start found --> use whole file (rewind) and set container marker
 		if (!($this->container = $line !== false))
 		{
-			fseek($this->ical_file,0,SEEK_SET);
+			fseek($this->ical_file, 0, SEEK_SET);
 		}
 		//error_log(__METHOD__."() $this->base container ".($this->container ? 'found' : 'NOT found'));
 
 		$data = $line;
 		// advance to first component
-		while (($line = $this->read_line()) && substr($line,0,6) !== 'BEGIN:')
+		while (($line = $this->read_line()) && substr($line, 0, 6) !== 'BEGIN:')
 		{
 			$matches = null;
 			if (preg_match('/^VERSION:(\d\.\d)\s*$/ism', $line, $matches))
@@ -307,7 +307,7 @@ 
 		{
 			$data .= "END:$this->base\n";
 			//error_log(__METHOD__."() about to call this->parsevCalendar('$data','$this->base','$this->charset')");
-			$this->parsevCalendar($data,$this->base,$this->charset);
+			$this->parsevCalendar($data, $this->base, $this->charset);
 		}
 		if ($line) $this->unread_line($line);
 
@@ -320,10 +320,10 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		//error_log(__METHOD__."() returning ".(is_a($this->component,'Horde_Icalendar') ? 'TRUE' : 'FALSE').' get_class($this->component)='.get_class($this->component));
-		return is_a($this->component,'Horde_Icalendar');
+		return is_a($this->component, 'Horde_Icalendar');
 	}
 }
 
@@ -441,8 +441,8 @@ 
 	if (!is_resource($ical_file)) echo "<pre>$ical_file</pre>\n";
 	//$calendar_ical = new calendar_ical();
 	//$calendar_ical->setSupportedFields('file');
-	$ical_it = new IcalIterator($ical_file);//,'VCALENDAR','iso-8859-1',array($calendar_ical,'_ical2egw_callback'),array('Europe/Berlin'));
-	foreach($ical_it as $uid => $vevent)
+	$ical_it = new IcalIterator($ical_file); //,'VCALENDAR','iso-8859-1',array($calendar_ical,'_ical2egw_callback'),array('Europe/Berlin'));
+	foreach ($ical_it as $uid => $vevent)
 	{
 		echo "$uid<pre>".print_r($vevent->toHash(), true)."</pre>\n";
 	}

api/src/Link/Storage.php

Spacing +58 added lines, -58 removed lines

@@ -59,7 +59,7 @@ 
 	 * @param int $lastmod =0 timestamp of last modification (defaults to now=time())
 	 * @return int/boolean False (for db or param-error) or on success link_id (Please not the return-value of $id1)
 	 */
-	static function link( $app1,&$id1,$app2,$id2='',$remark='',$owner=0,$lastmod=0 )
+	static function link($app1, &$id1, $app2, $id2 = '', $remark = '', $owner = 0, $lastmod = 0)
 	{
 		if (self::DEBUG)
 		{
@@ -68,21 +68,21 @@ 
 		if ($app1 == $app2 && $id1 == $id2 ||
 		    $id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
 		{
-			return False;	// dont link to self or other nosense
+			return False; // dont link to self or other nosense
 		}
-		if (($link = self::get_link($app1,$id1,$app2,$id2)))
+		if (($link = self::get_link($app1, $id1, $app2, $id2)))
 		{
 			if ($link['link_remark'] != $remark)
 			{
-				self::update_remark($link['link_id'],$remark);
+				self::update_remark($link['link_id'], $remark);
 			}
-			return $link['link_id'];	// link alread exist
+			return $link['link_id']; // link alread exist
 		}
 		if (!$owner)
 		{
 			$owner = $GLOBALS['egw_info']['user']['account_id'];
 		}
-		return self::$db->insert(self::TABLE,array(
+		return self::$db->insert(self::TABLE, array(
 				'link_app1'		=> $app1,
 				'link_id1'		=> $id1,
 				'link_app2'		=> $app2,
@@ -90,7 +90,7 @@ 
 				'link_remark'	=> $remark,
 				'link_lastmod'	=> $lastmod ? $lastmod : time(),
 				'link_owner'	=> $owner,
-			),False,__LINE__,__FILE__) ? self::$db->get_last_insert_id(self::TABLE,'link_id') : false;
+			), False, __LINE__, __FILE__) ? self::$db->get_last_insert_id(self::TABLE, 'link_id') : false;
 	}
 
 	/**
@@ -100,14 +100,14 @@ 
 	 * @param string $remark new text for the remark
 	 * @return boolean true on success, else false
 	 */
-	static function update_remark($link_id,$remark)
+	static function update_remark($link_id, $remark)
 	{
-		return self::$db->update(self::TABLE,array(
+		return self::$db->update(self::TABLE, array(
 				'link_remark'	=> $remark,
 				'link_lastmod'	=> time(),
-			),array(
+			), array(
 				'link_id'	=> $link_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 	}
 
 	/**
@@ -121,15 +121,15 @@ 
 	 * @param int|array $limit =null number of entries to return, default null = all or array(offset, num_rows) to return num_rows starting from offset
 	 * @return array id => links pairs if $id is an array or just the links (only_app: ids) or empty array if no matching links found
 	 */
-	static function get_links($app, $id, $only_app='', $order='link_lastmod DESC', $deleted=false, $limit=null)
+	static function get_links($app, $id, $only_app = '', $order = 'link_lastmod DESC', $deleted = false, $limit = null)
 	{
 		if (self::DEBUG)
 		{
-			echo "<p>solink.get_links($app,".print_r($id,true).",$only_app,$order,$deleted)</p>\n";
+			echo "<p>solink.get_links($app,".print_r($id, true).",$only_app,$order,$deleted)</p>\n";
 		}
 		if (($not_only = $only_app[0] == '!'))
 		{
-			$only_app = substr($only_app,1);
+			$only_app = substr($only_app, 1);
 		}
 
 		$offset = false;
@@ -137,32 +137,32 @@ 
 		{
 			list($offset, $limit) = $limit;
 		}
-		elseif($limit)
+		elseif ($limit)
 		{
 			$offset = 0;
 		}
 
 		$links = array();
 		try {
-			foreach(self::$db->select(self::TABLE, '*', self::$db->expression(self::TABLE, '((', array(
+			foreach (self::$db->select(self::TABLE, '*', self::$db->expression(self::TABLE, '((', array(
 						'link_app1'	=> $app,
 						'link_id1'	=> $id,
-					),') OR (',array(
+					), ') OR (', array(
 						'link_app2'	=> $app,
 						'link_id2'	=> $id,
-					),'))',
+					), '))',
 					$deleted ? '' : ' AND deleted IS NULL'
 				), __LINE__, __FILE__, $offset, $order ? " ORDER BY $order" : '', 'phpgwapi', $limit) as $row)
 			{
 				// check if left side (1) is one of our targets --> add it
-				if ($row['link_app1'] == $app && in_array($row['link_id1'],(array)$id))
+				if ($row['link_app1'] == $app && in_array($row['link_id1'], (array)$id))
 				{
-					self::_add2links($row,true,$only_app,$not_only,$links);
+					self::_add2links($row, true, $only_app, $not_only, $links);
 				}
 				// check if right side (2) is one of our targets --> add it (both can be true for multiple targets!)
-				if ($row['link_app2'] == $app && in_array($row['link_id2'],(array)$id))
+				if ($row['link_app2'] == $app && in_array($row['link_id2'], (array)$id))
 				{
-					self::_add2links($row,false,$only_app,$not_only,$links);
+					self::_add2links($row, false, $only_app, $not_only, $links);
 				}
 			}
 			// if query returns exactly limit rows, we assume there are more and therefore set self::$limit_exceeded
@@ -170,18 +170,18 @@ 
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 		return is_array($id) ? $links : ($links[$id] ? $links[$id] : array());
 	}
 
-	private static function _add2links($row,$left,$only_app,$not_only,array &$links)
+	private static function _add2links($row, $left, $only_app, $not_only, array &$links)
 	{
 		$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
 		$linked_id  = $left ? $row['link_id2'] : $row['link_id1'];
 		$app_id = $left ? $row['link_id1'] : $row['link_id2'];
-		list($app) = explode('-',$linked_app);
+		list($app) = explode('-', $linked_app);
 		if ($only_app && $not_only == ($linked_app == $only_app) || !$GLOBALS['egw_info']['user']['apps'][$app])
 		{
 			#echo "$linked_app == $only_app, ";var_dump($linked_app == $only_app);echo "	->dont return a link<br>";
@@ -208,13 +208,13 @@ 
 	 * @param string $id2 ='' id in $app2, if no integer link_id given in $app_link_id
 	 * @return array with link-data or False
 	 */
-	static function get_link($app_link_id,$id='',$app2='',$id2='')
+	static function get_link($app_link_id, $id = '', $app2 = '', $id2 = '')
 	{
 		if (self::DEBUG)
 		{
 			echo "<p>solink.get_link('$app_link_id',$id,'$app2','$id2')</p>\n";
 		}
-		if ((int) $app_link_id > 0)
+		if ((int)$app_link_id > 0)
 		{
 			$where = array('link_id' => $app_link_id);
 		}
@@ -224,24 +224,24 @@ 
 			{
 				return False;
 			}
-			$where = self::$db->expression(self::TABLE,'(',array(
+			$where = self::$db->expression(self::TABLE, '(', array(
 					'link_app1'	=> $app_link_id,
 					'link_id1'	=> $id,
 					'link_app2'	=> $app2,
 					'link_id2'	=> $id2,
-				),') OR (',array(
+				), ') OR (', array(
 					'link_app2'	=> $app_link_id,
 					'link_id2'	=> $id,
 					'link_app1'	=> $app2,
 					'link_id1'	=> $id2,
-				),')');
+				), ')');
 		}
 		try {
-			return self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__)->fetch(ADODB_FETCH_ASSOC);
+			return self::$db->select(self::TABLE, '*', $where, __LINE__, __FILE__)->fetch(ADODB_FETCH_ASSOC);
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 		return false;
@@ -259,7 +259,7 @@ 
 	 * @param boolean $hold_for_purge Don't really delete the link, just mark it as deleted and wait for final delete of linked entry
 	 * @return array with deleted links
 	 */
-	static function unlink($link_id,$app='',$id='',$owner=0,$app2='',$id2='',$hold_for_purge=false)
+	static function unlink($link_id, $app = '', $id = '', $owner = 0, $app2 = '', $id2 = '', $hold_for_purge = false)
 	{
 		if (self::DEBUG)
 		{
@@ -284,21 +284,21 @@ 
 					$check1['link_id1'] = $id;
 					$check2['link_id2'] = $id;
 				}
-				$where = self::$db->expression(self::TABLE,'((',$check1,') OR (',$check2,'))');
+				$where = self::$db->expression(self::TABLE, '((', $check1, ') OR (', $check2, '))');
 			}
 			elseif ($app != '' && $app2 != '')
 			{
-				$where = self::$db->expression(self::TABLE,'(',array(
+				$where = self::$db->expression(self::TABLE, '(', array(
 						'link_app1'	=> $app,
 						'link_id1'	=> $id,
 						'link_app2'	=> $app2,
 						'link_id2'	=> $id2,
-					),') OR (',array(
+					), ') OR (', array(
 						'link_app1'	=> $app2,
 						'link_id1'	=> $id2,
 						'link_app2'	=> $app,
 						'link_id2'	=> $id,
-					),')');
+					), ')');
 			}
 			if ($owner)
 			{
@@ -308,25 +308,25 @@ 
 		}
 		$deleted = array();
 		try {
-			foreach(self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__) as $row)
+			foreach (self::$db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
 			{
 				$deleted[] = $row;
 			}
-			if($hold_for_purge)
+			if ($hold_for_purge)
 			{
-				self::$db->update(self::TABLE,array(
+				self::$db->update(self::TABLE, array(
 					'deleted' => time(),
 					'link_lastmod' => time(),
-				), $where, __LINE__,__FILE__);
+				), $where, __LINE__, __FILE__);
 			}
 			else
 			{
-				self::$db->delete(self::TABLE,$where,__LINE__,__FILE__);
+				self::$db->delete(self::TABLE, $where, __LINE__, __FILE__);
 			}
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 
@@ -357,8 +357,8 @@ 
 			$check1['link_id1'] = $id;
 			$check2['link_id2'] = $id;
 		}
-		$where = self::$db->expression(self::TABLE,'((',$check1,') OR (',$check2,'))');
-		self::$db->update(self::TABLE,array('deleted'=> null), $where, __LINE__,__FILE__);
+		$where = self::$db->expression(self::TABLE, '((', $check1, ') OR (', $check2, '))');
+		self::$db->update(self::TABLE, array('deleted'=> null), $where, __LINE__, __FILE__);
 	}
 
 	/**
@@ -371,13 +371,13 @@ 
 	 * @param int $new_owner account_id of new owner
 	 * @return int number of links changed
 	 */
-	static function chown($owner,$new_owner)
+	static function chown($owner, $new_owner)
 	{
-		if ((int)$owner <= 0 || (int) $new_owner <= 0)
+		if ((int)$owner <= 0 || (int)$new_owner <= 0)
 		{
 			return 0;
 		}
-		self::$db->update(self::TABLE,array('owner'=>$new_owner),array('owner'=>$owner),__LINE__,__FILE__);
+		self::$db->update(self::TABLE, array('owner'=>$new_owner), array('owner'=>$owner), __LINE__, __FILE__);
 
 		return self::$db->affected_rows();
 	}
@@ -404,15 +404,15 @@ 
 	 * @param int|array $limit =null number of entries to return, default null = all or array(offset, num_rows) to return num_rows starting from offset
 	 * @return array with links from entries from $app to $target_app/$target_id plus the other (b) link_id/app/id in the keys 'link3'/'app3'/'id3'
 	 */
-	static function get_3links($app, $target_app, $target_id=null, $just_app_ids=false, $order='link_lastmod DESC', $limit=null)
+	static function get_3links($app, $target_app, $target_id = null, $just_app_ids = false, $order = 'link_lastmod DESC', $limit = null)
 	{
 		$table = self::TABLE;
-		$arrayofselects=array(
+		$arrayofselects = array(
 			// retrieve the type of links, where the relation is realized as timesheet->infolog/tracker via infolog->projectmanager to timesheet->projectmanager
 			array('table'=>self::TABLE,
 				'cols'=>'c.*,b.link_app1 AS app3,b.link_id1 AS id3,b.link_id AS link3',
 				'where'=>'a.link_app1='.self::$db->quote($app).' AND c.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND c.', array('link_id2' => $target_id))),
                         	'join'=>" a
                         		JOIN $table b ON a.link_id2=b.link_id1 AND a.link_app2=b.link_app1
                        			JOIN $table c ON a.link_id1=c.link_id1 AND a.link_app1=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app2 AND c.link_id2=b.link_id2",
@@ -421,7 +421,7 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'b.link_id, b.link_app2 as app1, b.link_id2 as id1, b.link_app1 as app2, b.link_id1 as id2, b.link_remark,b.link_lastmod,b.link_owner,b.deleted,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
                        		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND b.', array('link_id1' => $target_id))),
                         	'join'=>" a
                         		JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id1 AND a.link_app2=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app1 AND c.link_id2=b.link_id1",
@@ -430,7 +430,7 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'a.*,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
                      		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND a.', array('link_id2' => $target_id))),
                        		'join'=>" a
                        			JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id2 AND a.link_app2=c.link_app2 AND a.link_id!=c.link_id AND c.link_app1=b.link_app1 AND c.link_id1=b.link_id1",
@@ -442,17 +442,17 @@ 
 		{
 			list($offset, $limit) = $limit;
 		}
-		elseif($limit)
+		elseif ($limit)
 		{
 			$offset = 0;
 		}
 
 		$links = array();
-		foreach(self::$db->union($arrayofselects, __LINE__, __FILE__, $order, $offset, $limit) as $row)
+		foreach (self::$db->union($arrayofselects, __LINE__, __FILE__, $order, $offset, $limit) as $row)
 		{
 			if ($just_app_ids)
 			{
-				if ($row['link_app1'] == $target_app && (is_null($target_id) || in_array($row['link_id1'],(array)$target_id)))
+				if ($row['link_app1'] == $target_app && (is_null($target_id) || in_array($row['link_id1'], (array)$target_id)))
 				{
 					$links[$row['link_id']] = $row['link_id2'];
 				}
@@ -463,7 +463,7 @@ 
 			}
 			else
 			{
-				$links[] = Api\Db::strip_array_keys($row,'link_');
+				$links[] = Api\Db::strip_array_keys($row, 'link_');
 			}
 		}
 		// if query returns exactly limit rows, we assume there are more and therefore set self::$limit_exceeded
@@ -477,7 +477,7 @@ 
 	 */
 	static function init_static( )
 	{
-		self::$db     = $GLOBALS['egw']->db;
+		self::$db = $GLOBALS['egw']->db;
 	}
 }
 Storage::init_static();

api/src/Storage/Db2DataIterator.php

Spacing +8 added lines, -8 removed lines

@@ -46,13 +46,13 @@ 
 	 * @param Base $storage
 	 * @param \Traversable $rs
 	 */
-	public function __construct(Base $storage, \Traversable $rs=null)
+	public function __construct(Base $storage, \Traversable $rs = null)
 	{
 		$this->storage = $storage;
 
 		$this->total = $storage->total;
 
-		if (is_a($rs,'IteratorAggregate'))
+		if (is_a($rs, 'IteratorAggregate'))
 		{
 			$this->rs = $rs->getIterator();
 		}
@@ -69,7 +69,7 @@ 
 	 */
 	public function current()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			$data = $this->rs->current();
 
@@ -85,7 +85,7 @@ 
 	 */
 	public function key()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->key();
 		}
@@ -97,7 +97,7 @@ 
 	 */
 	public function next()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->next();
 		}
@@ -108,7 +108,7 @@ 
 	 */
 	public function rewind()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->rewind();
 		}
@@ -119,9 +119,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->valid();
 		}

api/src/Storage/Base2.php

Spacing +7 added lines, -7 removed lines

@@ -53,9 +53,9 @@ 
 	 *
 	 * @return so_sql2
 	 */
-	function __construct($app='',$table='',Api\Db $db=null,$column_prefix='',$no_clone=false)
+	function __construct($app = '', $table = '', Api\Db $db = null, $column_prefix = '', $no_clone = false)
 	{
-		parent::__construct($app,$table,$db,$column_prefix,$no_clone);
+		parent::__construct($app, $table, $db, $column_prefix, $no_clone);
 	}
 
 	/**
@@ -68,13 +68,13 @@ 
 	 */
 	function __get($property)
 	{
-		switch($property)
+		switch ($property)
 		{
 			case 'id':
 				$property = $this->autoinc_id;
 				break;
 		}
-		if (in_array($property,$this->db_cols) || in_array($property,$this->non_db_cols))
+		if (in_array($property, $this->db_cols) || in_array($property, $this->non_db_cols))
 		{
 			return $this->data[$property];
 		}
@@ -88,15 +88,15 @@ 
 	 * @param string $property
 	 * @param mixed $value
 	 */
-	function __set($property,$value)
+	function __set($property, $value)
 	{
-		switch($property)
+		switch ($property)
 		{
 			case 'id':
 				$property = $this->autoinc_id;
 				break;
 		}
-		if (in_array($property,$this->db_cols) || in_array($property,$this->non_db_cols))
+		if (in_array($property, $this->db_cols) || in_array($property, $this->non_db_cols))
 		{
 			$this->data[$property] = $value;
 		}

api/src/Exception/NoPermission/App.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  */
 class App extends Exception\NoPermission
 {
-	function __construct($msg=null,$code=101)
+	function __construct($msg = null, $code = 101)
 	{
 		if (isset($GLOBALS['egw_info']['apps'][$msg]))
 		{
@@ -39,6 +39,6 @@ 
 						'"'.$app.'"');
 			}
 		}
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

api/src/Exception/NoPermission/Admin.php

Spacing +2 added lines, -2 removed lines

@@ -19,10 +19,10 @@
  */
 class Admin extends App
 {
-	function __construct($msg=null,$code=102)
+	function __construct($msg = null, $code = 102)
 	{
 		if (is_null($msg)) $msg = 'admin';
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

api/src/Exception/NotFound.php

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
 	 * @param string $msg =null message, default "Entry not found!"
 	 * @param int $code =99 numerical code, default 2
 	 */
-	function __construct($msg=null,$code=2)
+	function __construct($msg = null, $code = 2)
 	{
 		if (is_null($msg)) $msg = lang('Entry not found!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }