EGroupware / egroupware

api/config.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 $etag = '"'.md5($config.$link_registry).'"';
 
 // 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
+Api\Session::cache_control(86400); // cache for one day
 Header('Content-Type: text/javascript; charset=utf-8');
 Header('ETag: '.$etag);
 
@@ -47,7 +47,7 @@ 
 $content .= 'egw.set_link_registry('.$link_registry.", undefined, egw && egw.window !== window);\n";
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
-if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
+if (in_array('gzip', explode(',', $_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
 {
 	$content = gzencode($content);
 	header('Content-Encoding: gzip');

api/js/etemplate/test/test.php

Spacing +5 added lines, -5 removed lines

@@ -16,18 +16,18 @@
 
 use EGroupware\Api;
 
-Api\Framework::includeJS('.','etemplate2','etemplate');
-Api\Framework::includeJS('jquery','jquery.tools.min','phpgwapi'); // Not needed once JS require works for files like this
-Api\Framework::includeJS('jquery','jquery.html5_upload','phpgwapi'); // Not needed once JS require works for files like this
+Api\Framework::includeJS('.', 'etemplate2', 'etemplate');
+Api\Framework::includeJS('jquery', 'jquery.tools.min', 'phpgwapi'); // Not needed once JS require works for files like this
+Api\Framework::includeJS('jquery', 'jquery.html5_upload', 'phpgwapi'); // Not needed once JS require works for files like this
 Api\Framework::includeCSS('/api/js/etemplate/test/test.css');
 
 /*
 * Test using any actual template
 */
 	$template = 'etemplate.et2_test_file_upload';
-	if($template) {
+	if ($template) {
 		$etemplate = new Api\Etemplate('etemplate.et2_test_file_upload');
-		$etemplate->exec('',array());
+		$etemplate->exec('', array());
 		return;
 	}
 	echo $GLOBALS['egw']->framework->header();

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
 * Test using any actual template
 */
 	$template = 'etemplate.et2_test_file_upload';
-	if($template) {
+	if($template)
+	{
 		$etemplate = new Api\Etemplate('etemplate.et2_test_file_upload');
 		$etemplate->exec('',array());
 		return;

api/categories.php

Spacing +5 added lines, -5 removed lines

@@ -30,11 +30,11 @@ 
 $appname = $_GET['app'] && $GLOBALS['egw_info']['apps'][$_GET['app']] ? $_GET['app'] : Api\Categories::GLOBAL_APPNAME;
 
 $cats = new Api\Categories('', $appname);
-$categories = $cats->return_array('all',0, false, '', 'ASC','',$appname==Api\Categories::GLOBAL_APPNAME);
+$categories = $cats->return_array('all', 0, false, '', 'ASC', '', $appname == Api\Categories::GLOBAL_APPNAME);
 
 $content = "/* Category CSS for $appname */\n\n";
 
-foreach($categories as $cat)
+foreach ($categories as $cat)
 {
 	if (!isset($cat['data'])) continue;
 	if (!empty($cat['data']['color']))
@@ -45,7 +45,7 @@ 
 	}
 	if (!empty($cat['data']['icon']))
 	{
-		$content .= ".cat_{$cat['id']} .cat_icon { background-image: url('". admin_categories::icon_url($cat['data']['icon']) ."');} /*{$cat['name']}*/\n";
+		$content .= ".cat_{$cat['id']} .cat_icon { background-image: url('".admin_categories::icon_url($cat['data']['icon'])."');} /*{$cat['name']}*/\n";
 	}
 }
 
@@ -53,7 +53,7 @@ 
 $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 1 day
+Api\Session::cache_control(86400); // cache for 1 day
 Header('Content-Type: text/css; charset=utf-8');
 Header('ETag: '.$etag);
 
@@ -65,7 +65,7 @@ 
 }
 
 // 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

@@ -36,7 +36,10 @@
 
 foreach($categories as $cat)
 {
-	if (!isset($cat['data'])) continue;
+	if (!isset($cat['data']))
+	{
+		continue;
+	}
 	if (!empty($cat['data']['color']))
 	{
 		// Use slightly more specific selector that just class, to allow defaults

api/thumbnail.php

Spacing +25 added lines, -26 removed lines

@@ -70,9 +70,9 @@ 
 		}
 	}
 
-	if (!preg_match('/^[a-z0-9_-]+$/i',$app))
+	if (!preg_match('/^[a-z0-9_-]+$/i', $app))
 	{
-		die('Stop');	// just to prevent someone doing nasty things
+		die('Stop'); // just to prevent someone doing nasty things
 	}
 
 	return $app;
@@ -83,8 +83,7 @@ 
  */
 function get_maxsize()
 {
-	$preset = !($GLOBALS['egw_info']['server']['link_list_thumbnail'] > 0) ? 64 :
-		$GLOBALS['egw_info']['server']['link_list_thumbnail'];
+	$preset = !($GLOBALS['egw_info']['server']['link_list_thumbnail'] > 0) ? 64 : $GLOBALS['egw_info']['server']['link_list_thumbnail'];
 
 	// Another maximum size may be passed if thumbnails are turned on
 	if ($preset != 0 && isset($_GET['thsize']) && is_numeric($_GET['thsize']))
@@ -150,7 +149,7 @@ 
 	}
 	$dst = gen_dstfile($stat && !empty($stat['url']) ? $stat['url'] : $src, $maxsize, $height, $width, $minsize);
 	$dst_dir = dirname($dst);
-	if(file_exists($dst_dir))
+	if (file_exists($dst_dir))
 	{
 		// Check whether the destination file already exists and is newer than
 		// the source file. Assume the file doesn't exist if thumbnailing is turned off.
@@ -190,7 +189,7 @@ 
 		{
 			// Allow client to cache these, makes scrolling in filemanager much nicer
 			// setting maximum allow caching time of one year, if url contains (non-empty) moditication time
-			Api\Session::cache_control(empty($_GET['mtime']) ? 300 : 31536000, true);	// true = private / browser only caching
+			Api\Session::cache_control(empty($_GET['mtime']) ? 300 : 31536000, true); // true = private / browser only caching
 			header('Content-Type: '.$output_mime);
 			readfile($dst);
 			return true;
@@ -212,7 +211,7 @@ 
  * @param int $minsize =null
  * @return string
  */
-function gen_dstfile($src, $maxsize, $height=null, $width=null, $minsize=null)
+function gen_dstfile($src, $maxsize, $height = null, $width = null, $minsize = null)
 {
 	// Use the egroupware file cache to store the thumbnails on a per instance basis
 	$cachefile = new Api\Cache\Files(array());
@@ -238,7 +237,7 @@ 
  * TODO: As this is a general purpose function, it might probably be moved
  *   to some other php file or an "image utils" class.
  */
-function get_scaled_image_size($w, $h, $maxw, $maxh, $minw=0, $minh=0)
+function get_scaled_image_size($w, $h, $maxw, $maxh, $minw = 0, $minh = 0)
 {
 	//Scale will contain the factor by which the image has to be scaled down
 	$scale = 1.0;
@@ -299,7 +298,7 @@ 
  * @param int $maxh the maximum height of the thumbnail
  * @returns boolean|resource false or a gd_image
  */
-function gd_image_load($file,$maxw,$maxh)
+function gd_image_load($file, $maxw, $maxh)
 {
 	// Get mime type
 	list($type, $image_type) = explode('/', $mime = Vfs::mime_content_type($file));
@@ -307,9 +306,9 @@ 
 	if (!$type) list($type, $image_type) = explode('/', $mime = Api\MimeMagic::filename2mime($file));
 
 	// Call the according gd constructor depending on the file type
-	if($type == 'image')
+	if ($type == 'image')
 	{
-		if (in_array($image_type, array('tiff','jpeg')) && ($image = exif_thumbnail_load($file)))
+		if (in_array($image_type, array('tiff', 'jpeg')) && ($image = exif_thumbnail_load($file)))
 		{
 			return $image;
 		}
@@ -332,12 +331,12 @@ 
 	else if ($type == 'application')
 	{
 		$thumb = false;
-		if(strpos($image_type,'vnd.oasis.opendocument.') === 0)
+		if (strpos($image_type, 'vnd.oasis.opendocument.') === 0)
 		{
 			// OpenDocuments have thumbnails inside already
 			$thumb = get_opendocument_thumbnail($file);
 		}
-		else if($image_type == 'pdf')
+		else if ($image_type == 'pdf')
 		{
 			$thumb = get_pdf_thumbnail($file);
 		}
@@ -347,7 +346,7 @@ 
 			//$thumb = get_msoffice_thumbnail($file);
 		}
 		// Mark it with mime type icon
-		if($thumb)
+		if ($thumb)
 		{
 			// Need to scale first, or the mark will be wrong size
 			$scaled = get_scaled_image_size(imagesx($thumb), imagesy($thumb), $maxw, $maxh);
@@ -387,8 +386,8 @@ 
 
 	// Image is already there, but we can't access them directly through VFS
 	$ext = $mimetype == 'application/vnd.oasis.opendocument.text' ? '.odt' : '.ods';
-	$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($file,$ext).'-');
-	copy($file,$archive);
+	$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($file, $ext).'-');
+	copy($file, $archive);
 
 	$thumbnail_url = 'zip://'.$archive.'#Thumbnails/thumbnail.png';
 	$image = imagecreatefromstring(file_get_contents($thumbnail_url));
@@ -442,7 +441,7 @@ 
  */
 function get_pdf_thumbnail($file)
 {
-	if(!pdf_thumbnails_available()) return false;
+	if (!pdf_thumbnails_available()) return false;
 
 	// switch off max_excution_time, as some thumbnails take longer and
 	// will be startet over and over again, if they dont finish
@@ -471,7 +470,7 @@ 
 	$target_height = imagesy($target_image);
 
 	// Find mime image, if no tag image set
-	if(!$tag_image && $mime)
+	if (!$tag_image && $mime)
 	{
 		list($app, $icon) = explode('/', Vfs::mime_icon($mime), 2);
 		list(, $path) = explode($GLOBALS['egw_info']['server']['webserver_url'],
@@ -482,16 +481,16 @@ 
 
 	// Find correct size - max 1/3 target
 	$tag_size = get_scaled_image_size(imagesx($tag_image), imagesy($tag_image), $target_width / 3, $target_height / 3);
-	if(!$tag_size) return;
-	list($tag_width,$tag_height) = $tag_size;
+	if (!$tag_size) return;
+	list($tag_width, $tag_height) = $tag_size;
 
 	// Put it in
-	if($mime)
+	if ($mime)
 	{
-		imagecopyresampled($target_image,$tag_image,
+		imagecopyresampled($target_image, $tag_image,
 			$target_width - $tag_width,
 			$target_height - $tag_height,
-			0,0,
+			0, 0,
 			$tag_width,
 			$tag_height,
 			imagesx($tag_image),
@@ -545,7 +544,7 @@ 
 function gd_image_thumbnail($file, $maxw, $maxh, $minw, $minh)
 {
 	//Load the image
-	if (($img_src = gd_image_load($file,$maxw,$maxh)) !== false)
+	if (($img_src = gd_image_load($file, $maxw, $maxh)) !== false)
 	{
 		//Get the constraints of the image
 		$w = imagesx($img_src);
@@ -575,14 +574,14 @@ 
 */
 function gdVersion($user_ver = 0)
 {
-	if (! extension_loaded('gd')) { return; }
+	if (!extension_loaded('gd')) { return; }
 	static $gd_ver = 0;
 
 	// Just accept the specified setting if it's 1.
 	if ($user_ver == 1) { $gd_ver = 1; return 1; }
 
 	// Use the static variable if function was called previously.
-	if ($user_ver !=2 && $gd_ver > 0 ) { return $gd_ver; }
+	if ($user_ver != 2 && $gd_ver > 0) { return $gd_ver; }
 
 	// Use the gd_info() function if possible.
 	if (function_exists('gd_info')) {

Braces +38 added lines, -12 removed lines

@@ -244,10 +244,13 @@ 
 	$scale = 1.0;
 
 	//Select the constraining dimension
-	if ($w > $h) // landscape image: constraining factor $minh or $maxw
+	if ($w > $h)
+	{
+		// landscape image: constraining factor $minh or $maxw
 	{
 		$scale = $minh ? $minh / $h : $maxw / $w;
 	}
+	}
 	else // portrail image: constraining factor $minw or $maxh
 	{
 		$scale = $minw ? $minw / $w : $maxh / $h;
@@ -304,7 +307,10 @@ 
 	// Get mime type
 	list($type, $image_type) = explode('/', $mime = Vfs::mime_content_type($file));
 	// if $file is not from vfs, use Api\MimeMagic::filename2mime to get mime-type from extension
-	if (!$type) list($type, $image_type) = explode('/', $mime = Api\MimeMagic::filename2mime($file));
+	if (!$type)
+	{
+		list($type, $image_type) = explode('/', $mime = Api\MimeMagic::filename2mime($file));
+	}
 
 	// Call the according gd constructor depending on the file type
 	if($type == 'image')
@@ -442,7 +448,10 @@ 
  */
 function get_pdf_thumbnail($file)
 {
-	if(!pdf_thumbnails_available()) return false;
+	if(!pdf_thumbnails_available())
+	{
+		return false;
+	}
 
 	// switch off max_excution_time, as some thumbnails take longer and
 	// will be startet over and over again, if they dont finish
@@ -482,7 +491,10 @@ 
 
 	// Find correct size - max 1/3 target
 	$tag_size = get_scaled_image_size(imagesx($tag_image), imagesy($tag_image), $target_width / 3, $target_height / 3);
-	if(!$tag_size) return;
+	if(!$tag_size)
+	{
+		return;
+	}
 	list($tag_width,$tag_height) = $tag_size;
 
 	// Put it in
@@ -575,17 +587,24 @@ 
 */
 function gdVersion($user_ver = 0)
 {
-	if (! extension_loaded('gd')) { return; }
+	if (! extension_loaded('gd'))
+	{
+return; }
 	static $gd_ver = 0;
 
 	// Just accept the specified setting if it's 1.
-	if ($user_ver == 1) { $gd_ver = 1; return 1; }
+	if ($user_ver == 1)
+	{
+$gd_ver = 1; return 1; }
 
 	// Use the static variable if function was called previously.
-	if ($user_ver !=2 && $gd_ver > 0 ) { return $gd_ver; }
+	if ($user_ver !=2 && $gd_ver > 0 )
+	{
+return $gd_ver; }
 
 	// Use the gd_info() function if possible.
-	if (function_exists('gd_info')) {
+	if (function_exists('gd_info'))
+	{
 		$ver_info = gd_info();
 		$match = null;
 		preg_match('/\d/', $ver_info['GD Version'], $match);
@@ -594,11 +613,15 @@ 
 	}
 
 	// If phpinfo() is disabled use a specified / fail-safe choice...
-	if (preg_match('/phpinfo/', ini_get('disable_functions'))) {
-		if ($user_ver == 2) {
+	if (preg_match('/phpinfo/', ini_get('disable_functions')))
+	{
+		if ($user_ver == 2)
+		{
 			$gd_ver = 2;
 			return 2;
-		} else {
+		}
+		else
+		{
 			$gd_ver = 1;
 			return 1;
 		}
@@ -607,6 +630,9 @@ 
 	ob_start();
 	phpinfo(8);
 	$info = stristr(ob_get_clean(), 'gd version');
-	if (preg_match('/\d/', $info, $match)) $gd_ver = $match[0];
+	if (preg_match('/\d/', $info, $match))
+	{
+		$gd_ver = $match[0];
+	}
 	return $match[0];
 }

api/user.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 $etag = '"'.md5($preferences.$ab_preferences.$user).'"';
 
 // headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
-Api\Session::cache_control(86400);	// cache for 1 day
+Api\Session::cache_control(86400); // cache for 1 day
 Header('Content-Type: text/javascript; charset=utf-8');
 Header('ETag: '.$etag);
 
@@ -49,7 +49,7 @@ 
 $content .= 'egw.set_user('.$user.", 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');

setup/inc/class.setup_cmd_hooks.inc.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 	 * @param string $config_passwd=null pw of above user
 	 * @param boolean $verbose=false if true, echos out some status information during the run
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null)
+	function __construct($domain, $config_user = null, $config_passwd = null)
 	{
 		if (!is_array($domain))
 		{
@@ -45,17 +45,17 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
-		if ($check_only) return true;	// nothing to check, no arguments ...
+		if ($check_only) return true; // nothing to check, no arguments ...
 
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,15,$this->verbose);
+		$this->check_installed($this->domain, 15, $this->verbose);
 
 		global $setup_info;
-		foreach($setup_info as $appname => $info)
+		foreach ($setup_info as $appname => $info)
 		{
 			if ($info['currentver']) self::$egw_setup->register_hooks($appname);
 		}

Braces +9 added lines, -2 removed lines

@@ -47,7 +47,11 @@ 
 	 */
 	protected function exec($check_only=false)
 	{
-		if ($check_only) return true;	// nothing to check, no arguments ...
+		if ($check_only)
+		{
+			return true;
+		}
+		// nothing to check, no arguments ...
 
 		// instanciate setup object and check authorisation
 		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
@@ -57,7 +61,10 @@ 
 		global $setup_info;
 		foreach($setup_info as $appname => $info)
 		{
-			if ($info['currentver']) self::$egw_setup->register_hooks($appname);
+			if ($info['currentver'])
+			{
+				self::$egw_setup->register_hooks($appname);
+			}
 		}
 		$this->restore_db();
 

setup/inc/class.setup_cmd_showheader.inc.php

Spacing +15 added lines, -15 removed lines

@@ -32,7 +32,7 @@ 
 	 *                           false: the complete header vars, plus install_id and webserver_url from the config table,
 	 *                           null:  only the header vars
 	 */
-	function __construct($data=true,$header_admin_user=null,$header_admin_password=null)
+	function __construct($data = true, $header_admin_user = null, $header_admin_password = null)
 	{
 		if (!is_array($data))
 		{
@@ -54,16 +54,16 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	function exec($check_only=false)
+	function exec($check_only = false)
 	{
-		if ($this->remote_id && $check_only) return true;	// cant check for the remote site locally!
+		if ($this->remote_id && $check_only) return true; // cant check for the remote site locally!
 
 		$this->_check_header_access();
 
 		if ($check_only) return true;
 
 		$egw_info_backup = $GLOBALS['egw_info'];
-		$GLOBALS['egw_info'] = array (
+		$GLOBALS['egw_info'] = array(
 			'flags' => array(
 				'noapi' => true,
 			),
@@ -72,7 +72,7 @@ 
 		{
 			throw new Exception('header.inc.php not found!');
 		}
-		eval(str_replace(array('<?php','perfgetmicrotime'),array('','perfgetmicrotime2'),$header));
+		eval(str_replace(array('<?php', 'perfgetmicrotime'), array('', 'perfgetmicrotime2'), $header));
 
 		// unset the flags, they are not part of  the header
 		unset($GLOBALS['egw_info']['flags']);
@@ -81,7 +81,7 @@ 
 		$GLOBALS['egw_info']['server']['versions']['phpgwapi'] = $egw_info_backup['server']['versions']['phpgwapi'];
 
 		// fetching the install id's stored in the database
-		foreach($GLOBALS['egw_domain'] as &$data)
+		foreach ($GLOBALS['egw_domain'] as &$data)
 		{
 			if (!is_null($this->hash_only))
 			{
@@ -89,9 +89,9 @@ 
 			}
 			try {
 				// it's saver to only send the remote_hash and not install_id and config_pw
-				$data['remote_hash'] = admin_cmd::remote_hash($data['install_id'],$data['config_passwd']);
+				$data['remote_hash'] = admin_cmd::remote_hash($data['install_id'], $data['config_passwd']);
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				if ($data['install_id']) $data['error'] .= $e->getMessage();
 			}
 			if ($this->hash_only)
@@ -100,7 +100,7 @@ 
 					'remote_hash'   => $data['remote_hash'],
 					'webserver_url' => $data['webserver_url'],
 					'install_id'     => $data['install_id'],
-				)+($data['error'] ? array(
+				) + ($data['error'] ? array(
 					'error' => $data['error'],
 				) : array());
 			}
@@ -133,17 +133,17 @@ 
 	{
 		$db = new Api\Db();
 
-		ob_start();		// not available db connection echos a lot grab ;-)
+		ob_start(); // not available db connection echos a lot grab ;-)
 		$err_rep = error_reporting(0);
 
 		$config = array();
 		try {
-			$db->connect($data['db_name'],$data['db_host'],$data['db_port'],$data['db_user'],$data['db_pass'],$data['db_type']);
+			$db->connect($data['db_name'], $data['db_host'], $data['db_port'], $data['db_user'], $data['db_pass'], $data['db_type']);
 			$db->set_app('phpgwapi');
-			$db->select('egw_config','config_name,config_value',array(
-				'config_name'=>array('install_id','webserver_url','account_repository','allow_remote_admin','mail_suffix'),
+			$db->select('egw_config', 'config_name,config_value', array(
+				'config_name'=>array('install_id', 'webserver_url', 'account_repository', 'allow_remote_admin', 'mail_suffix'),
 				'config_app'=>'phpgwapi',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 			while (($row = $db->row(true)))
 			{
 				$config[$row['config_name']] = $row['config_value'];
@@ -167,7 +167,7 @@ 
 	 * @param boolean $set_modifier =true set the current user as modifier or 0 (= run by the system)
 	 * @return boolean true on success, false otherwise
 	 */
-	function save($set_modifier=true)
+	function save($set_modifier = true)
 	{
 		if ($this->remote_id)
 		{

Braces +13 added lines, -3 removed lines

@@ -56,11 +56,18 @@ 
 	 */
 	function exec($check_only=false)
 	{
-		if ($this->remote_id && $check_only) return true;	// cant check for the remote site locally!
+		if ($this->remote_id && $check_only)
+		{
+			return true;
+		}
+		// cant check for the remote site locally!
 
 		$this->_check_header_access();
 
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		$egw_info_backup = $GLOBALS['egw_info'];
 		$GLOBALS['egw_info'] = array (
@@ -92,7 +99,10 @@ 
 				$data['remote_hash'] = admin_cmd::remote_hash($data['install_id'],$data['config_passwd']);
 			}
 			catch(Exception $e) {
-				if ($data['install_id']) $data['error'] .= $e->getMessage();
+				if ($data['install_id'])
+				{
+					$data['error'] .= $e->getMessage();
+				}
 			}
 			if ($this->hash_only)
 			{

setup/inc/class.setup_cmd_update.inc.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param boolean $verbose =false if true, echos out some status information during the run
 	 * @param string $app =null single application to update or install
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$backup=null,$verbose=false,$app=null)
+	function __construct($domain, $config_user = null, $config_passwd = null, $backup = null, $verbose = false, $app = null)
 	{
 		if (!is_array($domain))
 		{
@@ -55,32 +55,32 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		global $setup_info;
 
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,array(14),$this->verbose);
+		$this->check_installed($this->domain, array(14), $this->verbose);
 
 		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 4 &&
 			(!$this->app || !in_array($this->app, self::$apps_to_install) && !in_array($this->app, self::$apps_to_upgrade)) &&
 			!self::check_autoinstall())
 		{
-			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
+			return lang('No update necessary, domain %1(%2) is up to date.', $this->domain, $GLOBALS['egw_domain'][$this->domain]['db_type']);
 		}
 		if ($check_only) return lang('Update necessary.');
 
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
-		self::$egw_setup->process->init_process();	// we need a new schema-proc instance for each new domain
+		self::$egw_setup->process->init_process(); // we need a new schema-proc instance for each new domain
 
 		// request to install a single app
 		if ($this->app && in_array($this->app, self::$apps_to_install))
 		{
 			$app_title = $setup_info[$this->app]['title'] ? $setup_info[$this->app]['title'] : $setup_info[$this->app]['name'];
-			self::_echo_message($this->verbose,lang('Start installing application %1 ...',$app_title));
+			self::_echo_message($this->verbose, lang('Start installing application %1 ...', $app_title));
 			ob_start();
 			$terror = array($this->app => $setup_info[$this->app]);
 
@@ -88,7 +88,7 @@ 
 			{
 				$errors = self::$egw_setup->process->current($terror, $this->verbose);
 				$terror = self::$egw_setup->process->default_records($errors, $this->verbose);
-				echo $app_title . ' ' . lang('tables installed, unless there are errors printed above') . '.';
+				echo $app_title.' '.lang('tables installed, unless there are errors printed above').'.';
 			}
 			else
 			{
@@ -102,20 +102,20 @@ 
 				{
 					self::$egw_setup->register_app($setup_info[$this->app]['name']);
 				}
-				echo $app_title . ' ' . lang('registered') . '.';
+				echo $app_title.' '.lang('registered').'.';
 
 				if ($setup_info[$this->app]['hooks'])
 				{
 					self::$egw_setup->register_hooks($setup_info[$this->app]['name']);
-					echo "\n".$app_title . ' ' . lang('hooks registered') . '.';
+					echo "\n".$app_title.' '.lang('hooks registered').'.';
 				}
 			}
 		}
 		else
 		{
-			self::_echo_message($this->verbose,lang('Start updating the database ...'));
+			self::_echo_message($this->verbose, lang('Start updating the database ...'));
 			ob_start();
-			self::$egw_setup->process->pass($setup_info,'upgrade',false);
+			self::$egw_setup->process->pass($setup_info, 'upgrade', false);
 		}
 		$messages = ob_get_contents();
 		ob_end_clean();

Braces +8 added lines, -2 removed lines

@@ -70,7 +70,10 @@ 
 		{
 			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
 		}
-		if ($check_only) return lang('Update necessary.');
+		if ($check_only)
+		{
+			return lang('Update necessary.');
+		}
 
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
@@ -119,7 +122,10 @@ 
 		}
 		$messages = ob_get_contents();
 		ob_end_clean();
-		if ($messages && $this->verbose) echo strip_tags($messages)."\n";
+		if ($messages && $this->verbose)
+		{
+			echo strip_tags($messages)."\n";
+		}
 
 		$this->restore_db();
 

setup/inc/class.setup_cmd_admin.inc.php

Spacing +13 added lines, -13 removed lines

@@ -38,8 +38,8 @@ 
 	 * @param array $config =array() extra config for the account object: account_repository, ldap_*
 	 * @param string $lang ='en'
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$admin_user=null,$admin_password=null,
-		$admin_firstname=null,$admin_lastname=null,$admin_email=null,array $config=array(),$lang='en')
+	function __construct($domain, $config_user = null, $config_passwd = null, $admin_user = null, $admin_password = null,
+		$admin_firstname = null, $admin_lastname = null, $admin_email = null, array $config = array(), $lang = 'en')
 	{
 		if (!is_array($domain))
 		{
@@ -68,21 +68,21 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		if ($check_only && $this->remote_id)
 		{
-			return true;	// can only check locally
+			return true; // can only check locally
 		}
-		$this->check_installed($this->domain,15);
+		$this->check_installed($this->domain, 15);
 
 		if (!$this->admin_firstname) $this->set_defaults['admin_firstname'] = $this->admin_firstname = lang('Admin');
 		if (!$this->admin_lastname) $this->set_defaults['admin_lastname'] = $this->admin_lastname = lang('User');
-		if (strpos($this->admin_email,'$') !== false)
+		if (strpos($this->admin_email, '$') !== false)
 		{
 			$this->set_defaults['email'] = $this->admin_email = str_replace(
-				array('$domain','$uid','$account_lid'),
-				array($this->domain,$this->admin_user,$this->admin_user),$this->admin_email);
+				array('$domain', '$uid', '$account_lid'),
+				array($this->domain, $this->admin_user, $this->admin_user), $this->admin_email);
 		}
 		$_POST['username'] = $this->admin_user;
 		$_POST['passwd2']  = $_POST['passwd'] = $this->admin_password;
@@ -99,9 +99,9 @@ 
 		switch ($error)
 		{
 			case 41:
-				throw new Api\Exception\WrongUserinput(lang('Error in admin-creation !!!'),41);
+				throw new Api\Exception\WrongUserinput(lang('Error in admin-creation !!!'), 41);
 			case 42:
-				throw new Api\Exception\WrongUserinput(lang('Error in group-creation !!!'),42);
+				throw new Api\Exception\WrongUserinput(lang('Error in group-creation !!!'), 42);
 		}
 		$this->restore_db();
 
@@ -112,13 +112,13 @@ 
 		if (php_sapi_name() !== 'cli' || !file_exists(EGW_SERVER_ROOT.'/stylite') || file_exists(EGW_SERVER_ROOT.'/managementserver'))
 		{
 			$output = $ret = null;
-			exec($cmd,$output,$ret);
+			exec($cmd, $output, $ret);
 		}
-		$output = implode("\n",$output);
+		$output = implode("\n", $output);
 		//echo "ret=$ret\n".$output;
 		if ($ret)
 		{
-			throw new Api\Exception ($output,$ret);
+			throw new Api\Exception($output, $ret);
 		}
 		return lang('Admin account successful created.');
 	}

Braces +8 added lines, -2 removed lines

@@ -76,8 +76,14 @@
 		}
 		$this->check_installed($this->domain,15);
 
-		if (!$this->admin_firstname) $this->set_defaults['admin_firstname'] = $this->admin_firstname = lang('Admin');
-		if (!$this->admin_lastname) $this->set_defaults['admin_lastname'] = $this->admin_lastname = lang('User');
+		if (!$this->admin_firstname)
+		{
+			$this->set_defaults['admin_firstname'] = $this->admin_firstname = lang('Admin');
+		}
+		if (!$this->admin_lastname)
+		{
+			$this->set_defaults['admin_lastname'] = $this->admin_lastname = lang('User');
+		}
 		if (strpos($this->admin_email,'$') !== false)
 		{
 			$this->set_defaults['email'] = $this->admin_email = str_replace(