EGroupware / egroupware

importexport/setup/default_records.inc.php

Spacing +11 added lines, -11 removed lines

@@ -12,9 +12,9 @@ 
 if (!extension_loaded('dom'))
 {
 	echo "<p>Required PHP DOM extension missing, installation of ImportExport definitions aborted.</p>\n";
-	return;	// otherwise we mess up the whole eGroupware install process
+	return; // otherwise we mess up the whole eGroupware install process
 }
-require_once(EGW_INCLUDE_ROOT. '/importexport/inc/class.importexport_definitions_bo.inc.php');
+require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.importexport_definitions_bo.inc.php');
 
 // This sets up $GLOBALS['egw']->accounts and $GLOBALS['egw']->db
 $GLOBALS['egw_setup']->setup_account_object();
@@ -22,22 +22,22 @@ 
 // step through every source code intstalled app
 $egwdir = dir(EGW_INCLUDE_ROOT);
 while (false !== ($appdir = $egwdir->read())) {
-	$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-	if ( !is_dir( $defdir ) ) continue;
+	$defdir = EGW_INCLUDE_ROOT."/$appdir/setup/";
+	if (!is_dir($defdir)) continue;
 
 	// step through each file in defdir of app
 	$d = dir($defdir);
 	while (false !== ($entry = $d->read())) {
-		$file = $defdir. '/'. $entry;
-		list( $filename, $extension) = explode('.',$entry);
-		if ( $extension != 'xml' ) continue;
-		importexport_definitions_bo::import( $file );
+		$file = $defdir.'/'.$entry;
+		list($filename, $extension) = explode('.', $entry);
+		if ($extension != 'xml') continue;
+		importexport_definitions_bo::import($file);
 	}
 }
 
 // give Default and Admins group rights for ImportExport
-foreach(array('Default' => 'Default','Admins' => 'Admin') as $account_lid => $name)
+foreach (array('Default' => 'Default', 'Admins' => 'Admin') as $account_lid => $name)
 {
-	$account_id = $GLOBALS['egw_setup']->add_account($account_lid,$name,'Group',False,False);
-	$GLOBALS['egw_setup']->add_acl('importexport','run',$account_id);
+	$account_id = $GLOBALS['egw_setup']->add_account($account_lid, $name, 'Group', False, False);
+	$GLOBALS['egw_setup']->add_acl('importexport', 'run', $account_id);
 }

importexport/inc/class.importexport_iface_import_plugin.inc.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * @param definition $_definition
 	 * @return int number of successful imports
 	 */
-	public function import( $_stream, importexport_definition $_definition );
+	public function import($_stream, importexport_definition $_definition);
 
 	/**
 	 * Reads entries, and presents them back as they will be understood

importexport/inc/class.importexport_iface_export_record.inc.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param array $_options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options );
+	public function __construct($_stream, array $_options);
 	
 	/**
 	 * exports a record into resource of handle
@@ -41,7 +41,7 @@ 
 	 * @param object of interface egw_record _record
 	 * @return bool
 	 */
-	public function export_record( importexport_iface_egw_record $_record );
+	public function export_record(importexport_iface_egw_record $_record);
 
 	/**
 	 * Retruns total number of exported records.

importexport/inc/class.importexport_iface_import_record.inc.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param array $_options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options );
+	public function __construct($_stream, array $_options);
 
 	/**
 	 * cleanup
@@ -42,7 +42,7 @@ 
 	 * @param string _position may be: {first|last|next|previous|somenumber}
 	 * @return bool
 	 */
-	public function get_record( $_position = 'next' );
+	public function get_record($_position = 'next');
 
 	/**
 	 * Retruns total number of records for the open resource.

importexport/inc/class.importexport_arrayxml.inc.php

Spacing +23 added lines, -23 removed lines

@@ -30,39 +30,39 @@ 
 	 * @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 ) {

-			$_node = new DOMDocument( '1.0', 'utf-8' );

+		if ($_node === null) {

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

 			$_node->formatOutput = true;

 			$returnXML = true;

 		}

 		

-		$datatype = gettype( $_data );

-		switch ( $datatype ) {

+		$datatype = gettype($_data);

+		switch ($datatype) {

 			case 'array' :

-				$subnode = new DOMElement( 'entry' );

-				$_node->appendChild( $subnode );

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

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

+				$subnode = new DOMElement('entry');

+				$_node->appendChild($subnode);

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

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

 					

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

-					self::array2xml( $ivalue, $ikey, $subnode );

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

+					self::array2xml($ivalue, $ikey, $subnode);

 				}

 				break;

 

 			default : 

-				switch ( $datatype ) {

+				switch ($datatype) {

 					case 'boolean' :

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

 						break;

 					default:

 						$data = &$_data;

 				}

-				$subnode = new DOMElement( 'entry' , $data );

-				$_node->appendChild( $subnode );

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

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

+				$subnode = new DOMElement('entry', $data);

+				$_node->appendChild($subnode);

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

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

 				break;

 		}

 		return $returnXML ? $_node->saveXML() : '';

@@ -74,28 +74,28 @@ 
 	 * @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 {

 			$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 ) {

+				switch ($type) {

 					case 'boolean' :

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

 						break;

importexport/inc/class.importexport_iface_egw_record.inc.php

Spacing +5 added lines, -5 removed lines

@@ -36,7 +36,7 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' );
+	public function __construct($_identifier = '');
 	
 	/**
 	 * magic method to set attributes of record
@@ -97,7 +97,7 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier );
+	public function save($_dst_identifier);
 	
 	/**
 	 * copys current record to record identified by $_dst_identifier
@@ -105,7 +105,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier );
+	public function copy($_dst_identifier);
 	
 	/**
 	 * moves current record to record identified by $_dst_identifier
@@ -114,14 +114,14 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier );
+	public function move($_dst_identifier);
 	
 	/**
 	 * delets current record from backend
 	 * @return void
 	 *
 	 */
