EGroupware / egroupware

calendar/inc/class.calendar_tracking.inc.php

Spacing +14 added lines, -14 removed lines

@@ -114,18 +114,18 @@ 
 	 */
 	public function __construct()
 	{
-		parent::__construct('calendar');	// adds custom fields
+		parent::__construct('calendar'); // adds custom fields
 	}
 
 	/**
 	 * Tracks the changes in one entry $data, by comparing it with the last version in $old
 	 * Overrides parent to reformat participants into a format parent can handle
 	 */
-	public function track(array $data,array $old=null,$user=null,$deleted=null,array $changed_fields=null)
+	public function track(array $data, array $old = null, $user = null, $deleted = null, array $changed_fields = null)
 	{
 		// Don't try to track dates on recurring events.
 		// It won't change for the base event, and any change to the time creates an exception
-		if($data['recur_type'])
+		if ($data['recur_type'])
 		{
 			unset($data['start']); unset($data['end']);
 			unset($old['start']); unset($old['end']);
@@ -136,7 +136,7 @@ 
 		* If this is one of a recurring event, append the recur_date to the participant field so we can
 		* filter by it later.
 		*/
-		if(is_array($data['participants']))
+		if (is_array($data['participants']))
 		{
 			$participants = $data['participants'];
 			$data['participants'] = array();
@@ -144,25 +144,25 @@ 
 		}
 		// if clients eg. CalDAV do NOT set participants, they are left untouched
 		// therefore we should not track them, as all updates then show up as all participants removed
-		elseif(!isset($data['participants']))
+		elseif (!isset($data['participants']))
 		{
 			unset($old['participants']);
 		}
-		if(is_array($old['participants']))
+		if (is_array($old['participants']))
 		{
 			$participants = $old['participants'];
 			$old['participants'] = array();
 			$old = array_merge($old, $this->alter_participants($participants));
 		}
-		parent::track($data,$old,$user,$deleted, $changed_fields);
+		parent::track($data, $old, $user, $deleted, $changed_fields);
 	}
 
 	/**
 	 * Overrides parent because calendar_boupdates handles the notifications
 	 */
-	public function do_notifications($data,$old,$deleted=null)
+	public function do_notifications($data, $old, $deleted = null)
 	{
-		unset($data, $old, $deleted);	// unused, but required by function signature
+		unset($data, $old, $deleted); // unused, but required by function signature
 		return true;
 	}
 
@@ -177,21 +177,21 @@ 
 	 * @param array $old = null
 	 * @return array of keys with different values in $data and $old
 	 */
-	public function changed_fields(array $data,array $old=null)
+	public function changed_fields(array $data, array $old = null)
 	{
-		if(is_array($data['participants']))
+		if (is_array($data['participants']))
 		{
 			$participants = $data['participants'];
 			$data['participants'] = array();
 			$data = array_merge($data, $this->alter_participants($participants));
 		}
-		if(is_array($old['participants']))
+		if (is_array($old['participants']))
 		{
 			$participants = $old['participants'];
 			$old['participants'] = array();
 			$old = array_merge($old, $this->alter_participants($participants));
 		}
-		return parent::changed_fields($data,$old);
+		return parent::changed_fields($data, $old);
 	}
 
 	/**
@@ -202,7 +202,7 @@ 
 	protected function alter_participants($participants)
 	{
 		$data = array();
-		foreach($participants as $uid => $status)
+		foreach ($participants as $uid => $status)
 		{
 			$quantity = $role = $user_type = $user_id = null;
 			calendar_so::split_status($status, $quantity, $role);

api/asyncservices.php

Spacing +10 added lines, -11 removed lines

@@ -15,7 +15,7 @@ 
 use EGroupware\Api\Asyncservice;
 
 if (!isset($_REQUEST['domain'])) $_REQUEST['domain'] = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'default';
-$path_to_egroupware = realpath(__DIR__.'/..');	//  need to be adapted if this script is moved somewhere else
+$path_to_egroupware = realpath(__DIR__.'/..'); //  need to be adapted if this script is moved somewhere else
 
 // remove the comment from one of the following lines to enable loging
 // define('ASYNC_LOG','C:\\async.log');		// Windows
@@ -25,8 +25,8 @@ 
 if (defined('ASYNC_LOG'))
 {
 	$msg = date('Y/m/d H:i:s ').$_REQUEST['domain'].": asyncservice started\n";
-	$f = fopen(ASYNC_LOG,'a+');
-	fwrite($f,$msg);
+	$f = fopen(ASYNC_LOG, 'a+');
+	fwrite($f, $msg);
 	fclose($f);
 }
 $GLOBALS['egw_info']['flags'] = array(
@@ -43,8 +43,8 @@ 
 	}
 	if (defined('ASYNC_LOG'))
 	{
-		$f = fopen(ASYNC_LOG,'a+');
-		fwrite($f,$msg);
+		$f = fopen(ASYNC_LOG, 'a+');
+		fwrite($f, $msg);
 		fclose($f);
 	}
 	die($msg);
@@ -63,8 +63,8 @@ 
 	}
 	if (defined('ASYNC_LOG'))
 	{
-		$f = fopen(ASYNC_LOG,'a+');
-		fwrite($f,$msg);
+		$f = fopen(ASYNC_LOG, 'a+');
+		fwrite($f, $msg);
 		fclose($f);
 	}
 	die($msg);
@@ -75,8 +75,7 @@ 
 $async = new Asyncservice();
 $num = $async->check_run(isset($_REQUEST['run_by']) ? $_REQUEST['run_by'] : 'crontab');
 
-$msg = date('Y/m/d H:i:s ').$_REQUEST['domain'].': '.($num === false ? 'An error occured: can not obtain semaphore!' :
-	($num ? "$num job(s) executed" : 'Nothing to execute'))."\n\n";
+$msg = date('Y/m/d H:i:s ').$_REQUEST['domain'].': '.($num === false ? 'An error occured: can not obtain semaphore!' : ($num ? "$num job(s) executed" : 'Nothing to execute'))."\n\n";
 
 if (isset($_SERVER['HTTP_HOST']))
 {
@@ -87,7 +86,7 @@ 
 
 if (defined('ASYNC_LOG'))
 {
-	$f = fopen(ASYNC_LOG,'a+');
-	fwrite($f,$msg);
+	$f = fopen(ASYNC_LOG, 'a+');
+	fwrite($f, $msg);
 	fclose($f);
 }

api/images.php

Spacing +6 added lines, -6 removed lines

@@ -28,17 +28,17 @@ 
 
 include '../header.inc.php';
 
-$content = json_encode(Api\Image::map(preg_match('/^[a-z0-9_-]+$/i',$_GET['template']) ? $_GET['template'] : null, $_GET['svg']),
-	JSON_FORCE_OBJECT |	// export empty php-arrays as empty objects, not empty arrays
-	JSON_UNESCAPED_SLASHES | // do not escape slashes, smaller and better readable
+$content = json_encode(Api\Image::map(preg_match('/^[a-z0-9_-]+$/i', $_GET['template']) ? $_GET['template'] : null, $_GET['svg']),
+	JSON_FORCE_OBJECT|// export empty php-arrays as empty objects, not empty arrays
+	JSON_UNESCAPED_SLASHES|// do not escape slashes, smaller and better readable
 	(!empty($_GET['debug']) ? JSON_PRETTY_PRINT : 0));
 
 // use an etag over the image mapp
 $etag = '"'.md5($content).'"';
 
 // headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
-Api\Session::cache_control(86400);	// cache for one day
-Header('Content-Type: '.(empty($_GET['debug'])?'text/javascript':'application/json').'; charset=utf-8');
+Api\Session::cache_control(86400); // cache for one day
+Header('Content-Type: '.(empty($_GET['debug']) ? 'text/javascript' : 'application/json').'; charset=utf-8');
 Header('ETag: '.$etag);
 
 // if servers send a If-None-Match header, response with 304 Not Modified, if etag matches
@@ -51,7 +51,7 @@ 
 if (empty($_GET['debug'])) $content = 'egw.set_images('.$content.", egw && egw.window !== window);\n";
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
-if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
+if (in_array('gzip', explode(',', $_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
 {
 	$content = gzencode($content);
 	header('Content-Encoding: gzip');

api/src/Framework/Template.php

Spacing +34 added lines, -34 removed lines

@@ -32,7 +32,7 @@ 
 	 *	- function-name like set_var to get eg. all assignments or
 	 *	- handle- / variable-names - if you are only interested in some variables ;-)
 	 */
-	var $debug = False;	// array('cat_list','cat_list_t');
+	var $debug = False; // array('cat_list','cat_list_t');
 
 	/**
 	 * $file[handle] = 'filename';
@@ -128,9 +128,9 @@ 
 	 */
 	function set_file($handle, $filename = '')
 	{
-		if ($this->debug && $this->check_debug('set_file',$handle,$filename))
+		if ($this->debug && $this->check_debug('set_file', $handle, $filename))
 		{
-			echo "<p>Template::set_file('".print_r($handle,true)."','$filename')</p>\n";
+			echo "<p>Template::set_file('".print_r($handle, true)."','$filename')</p>\n";
 		}
 		if (!is_array($handle))
 		{
@@ -143,7 +143,7 @@ 
 		}
 		else
 		{
-			foreach($handle as $h => $f)
+			foreach ($handle as $h => $f)
 			{
 				$this->file[$h] = $this->filename($f);
 			}
@@ -160,7 +160,7 @@ 
 	 */
 	function set_block($parent, $handle, $name = '')
 	{
-		if ($this->debug && $this->check_debug('set_block',$parent,$handle,$name))
+		if ($this->debug && $this->check_debug('set_block', $parent, $handle, $name))
 		{
 			echo "<p>Template::set_block('$parent','$handle','$name')</p>\n";
 		}
@@ -177,14 +177,14 @@ 
 		$qhandle = preg_quote($handle);
 		$reg = "/<!--\\s+BEGIN $qhandle\\s+-->(.*)\n\\s*<!--\\s+END $qhandle\\s+-->/s";
 		$match = null;
-		if (!preg_match($reg,$str,$match))
+		if (!preg_match($reg, $str, $match))
 		{
 			// unfortunaly some apps set non-existing blocks, therefor I have to disable this diagnostics again for now
 			$this->halt("set_block: unable to find block '$handle' in '$parent'=<pre>".htmlspecialchars($str)."</pre> this->root=$this->root");
 			// return False;
 		}
-		$this->set_var($handle,$match[1]);
-		$this->set_var($parent,preg_replace($reg, '{' . "$name}",$str));
+		$this->set_var($handle, $match[1]);
+		$this->set_var($parent, preg_replace($reg, '{'."$name}", $str));
 	}
 
 	/* public: set_var(array $values)
@@ -205,18 +205,18 @@ 
 				$varname => $value
 			);
 		}
-		foreach($varname as $k => $v)
+		foreach ($varname as $k => $v)
 		{
 			if (!empty($k))
 			{
-				if ($this->debug && $this->check_debug('set_var',$k))
+				if ($this->debug && $this->check_debug('set_var', $k))
 				{
 					echo "<p>Template::set_var('$k','$v')</p>\n";
 				}
 				$this->varkeys[$k] = $this->varname($k);
 				$this->varvals[$k] = $this->egroupware_hack ? str_replace(
-					array('phpGroupWare','www.phpgroupware.org'),
-					array('eGroupWare','www.eGroupWare.org'),$v
+					array('phpGroupWare', 'www.phpgroupware.org'),
+					array('eGroupWare', 'www.eGroupWare.org'), $v
 				) : $v;
 			}
 		}
@@ -230,7 +230,7 @@ 
 	 */
 	function subst($handle)
 	{
-		if ($this->debug && $this->check_debug('subst',$handle))
+		if ($this->debug && $this->check_debug('subst', $handle))
 		{
 			echo "<p>Template::subst('$handle')</p>\n";
 		}
@@ -241,7 +241,7 @@ 
 		}
 
 		$str = $this->get_var($handle);
-		foreach($this->varkeys as $k => $v)
+		foreach ($this->varkeys as $k => $v)
 		{
 			$str = str_replace($v, $this->varvals[$k], $str);
 		}
@@ -276,7 +276,7 @@ 
 			$str = $this->subst($handle);
 			if ($append)
 			{
-				$this->set_var($target, $this->get_var($target) . $str);
+				$this->set_var($target, $this->get_var($target).$str);
 			}
 			else
 			{
@@ -285,7 +285,7 @@ 
 		}
 		else
 		{
-			foreach($handle as $h)
+			foreach ($handle as $h)
 			{
 				$str = $this->subst($h);
 				$this->set_var($target, $str);
@@ -332,7 +332,7 @@ 
 	 */
 	function get_vars()
 	{
-		foreach(array_keys($this->varkeys) as $k)
+		foreach (array_keys($this->varkeys) as $k)
 		{
 			$result[$k] = $this->varvals[$k];
 		}
@@ -353,7 +353,7 @@ 
 		}
 		else
 		{
-			foreach(array_keys($varname) as $k)
+			foreach (array_keys($varname) as $k)
 			{
 				$result[$k] = $this->varvals[$k];
 			}
@@ -382,7 +382,7 @@ 
 		{
 			return false;
 		}
-		foreach($m as $v)
+		foreach ($m as $v)
 		{
 			if (!isset($this->varkeys[$v]))
 			{
@@ -448,15 +448,15 @@ 
 	 * @param string $root ='' default $this->root
 	 * @param int $time =1
 	 */
-	protected function filename($filename,$root='',$time=1)
+	protected function filename($filename, $root = '', $time = 1)
 	{
-		if($root == '')
+		if ($root == '')
 		{
 			$root = $this->root;
 		}
-		if(substr($filename, 0, 1) != '/')
+		if (substr($filename, 0, 1) != '/')
 		{
-			$new_filename = $root . '/' . $filename;
+			$new_filename = $root.'/'.$filename;
 		}
 		else
 		{
@@ -465,14 +465,14 @@ 
 
 		if (!file_exists($new_filename))
 		{
-			if($time==2)
+			if ($time == 2)
 			{
 				$this->halt("filename: file $new_filename does not exist.");
 			}
 			else
 			{
-				$new_root = dirname($root) . DIRECTORY_SEPARATOR . 'default';
-				$new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
+				$new_root = dirname($root).DIRECTORY_SEPARATOR.'default';
+				$new_filename = $this->filename(str_replace($root.'/', '', $new_filename), $new_root, 2);
 			}
 		}
 		return $new_filename;
@@ -491,9 +491,9 @@ 
 	 */
 	function loadfile($handle)
 	{
-		if ($this->debug && $this->check_debug('loadfile',$handle))
+		if ($this->debug && $this->check_debug('loadfile', $handle))
 		{
-			echo "<p>Template::loadfile('$handle') file=<pre>\n".print_r($this->file,True)."</pre>\n";
+			echo "<p>Template::loadfile('$handle') file=<pre>\n".print_r($this->file, True)."</pre>\n";
 			echo "<p>backtrace: ".function_backtrace()."</p>\n";
 		}
 		if (isset($this->varkeys[$handle]) && !empty($this->varvals[$handle]))
@@ -502,9 +502,9 @@ 
 		}
 		if (!isset($this->file[$handle]))
 		{
-			if ($this->debug && $this->check_debug('loadfile',$handle))
+			if ($this->debug && $this->check_debug('loadfile', $handle))
 			{
-				echo "varkeys =<pre>".print_r($this->varkeys,True)."</pre>varvals =<pre>".print_r($this->varvals,True)."</pre>\n";
+				echo "varkeys =<pre>".print_r($this->varkeys, True)."</pre>varvals =<pre>".print_r($this->varvals, True)."</pre>\n";
 			}
 			$this->halt("loadfile: $handle is not a valid handle.");
 			return false;
@@ -549,10 +549,10 @@ 
 	{
 		if (!$this->debug) return False;
 
-		foreach(func_get_args() as $arg)
+		foreach (func_get_args() as $arg)
 		{
 			if (!is_array($this->debug) && $this->debug === $arg ||
-				(is_array($this->debug) && (@$this->debug[$arg] || in_array($arg,$this->debug,True))))
+				(is_array($this->debug) && (@$this->debug[$arg] || in_array($arg, $this->debug, True))))
 			{
 				return True;
 			}
@@ -601,8 +601,8 @@ 
 		{
 			$GLOBALS['egw_info']['server']['template_set'] = 'idots';
 		}
-		$tpldir         = EGW_SERVER_ROOT . '/' . $appname . '/templates/' . $GLOBALS['egw_info']['server']['template_set'];
-		$tpldir_default = EGW_SERVER_ROOT . '/' . $appname . '/templates/default';
+		$tpldir         = EGW_SERVER_ROOT.'/'.$appname.'/templates/'.$GLOBALS['egw_info']['server']['template_set'];
+		$tpldir_default = EGW_SERVER_ROOT.'/'.$appname.'/templates/default';
 
 		if (@is_dir($tpldir))
 		{

api/src/Framework/Tutorial.php

Spacing +7 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param array $content
 	 */
-	function popup ($content=null)
+	function popup($content = null)
 	{
 		// check and if not done register tutorial_menu hook
 		if (!Api\Hooks::exists('sidebox_all', 'api') ||
@@ -48,7 +48,7 @@ 
 		if (!is_array($content))
 		{
 			// Get tutorial object id
-			$tuid_indx = explode('-',$_GET['tuid']);
+			$tuid_indx = explode('-', $_GET['tuid']);
 			$appName = $tuid_indx[0];
 			$lang = $tuid_indx[1];
 			$id = $tuid_indx[2];
@@ -57,7 +57,7 @@ 
 		{
 			$appName = $content['list']['apps'];
 			$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
-			$id ="0";
+			$id = "0";
 		}
 		// read tutorials json file to fetch data
 		$tutorials = json_decode(self::getJsonData(), true);
@@ -74,8 +74,7 @@ 
 		if (in_array($appName, array_keys($GLOBALS['egw_info']['user']['apps'])) || $appName === "introduction")
 		{
 			// fallback to english video
-			$tutorial = $tutorials[$appName][$lang][$id]? $tutorials[$appName][$lang][$id]:
-				$tutorials[$appName]['en'][$id];
+			$tutorial = $tutorials[$appName][$lang][$id] ? $tutorials[$appName][$lang][$id] : $tutorials[$appName]['en'][$id];
 
 			$list = array(
 				'apps' => $appName,
@@ -86,7 +85,7 @@ 
 				$v ['onclick'] = 'app[egw.app_name()].tutorial_videoOnClick("'.$v['src'].'")';
 				array_push($list, $v);
 			}
-			$content = array (
+			$content = array(
 				'src' => $tutorial['src'],
 				'title' => $tutorial['title'],
 				'desc' => $tutorial['desc'],
@@ -137,13 +136,13 @@ 
 	public static function tutorial_menu()
 	{
 		if (Api\Header\UserAgent::mobile()) return;
-		$tutorials = json_decode(self::getJsonData(),true);
+		$tutorials = json_decode(self::getJsonData(), true);
 		$appname = $GLOBALS['egw_info']['flags']['currentapp'];
 		if (!is_array($tutorials[$appname])) return false;
 		if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable']
 			|| $GLOBALS['egw_info']['server']['egw_tutorial_disable'] == 'intro')
 		{
-			$file = Array (
+			$file = Array(
 				array(
 					'text'    => '<div id="egw_tutorial_'.$appname.'_sidebox" class="egwTutorial"/>',
 					'no_lang' => true,

api/src/Framework/Bundle.php

Spacing +15 added lines, -15 removed lines

@@ -51,7 +51,7 @@ 
 			$bundles = Cache::getTree(__CLASS__, 'bundles', array(__CLASS__, 'all'), array(), 7200);
 			$bundles_ts = $bundles['.ts'];
 			unset($bundles['.ts']);
-			foreach($bundles as $name => $files)
+			foreach ($bundles as $name => $files)
 			{
 				// to facilitate move to new api/et2 location, can be removed after 16.1 release
 				if ($name == 'et21' && !in_array('/api/js/etemplate/etemplate2.js', $files) ||
@@ -72,9 +72,9 @@ 
 		}
 		$to_include = $included_bundles = array();
 		$query = null;
-		foreach($js_includes as $file)
+		foreach ($js_includes as $file)
 		{
-			if ($file == '/api/js/jsapi/egw.js') continue;	// loaded via own tag, and we must not load it twice!
+			if ($file == '/api/js/jsapi/egw.js') continue; // loaded via own tag, and we must not load it twice!
 
 			if (!isset($to_include[$file]))
 			{
@@ -129,7 +129,7 @@ 
 	 * @param string $minurl =null url of minified bundle, to be used, if existing and recent
 	 * @return array js-files (can be more then one, if one of given files can not be bundeled)
 	 */
-	protected static function urls(array $js_includes, &$max_modified=null, $minurl=null)
+	protected static function urls(array $js_includes, &$max_modified = null, $minurl = null)
 	{
 		$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 		// ignore not existing minurl
@@ -137,28 +137,28 @@ 
 		$to_include_first = $to_include = $to_minify = array();
 		$max_modified = 0;
 		$query = null;
-		foreach($js_includes as $path)
+		foreach ($js_includes as $path)
 		{
 			if ($path == '/api/js/jsapi/egw.js') continue; // Leave egw.js out of bundle
 			unset($query);
-			list($path,$query) = explode('?',$path,2);
+			list($path, $query) = explode('?', $path, 2);
 			$mod = filemtime(EGW_SERVER_ROOT.$path);
 			if ($mod > $max_modified) $max_modified = $mod;
 
 			// ckeditor must be included before bundled files, as they depend on it!
-			if (strpos($path,'/ckeditor/ckeditor.js') !== false)
+			if (strpos($path, '/ckeditor/ckeditor.js') !== false)
 			{
-				$to_include_first[] = $path . '?' . $mod;
+				$to_include_first[] = $path.'?'.$mod;
 			}
 			// for now minify does NOT support query parameters, nor php files generating javascript
 			elseif ($debug_minify || $query || substr($path, -3) != '.js' || empty($minurl))
 			{
-				$path .= '?'. $mod.($query ? '&'.$query : '');
+				$path .= '?'.$mod.($query ? '&'.$query : '');
 				$to_include[] = $path;
 			}
 			else
 			{
-				$to_minify[] = substr($path,1);
+				$to_minify[] = substr($path, 1);
 			}
 		}
 		if (!$debug_minify && $to_minify)
@@ -246,7 +246,7 @@ 
 		$stock_files = call_user_func_array('array_merge', $bundles);
 
 		// generate template and app bundles, if installed
-		foreach(array(
+		foreach (array(
 			'jdots' => '/jdots/js/fw_jdots.js',
 			'mobile' => '/pixelegg/js/fw_mobile.js',
 			'pixelegg' => '/pixelegg/js/fw_pixelegg.js',
@@ -257,7 +257,7 @@ 
 		{
 			if (@file_exists(EGW_SERVER_ROOT.$file))
 			{
-				$inc_mgr = new IncludeMgr($stock_files);	// reset loaded files to stock files
+				$inc_mgr = new IncludeMgr($stock_files); // reset loaded files to stock files
 				$inc_mgr->include_js_file($file);
 				$bundles[$bundle] = array_diff($inc_mgr->get_included_files(), $stock_files);
 				self::urls($bundles[$bundle], $max_mod[$bundle]);
@@ -265,12 +265,12 @@ 
 		}
 
 		// automatic split bundles with more then MAX_BUNDLE_FILES (=50) files
-		foreach($bundles as $name => $files)
+		foreach ($bundles as $name => $files)
 		{
 			$n = '';
-			while (count($files) > self::MAX_BUNDLE_FILES*(int)$n)
+			while (count($files) > self::MAX_BUNDLE_FILES * (int)$n)
 			{
-				$files80 = array_slice($files, self::MAX_BUNDLE_FILES*(int)$n, self::MAX_BUNDLE_FILES, true);
+				$files80 = array_slice($files, self::MAX_BUNDLE_FILES * (int)$n, self::MAX_BUNDLE_FILES, true);
 				$bundles[$name.$n++] = $files80;
 			}
 		}

api/src/Framework/Extra.php

Spacing +10 added lines, -10 removed lines

@@ -54,12 +54,12 @@ 
 	 * @param string $with =null
 	 * @param string $msg_type =null 'error', 'warning' or 'success' (default)
 	 */
-	public static function refresh_opener($msg, $app, $id=null, $type=null, $targetapp=null, $replace=null, $with=null, $msg_type=null)
+	public static function refresh_opener($msg, $app, $id = null, $type = null, $targetapp = null, $replace = null, $with = null, $msg_type = null)
 	{
 		//error_log(__METHOD__.'('.array2string(func_get_args()).')');
 		self::$extra['refresh-opener'] = func_get_args();
 
-		unset($msg, $app, $id, $type, $targetapp, $replace, $with, $msg_type);	// used only via func_get_args();
+		unset($msg, $app, $id, $type, $targetapp, $replace, $with, $msg_type); // used only via func_get_args();
 	}
 
 	/**
@@ -70,11 +70,11 @@ 
 	 * @param string $msg message to show
 	 * @param string $type ='success' 'error', 'warning' or 'success' (default)
 	 */
-	public static function message($msg, $type='success')
+	public static function message($msg, $type = 'success')
 	{
 		self::$extra['message'] = func_get_args();
 
-		unset($msg, $type);	// used only via func_get_args();
+		unset($msg, $type); // used only via func_get_args();
 	}
 
 	/**
@@ -84,12 +84,12 @@ 
 	 * @param string $target
 	 * @param string $popup
 	 */
-	public static function popup($link, $target='_blank', $popup='640x480')
+	public static function popup($link, $target = '_blank', $popup = '640x480')
 	{
 		// default params are not returned by func_get_args!
-		$args = func_get_args()+array(null, '_blank', '640x480');
+		$args = func_get_args() + array(null, '_blank', '640x480');
 
-		unset($link, $target, $popup);	// used only via func_get_args()
+		unset($link, $target, $popup); // used only via func_get_args()
 
 		if (Json\Request::isJSONRequest())
 		{
@@ -106,7 +106,7 @@ 
 	 *
 	 * @param string $alert_msg ='' optional message to display as alert, before closing the window
 	 */
-	public static function window_close($alert_msg='')
+	public static function window_close($alert_msg = '')
 	{
 		//error_log(__METHOD__."()");
 		self::$extra['window-close'] = $alert_msg ? $alert_msg : true;
@@ -163,12 +163,12 @@ 
 	public static function get_extra()
 	{
 		// adding links of refreshed entry, to give others apps more information about necessity to refresh
-		if (isset(self::$extra['refresh-opener']) && count(self::$extra['refresh-opener']) <= 8 &&	// do not run twice
+		if (isset(self::$extra['refresh-opener']) && count(self::$extra['refresh-opener']) <= 8 && // do not run twice
 			!empty(self::$extra['refresh-opener'][1]) && !empty(self::$extra['refresh-opener'][2]))	// app/id given
 		{
 			$links = Link::get_links(self::$extra['refresh-opener'][1], self::$extra['refresh-opener'][2]);
 			$apps = array();
-			foreach($links as $link)
+			foreach ($links as $link)
 			{
 				$apps[$link['app']][] = $link['id'];
 			}

api/src/Framework/Minimal.php

Spacing +13 added lines, -13 removed lines

@@ -33,9 +33,9 @@ 
 	* @param string $template ='default' name of the template
 	* @return idots_framework
 	*/
-	function __construct($template='default')
+	function __construct($template = 'default')
 	{
-		parent::__construct($template);		// call the constructor of the extended class
+		parent::__construct($template); // call the constructor of the extended class
 	}
 
 	/**
@@ -44,7 +44,7 @@ 
 	* @param array $extra =array() extra attributes passed as data-attribute to egw.js
 	* @return string with html
 	*/
-	function header(array $extra=array())
+	function header(array $extra = array())
 	{
 		// make sure header is output only once
 		if (self::$header_done) return '';
@@ -66,11 +66,11 @@ 
 		// as the old Template class has problems if restored from the session (php-restore)
 		$this->tpl = new Template(EGW_SERVER_ROOT.$this->template_dir, 'keep');
 		$this->tpl->set_file(array('_head' => 'head.tpl'));
-		$this->tpl->set_block('_head','head');
+		$this->tpl->set_block('_head', 'head');
 
 		$this->tpl->set_var($this->_get_header($extra));
 
-		$content .= $this->tpl->fp('out','head');
+		$content .= $this->tpl->fp('out', 'head');
 
 		return $content;
 	}
@@ -93,7 +93,7 @@ 
 	 * @return boolean $consider_navbar_not_yet_called_as_true=true
 	 * @return boolean
 	 */
-	public function isTop($consider_navbar_not_yet_called_as_true=true)
+	public function isTop($consider_navbar_not_yet_called_as_true = true)
 	{
 		unset($consider_navbar_not_yet_called_as_true);
 
@@ -109,7 +109,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	function _add_topmenu_item(array $app_data,$alt_label=null)
+	function _add_topmenu_item(array $app_data, $alt_label = null)
 	{
 		unset($app_data, $alt_label);
 	}
@@ -122,7 +122,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	function _add_topmenu_info_item($content, $id=null)
+	function _add_topmenu_info_item($content, $id = null)
 	{
 		unset($content, $id);
 	}
@@ -134,10 +134,10 @@ 
 	*/
 	function footer()
 	{
-		static $footer_done=0;
-		if ($footer_done++) return;	// prevent multiple footers, not sure we still need this (RalfBecker)
+		static $footer_done = 0;
+		if ($footer_done++) return; // prevent multiple footers, not sure we still need this (RalfBecker)
 
-		return "</body>\n</html>\n";	// close body and html tag, eg. for popups
+		return "</body>\n</html>\n"; // close body and html tag, eg. for popups
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	* @param array $file
 	* @param string $type =null 'admin', 'preferences', 'favorites', ...
 	*/
-	function sidebox($appname,$menu_title,$file,$type=null)
+	function sidebox($appname, $menu_title, $file, $type = null)
 	{
 		unset($appname, $menu_title, $file, $type);
 	}
@@ -164,7 +164,7 @@ 
 	* @access public
 	* @return void
 	*/
-	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
+	function topmenu_info_icon($id, $icon_src, $iconlink, $blink = false, $tooltip = null)
 	{
 		unset($id, $icon_src, $iconlink, $blink, $tooltip);
 	}

api/src/Ldap/ServerInfo.php

Spacing +19 added lines, -19 removed lines

@@ -146,7 +146,7 @@ 
 	*/
 	function supportsObjectClass($_objectClass)
 	{
-		if($this->supportedObjectClasses[strtolower($_objectClass)])
+		if ($this->supportedObjectClasses[strtolower($_objectClass)])
 		{
 			return true;
 		}
@@ -161,21 +161,21 @@ 
 	 * @param int $version 2 or 3
 	 * @return ldapserverinfo
 	 */
-	public static function get($ds, $host, $version=3)
+	public static function get($ds, $host, $version = 3)
 	{
-		$filter='(objectclass=*)';
-		$justthese = array('structuralObjectClass','namingContexts','supportedLDAPVersion','subschemaSubentry','vendorname');
-		if(($sr = @ldap_read($ds, '', $filter, $justthese)))
+		$filter = '(objectclass=*)';
+		$justthese = array('structuralObjectClass', 'namingContexts', 'supportedLDAPVersion', 'subschemaSubentry', 'vendorname');
+		if (($sr = @ldap_read($ds, '', $filter, $justthese)))
 		{
-			if(($info = ldap_get_entries($ds, $sr)))
+			if (($info = ldap_get_entries($ds, $sr)))
 			{
 				$ldapServerInfo = new ServerInfo($host);
 				$ldapServerInfo->setVersion($version);
 
 				// check for naming contexts
-				if($info[0]['namingcontexts'])
+				if ($info[0]['namingcontexts'])
 				{
-					for($i=0; $i<$info[0]['namingcontexts']['count']; $i++)
+					for ($i = 0; $i < $info[0]['namingcontexts']['count']; $i++)
 					{
 						$namingcontexts[] = $info[0]['namingcontexts'][$i];
 					}
@@ -183,9 +183,9 @@ 
 				}
 
 				// check for ldap server type
-				if($info[0]['structuralobjectclass'])
+				if ($info[0]['structuralobjectclass'])
 				{
-					switch($info[0]['structuralobjectclass'][0])
+					switch ($info[0]['structuralobjectclass'][0])
 					{
 						case 'OpenLDAProotDSE':
 							$ldapServerType = OPENLDAP_LDAPSERVER;
@@ -202,30 +202,30 @@ 
 				}
 
 				// check for subschema entry dn
-				if($info[0]['subschemasubentry'])
+				if ($info[0]['subschemasubentry'])
 				{
 					$subschemasubentry = $info[0]['subschemasubentry'][0];
 					$ldapServerInfo->setSubSchemaEntry($subschemasubentry);
 				}
 
 				// create list of supported objetclasses
-				if(!empty($subschemasubentry))
+				if (!empty($subschemasubentry))
 				{
-					$filter='(objectclass=*)';
+					$filter = '(objectclass=*)';
 					$justthese = array('objectClasses');
 
-					if(($sr = ldap_read($ds, $subschemasubentry, $filter, $justthese)))
+					if (($sr = ldap_read($ds, $subschemasubentry, $filter, $justthese)))
 					{
-						if(($info = ldap_get_entries($ds, $sr)))
+						if (($info = ldap_get_entries($ds, $sr)))
 						{
-							if($info[0]['objectclasses']) {
-								for($i=0; $i<$info[0]['objectclasses']['count']; $i++)
+							if ($info[0]['objectclasses']) {
+								for ($i = 0; $i < $info[0]['objectclasses']['count']; $i++)
 								{
 									$matches = null;
-									if(preg_match('/^\( (.*) NAME \'(\w*)\' /', $info[0]['objectclasses'][$i], $matches))
+									if (preg_match('/^\( (.*) NAME \'(\w*)\' /', $info[0]['objectclasses'][$i], $matches))
 									{
 										#_debug_array($matches);
-										if(count($matches) == 3)
+										if (count($matches) == 3)
 										{
 											$supportedObjectClasses[$matches[1]] = strtolower($matches[2]);
 										}