EGroupware / egroupware

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/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,29 +44,29 @@ 
 	 * @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('lang_password', lang('password'));
 
 			// display login-message depending on $_GET[cd] and what's in database/header for "login_message"
 			$cd_msg = self::check_logoutcode($_GET['cd']);
@@ -87,9 +87,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'];
@@ -98,55 +98,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,
@@ -157,20 +157,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] == '/')
@@ -179,14 +179,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 */
@@ -194,14 +194,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', '');
 		}
 
 		/********************************************************\
@@ -209,31 +209,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);
 	}
 
 	/**
@@ -245,7 +245,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'));
@@ -260,7 +260,7 @@ 
 		// 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);
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	static function check_logoutcode($code)
 	{
-		switch($code)
+		switch ($code)
 		{
 			case 1:
 				return lang('You have been successfully logged out');

api/src/Framework/Minimal.php

Indentation +54 added lines, -54 removed lines

@@ -21,29 +21,29 @@ 
 class Minimal extends Api\Framework
 {
 	/**
-	* Instance of the phplib Template class for the API's template dir (EGW_TEMPLATE_DIR)
-	*
-	* @var Template
-	*/
+	 * Instance of the phplib Template class for the API's template dir (EGW_TEMPLATE_DIR)
+	 *
+	 * @var Template
+	 */
 	var $tpl;
 
 	/**
-	* Constructor
-	*
-	* @param string $template ='default' name of the template
-	* @return idots_framework
-	*/
+	 * Constructor
+	 *
+	 * @param string $template ='default' name of the template
+	 * @return idots_framework
+	 */
 	function __construct($template='default')
 	{
 		parent::__construct($template);		// call the constructor of the extended class
 	}
 
 	/**
-	* Returns the html-header incl. the opening body tag
-	*
-	* @param array $extra =array() extra attributes passed as data-attribute to egw.js
-	* @return string with html
-	*/
+	 * Returns the html-header incl. the opening body tag
+	 *
+	 * @param array $extra =array() extra attributes passed as data-attribute to egw.js
+	 * @return string with html
+	 */
 	function header(array $extra=array())
 	{
 		// make sure header is output only once
@@ -76,10 +76,10 @@ 
 	}
 
 	/**
-	* Returns the html from the body-tag til the main application area (incl. opening div tag)
-	*
-	* @return string with html
-	*/
+	 * Returns the html from the body-tag til the main application area (incl. opening div tag)
+	 *
+	 * @return string with html
+	 */
 	function navbar()
 	{
 		return '';
@@ -101,37 +101,37 @@ 
 	}
 
 	/**
-	* 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)
 	{
 		unset($app_data, $alt_label);
 	}
 
 	/**
-	* Add info items to the topmenu template class to be displayed
-	*
-	* @param string $content html of item
-	* @param string $id =null
-	* @access protected
-	* @return void
-	*/
+	 * Add info items to the topmenu template class to be displayed
+	 *
+	 * @param string $content html of item
+	 * @param string $id =null
+	 * @access protected
+	 * @return void
+	 */
 	function _add_topmenu_info_item($content, $id=null)
 	{
 		unset($content, $id);
 	}
 
 	/**
-	* Returns the html from the closing div of the main application area to the closing html-tag
-	*
-	* @return string html or null if no footer needed/wanted
-	*/
+	 * Returns the html from the closing div of the main application area to the closing html-tag
+	 *
+	 * @return string html or null if no footer needed/wanted
+	 */
 	function footer()
 	{
 		static $footer_done=0;
@@ -141,29 +141,29 @@ 
 	}
 
 	/**
-	* Parses one sidebox menu and add's the html to $this->sidebox_content for later use by $this->navbar
-	*
-	* @param string $appname
-	* @param string $menu_title
-	* @param array $file
-	* @param string $type =null 'admin', 'preferences', 'favorites', ...
-	*/
+	 * Parses one sidebox menu and add's the html to $this->sidebox_content for later use by $this->navbar
+	 *
+	 * @param string $appname
+	 * @param string $menu_title
+	 * @param array $file
+	 * @param string $type =null 'admin', 'preferences', 'favorites', ...
+	 */
 	function sidebox($appname,$menu_title,$file,$type=null)
 	{
 		unset($appname, $menu_title, $file, $type);
 	}
 
 	/**
-	* 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 html, or null of no tooltip
-	* @access public
-	* @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 html, or null of no tooltip
+	 * @access public
+	 * @return void
+	 */
 	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
 	{
 		unset($id, $icon_src, $iconlink, $blink, $tooltip);

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

Braces +9 added lines, -2 removed lines

@@ -47,7 +47,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;
 
 		// js stuff is not needed by login page or in popups
@@ -135,7 +138,11 @@ 
 	function footer()
 	{
 		static $footer_done=0;
-		if ($footer_done++) return;	// prevent multiple footers, not sure we still need this (RalfBecker)
+		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
 	}

Doc Comments -5 removed lines

@@ -356,11 +356,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)
 	{

api/src/Json/Push.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	{
 		if (!isset(self::$backend))
 		{
-			foreach(self::$backends as $class)
+			foreach (self::$backends as $class)
 			{
 				if (class_exists($class))
 				{

api/src/Json/Request.php

Spacing +16 added lines, -16 removed lines

@@ -39,7 +39,7 @@ 
 	 * @param boolean $set =null
 	 * @return boolean
 	 */
-	public static function isJSONRequest($set=null)
+	public static function isJSONRequest($set = null)
 	{
 		$ret = self::$_hadJSONRequest;
 		if (isset($set)) self::$_hadJSONRequest = $set;
@@ -62,11 +62,11 @@ 
 
 		if (get_magic_quotes_gpc()) $input_data = stripslashes($input_data);
 
-		$json_data = json_decode($input_data,true);
+		$json_data = json_decode($input_data, true);
 		if (is_array($json_data) && isset($json_data['request']) && isset($json_data['request']['parameters']) && is_array($json_data['request']['parameters']))
 		{
 			//error_log(__METHOD__.__LINE__.array2string($json_data['request']).function_backtrace());
-			$parameters =& $json_data['request']['parameters'];
+			$parameters = & $json_data['request']['parameters'];
 		}
 		else
 		{
@@ -77,14 +77,14 @@ 
 		{
 			$responses = array();
 			$response = Response::get();
-			foreach($parameters[0] as $uid => $data)
+			foreach ($parameters[0] as $uid => $data)
 			{
 				//error_log("$uid: menuaction=$data[menuaction], parameters=".array2string($data['parameters']));
 				$this->handleRequest($data['menuaction'], (array)$data['parameters']);
 				$responses[$uid] = $response->initResponseArray();
 				//error_log("responses[$uid]=".array2string($responses[$uid]));
 			}
-			$response->data($responses);	// send all responses as data
+			$response->data($responses); // send all responses as data
 		}
 		else
 		{
@@ -100,32 +100,32 @@ 
 	 */
 	public function handleRequest($menuaction, array $parameters)
 	{
-		if (strpos($menuaction,'::') !== false && strpos($menuaction,'.') === false)	// static method name app_something::method
+		if (strpos($menuaction, '::') !== false && strpos($menuaction, '.') === false)	// static method name app_something::method
 		{
-			@list($className,$functionName,$handler) = explode('::',$menuaction);
+			@list($className, $functionName, $handler) = explode('::', $menuaction);
 			if (substr($className, 0, 11) == 'EGroupware\\')
 			{
 				list(,$appName) = explode('\\', strtolower($className));
 			}
 			else
 			{
-				list($appName) = explode('_',$className);
+				list($appName) = explode('_', $className);
 			}
 
 			// Check for a real static method, avoid instanciation if it is
 			$m = new ReflectionMethod($menuaction);
-			if($m->isStatic())
+			if ($m->isStatic())
 			{
 				$ajaxClass = $className;
 			}
 		}
 		else
 		{
-			@list($appName, $className, $functionName, $handler) = explode('.',$menuaction);
+			@list($appName, $className, $functionName, $handler) = explode('.', $menuaction);
 		}
 		//error_log("json.php: appName=$appName, className=$className, functionName=$functionName, handler=$handler");
 
-		switch($handler)
+		switch ($handler)
 		{
 			case '/etemplate/process_exec':
 				$_GET['menuaction'] = $appName.'.'.$className.'.'.$functionName;
@@ -151,15 +151,15 @@ 
 				break;
 		}
 
-		if(substr($className,0,4) != 'ajax' && substr($className,-4) != 'ajax' &&
-			$menuaction != 'etemplate.etemplate.process_exec' && substr($functionName,0,4) != 'ajax' ||
-			!preg_match('/^[A-Za-z0-9_\\\\-]+(\.[A-Za-z0-9_\\\\]+\.|::)[A-Za-z0-9_]+$/',$menuaction))
+		if (substr($className, 0, 4) != 'ajax' && substr($className, -4) != 'ajax' &&
+			$menuaction != 'etemplate.etemplate.process_exec' && substr($functionName, 0, 4) != 'ajax' ||
+			!preg_match('/^[A-Za-z0-9_\\\\-]+(\.[A-Za-z0-9_\\\\]+\.|::)[A-Za-z0-9_]+$/', $menuaction))
 		{
 			// stopped for security reasons
 			error_log("className='$className', functionName='$functionName', menuaction='$menuaction'");
-			error_log($_SERVER['PHP_SELF']. ' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
+			error_log($_SERVER['PHP_SELF'].' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
 			// send message also to the user
-			throw new Exception\InvalidName($_SERVER['PHP_SELF']. ' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
+			throw new Exception\InvalidName($_SERVER['PHP_SELF'].' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
 		}
 
 		if (isset($template))

Braces +16 added lines, -4 removed lines

@@ -42,7 +42,10 @@ 
 	public static function isJSONRequest($set=null)
 	{
 		$ret = self::$_hadJSONRequest;
-		if (isset($set)) self::$_hadJSONRequest = $set;
+		if (isset($set))
+		{
+			self::$_hadJSONRequest = $set;
+		}
 		return $ret;
 	}
 
@@ -60,7 +63,10 @@ 
 		// Remember that we currently are in a JSON request - e.g. used in the redirect code
 		self::$_hadJSONRequest = true;
 
-		if (get_magic_quotes_gpc()) $input_data = stripslashes($input_data);
+		if (get_magic_quotes_gpc())
+		{
+			$input_data = stripslashes($input_data);
+		}
 
 		$json_data = json_decode($input_data,true);
 		if (is_array($json_data) && isset($json_data['request']) && isset($json_data['request']['parameters']) && is_array($json_data['request']['parameters']))
@@ -100,9 +106,12 @@ 
 	 */
 	public function handleRequest($menuaction, array $parameters)
 	{
-		if (strpos($menuaction,'::') !== false && strpos($menuaction,'.') === false)	// static method name app_something::method
+		if (strpos($menuaction,'::') !== false && strpos($menuaction,'.') === false)
+		{
+			// static method name app_something::method
 		{
 			@list($className,$functionName,$handler) = explode('::',$menuaction);
+		}
 			if (substr($className, 0, 11) == 'EGroupware\\')
 			{
 				list(,$appName) = explode('\\', strtolower($className));
@@ -179,6 +188,9 @@ 
 			Api\Translation::convert($parameters, 'utf-8'));
 
 		// check if we have push notifications, if notifications app available
-		if (class_exists('notifications_push')) notifications_push::get();
+		if (class_exists('notifications_push'))
+		{
+			notifications_push::get();
+		}
 	}
 }

api/src/Json/Tail.php

Spacing +18 added lines, -18 removed lines

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

Braces +24 added lines, -6 removed lines

@@ -76,7 +76,10 @@ 
 		{
 			$this->filename = $filename;
 
-			if (!$this->filenames || !in_array($filename,$this->filenames)) $this->filenames[] = $filename;
+			if (!$this->filenames || !in_array($filename,$this->filenames))
+			{
+				$this->filenames[] = $filename;
+			}
 		}
 	}
 
@@ -93,7 +96,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
-		if ($filename[0] != '/') $filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		if ($filename[0] != '/')
+		{
+			$filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		}
 
 		if (file_exists($filename))
 		{
@@ -101,7 +107,10 @@ 
 			if (!$start || $start < 0 || $start > $size || $size-$start > 4*self::MAX_CHUNK_SIZE)
 			{
 				$start = $size - 4*self::MAX_CHUNK_SIZE;
-				if ($start < 0) $start = 0;
+				if ($start < 0)
+				{
+					$start = 0;
+				}
 			}
 			$hsize = Api\Vfs::hsize($size);
 			$content = file_get_contents($filename, false, null, $start, self::MAX_CHUNK_SIZE);
@@ -137,7 +146,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
-		if ($filename[0] != '/') $filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		if ($filename[0] != '/')
+		{
+			$filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		}
 		if ($truncate)
 		{
 			file_put_contents($filename, '');
@@ -161,7 +173,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter("Must be instanciated with filename!");
 		}
-		if (is_null($header)) $header = $this->filename;
+		if (is_null($header))
+		{
+			$header = $this->filename;
+		}
 
 		return '
 <p style="float: left; margin: 5px"><b>'.htmlspecialchars($header).'</b></p>
@@ -192,7 +207,10 @@ 
 			throw new Api\Exception\WrongParameter("Not allowed to download '$filename'!");
 		}
 		Api\Header\Content::type(basename($filename), 'text/plain');
-		if ($filename[0] != '/') $filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		if ($filename[0] != '/')
+		{
+			$filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		}
 		for($n=ob_get_level(); $n > 0; --$n)
 		{
 			ob_end_clean();	// stop all output buffering, to NOT run into memory_limit

api/src/CalDAV/IcalIterator.php

Indentation +6 added lines, -6 removed lines

@@ -249,12 +249,12 @@
 
 		$this->component = Horde_Icalendar::newComponent($type, $this);
 		//error_log(__METHOD__."() this->component = Horde_Icalendar::newComponent('$type', \$this) = ".array2string($this->component));
-        if ($this->component === false)
-        {
-        	error_log(__METHOD__."() Horde_Icalendar::newComponent('$type', \$this) returned FALSE");
-        	return;
-            //return PEAR::raiseError("Unable to create object for type $type");
-        }
+		if ($this->component === false)
+		{
+			error_log(__METHOD__."() Horde_Icalendar::newComponent('$type', \$this) returned FALSE");
+			return;
+			//return PEAR::raiseError("Unable to create object for type $type");
+		}
 		if ($this->charset && $this->charset != 'utf-8')
 		{
 			$data = Api\Translation::convert($data, $this->charset, 'utf-8');

Spacing +22 added lines, -22 removed lines

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

Braces +29 added lines, -8 removed lines

@@ -116,7 +116,10 @@ 
 		if (is_callable($callback))
 		{
 			$this->callback = $callback;
-			if ($add_container) $callback_params[] = $this;
+			if ($add_container)
+			{
+				$callback_params[] = $this;
+			}
 			$this->callback_params = $callback_params;
 		}
 		if (is_string($ical_file))
@@ -197,8 +200,14 @@ 
 		{
 			$ret = is_a($this->component,'Horde_Icalendar');
 			do {
-				if ($ret === false) $this->next();
-				if (!is_a($this->component,'Horde_Icalendar')) return false;
+				if ($ret === false)
+				{
+					$this->next();
+				}
+				if (!is_a($this->component,'Horde_Icalendar'))
+				{
+					return false;
+				}
 				$params = $this->callback_params;
 				array_unshift($params,$this->component);
 			}
@@ -231,9 +240,12 @@ 
 		{
 			// ignore it
 		}
-		if ($line === false)	// end-of-file or end-of-container
+		if ($line === false)
+		{
+			// end-of-file or end-of-container
 		{
 			$this->component = false;
+		}
 			return;
 		}
 		$type = substr(trim($line),6);
@@ -309,7 +321,10 @@ 
 			//error_log(__METHOD__."() about to call this->parsevCalendar('$data','$this->base','$this->charset')");
 			$this->parsevCalendar($data,$this->base,$this->charset);
 		}
-		if ($line) $this->unread_line($line);
+		if ($line)
+		{
+			$this->unread_line($line);
+		}
 
 		// advance to first element
 		$this->next();
@@ -438,7 +453,10 @@ 
 ';
 	echo $GLOBALS['egw']->framework->header();
 	//$ical_file = fopen('/tmp/KalenderFelicitasKubala.ics');
-	if (!is_resource($ical_file)) echo "<pre>$ical_file</pre>\n";
+	if (!is_resource($ical_file))
+	{
+		echo "<pre>$ical_file</pre>\n";
+	}
 	//$calendar_ical = new calendar_ical();
 	//$calendar_ical->setSupportedFields('file');
 	$ical_it = new IcalIterator($ical_file);//,'VCALENDAR','iso-8859-1',array($calendar_ical,'_ical2egw_callback'),array('Europe/Berlin'));
@@ -446,5 +464,8 @@ 
 	{
 		echo "$uid<pre>".print_r($vevent->toHash(), true)."</pre>\n";
 	}
-	if (is_resource($ical_file)) fclose($ical_file);
-}
\ No newline at end of file
+	if (is_resource($ical_file))
+	{
+		fclose($ical_file);
+	}
+	}
\ No newline at end of file