EGroupware / egroupware

setup/index.php

Braces +15 added lines, -4 removed lines

@@ -49,10 +49,13 @@ 
 $GLOBALS['egw_info']['setup']['stage']['header'] = $GLOBALS['egw_setup']->detection->check_header();
 if ($GLOBALS['egw_info']['setup']['stage']['header'] != '10')
 {
-	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)	// header needs update, go there direct
+	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)
+	{
+		// header needs update, go there direct
 	{
 		Header('Location: manageheader.php');
 	}
+	}
 	else	// run check-install first
 	{
 		Header('Location: check_install.php?intro=1');
@@ -97,7 +100,9 @@ 
 	}
 }
 
-if ($GLOBALS['DEBUG']) { echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
+if ($GLOBALS['DEBUG'])
+{
+echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['db'] = 0;
 //$action = 'Upgrade';
@@ -501,8 +506,14 @@ 
 		$msg = '';
 		if ($to_upgrade || $to_install)
 		{
-			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
-			if ($to_install) $msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			if ($to_upgrade)
+			{
+				$msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
+			}
+			if ($to_install)
+			{
+				$msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			}
 		}
 		$btn_manage_apps = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$msg ? $msg : lang('This stage is completed<br />'),

setup/applications.php

Braces +4 added lines, -1 removed lines

@@ -285,7 +285,10 @@
 				$val = array2string($val);
 				break;
 			default:
-				if (is_array($val)) $val = implode(', ', $val);
+				if (is_array($val))
+				{
+					$val = implode(', ', $val);
+				}
 				break;
 		}
 		$setup_tpl->set_var('bg_color', $bgcolor[++$i & 1]);

setup/doc/chown.php

Braces +11 added lines, -3 removed lines

@@ -13,10 +13,13 @@ 
 
 chdir(dirname(__FILE__));	// to enable our relative pathes to work
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling as web-page
 {
 	die('<h1>setup/doc/chown.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 $recursive = false;
 
@@ -70,7 +73,10 @@ 
 {
 	global $change;
 
-	if (is_null($stat) && !($stat = stat($path))) return false;
+	if (is_null($stat) && !($stat = stat($path)))
+	{
+		return false;
+	}
 
 	if (isset($change[$stat['uid']]) && !chown($path, $uid=$change[$stat['uid']]))
 	{
@@ -86,10 +92,12 @@ 
 		foreach(new DirectoryIterator($path) as $child)
 		{
 			if (!$child->isDot())
-				chown_grp($child->getPathname(), array(
+			{
+							chown_grp($child->getPathname(), array(
 					'uid' => $child->getOwner(),
 					'gid' => $child->getGroup(),
 				), $recursive);
+			}
 		}
 	}
 }

importexport/setup/tables_update.inc.php

Braces +12 added lines, -4 removed lines

@@ -81,18 +81,26 @@
 
 		// step through every source code intstalled app
 		$egwdir = dir(EGW_INCLUDE_ROOT);
-		while (false !== ($appdir = $egwdir->read())) {
+		while (false !== ($appdir = $egwdir->read()))
+		{
 			$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-			if ( !is_dir( $defdir ) ) continue;
+			if ( !is_dir( $defdir ) )
+			{
+				continue;
+			}
 
 			// step through each file in defdir of app
 			$d = dir($defdir);
-			while (false !== ($entry = $d->read())) {
+			while (false !== ($entry = $d->read()))
+			{
 				try
 				{
 					$file = $defdir. '/'. $entry;
 					list( $filename, $extension) = explode('.',$entry);
-					if ( $extension != 'xml' ) continue;
+					if ( $extension != 'xml' )
+					{
+						continue;
+					}
 					importexport_definitions_bo::import( $file );
 				}
 				catch (Exception $e)

importexport/setup/default_records.inc.php

Braces +12 added lines, -4 removed lines

@@ -21,16 +21,24 @@
 
 // step through every source code intstalled app
 $egwdir = dir(EGW_INCLUDE_ROOT);
-while (false !== ($appdir = $egwdir->read())) {
+while (false !== ($appdir = $egwdir->read()))
+{
 	$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-	if ( !is_dir( $defdir ) ) continue;
+	if ( !is_dir( $defdir ) )
+	{
+		continue;
+	}
 
 	// step through each file in defdir of app
 	$d = dir($defdir);
-	while (false !== ($entry = $d->read())) {
+	while (false !== ($entry = $d->read()))
+	{
 		$file = $defdir. '/'. $entry;
 		list( $filename, $extension) = explode('.',$entry);
-		if ( $extension != 'xml' ) continue;
+		if ( $extension != 'xml' )
+		{
+			continue;
+		}
 		importexport_definitions_bo::import( $file );
 	}
 }

importexport/inc/class.importexport_iface_import_plugin.inc.php

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
  * So this interface just garanties the interaction with userinterfaces. It
  * has nothing to do with datatypes.
  */
-interface importexport_iface_import_plugin {
+interface importexport_iface_import_plugin
+{
 	
 	/**
 	 * imports entries according to given definition object.

importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php

Braces +21 added lines, -9 removed lines

@@ -90,14 +90,22 @@ 
 	/**
 	 * Called from framework so Import / Export can add links into other apps' sidebox.
 	 */
-	public static function other_apps() {
-		if(!$GLOBALS['egw_info']['user']['apps']['importexport']) return array();
-		if($GLOBALS['egw_info']['flags']['no_importexport'] === true) return array();
+	public static function other_apps()
+	{
+		if(!$GLOBALS['egw_info']['user']['apps']['importexport'])
+		{
+			return array();
+		}
+		if($GLOBALS['egw_info']['flags']['no_importexport'] === true)
+		{
+			return array();
+		}
 
 		$appname = $GLOBALS['egw_info']['flags']['currentapp'];
 		$cache = Api\Cache::getCache(Api\Cache::SESSION, 'importexport', 'sidebox_links');
 
-		if(!$cache[$appname] && $GLOBALS['egw_info']['user']['apps']['importexport']) {
+		if(!$cache[$appname] && $GLOBALS['egw_info']['user']['apps']['importexport'])
+		{
 			$cache[$appname]['import'] = importexport_helper_functions::has_definitions($appname, 'import');
 			$cache[$appname]['export'] = importexport_helper_functions::has_definitions($appname, 'export');
 			Api\Cache::setCache(Api\Cache::SESSION, 'importexport', 'sidebox_links', $cache);
@@ -117,7 +125,8 @@ 
 				'app' => 'importexport',
 				'text' => in_array($appname, array('sitemgr')) || count($plugins[$appname]['import']) > 1 ? 'Import' : 'Import CSV'
 			);
-			if($GLOBALS['egw_info']['flags']['disable_importexport']['import']) {
+			if($GLOBALS['egw_info']['flags']['disable_importexport']['import'])
+			{
 				$file['Import CSV']['link'] = '';
 			}
 		}
@@ -134,7 +143,8 @@ 
 				'app' => 'importexport',
 				'text' => in_array($appname, array('sitemgr')) || count($plugins[$appname]['export']) > 1 ? 'Export' : 'Export CSV'
 			);
-			if($GLOBALS['egw_info']['flags']['disable_importexport']['export']) {
+			if($GLOBALS['egw_info']['flags']['disable_importexport']['export'])
+			{
 				$file['Export CSV']['link'] = '';
 			}
 		}
@@ -142,15 +152,17 @@ 
 		$config = Api\Config::read('importexport');
 		if($appname != 'admin' && ($config['users_create_definitions'] || $GLOBALS['egw_info']['user']['apps']['admin']) &&
 			count(importexport_helper_functions::get_plugins($appname)) > 0
-		)
-		{
+		) {
 			$file['Define imports|exports']	= Egw::link('/index.php',array(
 				'menuaction' => 'importexport.importexport_definitions_ui.index',
 				'application' => $appname,
 				'ajax' => 'true'
 			),$GLOBALS['egw_info']['user']['apps']['admin'] ? 'admin' : 'preferences');
 		}
-		if($file) display_sidebox($appname,lang('importexport'),$file);
+		if($file)
+		{
+			display_sidebox($appname,lang('importexport'),$file);
+		}
 	}
 	
 	/**

importexport/inc/class.importexport_arrayxml.inc.php

Braces +36 added lines, -15 removed lines

@@ -20,7 +20,8 @@ 
  * @todo deal with other types like objects

  * @static only namespace here

  */ 

-class importexport_arrayxml {

+class importexport_arrayxml
+{
 	

 	/**

 	 * converts a php array to an xml string

@@ -30,29 +31,34 @@ 
 	 * @param DOMElement $_node

 	 * @return string XML string

 	 */

-	public static function array2xml ( $_data, $_name = 'root', $_node=null ) {

+	public static function array2xml ( $_data, $_name = 'root', $_node=null )
+	{
 		$returnXML = false;

-		if ( $_node === null ) {

+		if ( $_node === null )
+		{
 			$_node = new DOMDocument( '1.0', 'utf-8' );

 			$_node->formatOutput = true;

 			$returnXML = true;

 		}

 		

 		$datatype = gettype( $_data );

-		switch ( $datatype ) {

+		switch ( $datatype )
+		{
 			case 'array' :

 				$subnode = new DOMElement( 'entry' );

 				$_node->appendChild( $subnode );

 				$subnode->setAttribute( 'type', $datatype );

 				$subnode->setAttribute( 'name' , $_name );

 					

-				foreach ( $_data as $ikey => $ivalue ) {

+				foreach ( $_data as $ikey => $ivalue )
+				{
 					self::array2xml( $ivalue, $ikey, $subnode );

 				}

 				break;

 

 			default : 

-				switch ( $datatype ) {

+				switch ( $datatype )
+				{
 					case 'boolean' :

 						$data = $_data !== false ? 'TRUE' : 'FALSE';

 						break;

@@ -74,28 +80,43 @@ 
 	 * @param string $_xml

 	 * @return array

 	 */

-	public static function xml2array( $_xml ) {

-		if ( $_xml instanceof DOMElement ) {

+	public static function xml2array( $_xml )
+	{
+		if ( $_xml instanceof DOMElement )
+		{
 			$n = &$_xml;

-		} else {

+		}
+		else
+		{
 			$n = new DOMDocument;

 			$loaded = $n->loadXML($_xml);

-			if(!$loaded) return array();

+			if(!$loaded)
+			{
+				return array();
+			}
 		}

 		$xml_array = array();

 		

-		foreach($n->childNodes as $nc) {

+		foreach($n->childNodes as $nc)
+		{
 			

-			if ( $nc->nodeType != XML_ELEMENT_NODE ) continue;

+			if ( $nc->nodeType != XML_ELEMENT_NODE )
+			{
+				continue;
+			}
 				

 			$name = $nc->attributes->getNamedItem('name')->nodeValue;

 			$type = $nc->attributes->getNamedItem('type')->nodeValue;

 

 			//echo $nc->nodeType. "(length ): ". $nc->nodeName. " => ". $nc->nodeValue. "; Attriubtes: name=$name, type=$type  \n ";

-			if( $nc->childNodes->length >= 2) {

+			if( $nc->childNodes->length >= 2)
+			{
 				$xml_array[$name] = self::xml2array($nc);

-			} else {

-				switch ( $type ) {

+			}
+			else
+			{
+				switch ( $type )
+				{
 					case 'boolean' :

 						$value = $nc->nodeValue == 'FALSE' ? false : true;

 						break;

importexport/inc/class.importexport_iface_export_plugin.inc.php

Braces +2 added lines, -1 removed lines

@@ -34,7 +34,8 @@
  *
  * get_selector();  //returns array
  */
-interface importexport_iface_export_plugin {
+interface importexport_iface_export_plugin
+{
 	
 	/**
 	 * exports entries according to given definition object.