EGroupware / egroupware

api/src/Header/Content.php

Spacing +12 added lines, -12 removed lines

@@ -38,7 +38,7 @@ 
 	 * @param boolean $force_download =true send content-disposition attachment header
 	 * @param boolean $no_content_type =false do not send actual content-type and content-length header, just content-disposition
 	 */
-	public static function safe(&$content, $path, &$mime='', &$length=0, $nocache=true, $force_download=true, $no_content_type=false)
+	public static function safe(&$content, $path, &$mime = '', &$length = 0, $nocache = true, $force_download = true, $no_content_type = false)
 	{
 		// change old/aliased mime-types to new one, eg. image/pdf to application/pdf
 		$mime = Api\MimeMagic::fix_mime_type($mime);
@@ -54,7 +54,7 @@ 
 				UserAgent::type() == 'firefox' && UserAgent::version() >= 50)
 			{
 				$mime = 'text/plain';
-				header('X-Content-Type-Options: nosniff');	// stop IE & Chrome from content-type sniffing
+				header('X-Content-Type-Options: nosniff'); // stop IE & Chrome from content-type sniffing
 			}
 			// for the rest we change mime-type to text/html and let code below handle it safely
 			// this stops Safari and Firefox from using it as src attribute in a script tag
@@ -80,12 +80,12 @@ 
 			if (UserAgent::type() == 'chrome' && UserAgent::version() >= 24 ||
 				// mobile FF 24 on Android does NOT honor CSP!
 				UserAgent::type() == 'firefox' && !UserAgent::mobile() && UserAgent::version() >= 24 ||
-				UserAgent::type() == 'safari' && !UserAgent::mobile() && UserAgent::version() >= 536 ||	// OS X
+				UserAgent::type() == 'safari' && !UserAgent::mobile() && UserAgent::version() >= 536 || // OS X
 				UserAgent::type() == 'safari' && UserAgent::mobile() && UserAgent::version() >= 9537)	// iOS 7
 			{
-				$csp = "script-src 'none'";	// forbid to execute any javascript
+				$csp = "script-src 'none'"; // forbid to execute any javascript
 				header("Content-Security-Policy: $csp");
-				header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
+				header("X-Webkit-CSP: $csp"); // Chrome: <= 24, Safari incl. iOS
 				//header("X-Content-Security-Policy: $csp");	// FF <= 22
 				//error_log(__METHOD__."('$options[path]') ".UserAgent::type().'/'.UserAgent::version().(UserAgent::mobile()?'/mobile':'').": using Content-Security-Policy: $csp");
 			}
@@ -121,25 +121,25 @@ 
 	 * @param boolean $nocache =true send headers to disallow browser/proxies to cache the download
 	 * @param boolean $forceDownload =true send headers to handle as attachment/download
 	 */