-	public function delete ();
+	public function delete();
 	
 	/**
 	 * destructor

importexport/importexport_cli.php

Spacing +19 added lines, -19 removed lines

@@ -29,23 +29,23 @@ 
 
 if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.save_path')) && is_dir('/tmp') && is_writable('/tmp'))
 {
-	ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
+	ini_set('session.save_path', '/tmp'); // regular users may have no rights to apache's session dir
 }
 
 // Include PEAR::Console_Getopt
 require_once 'Console/Getopt.php';
 
 // Define exit codes for errors
-define('HEADER_NOT_FOUND',9);
-define('NO_ARGS',10);
-define('INVALID_OPTION',11);
+define('HEADER_NOT_FOUND', 9);
+define('NO_ARGS', 10);
+define('INVALID_OPTION', 11);
 
 // Reading the incoming arguments - same as $argv
 $args = Console_Getopt::readPHPArgv();
 
 // Make sure we got them (for non CLI binaries)
 if (PEAR::isError($args)) {
-   fwrite(STDERR,"importexport_cli: ".$args->getMessage()."\n".$usage);
+   fwrite(STDERR, "importexport_cli: ".$args->getMessage()."\n".$usage);
    exit(NO_ARGS);
 }
 
@@ -63,15 +63,15 @@ 
    );
 
 // Convert the arguments to options - check for the first argument
-if ( realpath($_SERVER['argv'][0]) == __FILE__ ) {
-   $options = Console_Getopt::getOpt($args,$short_opts,$long_opts);
+if (realpath($_SERVER['argv'][0]) == __FILE__) {
+   $options = Console_Getopt::getOpt($args, $short_opts, $long_opts);
 } else {
-   $options = Console_Getopt::getOpt2($args,$short_opts,$long_opts);
+   $options = Console_Getopt::getOpt2($args, $short_opts, $long_opts);
 }
 
 // Check the options are valid
 if (PEAR::isError($options)) {
-   fwrite(STDERR,"importexport_cli: ".$options->getMessage()."\n".$usage."\n");
+   fwrite(STDERR, "importexport_cli: ".$options->getMessage()."\n".$usage."\n");
    exit(INVALID_OPTION);
 }
 
@@ -98,13 +98,13 @@ 
 			$dryrun = true;
 			break;
 		default :
-			fwrite (STDERR,$usage."\n");
+			fwrite(STDERR, $usage."\n");
 			exit(INVALID_OPTION);
 	}
 }
 // check file
-if ( !$user || !$password ) {
-	fwrite(STDERR,'importexport_cli: You have to supply a username / password'."\n".$usage);
+if (!$user || !$password) {
+	fwrite(STDERR, 'importexport_cli: You have to supply a username / password'."\n".$usage);
 	exit(INVALID_OPTION);
 }
 
@@ -117,12 +117,12 @@ 
 	'nonavbar' => True,
 	'currentapp' => 'importexport',
 	'autocreate_session_callback' => 'import_export_access',
-	'login' => $user . '@' . $domain,
+	'login' => $user.'@'.$domain,
 	'passwd' => $password,
 );
 if (!is_readable($path_to_egroupware.'/header.inc.php'))
 {
-	fwrite(STDERR,"importexport.php: Could not find '$path_to_egroupware/header.inc.php', exiting !!!\n");
+	fwrite(STDERR, "importexport.php: Could not find '$path_to_egroupware/header.inc.php', exiting !!!\n");
 	exit(HEADER_NOT_FOUND);
 }
 include($path_to_egroupware.'/header.inc.php');
@@ -130,13 +130,13 @@ 
 // check file
 if (!is_readable($file))
 {
-	fwrite(STDERR,"importexport_cli: ". $file. ' is not readable'."\n");
+	fwrite(STDERR, "importexport_cli: ".$file.' is not readable'."\n");
 	exit(INVALID_OPTION);
 }
 
 $definition = new importexport_definition($definition);
-if( $definition->get_identifier() < 1 ) {
-	fwrite(STDERR,"importexport_cli: Definition not found! \n");
+if ($definition->get_identifier() < 1) {
+	fwrite(STDERR, "importexport_cli: Definition not found! \n");
 	exit(INVALID_OPTION);
 }
 
@@ -147,8 +147,8 @@ 
 
 $po = new $definition->plugin;
 
-$resource = fopen( $file, 'r' );
-$po->$type( $resource, $definition );
+$resource = fopen($file, 'r');
+$po->$type($resource, $definition);
 
 exit();
 

admin/setup/setup.inc.php

Spacing +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@ 
 $setup_info['admin']['name']      = 'admin';
 $setup_info['admin']['version']   = '16.1';
 $setup_info['admin']['app_order'] = 1;
-$setup_info['admin']['tables']    = array('egw_admin_queue','egw_admin_remote');
+$setup_info['admin']['tables']    = array('egw_admin_queue', 'egw_admin_remote');
 $setup_info['admin']['enable']    = 1;
-$setup_info['admin']['index']   = 'admin.admin_ui.index&ajax=true';
+$setup_info['admin']['index'] = 'admin.admin_ui.index&ajax=true';
 
 $setup_info['admin']['author'][] = array(
 	'name'  => 'eGroupWare coreteam',
@@ -27,7 +27,7 @@ 
 	'url'   => 'www.egroupware.org'
 );
 
-$setup_info['admin']['license']  = 'GPL';
+$setup_info['admin']['license'] = 'GPL';
 $setup_info['admin']['description'] = 'EGroupware administration application';
 
 /* The hooks this app includes, needed for hooks registration */

