EGroupware / egroupware

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);
 }

Braces +4 added lines, -1 removed lines

@@ -14,7 +14,10 @@
 
 use EGroupware\Api\Asyncservice;
 
-if (!isset($_REQUEST['domain'])) $_REQUEST['domain'] = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'default';
+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
 
 // remove the comment from one of the following lines to enable loging

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');

Braces +4 added lines, -1 removed lines

@@ -48,7 +48,10 @@
 	exit;
 }
 
-if (empty($_GET['debug'])) $content = 'egw.set_images('.$content.", egw && egw.window !== window);\n";
+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'))

api/src/Framework/IncludeMgr.php

Spacing +10 added lines, -10 removed lines

@@ -80,7 +80,7 @@ 
 	private function parse_file($file)
 	{
 		// file is from url and can contain query-params, eg. /phpgwapi/inc/jscalendar-setup.php?dateformat=d.m.Y&lang=de
-		if (strpos($file,'?') !== false) list($file) = explode('?',$file);
+		if (strpos($file, '?') !== false) list($file) = explode('?', $file);
 
 		// Mark the file as parsed
 		$this->parsed_files[$file] = true;
@@ -284,17 +284,17 @@ 
 	 * @returns the correct path on the server if the file is found or false, if the
 	 *  file is not found or no further processing is needed.
 	 */
-	private function translate_params($package, $file=null, $app='api')
+	private function translate_params($package, $file = null, $app = 'api')
 	{
 		if ($package[0] == '/' && is_readable(EGW_SERVER_ROOT.parse_url($path = $package, PHP_URL_PATH)) ||
 			// fix old /phpgwapi/js/ path by replacing it with /api/js/
 			substr($package, 0, 13) == '/phpgwapi/js/' && is_readable(EGW_SERVER_ROOT.parse_url($path = str_replace('/phpgwapi/js/', '/api/js/', $package), PHP_URL_PATH)) ||
 			$package[0] == '/' && is_readable(EGW_SERVER_ROOT.($path = $package)) ||
-			$package == '.' && is_readable(EGW_SERVER_ROOT.($path="/$app/js/$file.js")) ||
-			is_readable(EGW_SERVER_ROOT.($path="/$app/js/$package/$file.js")) ||
+			$package == '.' && is_readable(EGW_SERVER_ROOT.($path = "/$app/js/$file.js")) ||
+			is_readable(EGW_SERVER_ROOT.($path = "/$app/js/$package/$file.js")) ||
 			// fix not found by using app='api'
-			$app != 'api' && is_readable(EGW_SERVER_ROOT.($path="/api/js/$package/$file.js")) ||
-			$app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path="/phpgwapi/js/$package/$file.js")))
+			$app != 'api' && is_readable(EGW_SERVER_ROOT.($path = "/api/js/$package/$file.js")) ||
+			$app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path = "/phpgwapi/js/$package/$file.js")))
 		{
 			// normalise /./ to /
 			$path = str_replace('/./', '/', $path);
@@ -305,7 +305,7 @@ 
 			// 	adding the ctime to all js files...
 			if (is_array($file))
 			{
-				foreach($file as $name => $val)
+				foreach ($file as $name => $val)
 				{
 					$args .= (empty($args) ? '?' : '&').$name.'='.urlencode($val);
 				}
@@ -375,7 +375,7 @@ 
 	 * @param array $files
 	 * @param boolean $clear_files =false if true clear list of files, before including given ones
 	 */
-	public function include_files(array $files, $clear_files=false)
+	public function include_files(array $files, $clear_files = false)
 	{
 		if ($clear_files) $this->included_files = array();
 
@@ -391,7 +391,7 @@ 
 	 * @param boolean $clear_files =false if true clear list of files after returning them
 	 * @return array
 	 */
-	public function get_included_files($clear_files=false)
+	public function get_included_files($clear_files = false)
 	{
 		$ret = array_keys($this->included_files);
 		if ($clear_files) $this->included_files = array();
@@ -424,7 +424,7 @@ 
 
 	$paths = !empty($_GET['path']) ? (array)$_GET['path'] : (array)'/stylite/js/filemanager/filemanager.js';
 
-	foreach($paths as $path)
+	foreach ($paths as $path)
 	{
 		echo "\t<h1>".htmlspecialchars($path)."</h1>\n";
 		$mgr->include_js_file($path);

Braces +16 added lines, -4 removed lines

@@ -80,7 +80,10 @@ 
 	private function parse_file($file)
 	{
 		// file is from url and can contain query-params, eg. /phpgwapi/inc/jscalendar-setup.php?dateformat=d.m.Y&lang=de
-		if (strpos($file,'?') !== false) list($file) = explode('?',$file);
+		if (strpos($file,'?') !== false)
+		{
+			list($file) = explode('?',$file);
+		}
 
 		// Mark the file as parsed
 		$this->parsed_files[$file] = true;
@@ -326,12 +329,15 @@ 
 			}
 		}
 
-		if (self::$DEBUG_MODE) // DEBUG_MODE is currently ALWAYS true. Comment this code out if you don't want error messages.
+		if (self::$DEBUG_MODE)
+		{
+			// DEBUG_MODE is currently ALWAYS true. Comment this code out if you don't want error messages.
 		{
 			//error_log(__METHOD__."($package,$file,$app) $path NOT found".($this->debug_processing_file ? " while processing file '{$this->debug_processing_file}'." : "!").' '.function_backtrace());
 		}
 
 		return false;
+		}
 	}
 
 	/**
@@ -377,7 +383,10 @@ 
 	 */
 	public function include_files(array $files, $clear_files=false)
 	{
-		if ($clear_files) $this->included_files = array();
+		if ($clear_files)
+		{
+			$this->included_files = array();
+		}
 
 		foreach ($files as $file)
 		{
@@ -394,7 +403,10 @@ 
 	public function get_included_files($clear_files=false)
 	{
 		$ret = array_keys($this->included_files);
-		if ($clear_files) $this->included_files = array();
+		if ($clear_files)
+		{
+			$this->included_files = array();
+		}
 		return $ret;
 	}
 

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,

Braces +16 added lines, -4 removed lines

@@ -65,7 +65,10 @@ 
 		foreach (array_keys($tutorials) as $app)
 		{
 			// show only apps user has access to them
-			if (in_array($app, array_keys($GLOBALS['egw_info']['user']['apps']))) $apps [$app] = $app;
+			if (in_array($app, array_keys($GLOBALS['egw_info']['user']['apps'])))
+			{
+				$apps [$app] = $app;
+			}
 		}
 		$sel_options = array(
 			'apps' => $apps,
@@ -122,7 +125,10 @@ 
 		{
 			$json = file_get_contents('http://www.egroupware.de/videos/tutorials.json');
 			// Fallback tutorials.json
-			if (!$json) $json = file_get_contents('api/setup/tutorials.json');
+			if (!$json)
+			{
+				$json = file_get_contents('api/setup/tutorials.json');
+			}
 			// Cache the json object for two hours
 			Api\Cache::setCache(Api\Cache::TREE, __CLASS__, 'egw_tutorial_json', $json, 7200);
 		}
@@ -136,10 +142,16 @@ 
 	 */
 	public static function tutorial_menu()
 	{
-		if (Api\Header\UserAgent::mobile()) return;
+		if (Api\Header\UserAgent::mobile())
+		{
+			return;
+		}
 		$tutorials = json_decode(self::getJsonData(),true);
 		$appname = $GLOBALS['egw_info']['flags']['currentapp'];
-		if (!is_array($tutorials[$appname])) return false;
+		if (!is_array($tutorials[$appname]))
+		{
+			return false;
+		}
 		if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable']
 			|| $GLOBALS['egw_info']['server']['egw_tutorial_disable'] == 'intro')
 		{

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

@@ -143,7 +143,7 @@
 		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/About.php

Spacing +18 added lines, -18 removed lines

@@ -69,7 +69,7 @@ 
 	 */
 	function index()
 	{
-		$text_content = str_replace('GPLLINK',self::$knownLicenses['GPL'][0],'
+		$text_content = str_replace('GPLLINK', self::$knownLicenses['GPL'][0], '
 <p><b>EGroupware is a <a href="GPLLINK" title="read more about open source and the GPL" target="_blank">free</a>
 enterprise ready groupware software</b> for your network. It enables you to manage contacts, appointments, todos
 and many more for your whole business.</p>
@@ -101,10 +101,10 @@ 
 		{
 			return strcasecmp($a['title'], $b['title']);
 		});
-		array_unshift($apps, false);	// first empty row for eTemplate
+		array_unshift($apps, false); // first empty row for eTemplate
 
 		// putting templates below apps
-		foreach($GLOBALS['egw']->framework->list_templates(true) as $info)
+		foreach ($GLOBALS['egw']->framework->list_templates(true) as $info)
 		{
 			$apps[] = $this->_getParsedTemplateInfo($info);
 		}
@@ -136,7 +136,7 @@ 
 	function _getParsedTemplateInfo($info)
 	{
 		// define the return array
-		$info['image'] = file_exists(EGW_SERVER_ROOT.'/'.$info['icon']) ? $GLOBALS['egw_info']['server']['webserver_url'].'/'.$info['icon'] : Api\Image::find('thisdoesnotexist',array('navbar','nonav'));
+		$info['image'] = file_exists(EGW_SERVER_ROOT.'/'.$info['icon']) ? $GLOBALS['egw_info']['server']['webserver_url'].'/'.$info['icon'] : Api\Image::find('thisdoesnotexist', array('navbar', 'nonav'));
 		$info['author'] = $this->_getHtmlPersonalInfo($info, 'author');
 		$info['maintainer'] = $this->_getHtmlPersonalInfo($info, 'maintainer');
 
@@ -157,10 +157,10 @@ 
 	function _getParsedAppInfo($app)
 	{
 		// we read all setup files once, as no every app has it's own file
-		static $setup_info=null;
+		static $setup_info = null;
 		if (is_null($setup_info))
 		{
-			foreach(array_keys($GLOBALS['egw_info']['apps']) as $_app)
+			foreach (array_keys($GLOBALS['egw_info']['apps']) as $_app)
 			{
 				if (file_exists($file = EGW_INCLUDE_ROOT.'/'.$_app.'/setup/setup.inc.php'))
 				{
@@ -168,14 +168,14 @@ 
 				}
 			}
 		}
-		if (!isset($setup_info[$app]) || !is_array($setup_info[$app])) return null;	// app got eg. removed in filesystem
+		if (!isset($setup_info[$app]) || !is_array($setup_info[$app])) return null; // app got eg. removed in filesystem
 
-		$app_info  = array_merge($GLOBALS['egw_info']['apps'][$app], $setup_info[$app]);
+		$app_info = array_merge($GLOBALS['egw_info']['apps'][$app], $setup_info[$app]);
 
 		// define the return array
 		$icon_app = isset($app_info['icon_app']) ? $app_info['icon_app'] : $app;
 		$icon = isset($app_info['icon']) ? $app_info['icon'] : 'navbar';
-		$ret = $app_info+array(
+		$ret = $app_info + array(
 			'app'           => $app,
 			'title'         => lang(!empty($app_info['title']) ? $app_info['title'] : $app),
 			'image'			=> Api\Image::find($icon_app, $icon) ? $icon_app.'/'.$app : 'api/nonav',
@@ -274,12 +274,12 @@ 
 	}
 
 	static public $knownLicenses = array(
-		'GPL'	=> array('http://opensource.org/licenses/gpl-license.php','GNU General Public License version 2.0 or (at your option) any later version'),
-		'GPL2'	=> array('http://opensource.org/licenses/gpl-2.0.php','GNU General Public License version 2.0'),
-		'GPL3'	=> array('http://opensource.org/licenses/gpl-3.0.php','GNU General Public License version 3.0'),
-		'LGPL'	=> array('http://opensource.org/licenses/lgpl-2.1.php','GNU Lesser General Public License, version 2.1'),
-		'LGPL3'	=> array('http://opensource.org/licenses/lgpl-3.0.php','GNU Lesser General Public License, version 3.0'),
-		'PHP'   => array('http://opensource.org/licenses/php.php','PHP License'),
+		'GPL'	=> array('http://opensource.org/licenses/gpl-license.php', 'GNU General Public License version 2.0 or (at your option) any later version'),
+		'GPL2'	=> array('http://opensource.org/licenses/gpl-2.0.php', 'GNU General Public License version 2.0'),
+		'GPL3'	=> array('http://opensource.org/licenses/gpl-3.0.php', 'GNU General Public License version 3.0'),
+		'LGPL'	=> array('http://opensource.org/licenses/lgpl-2.1.php', 'GNU Lesser General Public License, version 2.1'),
+		'LGPL3'	=> array('http://opensource.org/licenses/lgpl-3.0.php', 'GNU Lesser General Public License, version 3.0'),
+		'PHP'   => array('http://opensource.org/licenses/php.php', 'PHP License'),
 	);
 
 	/**
@@ -300,14 +300,14 @@ 
 
 		if (isset(self::$knownLicenses[strtoupper($name)]))
 		{
-			if (empty($url)) $url = self::$knownLicenses[$name=strtoupper($name)][0];
-			if (empty($title)) $title = self::$knownLicenses[$name=strtoupper($name)][1];
+			if (empty($url)) $url = self::$knownLicenses[$name = strtoupper($name)][0];
+			if (empty($title)) $title = self::$knownLicenses[$name = strtoupper($name)][1];
 		}
 
 		return array(
 			'license' => $name ? $name : 'none',
 			'license_url' => $url,
 			'license_title' => $title,
-		)+$info;
+		) + $info;
 	}
 }

Braces +53 added lines, -21 removed lines

@@ -168,7 +168,11 @@ 
 				}
 			}
 		}
-		if (!isset($setup_info[$app]) || !is_array($setup_info[$app])) return null;	// app got eg. removed in filesystem
+		if (!isset($setup_info[$app]) || !is_array($setup_info[$app]))
+		{
+			return null;
+		}
+		// app got eg. removed in filesystem
 
 		$app_info  = array_merge($GLOBALS['egw_info']['apps'][$app], $setup_info[$app]);
 
@@ -191,7 +195,10 @@ 
 		{
 			$ret['author'] = $this->_getHtmlPersonalInfo($setup_info[$app], 'author');
 			$ret['maintainer'] = $this->_getHtmlPersonalInfo($setup_info[$app], 'maintainer');
-			if ($app_info['version'] != $setup_info[$app]['version']) $ret['version'] .= ' ('.$setup_info[$app]['version'].')';
+			if ($app_info['version'] != $setup_info[$app]['version'])
+			{
+				$ret['version'] .= ' ('.$setup_info[$app]['version'].')';
+			}
 			$ret['license'] = $setup_info[$app]['license'];
 			$ret['description'] = $setup_info[$app]['description'];
 			$ret['note'] = $setup_info[$app]['note'];
@@ -216,39 +223,54 @@ 
 	{
 		$authors = array();
 			// get the author(s)
-			if ($setup_info[$f]) {
+			if ($setup_info[$f])
+			{
 				// author is set
-				if (!is_array($setup_info[$f])) {
+				if (!is_array($setup_info[$f]))
+				{
 					// author is no array
 					$authors[0]['name'] = $setup_info[$f];
-					if ($setup_info[$f.'_email']) {
+					if ($setup_info[$f.'_email'])
+					{
 						$authors[0]['email'] = $setup_info[$f.'_email'];
 					}
-					if ($setup_info[$f.'_url']) {
+					if ($setup_info[$f.'_url'])
+					{
 						$authors[0]['url'] = $setup_info[$f.'_url'];
 					}
 
-				} else {
+				}
+				else
+				{
 					// author is array
-					if ($setup_info[$f]['name']) {
+					if ($setup_info[$f]['name'])
+					{
 						// only one author
 						$authors[0]['name'] = $setup_info[$f]['name'];
-						if ($setup_info[$f]['email']) {
+						if ($setup_info[$f]['email'])
+						{
 							$authors[0]['email'] = $setup_info[$f]['email'];
 						}
-						if ($setup_info[$f]['url']) {
+						if ($setup_info[$f]['url'])
+						{
 							$authors[0]['url'] = $setup_info[$f]['url'];
 						}
-					} else {
+					}
+					else
+					{
 						// may be more authors
-						foreach (array_keys($setup_info[$f]) as $number) {
-							if ($setup_info[$f][$number]['name']) {
+						foreach (array_keys($setup_info[$f]) as $number)
+						{
+							if ($setup_info[$f][$number]['name'])
+							{
 									$authors[$number]['name'] = $setup_info[$f][$number]['name'];
 							}
-							if ($setup_info[$f][$number]['email']) {
+							if ($setup_info[$f][$number]['email'])
+							{
 									$authors[$number]['email'] = $setup_info[$f][$number]['email'];
 							}
-							if ($setup_info[$f][$number]['url']) {
+							if ($setup_info[$f][$number]['url'])
+							{
 									$authors[$number]['url'] = $setup_info[$f][$number]['url'];
 							}
 						}
@@ -258,15 +280,19 @@ 
 
 		// html format authors
 		$s = '';
-		foreach ($authors as $author) {
-			if ($s != '') {
+		foreach ($authors as $author)
+		{
+			if ($s != '')
+			{
 					$s .= '<br />';
 			}
 			$s .= lang('name').': '.$author['name'];
-			if ($author['email']) {
+			if ($author['email'])
+			{
 					$s .= '<br />'.lang('email').': <a href="mailto:'.$author['email'].'">'.$author['email'].'</a>';
 			}
-			if ($author['url']) {
+			if ($author['url'])
+			{
 					$s .= '<br />'.lang('url').': <a href="'.$author['url'].'" target="_blank">'.$author['url'].'</a>';
 			}
 		}
@@ -300,8 +326,14 @@ 
 
 		if (isset(self::$knownLicenses[strtoupper($name)]))
 		{
-			if (empty($url)) $url = self::$knownLicenses[$name=strtoupper($name)][0];
-			if (empty($title)) $title = self::$knownLicenses[$name=strtoupper($name)][1];
+			if (empty($url))
+			{
+				$url = self::$knownLicenses[$name=strtoupper($name)][0];
+			}
+			if (empty($title))
+			{
+				$title = self::$knownLicenses[$name=strtoupper($name)][1];
+			}
 		}
 
 		return array(

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;
 			}
 		}

Braces +22 added lines, -5 removed lines

@@ -74,7 +74,11 @@ 
 		$query = null;
 		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]))
 			{
@@ -133,17 +137,27 @@ 
 	{
 		$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 		// ignore not existing minurl
-		if (!empty($minurl) && !file_exists(EGW_SERVER_ROOT.$minurl)) $minurl = null;
+		if (!empty($minurl) && !file_exists(EGW_SERVER_ROOT.$minurl))
+		{
+			$minurl = null;
+		}
 		$to_include_first = $to_include = $to_minify = array();
 		$max_modified = 0;
 		$query = null;
 		foreach($js_includes as $path)
 		{
-			if ($path == '/api/js/jsapi/egw.js') continue; // Leave egw.js out of bundle
+			if ($path == '/api/js/jsapi/egw.js')
+			{
+				continue;
+			}
+			// Leave egw.js out of bundle
 			unset($query);
 			list($path,$query) = explode('?',$path,2);
 			$mod = filemtime(EGW_SERVER_ROOT.$path);
-			if ($mod > $max_modified) $max_modified = $mod;
+			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)
@@ -182,7 +196,10 @@ 
 			// need to include minified javascript before not minified stuff like jscalendar-setup, as it might depend on it
 			array_unshift($to_include, $path);
 		}
-		if ($to_include_first) $to_include = array_merge($to_include_first, $to_include);
+		if ($to_include_first)
+		{
+			$to_include = array_merge($to_include_first, $to_include);
+		}
 		//error_log(__METHOD__."("./*array2string($js_includes).*/", $max_modified, $minurl) returning ".array2string($to_include));
 		return $to_include;
 	}

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'];
 			}

Braces +4 added lines, -1 removed lines

@@ -164,9 +164,12 @@
 	{
 		// 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
-			!empty(self::$extra['refresh-opener'][1]) && !empty(self::$extra['refresh-opener'][2]))	// app/id given
+			!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)
 			{

api/src/Framework/Login.php

Indentation +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 	 *
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
-	*/
+	 */
 	function screen($extra_vars, $change_passwd=null)
 	{
 		Api\Header\ContentSecurityPolicy::add('frame-src', array());	// array() no external frame-sources
@@ -226,8 +226,8 @@ 
 	}
 
 	/**
-	* displays a login denied message
-	*/
+	 * displays a login denied message
+	 */
 	function denylogin_screen()
 	{
 		try {

Spacing +50 added lines, -50 removed lines

@@ -44,30 +44,30 @@ 
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
 	*/
-	function screen($extra_vars, $change_passwd=null)
+	function screen($extra_vars, $change_passwd = null)
 	{
-		Api\Header\ContentSecurityPolicy::add('frame-src', array());	// array() no external frame-sources
+		Api\Header\ContentSecurityPolicy::add('frame-src', array()); // array() no external frame-sources
 
 		//error_log(__METHOD__."() this->template=$this->framework->template, this->template_dir=$this->framework->template_dir, get_class(this)=".get_class($this));
 		try {
 			$tmpl = new Template(EGW_SERVER_ROOT.$this->framework->template_dir);
-			$tmpl->set_file(array('login_form' => Api\Header\UserAgent::mobile()?'login_mobile.tpl':'login.tpl'));
+			$tmpl->set_file(array('login_form' => Api\Header\UserAgent::mobile() ? 'login_mobile.tpl' : 'login.tpl'));
 		}
-		catch(Api\Exception\WrongParameter $e) {
+		catch (Api\Exception\WrongParameter $e) {
 			unset($e);
 			$tmpl = new Template(EGW_SERVER_ROOT.'/api/templates/default');
-			$tmpl->set_file(array('login_form' => Api\Header\UserAgent::mobile()?'login_mobile.tpl':'login.tpl'));
+			$tmpl->set_file(array('login_form' => Api\Header\UserAgent::mobile() ? 'login_mobile.tpl' : 'login.tpl'));
 		}
 
-		$tmpl->set_var('lang_message',$GLOBALS['loginscreenmessage']);
+		$tmpl->set_var('lang_message', $GLOBALS['loginscreenmessage']);
 
 		// hide change-password fields, if not requested
 		if (!$change_passwd)
 		{
-			$tmpl->set_block('login_form','change_password');
+			$tmpl->set_block('login_form', 'change_password');
 			$tmpl->set_var('change_password', '');
-			$tmpl->set_var('lang_password',lang('password'));
-			$tmpl->set_var('cd',check_logoutcode($_GET['cd']));
+			$tmpl->set_var('lang_password', lang('password'));
+			$tmpl->set_var('cd', check_logoutcode($_GET['cd']));
 			$tmpl->set_var('cd_class', isset($_GET['cd']) && $_GET['cd'] != 1 ? 'error' : '');
 			$last_loginid = $_COOKIE['last_loginid'];
 			$last_domain  = $_COOKIE['last_domain'];
@@ -76,9 +76,9 @@ 
 		}
 		else
 		{
-			$tmpl->set_var('lang_password',lang('Old password'));
-			$tmpl->set_var('lang_new_password',lang('New password'));
-			$tmpl->set_var('lang_repeat_password',lang('Repeat password'));
+			$tmpl->set_var('lang_password', lang('Old password'));
+			$tmpl->set_var('lang_new_password', lang('New password'));
+			$tmpl->set_var('lang_repeat_password', lang('Repeat password'));
 			$tmpl->set_var('cd', $change_passwd);
 			$tmpl->set_var('cd_class', 'error');
 			$last_loginid = $_POST['login'];
@@ -87,55 +87,55 @@ 
 			$tmpl->set_var('autofocus_login', '');
 			$tmpl->set_var('autofocus_new_passwd', 'autofocus');
 		}
-		if($GLOBALS['egw_info']['server']['show_domain_selectbox'])
+		if ($GLOBALS['egw_info']['server']['show_domain_selectbox'])
 		{
-			foreach(array_keys($GLOBALS['egw_domain']) as $domain)
+			foreach (array_keys($GLOBALS['egw_domain']) as $domain)
 			{
 				$domains[$domain] = $domain;
 			}
 			$tmpl->set_var(array(
 				'lang_domain'   => lang('domain'),
-				'select_domain' => Api\Html::select('logindomain',$last_domain,$domains,true,'tabindex="2"',0,false),
+				'select_domain' => Api\Html::select('logindomain', $last_domain, $domains, true, 'tabindex="2"', 0, false),
 			));
 		}
 		else
 		{
 			/* trick to make domain section disapear */
-			$tmpl->set_block('login_form','domain_selection');
-			$tmpl->set_var('domain_selection',$GLOBALS['egw_info']['user']['domain'] ?
-			Api\Html::input_hidden('logindomain',$GLOBALS['egw_info']['user']['domain']) : '');
+			$tmpl->set_block('login_form', 'domain_selection');
+			$tmpl->set_var('domain_selection', $GLOBALS['egw_info']['user']['domain'] ?
+			Api\Html::input_hidden('logindomain', $GLOBALS['egw_info']['user']['domain']) : '');
 
-			if($last_loginid !== '')
+			if ($last_loginid !== '')
 			{
 				reset($GLOBALS['egw_domain']);
 				list($default_domain) = each($GLOBALS['egw_domain']);
 
-				if(!empty ($last_domain) && $last_domain != $default_domain)
+				if (!empty ($last_domain) && $last_domain != $default_domain)
 				{
-					$last_loginid .= '@' . $last_domain;
+					$last_loginid .= '@'.$last_domain;
 				}
 			}
 		}
 
 		$config_reg = Api\Config::read('registration');
 
-		if($config_reg['enable_registration'])
+		if ($config_reg['enable_registration'])
 		{
 			if ($config_reg['register_link'])
 			{
-				$reg_link='&nbsp;<a href="'. $this->framework->link('/registration/index.php','lang_code='.$_GET['lang']). '">'.lang('Not a user yet? Register now').'</a><br/>';
+				$reg_link = '&nbsp;<a href="'.$this->framework->link('/registration/index.php', 'lang_code='.$_GET['lang']).'">'.lang('Not a user yet? Register now').'</a><br/>';
 			}
 			if ($config_reg['lostpassword_link'])
 			{
-				$lostpw_link='&nbsp;<a href="'. $this->framework->link('/registration/index.php','menuaction=registration.registration_ui.lost_password&lang_code='.$_GET['lang']). '">'.lang('Lost password').'</a><br/>';
+				$lostpw_link = '&nbsp;<a href="'.$this->framework->link('/registration/index.php', 'menuaction=registration.registration_ui.lost_password&lang_code='.$_GET['lang']).'">'.lang('Lost password').'</a><br/>';
 			}
 			if ($config_reg['lostid_link'])
 			{
-				$lostid_link='&nbsp;<a href="'. $this->framework->link('/registration/index.php','menuaction=registration.registration_ui.lost_username&lang_code='.$_GET['lang']). '">'.lang('Lost Login Id').'</a><br/>';
+				$lostid_link = '&nbsp;<a href="'.$this->framework->link('/registration/index.php', 'menuaction=registration.registration_ui.lost_username&lang_code='.$_GET['lang']).'">'.lang('Lost Login Id').'</a><br/>';
 			}
 
 			/* if at least one option of "registration" is activated display the registration section */
-			if($config_reg['register_link'] || $config_reg['lostpassword_link'] || $config_reg['lostid_link'] )
+			if ($config_reg['register_link'] || $config_reg['lostpassword_link'] || $config_reg['lostid_link'])
 			{
 				$tmpl->set_var(array(
 				'register_link'     => $reg_link,
@@ -146,20 +146,20 @@ 
 			else
 			{
 				/* trick to make registration section disapear */
-				$tmpl->set_block('login_form','registration');
-				$tmpl->set_var('registration','');
+				$tmpl->set_block('login_form', 'registration');
+				$tmpl->set_var('registration', '');
 			}
 		}
 
-		$tmpl->set_var('login_url', $GLOBALS['egw_info']['server']['webserver_url'] . '/login.php' . $extra_vars);
+		$tmpl->set_var('login_url', $GLOBALS['egw_info']['server']['webserver_url'].'/login.php'.$extra_vars);
 		$tmpl->set_var('version', $GLOBALS['egw_info']['server']['versions']['phpgwapi']);
 		$tmpl->set_var('login', $last_loginid);
 
-		$tmpl->set_var('lang_username',lang('username'));
-		$tmpl->set_var('lang_login',lang('login'));
+		$tmpl->set_var('lang_username', lang('username'));
+		$tmpl->set_var('lang_login', lang('login'));
 
 		$tmpl->set_var('website_title', $GLOBALS['egw_info']['server']['site_title']);
-		$tmpl->set_var('template_set',$this->framework->template);
+		$tmpl->set_var('template_set', $this->framework->template);
 
 		if (substr($GLOBALS['egw_info']['server']['login_logo_file'], 0, 4) == 'http' ||
 			$GLOBALS['egw_info']['server']['login_logo_file'][0] == '/')
@@ -168,14 +168,14 @@ 
 		}
 		else
 		{
-			$var['logo_file'] = Api\Image::find('api',$GLOBALS['egw_info']['server']['login_logo_file']?$GLOBALS['egw_info']['server']['login_logo_file']:'logo', '', null);	// null=explicit allow svg
+			$var['logo_file'] = Api\Image::find('api', $GLOBALS['egw_info']['server']['login_logo_file'] ? $GLOBALS['egw_info']['server']['login_logo_file'] : 'logo', '', null); // null=explicit allow svg
 		}
-		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url']?$GLOBALS['egw_info']['server']['login_logo_url']:'http://www.egroupware.org';
-		if (substr($var['logo_url'],0,4) != 'http')
+		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url'] ? $GLOBALS['egw_info']['server']['login_logo_url'] : 'http://www.egroupware.org';
+		if (substr($var['logo_url'], 0, 4) != 'http')
 		{
 			$var['logo_url'] = 'http://'.$var['logo_url'];
 		}
-		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title']?$GLOBALS['egw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title'] ? $GLOBALS['egw_info']['server']['login_logo_title'] : 'www.eGroupWare.org';
 		$tmpl->set_var($var);
 
 		/* language section if activated in site Config */
@@ -183,14 +183,14 @@ 
 		{
 			$tmpl->set_var(array(
 				'lang_language' => lang('Language'),
-				'select_language' => Api\Html::select('lang',$GLOBALS['egw_info']['user']['preferences']['common']['lang'],
-				Api\Translation::get_installed_langs(),true,'tabindex="1"',0,false),
+				'select_language' => Api\Html::select('lang', $GLOBALS['egw_info']['user']['preferences']['common']['lang'],
+				Api\Translation::get_installed_langs(), true, 'tabindex="1"', 0, false),
 			));
 		}
 		else
 		{
-			$tmpl->set_block('login_form','language_select');
-			$tmpl->set_var('language_select','');
+			$tmpl->set_block('login_form', 'language_select');
+			$tmpl->set_var('language_select', '');
 		}
 
 		/********************************************************\
@@ -198,31 +198,31 @@ 
 		* and place a time selectbox, how long cookie is valid   *
 		\********************************************************/
 
-		if($GLOBALS['egw_info']['server']['allow_cookie_auth'])
+		if ($GLOBALS['egw_info']['server']['allow_cookie_auth'])
 		{
-			$tmpl->set_block('login_form','remember_me_selection');
-			$tmpl->set_var('lang_remember_me',lang('Remember me'));
-			$tmpl->set_var('select_remember_me',Api\Html::select('remember_me', '', array(
+			$tmpl->set_block('login_form', 'remember_me_selection');
+			$tmpl->set_var('lang_remember_me', lang('Remember me'));
+			$tmpl->set_var('select_remember_me', Api\Html::select('remember_me', '', array(
 				'' => lang('not'),
 				'1hour' => lang('1 Hour'),
 				'1day' => lang('1 Day'),
 				'1week'=> lang('1 Week'),
 				'1month' => lang('1 Month'),
 				'forever' => lang('Forever'),
-			),true,'tabindex="3"',0,false));
+			), true, 'tabindex="3"', 0, false));
 		}
 		else
 		{
 			/* trick to make remember_me section disapear */
-			$tmpl->set_block('login_form','remember_me_selection');
-			$tmpl->set_var('remember_me_selection','');
+			$tmpl->set_block('login_form', 'remember_me_selection');
+			$tmpl->set_var('remember_me_selection', '');
 		}
 		$tmpl->set_var('autocomplete', ($GLOBALS['egw_info']['server']['autocomplete_login'] ? 'autocomplete="off"' : ''));
 
 		// load jquery for login screen too
 		Api\Framework::includeJS('jquery', 'jquery');
 
-		$this->framework->render($tmpl->fp('loginout','login_form'),false,false);
+		$this->framework->render($tmpl->fp('loginout', 'login_form'), false, false);
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 			$tmpl = new Template(EGW_SERVER_ROOT.$this->framework->template_dir);
 			$tmpl->set_file(array('login_form' => 'login_denylogin.tpl'));
 		}
-		catch(Api\Exception\WrongParameter $e) {
+		catch (Api\Exception\WrongParameter $e) {
 			unset($e);
 			$tmpl = new Template(EGW_SERVER_ROOT.'/api/templates/default');
 			$tmpl->set_file(array('login_form' => 'login_denylogin.tpl'));
@@ -249,6 +249,6 @@ 
 		// load jquery for deny-login screen too
 		Api\Framework::includeJS('jquery', 'jquery');
 
-		$this->framework->render($tmpl->fp('loginout','login_form'),false,false);
+		$this->framework->render($tmpl->fp('loginout', 'login_form'), false, false);
 	}
  }

api/src/Framework/Ajax.php

Indentation +18 added lines, -18 removed lines

@@ -337,16 +337,16 @@ 
 	}
 
 	/**
-	* called by hooks to add an icon in the topmenu info location
-	*
-	* @param string $id unique element id
-	* @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
-	* @param string $iconlink where the icon links to
-	* @param booleon $blink set true to make the icon blink
-	* @param mixed $tooltip string containing the tooltip Api\Html, or null of no tooltip
-	* @todo implement in a reasonable way for jdots
-	* @return void
-	*/
+	 * called by hooks to add an icon in the topmenu info location
+	 *
+	 * @param string $id unique element id
+	 * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
+	 * @param string $iconlink where the icon links to
+	 * @param booleon $blink set true to make the icon blink
+	 * @param mixed $tooltip string containing the tooltip Api\Html, or null of no tooltip
+	 * @todo implement in a reasonable way for jdots
+	 * @return void
+	 */
 	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
 	{
 		unset($id,$icon_src,$iconlink,$blink,$tooltip);	// not used
@@ -354,14 +354,14 @@ 
 	}
 
 	/**
-	* Add menu items to the topmenu template class to be displayed
-	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
-	*/
+	 * Add menu items to the topmenu template class to be displayed
+	 *
+	 * @param array $app application data
+	 * @param mixed $alt_label string with alternative menu item label default value = null
+	 * @param string $urlextra string with alternate additional code inside <a>-tag
+	 * @access protected
+	 * @return void
+	 */
 	function _add_topmenu_item(array $app_data,$alt_label=null)
 	{
 		switch($app_data['name'])

Spacing +76 added lines, -76 removed lines

@@ -57,11 +57,11 @@ 
 	 *
 	 * @param string $template = '' name of the template
 	 */
-	function __construct($template=self::APP)
+	function __construct($template = self::APP)
 	{
-		parent::__construct($template);		// call the constructor of the extended class
+		parent::__construct($template); // call the constructor of the extended class
 
-		$this->template_dir = '/'.$template;		// we are packaged as an application
+		$this->template_dir = '/'.$template; // we are packaged as an application
 	}
 
 	/**
@@ -129,16 +129,16 @@ 
 	public static function app_from_url($url)
 	{
 		$matches = null;
-		if (preg_match('/menuaction=([a-z0-9_-]+)\./i',$url,$matches))
+		if (preg_match('/menuaction=([a-z0-9_-]+)\./i', $url, $matches))
 		{
 			return $matches[1];
 		}
 		if ($GLOBALS['egw_info']['server']['webserver_url'] &&
-			($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'],PHP_URL_PATH)))
+			($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'], PHP_URL_PATH)))
 		{
-			list(,$url) = explode($webserver_path, parse_url($url,PHP_URL_PATH),2);
+			list(,$url) = explode($webserver_path, parse_url($url, PHP_URL_PATH), 2);
 		}
-		if (preg_match('/\/([^\/]+)\/([^\/]+\.php)?(\?|\/|$)/',$url,$matches))
+		if (preg_match('/\/([^\/]+)\/([^\/]+\.php)?(\?|\/|$)/', $url, $matches))
 		{
 			return $matches[1];
 		}
@@ -154,7 +154,7 @@ 
 	 * @param string $link_app = null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function link($url = '', $extravars = '', $link_app=null)
+	static function link($url = '', $extravars = '', $link_app = null)
 	{
 		if (is_null($link_app)) $link_app = self::$link_app;
 		$link = parent::link($url, $extravars);
@@ -165,7 +165,7 @@ 
 			// Link gets handled in JS, so quotes need slashes as well as url-encoded
 			// encoded ampersands in get parameters (%26) need to be encoded twise,
 			// so they are still encoded when assigned to window.location
-			$link_with_slashes = str_replace(array('%27','%26'), array('\%27','%2526'), $link);
+			$link_with_slashes = str_replace(array('%27', '%26'), array('\%27', '%2526'), $link);
 
 			//$link = "javascript:window.egw_link_handler?egw_link_handler('$link','$link_app'):parent.egw_link_handler('$link','$link_app');";
 			$link = "javascript:egw_link_handler('$link_with_slashes','$link_app')";
@@ -183,7 +183,7 @@ 
 	protected function _get_csp_frame_src()
 	{
 		$srcs = array();
-		foreach(Api\Hooks::process('csp-frame-src') as $src)
+		foreach (Api\Hooks::process('csp-frame-src') as $src)
 		{
 			if ($src) $srcs = array_merge($srcs, $src);
 		}
@@ -196,7 +196,7 @@ 
 	 * @param array $extra = array() extra attributes passed as data-attribute to egw.js
 	 * @return string with Api\Html
 	 */
-	function header(array $extra=array())
+	function header(array $extra = array())
 	{
 		// make sure header is output only once
 		if (self::$header_done) return '';
@@ -221,8 +221,8 @@ 
 		{
 			$this->tpl->set_file(array('_head' => 'head.tpl'));
 		}
-		$this->tpl->set_block('_head','head');
-		$this->tpl->set_block('_head','framework');
+		$this->tpl->set_block('_head', 'head');
+		$this->tpl->set_block('_head', 'framework');
 
 		// should we draw the framework, or just a header
 		$do_framework = isset($_GET['cd']) && $_GET['cd'] === 'yes';
@@ -247,7 +247,7 @@ 
 			{
 				self::includeJS('.', 'fw_'.static::APP, static::JS_INCLUDE_APP);
 			}
-			Api\Cache::unsetSession(__CLASS__,'sidebox_md5');	// sideboxes need to be send again
+			Api\Cache::unsetSession(__CLASS__, 'sidebox_md5'); // sideboxes need to be send again
 
 			$extra['navbar-apps'] = $this->get_navbar_apps($_SERVER['REQUEST_URI']);
 		}
@@ -256,7 +256,7 @@ 
 		// - if not we need to check if we have an opener (are a popup window)
 		// - as popups can open further popups, we need to decend all the way down until we find a framework
 		// - only if we cant find a framework in all openers, we redirect to create a new framework
-		if(!$do_framework)
+		if (!$do_framework)
 		{
 			// fetch sidebox from application and set it in extra data, if we are no popup
 			if (!$GLOBALS['egw_info']['flags']['nonavbar'])
@@ -266,12 +266,12 @@ 
 			// for remote manual never check/create framework
 			if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('manual', 'login', 'logout', 'sitemgr')))
 			{
-				if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script']='';
+				if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script'] = '';
 				$extra['check-framework'] = $_GET['cd'] !== 'no';
 			}
 		}
 		$this->tpl->set_var($this->_get_header($extra));
-		$content = $this->tpl->fp('out','head').$content;
+		$content = $this->tpl->fp('out', 'head').$content;
 
 		if (!$do_framework)
 		{
@@ -280,10 +280,10 @@ 
 
 		// topmenu
 		$vars = $this->_get_navbar($apps = $this->_get_navbar_apps());
-		$this->tpl->set_var($this->topmenu($vars,$apps));
+		$this->tpl->set_var($this->topmenu($vars, $apps));
 
 		// hook after_navbar (eg. notifications)
-		$this->tpl->set_var('hook_after_navbar',$this->_get_after_navbar());
+		$this->tpl->set_var('hook_after_navbar', $this->_get_after_navbar());
 
 		//Global sidebar width
 		$this->tpl->set_var('sidebox_width', self::get_global_sidebar_width());
@@ -300,7 +300,7 @@ 
 
 		// add framework div's
 		$this->tpl->set_var($this->_get_footer());
-		$content .= $this->tpl->fp('out','framework');
+		$content .= $this->tpl->fp('out', 'framework');
 		$content .= self::footer(false);
 
 		echo $content;
@@ -319,14 +319,14 @@ 
 	 * @param array $apps
 	 * @return array
 	 */
-	function topmenu(array $vars,array $apps)
+	function topmenu(array $vars, array $apps)
 	{
 		$this->topmenu_items = $this->topmenu_info_items = array();
 
-		parent::topmenu($vars,$apps);
-		$vars['topmenu_items'] = "<ul>\n<li>".implode("</li>\n<li>",$this->topmenu_items)."</li>\n</ul>";
+		parent::topmenu($vars, $apps);
+		$vars['topmenu_items'] = "<ul>\n<li>".implode("</li>\n<li>", $this->topmenu_items)."</li>\n</ul>";
 		$vars['topmenu_info_items'] = '';
-		foreach($this->topmenu_info_items as $id => $item)
+		foreach ($this->topmenu_info_items as $id => $item)
 		{
 			$vars['topmenu_info_items'] .= '<div class="topmenu_info_item"'.
 				(is_numeric($id) ? '' : ' id="topmenu_info_'.$id.'"').'>'.$item."</div>\n";
@@ -347,9 +347,9 @@ 
 	* @todo implement in a reasonable way for jdots
 	* @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);	// not used
+		unset($id, $icon_src, $iconlink, $blink, $tooltip); // not used
 		// not yet implemented, only used in admin/inc/hook_topmenu_info.inc.php to notify about pending updates
 	}
 
@@ -362,9 +362,9 @@ 
 	* @access protected
 	* @return void
 	*/
-	function _add_topmenu_item(array $app_data,$alt_label=null)
+	function _add_topmenu_item(array $app_data, $alt_label = null)
 	{
-		switch($app_data['name'])
+		switch ($app_data['name'])
 		{
 			case 'logout':
 				if (Api\Header\UserAgent::mobile() || $GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'mobile')
@@ -373,7 +373,7 @@ 
 				}
 				else
 				{
-					return;	// no need for logout in topmenu on jdots
+					return; // no need for logout in topmenu on jdots
 				}
 				break;
 
@@ -382,7 +382,7 @@ 
 				break;
 
 			default:
-				if (strpos($app_data['url'],'logout.php') === false && substr($app_data['url'], 0, 11) != 'javascript:')
+				if (strpos($app_data['url'], 'logout.php') === false && substr($app_data['url'], 0, 11) != 'javascript:')
 				{
 					$app_data['url'] = "javascript:egw_link_handler('".$app_data['url']."','".
 						(isset($GLOBALS['egw_info']['user']['apps'][$app_data['name']]) ?
@@ -390,8 +390,8 @@ 
 				}
 		}
 		$id = $app_data['id'] ? $app_data['id'] : ($app_data['name'] ? $app_data['name'] : $app_data['title']);
-		$title =  htmlspecialchars($alt_label ? $alt_label : $app_data['title']);
-		$this->topmenu_items[] = '<a id="topmenu_' . $id . '" href="'.htmlspecialchars($app_data['url']).'" title="'.$app_data['title'].'">'.$title.'</a>';
+		$title = htmlspecialchars($alt_label ? $alt_label : $app_data['title']);
+		$this->topmenu_items[] = '<a id="topmenu_'.$id.'" href="'.htmlspecialchars($app_data['url']).'" title="'.$app_data['title'].'">'.$title.'</a>';
 	}
 
 	/**
@@ -402,11 +402,11 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	function _add_topmenu_info_item($content, $id=null)
+	function _add_topmenu_info_item($content, $id = null)
 	{
-		if(strpos($content,'menuaction=admin.admin_accesslog.sessions') !== false)
+		if (strpos($content, 'menuaction=admin.admin_accesslog.sessions') !== false)
 		{
-			$content = preg_replace('/href="([^"]+)"/',"href=\"javascript:egw_link_handler('\\1','admin')\"",$content);
+			$content = preg_replace('/href="([^"]+)"/', "href=\"javascript:egw_link_handler('\\1','admin')\"", $content);
 		}
 		if ($id)
 		{
@@ -425,10 +425,10 @@ 
 	 */
 	static function ajax_tz_selection($tz)
 	{
-		Api\DateTime::setUserPrefs($tz);	// throws exception, if tz is invalid
+		Api\DateTime::setUserPrefs($tz); // throws exception, if tz is invalid
 
 		$GLOBALS['egw']->preferences->read_repository();
-		$GLOBALS['egw']->preferences->add('common','tz',$tz);
+		$GLOBALS['egw']->preferences->add('common', 'tz', $tz);
 		$GLOBALS['egw']->preferences->save_repository();
 	}
 
@@ -480,13 +480,13 @@ 
 		// only send admin sidebox, for admin index url (when clicked on admin),
 		// not for other admin pages, called eg. from sidebox menu of other apps
 		// --> that way we always stay in the app, and NOT open admin sidebox for an app tab!!!
-		if ($app == 'admin' && substr($_SERVER['PHP_SELF'],-16) != '/admin/index.php' &&
+		if ($app == 'admin' && substr($_SERVER['PHP_SELF'], -16) != '/admin/index.php' &&
 			$_GET['menuaction'] != 'admin.admin_ui.index')
 		{
 			//error_log(__METHOD__."() app=$app, menuaction=$_GET[menuaction], PHP_SELF=$_SERVER[PHP_SELF] --> sidebox request ignored");
 			return;
 		}
-		$md5_session =& Api\Cache::getSession(__CLASS__,'sidebox_md5');
+		$md5_session = & Api\Cache::getSession(__CLASS__, 'sidebox_md5');
 
 		//Set the sidebox content
 		$sidebox = $this->get_sidebox($app);
@@ -495,7 +495,7 @@ 
 		if ($md5_session[$app] !== $md5)
 		{
 			//error_log(__METHOD__."() header changed md5_session[$app]!=='$md5' --> setting it on self::\$extra[setSidebox]");
-			$md5_session[$app] = $md5;	// update md5 in session
+			$md5_session[$app] = $md5; // update md5 in session
 			self::$extra['setSidebox'] = array($app, $sidebox, $md5);
 		}
 		//else error_log(__METHOD__."() md5_session[$app]==='$md5' --> nothing to do");
@@ -509,9 +509,9 @@ 
 	 * @return boolean $consider_navbar_not_yet_called_as_true=true ignored by jdots, we only care for cd=yes GET param
 	 * @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);	// not used
+		unset($consider_navbar_not_yet_called_as_true); // not used
 		return isset($_GET['cd']) && $_GET['cd'] === 'yes';
 	}
 
@@ -537,7 +537,7 @@ 
 	 * @param array $file
 	 * @param string $type = null 'admin', 'preferences', 'favorites', ...
 	 */
-	public function sidebox($appname,$menu_title,$file,$type=null)
+	public function sidebox($appname, $menu_title, $file, $type = null)
 	{
 		if (!isset($file['menuOpened'])) $file['menuOpened'] = (boolean)$this->sidebox_menu_opened;
 		//error_log(__METHOD__."('$appname', '$menu_title', file[menuOpened]=$file[menuOpened], ...) this->sidebox_menu_opened=$this->sidebox_menu_opened");
@@ -547,7 +547,7 @@ 
 		if (($type == 'admin' || $menu_title == lang('Admin')) && $appname != 'admin')
 		{
 			$file = preg_replace("/^(javascript:egw_link_handler\(')(.*)menuaction=([^&]+)(.*)(','[^']+'\))$/",
-				'$1$2menuaction=admin.admin_ui.index&load=$3$4&ajax=true\',\'admin\')', $file_was=$file);
+				'$1$2menuaction=admin.admin_ui.index&load=$3$4&ajax=true\',\'admin\')', $file_was = $file);
 		}
 
 		$this->sideboxes[$appname][$menu_title] = $file;
@@ -582,15 +582,15 @@ 
 			self::$link_app = $appname;
 			// allow other apps to hook into sidebox menu of an app, hook-name: sidebox_$appname
 			$this->sidebox_menu_opened = true;
-			Api\Hooks::process('sidebox_'.$appname,array($appname),true);	// true = call independent of app-permissions
+			Api\Hooks::process('sidebox_'.$appname, array($appname), true); // true = call independent of app-permissions
 
 			// calling the old hook
 			$this->sidebox_menu_opened = true;
-			Api\Hooks::single('sidebox_menu',$appname);
+			Api\Hooks::single('sidebox_menu', $appname);
 			self::$link_app = null;
 
 			// allow other apps to hook into sidebox menu of every app: sidebox_all
-			Api\Hooks::process('sidebox_all',array($GLOBALS['egw_info']['flags']['currentapp']),true);
+			Api\Hooks::process('sidebox_all', array($GLOBALS['egw_info']['flags']['currentapp']), true);
 		}
 		//If there still is no sidebox content, return null here
 		if (!isset($this->sideboxes[$appname]))
@@ -599,17 +599,17 @@ 
 		}
 
 		$data = array();
-		foreach($this->sideboxes[$appname] as $menu_name => &$file)
+		foreach ($this->sideboxes[$appname] as $menu_name => &$file)
 		{
 			$current_menu = array(
-				'menu_name' => md5($menu_name),	// can contain Api\Html tags and javascript!
+				'menu_name' => md5($menu_name), // can contain Api\Html tags and javascript!
 				'title' => $menu_name,
 				'entries' => array(),
 				'opened' => (boolean)$file['menuOpened'],
 			);
-			foreach($file as $item_text => $item_link)
+			foreach ($file as $item_text => $item_link)
 			{
-				if ($item_text === 'menuOpened' ||	// flag, not menu entry
+				if ($item_text === 'menuOpened' || // flag, not menu entry
 					$item_text === '_NewLine_' || $item_link === '_NewLine_')
 				{
 					continue;
@@ -620,14 +620,14 @@ 
 				}
 
 				$var = array();
-				$var['icon_or_star'] = $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images/bullet.png';
+				$var['icon_or_star'] = $GLOBALS['egw_info']['server']['webserver_url'].$this->template_dir.'/images/bullet.png';
 				$var['target'] = '';
-				if(is_array($item_link))
+				if (is_array($item_link))
 				{
-					if(isset($item_link['icon']))
+					if (isset($item_link['icon']))
 					{
 						$app = isset($item_link['app']) ? $item_link['app'] : $appname;
-						$var['icon_or_star'] = $item_link['icon'] ? Api\Image::find($app,$item_link['icon']) : False;
+						$var['icon_or_star'] = $item_link['icon'] ? Api\Image::find($app, $item_link['icon']) : False;
 					}
 					$var['lang_item'] = isset($item_link['no_lang']) && $item_link['no_lang'] ? $item_link['text'] : lang($item_link['text']);
 					$var['item_link'] = $item_link['link'];
@@ -663,7 +663,7 @@ 
 	public static function ajax_tab_changed_state($tablist)
 	{
 		$tabs = array();
-		foreach($tablist as $data)
+		foreach ($tablist as $data)
 		{
 			$tabs[] = $data['appName'];
 			if ($data['active']) $active = $data['appName'];
@@ -672,7 +672,7 @@ 
 		// used eg. in phpFreeChat to leave the chat
 		if (($old_tabs = Api\Cache::getSession(__CLASS__, 'open_tabs')))
 		{
-			foreach(array_diff(explode(',',$old_tabs),$tabs) as $app)
+			foreach (array_diff(explode(',', $old_tabs), $tabs) as $app)
 			{
 				//error_log("Tab '$app' closed, old_tabs=$old_tabs");
 				Api\Hooks::single(array(
@@ -681,7 +681,7 @@ 
 				), $app);
 			}
 		}
-		$open = implode(',',$tabs);
+		$open = implode(',', $tabs);
 
 		if ($open != $GLOBALS['egw_info']['user']['preferences']['common']['open_tabs'] ||
 			$active != $GLOBALS['egw_info']['user']['preferences']['common']['active_tab'])
@@ -748,7 +748,7 @@ 
 		$i = 0;
 
 		//Parse the "$apps" array for valid content (security)
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			//Check whether the app really exists and add it to the $app_arr var
 			if ($GLOBALS['egw_info']['user']['apps'][$app])
@@ -779,17 +779,17 @@ 
 	 */
 	public function navbar_apps()
 	{
-		$apps = parent::_get_navbar_apps(Api\Image::svg_usable());	// use svg if usable in browser
+		$apps = parent::_get_navbar_apps(Api\Image::svg_usable()); // use svg if usable in browser
 
 		//Add its sidebox width to each app
 		foreach ($apps as $app => &$data)
 		{
 			$data['sideboxwidth'] = self::get_sidebar_width($app);
 			// overwrite icon with svg, if supported by browser
-			unset($data['icon_hover']);	// not used in jdots
+			unset($data['icon_hover']); // not used in jdots
 		}
 
-		unset($apps['logout']);	// never display it
+		unset($apps['logout']); // never display it
 		if (isset($apps['about'])) $apps['about']['noNavbar'] = true;
 		if (isset($apps['preferences'])) $apps['preferences']['noNavbar'] = true;
 		if (isset($apps['manual'])) $apps['manual']['noNavbar'] = true;
@@ -839,7 +839,7 @@ 
 		}
 
 		// check if user called a specific url --> open it as active tab
-		$last_direct_url =& Api\Cache::getSession(__CLASS__, 'last_direct_url');
+		$last_direct_url = & Api\Cache::getSession(__CLASS__, 'last_direct_url');
 		if ($url !== $last_direct_url)
 		{
 			$active_tab = $url_tab = self::app_from_url($url);
@@ -852,9 +852,9 @@ 
 		if ($active_tab && array_key_exists($active_tab, $apps))
 		{
 			// Do not remove cd=yes if it's an ajax=true app
-			if (strpos( $apps[$active_tab]['url'],'ajax=true') !== False)
+			if (strpos($apps[$active_tab]['url'], 'ajax=true') !== False)
 			{
-				$url = preg_replace('/[&?]cd=yes/','',$url);
+				$url = preg_replace('/[&?]cd=yes/', '', $url);
 			}
 			$apps[$active_tab]['openOnce'] = $url;
 			$store_prefs = true;
@@ -869,8 +869,8 @@ 
 		{
 			$open_tabs = $GLOBALS['egw_info']['user']['preferences']['common']['open_tabs'];
 		}
-		$open_tabs = $open_tabs ? explode(',',$open_tabs) : array();
-		if ($active_tab && !in_array($active_tab,$open_tabs))
+		$open_tabs = $open_tabs ? explode(',', $open_tabs) : array();
+		if ($active_tab && !in_array($active_tab, $open_tabs))
 		{
 			$open_tabs[] = $active_tab;
 			$store_prefs = true;
@@ -878,14 +878,14 @@ 
 		if ($store_prefs)
 		{
 			$GLOBALS['egw']->preferences->read_repository();
-			$GLOBALS['egw']->preferences->add('common', 'open_tabs', implode(',',$open_tabs));
+			$GLOBALS['egw']->preferences->add('common', 'open_tabs', implode(',', $open_tabs));
 			$GLOBALS['egw']->preferences->add('common', 'active_tab', $active_tab);
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
 
 		//error_log(__METHOD__."('$url') url_tab='$url_tab', active_tab=$active_tab, open_tabs=".array2string($open_tabs));
 		// Restore Tabs
-		foreach($open_tabs as $n => $app)
+		foreach ($open_tabs as $n => $app)
 		{
 			if (isset($apps[$app]))		// user might no longer have app rights
 			{
@@ -912,10 +912,10 @@ 
 	 * @param boolean $no_framework = true
 	 * @return string
 	 */
-	function footer($no_framework=true)
+	function footer($no_framework = true)
 	{
 		//error_log(__METHOD__."($no_framework) footer_done=".array2string(self::$footer_done).' '.function_backtrace());
-		if (self::$footer_done) return;	// prevent (multiple) footers
+		if (self::$footer_done) return; // prevent (multiple) footers
 		self::$footer_done = true;
 
 		if (!isset($GLOBALS['egw_info']['flags']['nofooter']) || !$GLOBALS['egw_info']['flags']['nofooter'])
@@ -927,7 +927,7 @@ 
 			}
 		}
 		return $footer.
-			$GLOBALS['egw_info']['flags']['need_footer']."\n".	// eg. javascript, which need to be at the end of the page
+			$GLOBALS['egw_info']['flags']['need_footer']."\n".// eg. javascript, which need to be at the end of the page
 			"</body>\n</html>\n";
 	}
 
@@ -965,15 +965,15 @@ 
 		if ($parts['query'])
 		{
 			$_SERVER['REQUEST_URI'] = '?'.$parts['query'];
-			parse_str($parts['query'],$_GET);
-			$_REQUEST = $_GET;	// some apps use $_REQUEST to check $_GET or $_POST
+			parse_str($parts['query'], $_GET);
+			$_REQUEST = $_GET; // some apps use $_REQUEST to check $_GET or $_POST
 		}
 
 		if (!isset($_GET['menuaction']))
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."('$link') no menuaction set!");
 		}
-		list($app,$class,$method) = explode('.',$_GET['menuaction']);
+		list($app, $class, $method) = explode('.', $_GET['menuaction']);
 
 		if (!isset($GLOBALS['egw_info']['user']['apps'][$app]))
 		{
@@ -985,7 +985,7 @@ 
 
 		$GLOBALS[$class] = $obj = CreateObject($app.'.'.$class);
 
-		if(!is_array($obj->public_functions) || !$obj->public_functions[$method])
+		if (!is_array($obj->public_functions) || !$obj->public_functions[$method])
 		{
 			throw new Api\Exception\NoPermission("Bad menuaction {$_GET['menuaction']}, not listed in public_functions!");
 		}

Doc Comments -5 removed lines

@@ -103,11 +103,6 @@
 	/**
 	* Add menu items to the topmenu template class to be displayed
 	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
 	*/
 	function _add_topmenu_item(array $app_data,$alt_label=null)
 	{

Braces +56 added lines, -14 removed lines

@@ -104,7 +104,9 @@ 
 
 		//Width may not be smaller than MIN_SIDEBAR_WIDTH
 		if ($width < self::MIN_SIDEBAR_WIDTH)
-			$width = self::MIN_SIDEBAR_WIDTH;
+		{
+					$width = self::MIN_SIDEBAR_WIDTH;
+		}
 
 		return $width;
 	}
@@ -156,7 +158,10 @@ 
 	 */
 	static function link($url = '', $extravars = '', $link_app=null)
 	{
-		if (is_null($link_app)) $link_app = self::$link_app;
+		if (is_null($link_app))
+		{
+			$link_app = self::$link_app;
+		}
 		$link = parent::link($url, $extravars);
 
 		// $link_app === true --> detect application, otherwise use given application
@@ -185,7 +190,10 @@ 
 		$srcs = array();
 		foreach(Api\Hooks::process('csp-frame-src') as $src)
 		{
-			if ($src) $srcs = array_merge($srcs, $src);
+			if ($src)
+			{
+				$srcs = array_merge($srcs, $src);
+			}
 		}
 		return $srcs;
 	}
@@ -199,7 +207,10 @@ 
 	function header(array $extra=array())
 	{
 		// make sure header is output only once
-		if (self::$header_done) return '';
+		if (self::$header_done)
+		{
+			return '';
+		}
 		self::$header_done = true;
 
 		$this->send_headers();
@@ -266,7 +277,10 @@ 
 			// for remote manual never check/create framework
 			if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('manual', 'login', 'logout', 'sitemgr')))
 			{
-				if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script']='';
+				if (empty($GLOBALS['egw_info']['flags']['java_script']))
+				{
+					$GLOBALS['egw_info']['flags']['java_script']='';
+				}
 				$extra['check-framework'] = $_GET['cd'] !== 'no';
 			}
 		}
@@ -539,7 +553,10 @@ 
 	 */
 	public function sidebox($appname,$menu_title,$file,$type=null)
 	{
-		if (!isset($file['menuOpened'])) $file['menuOpened'] = (boolean)$this->sidebox_menu_opened;
+		if (!isset($file['menuOpened']))
+		{
+			$file['menuOpened'] = (boolean)$this->sidebox_menu_opened;
+		}
 		//error_log(__METHOD__."('$appname', '$menu_title', file[menuOpened]=$file[menuOpened], ...) this->sidebox_menu_opened=$this->sidebox_menu_opened");
 		$this->sidebox_menu_opened = false;
 
@@ -666,7 +683,10 @@ 
 		foreach($tablist as $data)
 		{
 			$tabs[] = $data['appName'];
-			if ($data['active']) $active = $data['appName'];
+			if ($data['active'])
+			{
+				$active = $data['appName'];
+			}
 		}
 		// send app a notification, that it's tab got closed
 		// used eg. in phpFreeChat to leave the chat
@@ -790,10 +810,22 @@ 
 		}
 
 		unset($apps['logout']);	// never display it
-		if (isset($apps['about'])) $apps['about']['noNavbar'] = true;
-		if (isset($apps['preferences'])) $apps['preferences']['noNavbar'] = true;
-		if (isset($apps['manual'])) $apps['manual']['noNavbar'] = true;
-		if (isset($apps['home'])) $apps['home']['noNavbar'] = true;
+		if (isset($apps['about']))
+		{
+			$apps['about']['noNavbar'] = true;
+		}
+		if (isset($apps['preferences']))
+		{
+			$apps['preferences']['noNavbar'] = true;
+		}
+		if (isset($apps['manual']))
+		{
+			$apps['manual']['noNavbar'] = true;
+		}
+		if (isset($apps['home']))
+		{
+			$apps['home']['noNavbar'] = true;
+		}
 
 		// no need for website icon, if we have sitemgr
 		if (isset($apps['sitemgr']) && isset($apps['sitemgr-link']))
@@ -862,7 +894,10 @@ 
 		else
 		{
 			$active_tab = $GLOBALS['egw_info']['user']['preferences']['common']['active_tab'];
-			if (!$active_tab) $active_tab = $default_app;
+			if (!$active_tab)
+			{
+				$active_tab = $default_app;
+			}
 		}
 		// if we have the open tabs in the session, use it instead the maybe forced common prefs open_tabs
 		if (!($open_tabs = Api\Cache::getSession(__CLASS__, 'open_tabs')))
@@ -887,9 +922,12 @@ 
 		// Restore Tabs
 		foreach($open_tabs as $n => $app)
 		{
-			if (isset($apps[$app]))		// user might no longer have app rights
+			if (isset($apps[$app]))
+			{
+				// user might no longer have app rights
 			{
 				$apps[$app]['opened'] = $n;
+			}
 				if ($app == $active_tab)
 				{
 					$apps[$app]['active'] = true;
@@ -915,7 +953,11 @@ 
 	function footer($no_framework=true)
 	{
 		//error_log(__METHOD__."($no_framework) footer_done=".array2string(self::$footer_done).' '.function_backtrace());
-		if (self::$footer_done) return;	// prevent (multiple) footers
+		if (self::$footer_done)
+		{
+			return;
+		}
+		// prevent (multiple) footers
 		self::$footer_done = true;
 
 		if (!isset($GLOBALS['egw_info']['flags']['nofooter']) || !$GLOBALS['egw_info']['flags']['nofooter'])