-	public static function type($fn,$mime='',$length=0,$nocache=True,$forceDownload=true)
+	public static function type($fn, $mime = '', $length = 0, $nocache = True, $forceDownload = true)
 	{
 		// if no mime-type is given or it's the default binary-type, guess it from the extension
-		if(empty($mime) || $mime == 'application/octet-stream')
+		if (empty($mime) || $mime == 'application/octet-stream')
 		{
 			$mime = Api\MimeMagic::filename2mime($fn);
 		}
-		if($fn)
+		if ($fn)
 		{
 			// Show this for all
-			self::disposition($fn,$forceDownload);
+			self::disposition($fn, $forceDownload);
 			header('Content-type: '.$mime);
 
-			if($length)
+			if ($length)
 			{
 				header('Content-length: '.$length);
 			}
 
-			if($nocache)
+			if ($nocache)
 			{
 				header('Pragma: no-cache');
 				header('Pragma: public');
@@ -155,7 +155,7 @@ 
 	 * @param string $fn filename
 	 * @param boolean $forceDownload =true send headers to handle as attachment/download
 	 */
-	public static function disposition($fn, $forceDownload=true)
+	public static function disposition($fn, $forceDownload = true)
 	{
 		if ($forceDownload)
 		{

Braces +10 added lines, -3 removed lines

@@ -81,9 +81,13 @@ 
 				// mobile FF 24 on Android does NOT honor CSP!
 				UserAgent::type() == 'firefox' && !UserAgent::mobile() && UserAgent::version() >= 24 ||
 				UserAgent::type() == 'safari' && !UserAgent::mobile() && UserAgent::version() >= 536 ||	// OS X
-				UserAgent::type() == 'safari' && UserAgent::mobile() && UserAgent::version() >= 9537)	// iOS 7
+				UserAgent::type() == 'safari' && UserAgent::mobile() && UserAgent::version() >= 9537)
 			{
-				$csp = "script-src 'none'";	// forbid to execute any javascript
+				// iOS 7
+			{
+				$csp = "script-src 'none'";
+			}
+			// forbid to execute any javascript
 				header("Content-Security-Policy: $csp");
 				header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
 				//header("X-Content-Security-Policy: $csp");	// FF <= 22
@@ -100,7 +104,10 @@ 
 
 		if ($no_content_type)
 		{
-			if ($force_download) self::disposition(Api\Vfs::basename($path), $force_download);
+			if ($force_download)
+			{
+				self::disposition(Api\Vfs::basename($path), $force_download);
+			}
 		}
 		else
 		{

api/src/Json/Tail.php

Braces +24 added lines, -6 removed lines

@@ -79,7 +79,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;
+			}
 		}
 	}
 
@@ -96,7 +99,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))
 		{
@@ -104,7 +110,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);
@@ -140,7 +149,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, '');
@@ -164,7 +176,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>
@@ -195,7 +210,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

admin/inc/class.admin_denyaccess.inc.php

Spacing +35 added lines, -35 removed lines