admin/setup/tables_current.inc.php

Spacing +24 added lines, -24 removed lines

@@ -15,37 +15,37 @@
 $phpgw_baseline = array(
 	'egw_admin_queue' => array(
 		'fd' => array(
-			'cmd_id' => array('type' => 'auto','nullable' => False),
-			'cmd_uid' => array('type' => 'ascii','precision' => '64','nullable' => False),
-			'cmd_creator' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False),
-			'cmd_creator_email' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'cmd_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False),
-			'cmd_type' => array('type' => 'ascii','precision' => '32','nullable' => False,'default' => 'admin_cmd'),
-			'cmd_status' => array('type' => 'int','precision' => '1'),
-			'cmd_scheduled' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'cmd_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'cmd_modifier' => array('type' => 'int','meta' => 'user','precision' => '4'),
-			'cmd_modifier_email' => array('type' => 'varchar','precision' => '128'),
-			'cmd_error' => array('type' => 'varchar','precision' => '255'),
-			'cmd_errno' => array('type' => 'int','precision' => '4'),
-			'cmd_requested' => array('type' => 'int','precision' => '4'),
-			'cmd_requested_email' => array('type' => 'varchar','precision' => '128'),
-			'cmd_comment' => array('type' => 'varchar','precision' => '255'),
-			'cmd_data' => array('type' => 'ascii','precision' => '16384'),
-			'remote_id' => array('type' => 'int','precision' => '4')
+			'cmd_id' => array('type' => 'auto', 'nullable' => False),
+			'cmd_uid' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False),
+			'cmd_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False),
+			'cmd_creator_email' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'cmd_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False),
+			'cmd_type' => array('type' => 'ascii', 'precision' => '32', 'nullable' => False, 'default' => 'admin_cmd'),
+			'cmd_status' => array('type' => 'int', 'precision' => '1'),
+			'cmd_scheduled' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'cmd_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'cmd_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4'),
+			'cmd_modifier_email' => array('type' => 'varchar', 'precision' => '128'),
+			'cmd_error' => array('type' => 'varchar', 'precision' => '255'),
+			'cmd_errno' => array('type' => 'int', 'precision' => '4'),
+			'cmd_requested' => array('type' => 'int', 'precision' => '4'),
+			'cmd_requested_email' => array('type' => 'varchar', 'precision' => '128'),
+			'cmd_comment' => array('type' => 'varchar', 'precision' => '255'),
+			'cmd_data' => array('type' => 'ascii', 'precision' => '16384'),
+			'remote_id' => array('type' => 'int', 'precision' => '4')
 		),
 		'pk' => array('cmd_id'),
 		'fk' => array(),
-		'ix' => array('cmd_status','cmd_scheduled'),
+		'ix' => array('cmd_status', 'cmd_scheduled'),
 		'uc' => array('cmd_uid')
 	),
 	'egw_admin_remote' => array(
 		'fd' => array(
-			'remote_id' => array('type' => 'auto','nullable' => False),
-			'remote_name' => array('type' => 'varchar','precision' => '64','nullable' => False),
-			'remote_hash' => array('type' => 'ascii','precision' => '32','nullable' => False),
-			'remote_url' => array('type' => 'ascii','precision' => '128','nullable' => False),
-			'remote_domain' => array('type' => 'ascii','precision' => '64','nullable' => False)
+			'remote_id' => array('type' => 'auto', 'nullable' => False),
+			'remote_name' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False),
+			'remote_hash' => array('type' => 'ascii', 'precision' => '32', 'nullable' => False),
+			'remote_url' => array('type' => 'ascii', 'precision' => '128', 'nullable' => False),
+			'remote_domain' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False)
 		),
 		'pk' => array('remote_id'),
 		'fk' => array(),