@@ -28,7 +28,7 @@ 
 	function __construct()
 	{
 		$this->account_id = (int)$_GET['account_id'];
-		if (!$this->account_id || $GLOBALS['egw']->acl->check('account_access',64,'admin'))
+		if (!$this->account_id || $GLOBALS['egw']->acl->check('account_access', 64, 'admin'))
 		{
 			$GLOBALS['egw']->redirect_link('/index.php');
 		}
@@ -37,8 +37,8 @@ 
 
 	function common_header()
 	{
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin') . ' - ' . lang('ACL Manager') .
-			': ' . Api\Accounts::username($this->account_id);
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('ACL Manager').
+			': '.Api\Accounts::username($this->account_id);
 		echo $GLOBALS['egw']->framework->header();
 	}
 
@@ -46,39 +46,39 @@ 
 	{
 		$this->common_header();
 
-		Api\Hooks::process('acl_manager',array('preferences'));
+		Api\Hooks::process('acl_manager', array('preferences'));
 
 		$this->template->set_file(array(
 			'app_list'   => 'acl_applist.tpl'
 		));
-		$this->template->set_block('app_list','list');
-		$this->template->set_block('app_list','app_row');
-		$this->template->set_block('app_list','app_row_noicon');
-		$this->template->set_block('app_list','link_row');
-		$this->template->set_block('app_list','spacer_row');
+		$this->template->set_block('app_list', 'list');
+		$this->template->set_block('app_list', 'app_row');
+		$this->template->set_block('app_list', 'app_row_noicon');
+		$this->template->set_block('app_list', 'link_row');
+		$this->template->set_block('app_list', 'spacer_row');
 
 		if (is_array($GLOBALS['acl_manager']))
 		{
-			foreach($GLOBALS['acl_manager'] as $app => $locations)
+			foreach ($GLOBALS['acl_manager'] as $app => $locations)
 			{
-				$icon = Api\Image::find($app,array('navbar.png',$app.'png','navbar.gif',$app.'.gif'));
-				$this->template->set_var('icon_backcolor',$GLOBALS['egw_info']['theme']['row_off']);
-				$this->template->set_var('link_backcolor',$GLOBALS['egw_info']['theme']['row_off']);
-				$this->template->set_var('app_name',$GLOBALS['egw_info']['apps'][$app]['title']);
-				$this->template->set_var('app_icon',$icon);
+				$icon = Api\Image::find($app, array('navbar.png', $app.'png', 'navbar.gif', $app.'.gif'));
+				$this->template->set_var('icon_backcolor', $GLOBALS['egw_info']['theme']['row_off']);
+				$this->template->set_var('link_backcolor', $GLOBALS['egw_info']['theme']['row_off']);
+				$this->template->set_var('app_name', $GLOBALS['egw_info']['apps'][$app]['title']);
+				$this->template->set_var('app_icon', $icon);
 
 				if ($icon)
 				{
-					$this->template->fp('rows','app_row',True);
+					$this->template->fp('rows', 'app_row', True);
 				}
 				else
 				{
-					$this->template->fp('rows','app_row_noicon',True);
+					$this->template->fp('rows', 'app_row_noicon', True);
 				}
 
 				if (is_array($locations))
 				{
-					foreach($locations as $loc => $value)
+					foreach ($locations as $loc => $value)
 					{
 						$link_values = array(
 							'menuaction' => 'admin.admin_denyaccess.access_form',
@@ -87,20 +87,20 @@ 
 							'account_id' => $this->account_id
 						);
 
-						$this->template->set_var('link_location',$GLOBALS['egw']->link('/index.php',$link_values));
-						$this->template->set_var('lang_location',lang($value['name']));
-						$this->template->fp('rows','link_row',True);
+						$this->template->set_var('link_location', $GLOBALS['egw']->link('/index.php', $link_values));
+						$this->template->set_var('lang_location', lang($value['name']));
+						$this->template->fp('rows', 'link_row', True);
 					}
 				}
 
-				$this->template->parse('rows','spacer_row',True);
+				$this->template->parse('rows', 'spacer_row', True);
 			}
 		}
 		$this->template->set_var(array(
 			'cancel_action' => $GLOBALS['egw']->link('/admin/index.php'),
 			'lang_cancel'   => lang('Cancel')
 		));
-		$this->template->pfp('out','list');
+		$this->template->pfp('out', 'list');
 		echo $GLOBALS['egw']->framework->footer();
 	}
 
@@ -120,7 +120,7 @@ 
 				$total_rights = 0;
 				if (is_array($_POST['acl_rights']))
 				{
-					foreach($_POST['acl_rights'] as $rights)
+					foreach ($_POST['acl_rights'] as $rights)
 					{
 						$total_rights += $rights;
 					}
@@ -137,16 +137,16 @@ 
 			$this->list_apps();
 			return;
 		}
-		Api\Hooks::single('acl_manager',$_GET['acl_app']);
+		Api\Hooks::single('acl_manager', $_GET['acl_app']);
 		$acl_manager = $GLOBALS['acl_manager'][$_GET['acl_app']][$location];
 
 		$this->common_header();
-		$this->template->set_file('form','acl_manager_form.tpl');
+		$this->template->set_file('form', 'acl_manager_form.tpl');
 		$this->template->set_var('csrf_token', Api\Csrf::token(__FILE__));
 
 		$afn = Api\Accounts::username($this->account_id);
 
-		$this->template->set_var('lang_message',lang('Check items to <b>%1</b> to %2 for %3',lang($acl_manager['name']),$GLOBALS['egw_info']['apps'][$_GET['acl_app']]['title'],$afn));
+		$this->template->set_var('lang_message', lang('Check items to <b>%1</b> to %2 for %3', lang($acl_manager['name']), $GLOBALS['egw_info']['apps'][$_GET['acl_app']]['title'], $afn));
 		$link_values = array(
 			'menuaction' => 'admin.admin_denyaccess.access_form',
 			'acl_app'    => $_GET['acl_app'],
@@ -156,19 +156,19 @@ 
 
 		$acl    = new Api\Acl($this->account_id);
 		$acl->read_repository();
-		$grants = $acl->get_rights($location,$_GET['acl_app']);
+		$grants = $acl->get_rights($location, $_GET['acl_app']);
 
-		$this->template->set_var('form_action',$GLOBALS['egw']->link('/index.php',$link_values));
+		$this->template->set_var('form_action', $GLOBALS['egw']->link('/index.php', $link_values));
 
-		foreach($acl_manager['rights'] as $name => $value)
+		foreach ($acl_manager['rights'] as $name => $value)
 		{
-			$cb .= '<input type="checkbox" name="acl_rights[]" value="'.$value.'"'.($grants & $value ? ' checked' : '').'>&nbsp;'.lang($name)."<br>\n";
+			$cb .= '<input type="checkbox" name="acl_rights[]" value="'.$value.'"'.($grants&$value ? ' checked' : '').'>&nbsp;'.lang($name)."<br>\n";
 		}
-		$this->template->set_var('select_values',$cb);
-		$this->template->set_var('lang_submit',lang('Save'));
-		$this->template->set_var('lang_cancel',lang('Cancel'));
+		$this->template->set_var('select_values', $cb);
+		$this->template->set_var('lang_submit', lang('Save'));
+		$this->template->set_var('lang_cancel', lang('Cancel'));
 
-		$this->template->pfp('out','form');
+		$this->template->pfp('out', 'form');
 		echo $GLOBALS['egw']->framework->footer();
 	}
 }

api/src/Framework/Login.php

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', htmlspecialchars($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/loader/security.php

Spacing +18 added lines, -18 removed lines

@@ -20,9 +20,9 @@ 
  * @param array &$var reference of array to check
  * @param string $name ='' name of the array
  */
-function _check_script_tag(&$var,$name='')
+function _check_script_tag(&$var, $name = '')
 {
-	static $preg=null;
+	static $preg = null;
 	//old: '/<\/?[^>]*\b(iframe|script|javascript|on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mousedown|mousemove|mouseout|mouseover|mouseup|reset|select|submit|unload))\b[^>]*>/i';
 	if (!isset($preg)) $preg =
 		// forbidden tags like iframe or script
@@ -39,15 +39,15 @@ 
 		'<[^>]+style\s*=\s*("|\')[^>]*(behavior\s*:\s*url|expression)\s*\()/i';
 	if (is_array($var))
 	{
-		foreach($var as $key => $val)
+		foreach ($var as $key => $val)
 		{
 			if (is_array($val))
 			{
-				_check_script_tag($var[$key],$name.'['.$key.']');
+				_check_script_tag($var[$key], $name.'['.$key.']');
 			}
-			elseif(strpos($val, '<') !== false)	// speedup: ignore everything without <
+			elseif (strpos($val, '<') !== false)	// speedup: ignore everything without <
 			{
-				if (preg_match($preg,$val))
+				if (preg_match($preg, $val))
 				{
 					// special handling for $_POST[json_data], to decend into it's decoded content, fixing json direct might break json syntax
 					if ($name == '_POST' && $key == 'json_data' && ($json_data = json_decode($val, true)))
@@ -61,7 +61,7 @@ 
 					// attempt to clean the thing
 					$var[$key] = $val = Api\Html\HtmLawed::purify($val);
 					// check if we succeeded, if not drop the var anyway, keep the egw_unset_var in any case
-					if (preg_match($preg,$val))
+					if (preg_match($preg, $val))
 					{
 						error_log("*** _check_script_tag($name): unset(${name}[$key]) with value $val***");
 						unset($var[$key]);
@@ -173,15 +173,15 @@ 
 	die("<p style='color: ".($num_failed?'red':'black')."'>Tests finished: $num_failed / $total failed</p>");
 }*/
 
-foreach(array('_COOKIE','_GET','_POST','_REQUEST','HTTP_GET_VARS','HTTP_POST_VARS') as $n => $where)
+foreach (array('_COOKIE', '_GET', '_POST', '_REQUEST', 'HTTP_GET_VARS', 'HTTP_POST_VARS') as $n => $where)
 {
 	$pregs = array(
 		'order' => '/^[a-zA-Z0-9_,]*$/',
 		'sort'  => '/^(ASC|DESC|asc|desc|0|1|2|3|4|5|6|7){0,1}$/',
 	);
-	foreach(array('order','sort') as $name)
+	foreach (array('order', 'sort') as $name)
 	{
-		if (isset($GLOBALS[$where][$name]) && !is_array($GLOBALS[$where][$name]) && !preg_match($pregs[$name],$GLOBALS[$where][$name]))
+		if (isset($GLOBALS[$where][$name]) && !is_array($GLOBALS[$where][$name]) && !preg_match($pregs[$name], $GLOBALS[$where][$name]))
 		{
 			$GLOBALS[$where][$name] = '';
 		}
@@ -190,14 +190,14 @@ 
 	// speeds up the execusion a bit
 	if (isset($GLOBALS[$where]) && is_array($GLOBALS[$where]) && ($n < 3 || isset($GLOBALS['egw_unset_vars'])))
 	{
-		_check_script_tag($GLOBALS[$where],$where);
+		_check_script_tag($GLOBALS[$where], $where);
 	}
 }
 //if (is_array($GLOBALS['egw_unset_vars'])) { echo "egw_unset_vars=<pre>".htmlspecialchars(print_r($GLOBALS['egw_unset_vars'],true))."</pre>"; exit; }
 
 // $GLOBALS[egw_info][flags][currentapp] and die  if it contains something nasty or unexpected
 if (isset($GLOBALS['egw_info']) && isset($GLOBALS['egw_info']['flags']) &&
-	isset($GLOBALS['egw_info']['flags']['currentapp']) && !preg_match('/^[A-Za-z0-9_-]+$/',$GLOBALS['egw_info']['flags']['currentapp']))
+	isset($GLOBALS['egw_info']['flags']['currentapp']) && !preg_match('/^[A-Za-z0-9_-]+$/', $GLOBALS['egw_info']['flags']['currentapp']))
 {
 	error_log(__FILE__.': '.__LINE__.' Invalid $GLOBALS[egw_info][flags][currentapp]='.array2string($GLOBALS['egw_info']['flags']['currentapp']).', $_SERVER[REQUEST_URI]='.array2string($_SERVER[REQUEST_URI]));
 	die('Invalid $GLOBALS[egw_info][flags][currentapp]!');
@@ -215,12 +215,12 @@ 
 			die('GLOBALS overwrite detected!!!');
 		}
 		// unregister all globals
-		$noUnset = array('GLOBALS','_GET','_POST','_COOKIE','_SERVER','_ENV','_FILES','xajax');
-		foreach(array_unique(array_merge(
-			array_keys($_GET),array_keys($_POST),array_keys($_COOKIE),array_keys($_SERVER),array_keys($_ENV),array_keys($_FILES),
+		$noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_SERVER', '_ENV', '_FILES', 'xajax');
+		foreach (array_unique(array_merge(
+			array_keys($_GET), array_keys($_POST), array_keys($_COOKIE), array_keys($_SERVER), array_keys($_ENV), array_keys($_FILES),
 			isset($_SESSION) && is_array($_SESSION) ? array_keys($_SESSION) : array())) as $k)
 		{
-			if (!in_array($k,$noUnset) && isset($GLOBALS[$k]))
+			if (!in_array($k, $noUnset) && isset($GLOBALS[$k]))
 			{
 				unset($GLOBALS[$k]);
 			}
@@ -250,7 +250,7 @@ 
 		preg_match('/(^|;|{)[OC]:\d+:"/', $str))
 	{
 		error_log(__METHOD__."('$str') contains objects --> return NULL");
-		return null;	// null, not false, to not trigger behavior of returning string itself to app code
+		return null; // null, not false, to not trigger behavior of returning string itself to app code
 	}
 	return unserialize($str);
 }
@@ -321,7 +321,7 @@ 
  * @param boolean $allow_not_serialized =false true: return $str as is, if it is no serialized array
  * @return array|str|false false if content can not be unserialized (not null like json_decode!)
  */
-function json_php_unserialize($str, $allow_not_serialized=false)
+function json_php_unserialize($str, $allow_not_serialized = false)
 {
 	if ((in_array($str[0], array('a', 'i', 's', 'b', 'O', 'C')) && $str[1] == ':' || $str === 'N;') &&
 		($arr = php_safe_unserialize($str)) !== false || $str === 'b:0;')