EGroupware / egroupware

filemanager/inc/class.filemanager_hooks.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 	/**
 	 * Entries for filemanagers's admin menu
 	 *
-	 * @param string|array $location ='admin' hook name or params
+	 * @param string $location ='admin' hook name or params
 	 */
 	static function admin($location = 'admin')
 	{

Indentation +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 		);
 		if ($location == 'admin')
 		{
-        	display_section(self::$appname,$file);
+			display_section(self::$appname,$file);
 		}
 		else
 		{
@@ -128,7 +128,7 @@ 
 			'yes' => lang('Yes')
 		);
 
-        $settings = array(
+		$settings = array(
 			'startfolder'	=> array(
 				'type'		=> 'input',
 				'name'		=> 'startfolder',

Spacing +32 added lines, -32 removed lines

@@ -34,19 +34,19 @@ 
 		//echo "<p>admin_prefs_sidebox_hooks::all_hooks(".print_r($args,True).") appname='$appname', location='$location'</p>\n";
 		$config = config::read(self::$appname);
 		if (!empty($config['max_folderlinks'])) self::$foldercount = (int)$config['max_folderlinks'];
-		$file_prefs    = &$GLOBALS['egw_info']['user']['preferences'][self::$appname];
+		$file_prefs = &$GLOBALS['egw_info']['user']['preferences'][self::$appname];
 		if ($location == 'sidebox_menu')
 		{
-			$title = $GLOBALS['egw_info']['apps'][self::$appname]['title'] . ' '. lang('Menu');
+			$title = $GLOBALS['egw_info']['apps'][self::$appname]['title'].' '.lang('Menu');
 			$file = array();
-			if($GLOBALS['egw_info']['apps']['stylite'])
+			if ($GLOBALS['egw_info']['apps']['stylite'])
 			{
 				// add "file a file" (upload) dialog
 				$file[] = array(
 					'text' => 'File a file',
-					'link' => "javascript:egw_openWindowCentered2('".egw::link('/index.php',array(
+					'link' => "javascript:egw_openWindowCentered2('".egw::link('/index.php', array(
 							'menuaction'=>'stylite.stylite_filemanager.upload',
-						),false)."','_blank',550,350)",
+						), false)."','_blank',550,350)",
 					'app'  => 'phpgwapi',
 					'icon' => 'upload',
 				);
@@ -54,9 +54,9 @@ 
 			// add selection for available views, if we have more then one
 			if (count(filemanager_ui::init_views()) > 1)
 			{
-				$index_url = egw::link('/index.php',array('menuaction' => 'filemanager.filemanager_ui.index'),false);
+				$index_url = egw::link('/index.php', array('menuaction' => 'filemanager.filemanager_ui.index'), false);
 				$file[] = array(
-					'text' => html::select('filemanager_view',filemanager_ui::get_view(),filemanager_ui::$views,false,
+					'text' => html::select('filemanager_view', filemanager_ui::get_view(), filemanager_ui::$views, false,
 						' onchange="'."egw_appWindow('filemanager').location='$index_url&view='+this.value;".
 						'" style="width: 100%;"'),
 					'no_lang' => True,
@@ -65,23 +65,23 @@ 
 			}
 			if ($file_prefs['showhome'] != 'no')
 			{
-				$file['Your home directory'] = egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$homepath,'ajax'=>'true'));
+				$file['Your home directory'] = egw::link('/index.php', array('menuaction'=>self::$appname.'.filemanager_ui.index', 'path'=>$homepath, 'ajax'=>'true'));
 			}
 			if ($file_prefs['showusers'] != 'no')
 			{
-				$file['Users and groups'] = egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$basepath,'ajax'=>'true'));
+				$file['Users and groups'] = egw::link('/index.php', array('menuaction'=>self::$appname.'.filemanager_ui.index', 'path'=>$basepath, 'ajax'=>'true'));
 			}
-			if (!empty($file_prefs['showbase']) && $file_prefs['showbase']=='yes')
+			if (!empty($file_prefs['showbase']) && $file_prefs['showbase'] == 'yes')
 			{
-				$file['Basedirectory'] = egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$rootpath,'ajax'=>'true'));
+				$file['Basedirectory'] = egw::link('/index.php', array('menuaction'=>self::$appname.'.filemanager_ui.index', 'path'=>$rootpath, 'ajax'=>'true'));
 			}
-			if (!empty($file_prefs['startfolder'])) $file['Startfolder']= egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$file_prefs['startfolder'],'ajax'=>'true'));
-			for ($i=1; $i<=self::$foldercount; $i++)
+			if (!empty($file_prefs['startfolder'])) $file['Startfolder'] = egw::link('/index.php', array('menuaction'=>self::$appname.'.filemanager_ui.index', 'path'=>$file_prefs['startfolder'], 'ajax'=>'true'));
+			for ($i = 1; $i <= self::$foldercount; $i++)
 			{
 				if (!empty($file_prefs['folderlink'.$i]))
 				{
-					$foldername = array_pop(explode('/',$file_prefs['folderlink'.$i]));
-					$file[lang('Link %1: %2',$i,$foldername)]= egw::link('/index.php',array(
+					$foldername = array_pop(explode('/', $file_prefs['folderlink'.$i]));
+					$file[lang('Link %1: %2', $i, $foldername)] = egw::link('/index.php', array(
 						'menuaction' => self::$appname.'.filemanager_ui.index',
 						'path'       => $file_prefs['folderlink'.$i],
 						'nolang'     => true,
@@ -89,9 +89,9 @@ 
 					));
 				}
 			}
-			$file['Placeholders'] = egw::link('/index.php','menuaction=filemanager.filemanager_merge.show_replacements');
-			$file['Shared files'] = egw::link('/index.php','menuaction=filemanager.filemanager_shares.index&ajax=true');
-			display_sidebox(self::$appname,$title,$file);
+			$file['Placeholders'] = egw::link('/index.php', 'menuaction=filemanager.filemanager_merge.show_replacements');
+			$file['Shared files'] = egw::link('/index.php', 'menuaction=filemanager.filemanager_shares.index&ajax=true');
+			display_sidebox(self::$appname, $title, $file);
 		}
 		if ($GLOBALS['egw_info']['user']['apps']['admin']) self::admin(self::$appname);
 	}
@@ -106,18 +106,18 @@ 
 		if (is_array($location)) $location = $location['location'];
 
 		$file = Array(
-			'Site Configuration' => egw::link('/index.php','menuaction=admin.uiconfig.index&appname='.self::$appname),
-			'Custom fields' => egw::link('/index.php','menuaction=admin.customfields.index&appname='.self::$appname.'&ajax=true'),
-			'Check virtual filesystem' => egw::link('/index.php','menuaction=filemanager.filemanager_admin.fsck'),
+			'Site Configuration' => egw::link('/index.php', 'menuaction=admin.uiconfig.index&appname='.self::$appname),
+			'Custom fields' => egw::link('/index.php', 'menuaction=admin.customfields.index&appname='.self::$appname.'&ajax=true'),
+			'Check virtual filesystem' => egw::link('/index.php', 'menuaction=filemanager.filemanager_admin.fsck'),
 			'VFS mounts and versioning' => egw::link('/index.php', 'menuaction=filemanager.filemanager_admin.index'),
 		);
 		if ($location == 'admin')
 		{
-        	display_section(self::$appname,$file);
+        	display_section(self::$appname, $file);
 		}
 		else
 		{
-			display_sidebox(self::$appname,lang('Admin'),$file);
+			display_sidebox(self::$appname, lang('Admin'), $file);
 		}
 	}
 
@@ -147,15 +147,15 @@ 
 				'admin'		=> False,
 			),
 		);
-		for ($i=1; $i <= self::$foldercount; $i++)
+		for ($i = 1; $i <= self::$foldercount; $i++)
 		{
-			$settings['folderlink'.$i]	= array(
+			$settings['folderlink'.$i] = array(
 				'type'		=> 'input',
 				'name'		=> 'folderlink'.$i,
 				'size'		=> 60,
 				'default'	=> '',
 				'label' 	=> lang('Enter the complete VFS path to specify a fast access link to a folder').' ('.$i.').',
-				'run_lang'  => -1,	// -1 = no lang on label
+				'run_lang'  => -1, // -1 = no lang on label
 				'xmlrpc'	=> True,
 				'admin'		=> False
 			);
@@ -176,7 +176,7 @@ 
 				'type'		=> 'select',
 				'name'		=> 'showhome',
 				'values'	=> $yes_no,
-				'label' 	=> lang('Show link "%1" in side box menu?',lang('Your home directory')),
+				'label' 	=> lang('Show link "%1" in side box menu?', lang('Your home directory')),
 				'xmlrpc'	=> True,
 				'admin'		=> False,
 				'forced'   => 'yes',
@@ -185,7 +185,7 @@ 
 				'type'		=> 'select',
 				'name'		=> 'showusers',
 				'values'	=> $yes_no,
-				'label' 	=> lang('Show link "%1" in side box menu?',lang('Users and groups')),
+				'label' 	=> lang('Show link "%1" in side box menu?', lang('Users and groups')),
 				'xmlrpc'	=> True,
 				'admin'		=> False,
 				'forced'   => 'yes',
@@ -197,9 +197,9 @@ 
 			'size'   => 60,
 			'label'  => 'Default document to insert entries',
 			'name'   => 'default_document',
-			'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.',lang('filemanager')).' '.
+			'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang('filemanager')).' '.
 				lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'name').' '.
-				lang('The following document-types are supported:'). implode(',',bo_merge::get_file_extensions()),
+				lang('The following document-types are supported:').implode(',', bo_merge::get_file_extensions()),
 			'run_lang' => false,
 			'xmlrpc' => True,
 			'admin'  => False,
@@ -210,8 +210,8 @@ 
 			'label'  => 'Directory with documents to insert entries',
 			'name'   => 'document_dir',
 			'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the %1 data inserted.', lang('filemanager')).' '.
-				lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','name').' '.
-				lang('The following document-types are supported:'). implode(',',bo_merge::get_file_extensions()),
+				lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'name').' '.
+				lang('The following document-types are supported:').implode(',', bo_merge::get_file_extensions()),
 			'run_lang' => false,
 			'xmlrpc' => True,
 			'admin'  => False,

Braces +20 added lines, -5 removed lines

@@ -33,7 +33,10 @@ 
 		$homepath = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 		//echo "<p>admin_prefs_sidebox_hooks::all_hooks(".print_r($args,True).") appname='$appname', location='$location'</p>\n";
 		$config = config::read(self::$appname);
-		if (!empty($config['max_folderlinks'])) self::$foldercount = (int)$config['max_folderlinks'];
+		if (!empty($config['max_folderlinks']))
+		{
+			self::$foldercount = (int)$config['max_folderlinks'];
+		}
 		$file_prefs    = &$GLOBALS['egw_info']['user']['preferences'][self::$appname];
 		if ($location == 'sidebox_menu')
 		{
@@ -75,7 +78,10 @@ 
 			{
 				$file['Basedirectory'] = egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$rootpath,'ajax'=>'true'));
 			}
-			if (!empty($file_prefs['startfolder'])) $file['Startfolder']= egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$file_prefs['startfolder'],'ajax'=>'true'));
+			if (!empty($file_prefs['startfolder']))
+			{
+				$file['Startfolder']= egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$file_prefs['startfolder'],'ajax'=>'true'));
+			}
 			for ($i=1; $i<=self::$foldercount; $i++)
 			{
 				if (!empty($file_prefs['folderlink'.$i]))
@@ -93,7 +99,10 @@ 
 			$file['Shared files'] = egw::link('/index.php','menuaction=filemanager.filemanager_shares.index&ajax=true');
 			display_sidebox(self::$appname,$title,$file);
 		}
-		if ($GLOBALS['egw_info']['user']['apps']['admin']) self::admin(self::$appname);
+		if ($GLOBALS['egw_info']['user']['apps']['admin'])
+		{
+			self::admin(self::$appname);
+		}
 	}
 
 	/**
@@ -103,7 +112,10 @@ 
 	 */
 	static function admin($location = 'admin')
 	{
-		if (is_array($location)) $location = $location['location'];
+		if (is_array($location))
+		{
+			$location = $location['location'];
+		}
 
 		$file = Array(
 			'Site Configuration' => egw::link('/index.php','menuaction=admin.uiconfig.index&appname='.self::$appname),
@@ -129,7 +141,10 @@ 
 	static function settings()
 	{
 		$config = config::read(self::$appname);
-		if (!empty($config['max_folderlinks'])) self::$foldercount = (int)$config['max_folderlinks'];
+		if (!empty($config['max_folderlinks']))
+		{
+			self::$foldercount = (int)$config['max_folderlinks'];
+		}
 
 		$yes_no = array(
 			'no'  => lang('No'),

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -464,7 +464,7 @@
 	{
 		unset($args);	// unused, but required by function signature
 		$appname = 'preferences';
-		$file = Array(
+		$file = array(
 			'Site configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname.'&ajax=true'),
 		);
 		display_section($appname, $file);

filemanager/inc/class.filemanager_shares.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
 	/**
 	 * Show files shared
 	 *
-	 * @param array $content=null
-	 * @param string $msg=''
+	 * @param array $content
 	 */
 	public function index(array $content=null)
 	{

Braces +4 added lines, -1 removed lines

@@ -101,7 +101,10 @@
 				$row['type'] = $row['share_writable'] ? Sharing::WRITABLE : Sharing::READONLY;
 			}
 			$row['share_passwd'] = (boolean)$row['share_passwd'];
-			if ($row['share_with']) $row['share_with'] = preg_replace('/,([^ ])/', ', $1', $row['share_with']);
+			if ($row['share_with'])
+			{
+				$row['share_with'] = preg_replace('/,([^ ])/', ', $1', $row['share_with']);
+			}
 		}
 		return $total;
 	}

Spacing +13 added lines, -13 removed lines

@@ -40,7 +40,7 @@ 
 	{
 		// sudo handling
 		parent::__construct();
-		self::$is_setup = egw_session::appsession('is_setup','filemanager');
+		self::$is_setup = egw_session::appsession('is_setup', 'filemanager');
 		self::$tmp_dir = '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.tmp/';
 	}
 
@@ -84,7 +84,7 @@ 
 		$readonlys = null;
 		$total = egw_sharing::so()->get_rows($query, $rows, $readonlys);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			if (substr($row['share_path'], 0, strlen(self::$tmp_dir)) === self::$tmp_dir)
 			{
@@ -125,21 +125,21 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	public function index(array $content=null)
+	public function index(array $content = null)
 	{
 		if (!is_array($content))
 		{
 			$content = array(
 				'nm' => array(
-					'get_rows'       =>	'filemanager.filemanager_shares.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-					'no_filter'      => True,	// current dir only
-					'no_filter2'     => True,	// I  disable the 2. filter (params are the same as for filter)
-					'no_cat'         => True,	// I  disable the cat-selectbox
-					'lettersearch'   => false,	// I  show a lettersearch
-					'searchletter'   =>	false,	// I0 active letter of the lettersearch or false for [all]
-					'start'          =>	0,		// IO position in list
-					'order'          =>	'share_created',	// IO name of the column to sort after (optional for the sortheaders)
-					'sort'           =>	'DESC',	// IO direction of the sort: 'ASC' or 'DESC'
+					'get_rows'       =>	'filemanager.filemanager_shares.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+					'no_filter'      => True, // current dir only
+					'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+					'no_cat'         => True, // I  disable the cat-selectbox
+					'lettersearch'   => false, // I  show a lettersearch
+					'searchletter'   =>	false, // I0 active letter of the lettersearch or false for [all]
+					'start'          =>	0, // IO position in list
+					'order'          =>	'share_created', // IO name of the column to sort after (optional for the sortheaders)
+					'sort'           =>	'DESC', // IO direction of the sort: 'ASC' or 'DESC'
 					//'default_cols'   => '!',	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
 					'csv_fields'     =>	false, // I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
 									//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
@@ -151,7 +151,7 @@ 
 		}
 		elseif ($content['nm']['action'])
 		{
-			switch($content['nm']['action'])
+			switch ($content['nm']['action'])
 			{
 				case 'delete':
 					$where = array('share_owner' => $GLOBALS['egw_info']['user']['account_id']);

filemanager/inc/class.filemanager_ui.inc.php

Doc Comments +6 added lines, -1 removed lines

@@ -536,6 +536,9 @@ 
 	 * @param int &$errs=null on return number of errors
 	 * @param int &$dirs=null on return number of dirs deleted
 	 * @param int &$files=null on return number of files deleted
+	 * @param integer $errs
+	 * @param integer $files
+	 * @param integer $dirs
 	 * @return string success or failure message displayed to the user
 	 */
 	static public function action($action,$selected,$dir=null,&$errs=null,&$files=null,&$dirs=null)
@@ -704,6 +707,9 @@ 
 	 * @param int &$errs=null on return number of errors
 	 * @param int &$dirs=null on return number of dirs deleted
 	 * @param int &$files=null on return number of files deleted
+	 * @param integer $errs
+	 * @param integer $dirs
+	 * @param integer $files
 	 * @return string
 	 */
 	public static function do_delete(array $selected, &$errs=null, &$dirs=null, &$files=null)
@@ -1325,7 +1331,6 @@ 
 	 *
 	 * @param string $action eg. 'delete', ...
 	 * @param array $selected selected path(s)
-	 * @param string $dir=null current directory
 	 * @see static::action()
 	 */
 	public static function ajax_action($action, $selected, $dir=null, $props=null)

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1420,7 +1420,7 @@
 					if (Vfs::file_exists($target) && $app_dir)
 					{
 						if (!Vfs::file_exists($app_dir)) Vfs::mkdir($app_dir);
-						error_log("Symlinking $target to $app_dir");
+						error_log("symlinking $target to $app_dir");
 						Vfs::symlink($target, Vfs::concat($app_dir,Vfs::encodePathComponent($file['name'])));
 					}
 				}

Braces +138 added lines, -35 removed lines

@@ -79,7 +79,10 @@ 
 			// search for plugins with additional filemanager views
 			foreach($GLOBALS['egw']->hooks->process('filemanager_views') as $views)
 			{
-				if (is_array($views)) static::$views += $views;
+				if (is_array($views))
+				{
+					static::$views += $views;
+				}
 			}
 			static::$views_init = true;
 		}
@@ -302,7 +305,10 @@ 
 			$content['nm']['home_dir'] = static::get_home_dir();
 			$content['nm']['view'] = $GLOBALS['egw_info']['user']['preferences']['filemanager']['nm_view'];
 
-			if (isset($_GET['msg'])) $msg = $_GET['msg'];
+			if (isset($_GET['msg']))
+			{
+				$msg = $_GET['msg'];
+			}
 
 			// Blank favorite set via GET needs special handling for path
 			if (isset($_GET['favorite']) && $_GET['favorite'] == 'blank')
@@ -336,7 +342,10 @@ 
 				// reset lettersearch as it confuses users (they think the dir is empty)
 				$content['nm']['searchletter'] = false;
 				// switch recusive display off
-				if (!$content['nm']['filter']) $content['nm']['filter'] = '';
+				if (!$content['nm']['filter'])
+				{
+					$content['nm']['filter'] = '';
+				}
 			}
 		}
 		$view = static::get_view();
@@ -388,37 +397,70 @@ 
 	{
 		$tpl = new etemplate_new('filemanager.index');
 
-		if($msg) egw_framework::message($msg);
+		if($msg)
+		{
+			egw_framework::message($msg);
+		}
 
 		if (($content['nm']['action'] || $content['nm']['rows']) && (empty($content['button']) || !isset($content['button'])))
 		{
 			if ($content['nm']['action'])
 			{
 				$msg = static::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-				if($msg) egw_framework::message($msg);
+				if($msg)
+				{
+					egw_framework::message($msg);
+				}
 
 				// clean up after action
 				unset($content['nm']['selected']);
 				// reset any occasion where action may be stored, as it may be ressurected out of the helpers by etemplate, which is quite unconvenient in case of action delete
-				if (isset($content['nm']['action'])) unset($content['nm']['action']);
-				if (isset($content['nm']['nm_action'])) unset($content['nm']['nm_action']);
-				if (isset($content['nm_action'])) unset($content['nm_action']);
+				if (isset($content['nm']['action']))
+				{
+					unset($content['nm']['action']);
+				}
+				if (isset($content['nm']['nm_action']))
+				{
+					unset($content['nm']['nm_action']);
+				}
+				if (isset($content['nm_action']))
+				{
+					unset($content['nm_action']);
+				}
 				// we dont use ['nm']['rows']['delete'], so unset it, if it is present
-				if (isset($content['nm']['rows']['delete'])) unset($content['nm']['rows']['delete']);
+				if (isset($content['nm']['rows']['delete']))
+				{
+					unset($content['nm']['rows']['delete']);
+				}
 			}
 			elseif($content['nm']['rows']['delete'])
 			{
 				$msg = static::action('delete',array_keys($content['nm']['rows']['delete']),$content['nm']['path']);
-				if($msg) egw_framework::message($msg);
+				if($msg)
+				{
+					egw_framework::message($msg);
+				}
 
 				// clean up after action
 				unset($content['nm']['rows']['delete']);
 				// reset any occasion where action may be stored, as we use ['nm']['rows']['delete'] anyhow
 				// we clean this up, as it may be ressurected out of the helpers by etemplate, which is quite unconvenient in case of action delete
-				if (isset($content['nm']['action'])) unset($content['nm']['action']);
-				if (isset($content['nm']['nm_action'])) unset($content['nm']['nm_action']);
-				if (isset($content['nm_action'])) unset($content['nm_action']);
-				if (isset($content['nm']['selected'])) unset($content['nm']['selected']);
+				if (isset($content['nm']['action']))
+				{
+					unset($content['nm']['action']);
+				}
+				if (isset($content['nm']['nm_action']))
+				{
+					unset($content['nm']['nm_action']);
+				}
+				if (isset($content['nm_action']))
+				{
+					unset($content['nm_action']);
+				}
+				if (isset($content['nm']['selected']))
+				{
+					unset($content['nm']['selected']);
+				}
 			}
 			unset($content['nm']['rows']);
 			egw_session::appsession('index','filemanager',$content['nm']);
@@ -583,9 +625,12 @@ 
 						foreach(egw_vfs::find($path) as $p)
 						{
 							$to = $dir.substr($p,$len);
-							if ($to == $p)	// cant copy into itself!
+							if ($to == $p)
+							{
+								// cant copy into itself!
 							{
 								++$errs;
+							}
 								continue;
 							}
 							if (($is_dir = egw_vfs::is_dir($p)) && egw_vfs::mkdir($to,null,STREAM_MKDIR_RECURSIVE))
@@ -640,7 +685,10 @@ 
 							continue;
 						}
 					}
-					if ($target[0] != '/') $target = egw_vfs::concat($dir, $target);
+					if ($target[0] != '/')
+					{
+						$target = egw_vfs::concat($dir, $target);
+					}
 					if (!egw_vfs::stat($target))
 					{
 						return lang('Link target %1 not found!', egw_vfs::decodePath($target));
@@ -683,10 +731,16 @@ 
 				switch($action)
 				{
 					case 'document':
-						if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['filemanager']['default_document'];
+						if (!$settings)
+						{
+							$settings = $GLOBALS['egw_info']['user']['preferences']['filemanager']['default_document'];
+						}
 						$document_merge = new filemanager_merge(egw_vfs::decodePath($dir));
 						$msg = $document_merge->download($settings, $selected, '', $GLOBALS['egw_info']['user']['preferences']['filemanager']['document_dir']);
-						if($msg) return $msg;
+						if($msg)
+						{
+							return $msg;
+						}
 						$errs = count($selected);
 						return false;
 				}
@@ -723,7 +777,9 @@ 
 				unset($selected[$key]);
 			}
 		}
-		if ($selected)	// somethings left to delete
+		if ($selected)
+		{
+			// somethings left to delete
 		{
 			// some precaution to never allow to (recursivly) remove /, /apps or /home
 			foreach((array)$selected as $path)
@@ -731,6 +787,7 @@ 
 				if (preg_match('/^\/?(home|apps|)\/*$/',$path))
 				{
 					$errs++;
+		}
 					return lang("Cautiously rejecting to remove folder '%1'!",egw_vfs::decodePath($path));
 				}
 			}
@@ -783,7 +840,10 @@ 
 		{
 			egw_session::appsession('index','filemanager',$query);
 		}
-		if(!$query['path']) $query['path'] = static::get_home_dir();
+		if(!$query['path'])
+		{
+			$query['path'] = static::get_home_dir();
+		}
 
 		// Change template to match selected view
 		if($query['view'])
@@ -841,7 +901,10 @@ 
 		$filter = $query['filter'] === '' ? 1 : $query['filter'];
 
 		$maxdepth = $filter && $filter != 4 ? (int)(boolean)$filter : null;
-		if($filter == 5) $maxdepth = 2;
+		if($filter == 5)
+		{
+			$maxdepth = 2;
+		}
 		$n = 0;
 		$vfs_options = array(
 			'mindepth' => 1,
@@ -894,10 +957,16 @@ 
 			{
 				unset($row);	// fixes a weird problem with php5.1, does NOT happen with php5.2
 				$row =& $rows[$path2n[$path]];
-				if ( !is_array($props) ) continue;
+				if ( !is_array($props) )
+				{
+					continue;
+				}
 				foreach($props as $prop)
 				{
-					if (!$all_cfs && $prop['name'][0] == '#' && !in_array($prop['name'],$cols_to_show)) continue;
+					if (!$all_cfs && $prop['name'][0] == '#' && !in_array($prop['name'],$cols_to_show))
+					{
+						continue;
+					}
 					$row[$prop['name']] = strlen($prop['val']) < 64 ? $prop['val'] : substr($prop['val'],0,64).' ...';
 				}
 			}
@@ -1025,7 +1094,10 @@ 
 								$tpl->set_validation_error('name',lang("There's already a file with that name!").'<br />'.
 									lang('To overwrite the existing file store again.',lang($button)));
 								$content['confirm_overwrite'] = $to;
-								if ($button == 'save') $button = 'apply';
+								if ($button == 'save')
+								{
+									$button = 'apply';
+								}
 								continue;
 							}
 							if (egw_vfs::rename($path,$to))
@@ -1098,13 +1170,19 @@ 
 								}
 								if ($ok && !$failed)
 								{
-									if(!$perm_changed++) $msg .= lang('Permissions of %1 changed.',$path.' '.lang('and all it\'s childeren'));
+									if(!$perm_changed++)
+									{
+										$msg .= lang('Permissions of %1 changed.',$path.' '.lang('and all it\'s childeren'));
+									}
 									$content['old'][$name] = $content[$name];
 								}
 								elseif($failed)
 								{
-									if(!$perm_failed++) $msg .= lang('Failed to change permissions of %1!',$path.lang('and all it\'s childeren').
+									if(!$perm_failed++)
+									{
+										$msg .= lang('Failed to change permissions of %1!',$path.lang('and all it\'s childeren').
 										($ok ? ' ('.lang('%1 failed, %2 succeded',$failed,$ok).')' : ''));
+									}
 								}
 							}
 							elseif (call_user_func_array($cmd,array($path,$value)))
@@ -1157,7 +1235,10 @@ 
 				}
 			}
 			egw_framework::refresh_opener($msg, 'filemanager', $refresh_path ? $refresh_path : $path, 'edit', null, '&path=[^&]*');
-			if ($button == 'save') egw_framework::window_close();
+			if ($button == 'save')
+			{
+				egw_framework::window_close();
+			}
 		}
 		if ($content['is_link'] && !egw_vfs::stat($path))
 		{
@@ -1167,12 +1248,18 @@ 
 		$content['icon'] = egw_vfs::mime_icon($content['mime']);
 		$content['msg'] = $msg;
 
-		if (($readonlys['uid'] = !egw_vfs::$is_root) && !$content['uid']) $content['ro_uid_root'] = 'root';
+		if (($readonlys['uid'] = !egw_vfs::$is_root) && !$content['uid'])
+		{
+			$content['ro_uid_root'] = 'root';
+		}
 		// only owner can change group & perms
 		if (($readonlys['gid'] = !$content['is_owner'] ||
-			egw_vfs::parse_url(egw_vfs::resolve_url($content['path']),PHP_URL_SCHEME) == 'oldvfs'))	// no uid, gid or perms in oldvfs
+			egw_vfs::parse_url(egw_vfs::resolve_url($content['path']),PHP_URL_SCHEME) == 'oldvfs'))
+		{
+			// no uid, gid or perms in oldvfs
 		{
 			if (!$content['gid']) $content['ro_gid_root'] = 'root';
+		}
 			foreach($content['perms'] as $name => $value)
 			{
 				$readonlys['perms['.$name.']'] = true;
@@ -1205,9 +1292,13 @@ 
 				5 => lang('Display of content'),
 				0 => lang('No access'),
 			);
-			if(($content['eacl'] = egw_vfs::get_eacl($content['path'])) !== false)	// backend supports eacl
+			if(($content['eacl'] = egw_vfs::get_eacl($content['path'])) !== false)
 			{
-				unset($readonlys['tabs']['filemanager.file.eacl']);	// --> switch the tab on again
+				// backend supports eacl
+			{
+				unset($readonlys['tabs']['filemanager.file.eacl']);
+			}
+			// --> switch the tab on again
 				foreach($content['eacl'] as &$eacl)
 				{
 					$eacl['path'] = rtrim(egw_vfs::parse_url($eacl['path'],PHP_URL_PATH),'/');
@@ -1264,10 +1355,13 @@ 
 				'comment' => (string)$content['comment'],
 				'mergeapp' => $content['mergeapp']
 			);
-			if ($cfs) foreach($cfs as $name => $data)
+			if ($cfs)
+			{
+				foreach($cfs as $name => $data)
 			{
 				$preserve['old']['#'.$name] = (string)$content['#'.$name];
 			}
+			}
 		}
 		if (egw_vfs::$is_root)
 		{
@@ -1289,7 +1383,10 @@ 
 			$tpl->setElementAttribute('tabs', 'add_tabs', true);
 
 			$tabs =& $tpl->getElementAttribute('tabs','tabs');
-			if (true) $tabs = array();
+			if (true)
+			{
+				$tabs = array();
+			}
 
 			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
 			{
@@ -1342,7 +1439,10 @@ 
 			'files' => 0,
 		);
 
-		if (!isset($dir)) $dir = array_pop($selected);
+		if (!isset($dir))
+		{
+			$dir = array_pop($selected);
+		}
 
 		switch($action)
 		{
@@ -1416,7 +1516,10 @@ 
 					$target=egw_vfs::concat($dir,egw_vfs::encodePathComponent($file['name']));
 					if (egw_vfs::file_exists($target) && $app_dir)
 					{
-						if (!egw_vfs::file_exists($app_dir)) egw_vfs::mkdir($app_dir);
+						if (!egw_vfs::file_exists($app_dir))
+						{
+							egw_vfs::mkdir($app_dir);
+						}
 						error_log("Symlinking $target to $app_dir");
 						egw_vfs::symlink($target, egw_vfs::concat($app_dir,egw_vfs::encodePathComponent($file['name'])));
 					}

Spacing +203 added lines, -205 removed lines

@@ -53,7 +53,7 @@ 
 			$_GET = etemplate::array_stripslashes($_GET);
 		}
 		// do we have root rights
-		if (egw_session::appsession('is_root','filemanager'))
+		if (egw_session::appsession('is_root', 'filemanager'))
 		{
 			egw_vfs::$is_root = true;
 		}
@@ -72,12 +72,12 @@ 
 		if (!static::$views_init)
 		{
 			// translate our labels
-			foreach(static::$views as &$label)
+			foreach (static::$views as &$label)
 			{
 				$label = lang($label);
 			}
 			// search for plugins with additional filemanager views
-			foreach($GLOBALS['egw']->hooks->process('filemanager_views') as $views)
+			foreach ($GLOBALS['egw']->hooks->process('filemanager_views') as $views)
 			{
 				if (is_array($views)) static::$views += $views;
 			}
@@ -93,7 +93,7 @@ 
 	 */
 	public static function get_view()
 	{
-		$view =& egw_cache::getSession('filemanager', 'view');
+		$view = & egw_cache::getSession('filemanager', 'view');
 		if (isset($_GET['view']))
 		{
 			$view = $_GET['view'];
@@ -117,7 +117,7 @@ 
 			'open' => array(
 				'caption' => lang('Open'),
 				'icon' => '',
-				'group' => $group=1,
+				'group' => $group = 1,
 				'allowOnMultiple' => false,
 				'onExecute' => 'javaScript:app.filemanager.open',
 				'default' => true
@@ -170,7 +170,7 @@ 
 			),
 			// DRAG and DROP events
 			'file_drag' => array(
-				'dragType' => array('file','link'),
+				'dragType' => array('file', 'link'),
 				'type' => 'drag',
 				'onExecute' => 'javaScript:app.filemanager.drag'
 			),
@@ -209,7 +209,7 @@ 
 		}
 		else
 		{
-			foreach(egw_sharing::$modes as $mode => $data)
+			foreach (egw_sharing::$modes as $mode => $data)
 			{
 				$actions['mail']['children']['mail_'.$mode] = array(
 					'caption' => $data['label'],
@@ -231,10 +231,10 @@ 
 	 *
 	 * @return string merge application or NULL if no property found
 	 */
-	private static function get_mergeapp($path, $scope='self')
+	private static function get_mergeapp($path, $scope = 'self')
 	{
 		$app = null;
-		switch($scope)
+		switch ($scope)
 		{
 			case 'self':
 				$props = egw_vfs::propfind($path, static::$merge_prop_namespace);
@@ -243,10 +243,10 @@ 
 			case 'parents':
 				// search for props in parent directories
 				$currentpath = $path;
-				while($dir = egw_vfs::dirname($currentpath))
+				while ($dir = egw_vfs::dirname($currentpath))
 				{
 					$props = egw_vfs::propfind($dir, static::$merge_prop_namespace);
-					if(!empty($props))
+					if (!empty($props))
 					{
 						// found prop in parent directory
 						return $app = $props[0]['val'];
@@ -265,26 +265,26 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function index(array $content=null,$msg=null)
+	function index(array $content = null, $msg = null)
 	{
 		if (!is_array($content))
 		{
 			$content = array(
-				'nm' => egw_session::appsession('index','filemanager'),
+				'nm' => egw_session::appsession('index', 'filemanager'),
 			);
 			if (!is_array($content['nm']))
 			{
 				$content['nm'] = array(
-					'get_rows'       =>	'filemanager.filemanager_ui.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-					'filter'         => '',	// current dir only
-					'no_filter2'     => True,	// I  disable the 2. filter (params are the same as for filter)
-					'no_cat'         => True,	// I  disable the cat-selectbox
-					'lettersearch'   => True,	// I  show a lettersearch
-					'searchletter'   =>	false,	// I0 active letter of the lettersearch or false for [all]
-					'start'          =>	0,		// IO position in list
-					'order'          =>	'name',	// IO name of the column to sort after (optional for the sortheaders)
-					'sort'           =>	'ASC',	// IO direction of the sort: 'ASC' or 'DESC'
-					'default_cols'   => '!comment,ctime',	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
+					'get_rows'       =>	'filemanager.filemanager_ui.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+					'filter'         => '', // current dir only
+					'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+					'no_cat'         => True, // I  disable the cat-selectbox
+					'lettersearch'   => True, // I  show a lettersearch
+					'searchletter'   =>	false, // I0 active letter of the lettersearch or false for [all]
+					'start'          =>	0, // IO position in list
+					'order'          =>	'name', // IO name of the column to sort after (optional for the sortheaders)
+					'sort'           =>	'ASC', // IO direction of the sort: 'ASC' or 'DESC'
+					'default_cols'   => '!comment,ctime', // I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
 					'csv_fields'     =>	false, // I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
 									//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
 					'actions'        => static::get_actions(),
@@ -295,7 +295,7 @@ 
 					'is_parent_value'=> egw_vfs::DIR_MIME_TYPE,
 					'header_left'    => 'filemanager.index.header_left',
 					'favorites'      => true,
-					'placeholder_actions' => array('mkdir','file_drop_mail','file_drop_move','file_drop_copy','file_drop_symlink')
+					'placeholder_actions' => array('mkdir', 'file_drop_mail', 'file_drop_move', 'file_drop_copy', 'file_drop_symlink')
 				);
 				$content['nm']['path'] = static::get_home_dir();
 			}
@@ -316,7 +316,7 @@ 
 			}
 			if (isset($_GET['path']) && ($path = $_GET['path']))
 			{
-				switch($path)
+				switch ($path)
 				{
 					case '..':
 						$path = egw_vfs::dirname($content['nm']['path']);
@@ -325,13 +325,13 @@ 
 						$path = static::get_home_dir();
 						break;
 				}
-				if ($path[0] == '/' && egw_vfs::stat($path,true) && egw_vfs::is_dir($path) && egw_vfs::check_access($path,egw_vfs::READABLE))
+				if ($path[0] == '/' && egw_vfs::stat($path, true) && egw_vfs::is_dir($path) && egw_vfs::check_access($path, egw_vfs::READABLE))
 				{
 					$content['nm']['path'] = $path;
 				}
 				else
 				{
-					$msg .= lang('The requested path %1 is not available.',egw_vfs::decodePath($path));
+					$msg .= lang('The requested path %1 is not available.', egw_vfs::decodePath($path));
 				}
 				// reset lettersearch as it confuses users (they think the dir is empty)
 				$content['nm']['searchletter'] = false;
@@ -341,11 +341,11 @@ 
 		}
 		$view = static::get_view();
 
-		if (strpos($view,'::') !== false && version_compare(PHP_VERSION,'5.3.0','<'))
+		if (strpos($view, '::') !== false && version_compare(PHP_VERSION, '5.3.0', '<'))
 		{
-			$view = explode('::',$view);
+			$view = explode('::', $view);
 		}
-		call_user_func($view,$content,$msg);
+		call_user_func($view, $content, $msg);
 	}
 
 	/**
@@ -358,7 +358,7 @@ 
 	 * @param boolean &$is_setup=null on return true if authenticated user is setup config user, false otherwise
 	 * @return boolean true is root user given, false otherwise (including logout / empty $user)
 	 */
-	protected function sudo($user='',$password=null,&$is_setup=null)
+	protected function sudo($user = '', $password = null, &$is_setup = null)
 	{
 		if (!$user)
 		{
@@ -367,15 +367,15 @@ 
 		else
 		{
 			// config user & password
-			$is_setup = egw_session::user_pw_hash($user,$password) === $GLOBALS['egw_info']['server']['config_hash'];
+			$is_setup = egw_session::user_pw_hash($user, $password) === $GLOBALS['egw_info']['server']['config_hash'];
 			// or vfs root user from setup >> configuration
-			$is_root = $is_setup ||	$GLOBALS['egw_info']['server']['vfs_root_user'] &&
-				in_array($user,preg_split('/, */',$GLOBALS['egw_info']['server']['vfs_root_user'])) &&
+			$is_root = $is_setup || $GLOBALS['egw_info']['server']['vfs_root_user'] &&
+				in_array($user, preg_split('/, */', $GLOBALS['egw_info']['server']['vfs_root_user'])) &&
 				$GLOBALS['egw']->auth->authenticate($user, $password, 'text');
 		}
 		//echo "<p>".__METHOD__."('$user','$password',$is_setup) user_pw_hash(...)='".egw_session::user_pw_hash($user,$password)."', config_hash='{$GLOBALS['egw_info']['server']['config_hash']}' --> returning ".array2string($is_root)."</p>\n";
-		egw_session::appsession('is_setup','filemanager',$is_setup);
-		return egw_session::appsession('is_root','filemanager',egw_vfs::$is_root = $is_root);
+		egw_session::appsession('is_setup', 'filemanager', $is_setup);
+		return egw_session::appsession('is_root', 'filemanager', egw_vfs::$is_root = $is_root);
 	}
 
 	/**
@@ -384,18 +384,18 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function listview(array $content=null,$msg=null)
+	function listview(array $content = null, $msg = null)
 	{
 		$tpl = new etemplate_new('filemanager.index');
 
-		if($msg) egw_framework::message($msg);
+		if ($msg) egw_framework::message($msg);
 
 		if (($content['nm']['action'] || $content['nm']['rows']) && (empty($content['button']) || !isset($content['button'])))
 		{
 			if ($content['nm']['action'])
 			{
-				$msg = static::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-				if($msg) egw_framework::message($msg);
+				$msg = static::action($content['nm']['action'], $content['nm']['selected'], $content['nm']['path']);
+				if ($msg) egw_framework::message($msg);
 
 				// clean up after action
 				unset($content['nm']['selected']);
@@ -406,10 +406,10 @@ 
 				// we dont use ['nm']['rows']['delete'], so unset it, if it is present
 				if (isset($content['nm']['rows']['delete'])) unset($content['nm']['rows']['delete']);
 			}
-			elseif($content['nm']['rows']['delete'])
+			elseif ($content['nm']['rows']['delete'])
 			{
-				$msg = static::action('delete',array_keys($content['nm']['rows']['delete']),$content['nm']['path']);
-				if($msg) egw_framework::message($msg);
+				$msg = static::action('delete', array_keys($content['nm']['rows']['delete']), $content['nm']['path']);
+				if ($msg) egw_framework::message($msg);
 
 				// clean up after action
 				unset($content['nm']['rows']['delete']);
@@ -421,11 +421,11 @@ 
 				if (isset($content['nm']['selected'])) unset($content['nm']['selected']);
 			}
 			unset($content['nm']['rows']);
-			egw_session::appsession('index','filemanager',$content['nm']);
+			egw_session::appsession('index', 'filemanager', $content['nm']);
 		}
 
 		// be tolerant with (in previous versions) not correct urlencoded pathes
-		if ($content['nm']['path'][0] == '/' && !egw_vfs::stat($content['nm']['path'],true) && egw_vfs::stat(urldecode($content['nm']['path'])))
+		if ($content['nm']['path'][0] == '/' && !egw_vfs::stat($content['nm']['path'], true) && egw_vfs::stat(urldecode($content['nm']['path'])))
 		{
 			$content['nm']['path'] = urldecode($content['nm']['path']);
 		}
@@ -436,22 +436,22 @@ 
 				list($button) = each($content['button']);
 				unset($content['button']);
 			}
-			switch($button)
+			switch ($button)
 			{
 				case 'upload':
 					if (!$content['upload'])
 					{
-						egw_framework::message(lang('You need to select some files first!'),'error');
+						egw_framework::message(lang('You need to select some files first!'), 'error');
 						break;
 					}
 					$upload_success = $upload_failure = array();
-					foreach(isset($content['upload'][0]) ? $content['upload'] : array($content['upload']) as $upload)
+					foreach (isset($content['upload'][0]) ? $content['upload'] : array($content['upload']) as $upload)
 					{
 						// encode chars which special meaning in url/vfs (some like / get removed!)
-						$to = egw_vfs::concat($content['nm']['path'],egw_vfs::encodePathComponent($upload['name']));
+						$to = egw_vfs::concat($content['nm']['path'], egw_vfs::encodePathComponent($upload['name']));
 						if ($upload &&
 							(egw_vfs::is_writable($content['nm']['path']) || egw_vfs::is_writable($to)) &&
-							copy($upload['tmp_name'],egw_vfs::PREFIX.$to))
+							copy($upload['tmp_name'], egw_vfs::PREFIX.$to))
 						{
 							$upload_success[] = $upload['name'];
 						}
@@ -463,12 +463,11 @@ 
 					$content['nm']['msg'] = '';
 					if ($upload_success)
 					{
-						egw_framework::message( count($upload_success) == 1 && !$upload_failure ? lang('File successful uploaded.') :
-							lang('%1 successful uploaded.',implode(', ',$upload_success)));
+						egw_framework::message(count($upload_success) == 1 && !$upload_failure ? lang('File successful uploaded.') : lang('%1 successful uploaded.', implode(', ', $upload_success)));
 					}
 					if ($upload_failure)
 					{
-						egw_framework::message(lang('Error uploading file!')."\n".etemplate::max_upload_size_message(),'error');
+						egw_framework::message(lang('Error uploading file!')."\n".etemplate::max_upload_size_message(), 'error');
 					}
 					break;
 			}
@@ -489,17 +488,17 @@ 
 			$tpl->setElementAttribute('nm[buttons][upload]', 'drop_target', 'popupMainDiv');
 		}
 		// Set view button to match current settings
-		if($content['nm']['view'] == 'tile')
+		if ($content['nm']['view'] == 'tile')
 		{
-			$tpl->setElementAttribute('nm[buttons][button][change_view]','label',lang('List view'));
-			$tpl->setElementAttribute('nm[buttons][button][change_view]','image','list_row');
+			$tpl->setElementAttribute('nm[buttons][button][change_view]', 'label', lang('List view'));
+			$tpl->setElementAttribute('nm[buttons][button][change_view]', 'image', 'list_row');
 
 		}
 		// if initial load is done via GET request (idots template or share.php)
 		// get_rows cant call app.filemanager.set_readonly, so we need to do that here
 		$content['initial_path_readonly'] = !egw_vfs::is_writable($content['nm']['path']);
 
-		$tpl->exec('filemanager.filemanager_ui.index',$content,$sel_options,$readonlys,array('nm' => $content['nm']));
+		$tpl->exec('filemanager.filemanager_ui.index', $content, $sel_options, $readonlys, array('nm' => $content['nm']));
 	}
 
 	/**
@@ -535,7 +534,7 @@ 
 	 * @param int &$files=null on return number of files deleted
 	 * @return string success or failure message displayed to the user
 	 */
-	static public function action($action,$selected,$dir=null,&$errs=null,&$files=null,&$dirs=null)
+	static public function action($action, $selected, $dir = null, &$errs = null, &$files = null, &$dirs = null)
 	{
 		if (!count($selected))
 		{
@@ -543,20 +542,20 @@ 
 		}
 		$errs = $dirs = $files = 0;
 
-		switch($action)
+		switch ($action)
 		{
 
 			case 'delete':
-				return static::do_delete($selected,$errs,$files,$dirs);
+				return static::do_delete($selected, $errs, $files, $dirs);
 
 			case 'mail':
 			case 'copy':
-				foreach($selected as $path)
+				foreach ($selected as $path)
 				{
 					if (strpos($path, 'mail::') === 0 && $path = substr($path, 6))
 					{
 						// Support for dropping mail in filemanager - Pass mail back to mail app
-						if(ExecMethod2('mail.mail_ui.vfsSaveMessage', $path, $dir, false))
+						if (ExecMethod2('mail.mail_ui.vfsSaveMessage', $path, $dir, false))
 						{
 							++$files;
 						}
@@ -567,8 +566,8 @@ 
 					}
 					elseif (!egw_vfs::is_dir($path))
 					{
-						$to = egw_vfs::concat($dir,egw_vfs::basename($path));
-						if ($path != $to && egw_vfs::copy($path,$to))
+						$to = egw_vfs::concat($dir, egw_vfs::basename($path));
+						if ($path != $to && egw_vfs::copy($path, $to))
 						{
 							++$files;
 						}
@@ -580,19 +579,19 @@ 
 					else
 					{
 						$len = strlen(dirname($path));
-						foreach(egw_vfs::find($path) as $p)
+						foreach (egw_vfs::find($path) as $p)
 						{
-							$to = $dir.substr($p,$len);
+							$to = $dir.substr($p, $len);
 							if ($to == $p)	// cant copy into itself!
 							{
 								++$errs;
 								continue;
 							}
-							if (($is_dir = egw_vfs::is_dir($p)) && egw_vfs::mkdir($to,null,STREAM_MKDIR_RECURSIVE))
+							if (($is_dir = egw_vfs::is_dir($p)) && egw_vfs::mkdir($to, null, STREAM_MKDIR_RECURSIVE))
 							{
 								++$dirs;
 							}
-							elseif(!$is_dir && egw_vfs::copy($p,$to))
+							elseif (!$is_dir && egw_vfs::copy($p, $to))
 							{
 								++$files;
 							}
@@ -605,15 +604,15 @@ 
 				}
 				if ($errs)
 				{
-					return lang('%1 errors copying (%2 diretories and %3 files copied)!',$errs,$dirs,$files);
+					return lang('%1 errors copying (%2 diretories and %3 files copied)!', $errs, $dirs, $files);
 				}
-				return $dirs ? lang('%1 directories and %2 files copied.',$dirs,$files) : lang('%1 files copied.',$files);
+				return $dirs ? lang('%1 directories and %2 files copied.', $dirs, $files) : lang('%1 files copied.', $files);
 
 			case 'move':
-				foreach($selected as $path)
+				foreach ($selected as $path)
 				{
-					$to = egw_vfs::is_dir($dir) || count($selected) > 1 ? egw_vfs::concat($dir,egw_vfs::basename($path)) : $dir;
-					if ($path != $to && egw_vfs::rename($path,$to))
+					$to = egw_vfs::is_dir($dir) || count($selected) > 1 ? egw_vfs::concat($dir, egw_vfs::basename($path)) : $dir;
+					if ($path != $to && egw_vfs::rename($path, $to))
 					{
 						++$files;
 					}
@@ -624,17 +623,17 @@ 
 				}
 				if ($errs)
 				{
-					return lang('%1 errors moving (%2 files moved)!',$errs,$files);
+					return lang('%1 errors moving (%2 files moved)!', $errs, $files);
 				}
-				return lang('%1 files moved.',$files);
+				return lang('%1 files moved.', $files);
 
 			case 'symlink':	// symlink given files to $dir
-				foreach((array)$selected as $target)
+				foreach ((array)$selected as $target)
 				{
 					$link = egw_vfs::concat($dir, egw_vfs::basename($target));
-					if (!egw_vfs::stat($dir) || ($ok = egw_vfs::mkdir($dir,0,true)))
+					if (!egw_vfs::stat($dir) || ($ok = egw_vfs::mkdir($dir, 0, true)))
 					{
-						if(!$ok)
+						if (!$ok)
 						{
 							$errs++;
 							continue;
@@ -656,15 +655,14 @@ 
 				}
 				if (count((array)$selected) == 1)
 				{
-					return $files ? lang('Symlink to %1 created.', egw_vfs::decodePath($target)) :
-						lang('Error creating symlink to target %1!', egw_vfs::decodePath($target));
+					return $files ? lang('Symlink to %1 created.', egw_vfs::decodePath($target)) : lang('Error creating symlink to target %1!', egw_vfs::decodePath($target));
 				}
 				$ret = lang('%1 elements linked.', $files);
 				if ($errs)
 				{
-					$ret = lang('%1 errors linking (%2)!',$errs, $ret);
+					$ret = lang('%1 errors linking (%2)!', $errs, $ret);
 				}
-				return $ret;//." egw_vfs::symlink('$target', '$link')";
+				return $ret; //." egw_vfs::symlink('$target', '$link')";
 
 			case 'createdir':
 				$dst = egw_vfs::concat($dir, is_array($selected) ? $selected[0] : $selected);
@@ -680,13 +678,13 @@ 
 
 			default:
 				list($action, $settings) = explode('_', $action, 2);
-				switch($action)
+				switch ($action)
 				{
 					case 'document':
 						if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['filemanager']['default_document'];
 						$document_merge = new filemanager_merge(egw_vfs::decodePath($dir));
 						$msg = $document_merge->download($settings, $selected, '', $GLOBALS['egw_info']['user']['preferences']['filemanager']['document_dir']);
-						if($msg) return $msg;
+						if ($msg) return $msg;
 						$errs = count($selected);
 						return false;
 				}
@@ -703,12 +701,12 @@ 
 	 * @param int &$files=null on return number of files deleted
 	 * @return string
 	 */
-	public static function do_delete(array $selected, &$errs=null, &$dirs=null, &$files=null)
+	public static function do_delete(array $selected, &$errs = null, &$dirs = null, &$files = null)
 	{
 		$dirs = $files = $errs = 0;
 		// we first delete all selected links (and files)
 		// feeding the links to dirs to egw_vfs::find() deletes the content of the dirs, not just the link!
-		foreach($selected as $key => $path)
+		foreach ($selected as $key => $path)
 		{
 			if (!egw_vfs::is_dir($path) || egw_vfs::is_link($path))
 			{
@@ -726,21 +724,21 @@ 
 		if ($selected)	// somethings left to delete
 		{
 			// some precaution to never allow to (recursivly) remove /, /apps or /home
-			foreach((array)$selected as $path)
+			foreach ((array)$selected as $path)
 			{
-				if (preg_match('/^\/?(home|apps|)\/*$/',$path))
+				if (preg_match('/^\/?(home|apps|)\/*$/', $path))
 				{
 					$errs++;
-					return lang("Cautiously rejecting to remove folder '%1'!",egw_vfs::decodePath($path));
+					return lang("Cautiously rejecting to remove folder '%1'!", egw_vfs::decodePath($path));
 				}
 			}
 			// now we use find to loop through all files and dirs: (selected only contains dirs now)
 			// - depth=true to get first the files and then the dir containing it
 			// - hidden=true to also return hidden files (eg. Thumbs.db), as we cant delete non-empty dirs
 			// - show-deleted=false to not (finally) deleted versioned files
-			foreach(egw_vfs::find($selected,array('depth'=>true,'hidden'=>true,'show-deleted'=>false)) as $path)
+			foreach (egw_vfs::find($selected, array('depth'=>true, 'hidden'=>true, 'show-deleted'=>false)) as $path)
 			{
-				if (($is_dir = egw_vfs::is_dir($path) && !egw_vfs::is_link($path)) && egw_vfs::rmdir($path,0))
+				if (($is_dir = egw_vfs::is_dir($path) && !egw_vfs::is_link($path)) && egw_vfs::rmdir($path, 0))
 				{
 					++$dirs;
 				}
@@ -756,13 +754,13 @@ 
 		}
 		if ($errs)
 		{
-			return lang('%1 errors deleteting (%2 directories and %3 files deleted)!',$errs,$dirs,$files);
+			return lang('%1 errors deleteting (%2 directories and %3 files deleted)!', $errs, $dirs, $files);
 		}
 		if ($dirs)
 		{
-			return lang('%1 directories and %2 files deleted.',$dirs,$files);
+			return lang('%1 directories and %2 files deleted.', $dirs, $files);
 		}
-		return $files == 1 ? lang('File deleted.') : lang('%1 files deleted.',$files);
+		return $files == 1 ? lang('File deleted.') : lang('%1 files deleted.', $files);
 	}
 
 	/**
@@ -776,37 +774,37 @@ 
 		// do NOT store query, if hierarchical data / children are requested
 		if (!$query['csv_export'])
 		{
-			egw_session::appsession('index','filemanager',$query);
+			egw_session::appsession('index', 'filemanager', $query);
 		}
-		if(!$query['path']) $query['path'] = static::get_home_dir();
+		if (!$query['path']) $query['path'] = static::get_home_dir();
 
 		// Change template to match selected view
-		if($query['view'])
+		if ($query['view'])
 		{
 			$query['template'] = ($query['view'] == 'row' ? 'filemanager.index.rows' : 'filemanager.tile');
 
 			// Store as preference but only for index, not home
-			if($query['get_rows'] == 'filemanager.filemanager_ui.get_rows')
+			if ($query['get_rows'] == 'filemanager.filemanager_ui.get_rows')
 			{
-				$GLOBALS['egw']->preferences->add('filemanager','nm_view',$query['view']);
+				$GLOBALS['egw']->preferences->add('filemanager', 'nm_view', $query['view']);
 				$GLOBALS['egw']->preferences->save_repository();
 			}
 		}
 		// be tolerant with (in previous versions) not correct urlencoded pathes
-		if (!egw_vfs::stat($query['path'],true) && egw_vfs::stat(urldecode($query['path'])))
+		if (!egw_vfs::stat($query['path'], true) && egw_vfs::stat(urldecode($query['path'])))
 		{
 			$query['path'] = urldecode($query['path']);
 		}
-		if (!egw_vfs::stat($query['path'],true) || !egw_vfs::is_dir($query['path']) || !egw_vfs::check_access($query['path'],egw_vfs::READABLE))
+		if (!egw_vfs::stat($query['path'], true) || !egw_vfs::is_dir($query['path']) || !egw_vfs::check_access($query['path'], egw_vfs::READABLE))
 		{
 			// only redirect, if it would be to some other location, gives redirect-loop otherwise
 			if ($query['path'] != ($path = static::get_home_dir()))
 			{
 				// we will leave here, since we are not allowed, or the location does not exist. Index must handle that, and give
 				// an appropriate message
-				egw::redirect_link('/index.php',array('menuaction'=>'filemanager.filemanager_ui.index',
+				egw::redirect_link('/index.php', array('menuaction'=>'filemanager.filemanager_ui.index',
 					'path' => $path,
-					'msg' => lang('The requested path %1 is not available.',egw_vfs::decodePath($query['path'])),
+					'msg' => lang('The requested path %1 is not available.', egw_vfs::decodePath($query['path'])),
 					'ajax' => 'true'
 				));
 			}
@@ -814,35 +812,35 @@ 
 			return 0;
 		}
 		$rows = $dir_is_writable = array();
-		if($query['searchletter'] && !empty($query['search']))
+		if ($query['searchletter'] && !empty($query['search']))
 		{
-			$namefilter = '/^'.$query['searchletter'].'.*'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'/i';
+			$namefilter = '/^'.$query['searchletter'].'.*'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).'/i';
 			if ($query['searchletter'] == strtolower($query['search'][0]))
 			{
-				$namefilter = '/^('.$query['searchletter'].'.*'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'|'.
-					str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).')/i';
+				$namefilter = '/^('.$query['searchletter'].'.*'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).'|'.
+					str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).')/i';
 			}
 		}
 		elseif ($query['searchletter'])
 		{
 			$namefilter = '/^'.$query['searchletter'].'/i';
 		}
-		elseif(!empty($query['search']))
+		elseif (!empty($query['search']))
 		{
-			$namefilter = '/'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'/i';
+			$namefilter = '/'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).'/i';
 		}
 
 		// Re-map so 'No filters' favorite ('') is depth 1
 		$filter = $query['filter'] === '' ? 1 : $query['filter'];
 
 		$maxdepth = $filter && $filter != 4 ? (int)(boolean)$filter : null;
-		if($filter == 5) $maxdepth = 2;
+		if ($filter == 5) $maxdepth = 2;
 		$n = 0;
 		$vfs_options = array(
 			'mindepth' => 1,
 			'maxdepth' => $maxdepth,
 			'dirsontop' => $filter <= 1,
-			'type' => $filter && $filter != 5 ? ($filter == 4 ? 'd' : null) : ($filter == 5 ? 'F':'f'),
+			'type' => $filter && $filter != 5 ? ($filter == 4 ? 'd' : null) : ($filter == 5 ? 'F' : 'f'),
 			'order' => $query['order'], 'sort' => $query['sort'],
 			'limit' => (int)$query['num_rows'].','.(int)$query['start'],
 			'need_mime' => true,
@@ -850,11 +848,11 @@ 
 			'hidden' => $filter == 3,
 			'follow' => $filter == 5,
 		);
-		if($query['col_filter']['mime'])
+		if ($query['col_filter']['mime'])
 		{
 			$vfs_options['mime'] = $query['col_filter']['mime'];
 		}
-		foreach(egw_vfs::find(!empty($query['col_filter']['dir']) ? $query['col_filter']['dir'] : $query['path'],$vfs_options,true) as $path => $row)
+		foreach (egw_vfs::find(!empty($query['col_filter']['dir']) ? $query['col_filter']['dir'] : $query['path'], $vfs_options, true) as $path => $row)
 		{
 			//echo $path; _debug_array($row);
 
@@ -868,32 +866,32 @@ 
 				$row['class'] = 'isDir';
 			}
 			$row['download_url'] = egw_vfs::download_url($path);
-			$row['gid'] = -abs($row['gid']);	// gid are positive, but we use negagive account_id for groups internal
+			$row['gid'] = -abs($row['gid']); // gid are positive, but we use negagive account_id for groups internal
 
 			$rows[++$n] = $row;
 			$path2n[$path] = $n;
 		}
 		// query comments and cf's for the displayed rows
-		$cols_to_show = explode(',',$GLOBALS['egw_info']['user']['preferences']['filemanager']['nextmatch-filemanager.index.rows']);
+		$cols_to_show = explode(',', $GLOBALS['egw_info']['user']['preferences']['filemanager']['nextmatch-filemanager.index.rows']);
 
 		// Always include comment in tiles
-		if($query['view'] == 'tile')
+		if ($query['view'] == 'tile')
 		{
 			$cols_to_show[] = 'comment';
 		}
-		$all_cfs = in_array('customfields',$cols_to_show) && $cols_to_show[count($cols_to_show)-1][0] != '#';
-		if ($path2n && (in_array('comment',$cols_to_show) || in_array('customfields',$cols_to_show)) &&
+		$all_cfs = in_array('customfields', $cols_to_show) && $cols_to_show[count($cols_to_show) - 1][0] != '#';
+		if ($path2n && (in_array('comment', $cols_to_show) || in_array('customfields', $cols_to_show)) &&
 			($path2props = egw_vfs::propfind(array_keys($path2n))))
 		{
-			foreach($path2props as $path => $props)
+			foreach ($path2props as $path => $props)
 			{
-				unset($row);	// fixes a weird problem with php5.1, does NOT happen with php5.2
-				$row =& $rows[$path2n[$path]];
-				if ( !is_array($props) ) continue;
-				foreach($props as $prop)
+				unset($row); // fixes a weird problem with php5.1, does NOT happen with php5.2
+				$row = & $rows[$path2n[$path]];
+				if (!is_array($props)) continue;
+				foreach ($props as $prop)
 				{
-					if (!$all_cfs && $prop['name'][0] == '#' && !in_array($prop['name'],$cols_to_show)) continue;
-					$row[$prop['name']] = strlen($prop['val']) < 64 ? $prop['val'] : substr($prop['val'],0,64).' ...';
+					if (!$all_cfs && $prop['name'][0] == '#' && !in_array($prop['name'], $cols_to_show)) continue;
+					$row[$prop['name']] = strlen($prop['val']) < 64 ? $prop['val'] : substr($prop['val'], 0, 64).' ...';
 				}
 			}
 		}
@@ -905,7 +903,7 @@ 
 		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'projectmanager')
 		{
 			// we need our app.css file
-			if (!file_exists(EGW_SERVER_ROOT.($css_file='/filemanager/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/app.css')))
+			if (!file_exists(EGW_SERVER_ROOT.($css_file = '/filemanager/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/app.css')))
 			{
 				$css_file = '/filemanager/templates/default/app.css';
 			}
@@ -921,7 +919,7 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function file(array $content=null,$msg='')
+	function file(array $content = null, $msg = '')
 	{
 		$tpl = new etemplate_new('filemanager.file');
 
@@ -931,9 +929,9 @@ 
 			{
 				$msg .= $_GET['msg'];
 			}
-			if (!($path = str_replace(array('#','?'),array('%23','%3F'),$_GET['path'])) ||	// ?, # need to stay encoded!
+			if (!($path = str_replace(array('#', '?'), array('%23', '%3F'), $_GET['path'])) || // ?, # need to stay encoded!
 				// actions enclose pathes containing comma with "
-				($path[0] == '"' && substr($path,-1) == '"' && !($path = substr(str_replace('""','"',$path),1,-1))) ||
+				($path[0] == '"' && substr($path, -1) == '"' && !($path = substr(str_replace('""', '"', $path), 1, -1))) ||
 				!($stat = egw_vfs::lstat($path)))
 			{
 				$msg .= lang('File or directory not found!')." path='$path', stat=".array2string($stat);
@@ -946,10 +944,10 @@ 
 				$content['path'] = $path;
 				$content['hsize'] = egw_vfs::hsize($stat['size']);
 				$content['mime'] = egw_vfs::mime_content_type($path);
-				$content['gid'] *= -1;	// our widgets use negative gid's
+				$content['gid'] *= -1; // our widgets use negative gid's
 				if (($props = egw_vfs::propfind($path)))
 				{
-					foreach($props as $prop)
+					foreach ($props as $prop)
 					{
 						$content[$prop['name']] = $prop['val'];
 					}
@@ -962,9 +960,9 @@ 
 			$content['tabs'] = $_GET['tabs'];
 			if (!($content['is_dir'] = egw_vfs::is_dir($path) && !egw_vfs::is_link($path)))
 			{
-				$content['perms']['executable'] = (int)!!($content['mode'] & 0111);
+				$content['perms']['executable'] = (int)!!($content['mode']&0111);
 				$mask = 6;
-				if (preg_match('/^text/',$content['mime']) && $content['size'] < 100000)
+				if (preg_match('/^text/', $content['mime']) && $content['size'] < 100000)
 				{
 					$content['text_content'] = file_get_contents(egw_vfs::PREFIX.$path);
 				}
@@ -974,19 +972,19 @@ 
 				//currently not implemented in backend $content['perms']['sticky'] = (int)!!($content['mode'] & 0x201);
 				$mask = 7;
 			}
-			foreach(array('owner' => 6,'group' => 3,'other' => 0) as $name => $shift)
+			foreach (array('owner' => 6, 'group' => 3, 'other' => 0) as $name => $shift)
 			{
-				$content['perms'][$name] = ($content['mode'] >> $shift) & $mask;
+				$content['perms'][$name] = ($content['mode'] >> $shift)&$mask;
 			}
-			$content['is_owner'] = egw_vfs::has_owner_rights($path,$content);
+			$content['is_owner'] = egw_vfs::has_owner_rights($path, $content);
 		}
 		else
 		{
 			//_debug_array($content);
-			$path =& $content['path'];
+			$path = & $content['path'];
 
 			list($button) = @each($content['button']); unset($content['button']);
-			if(!$button && $content['sudo'])
+			if (!$button && $content['sudo'])
 			{
 				// Button to stop sudo is not in button namespace
 				$button = 'sudo';
@@ -995,45 +993,45 @@ 
 			// need to check 'setup' button (submit button in sudo popup), as some browsers (eg. chrome) also fill the hidden field
 			if ($button == 'sudo' && egw_vfs::$is_root || $button == 'setup' && $content['sudo']['user'])
 			{
-				$msg = $this->sudo($button == 'setup' ? $content['sudo']['user'] : '',$content['sudo']['passwd']) ?
+				$msg = $this->sudo($button == 'setup' ? $content['sudo']['user'] : '', $content['sudo']['passwd']) ?
 					lang('Root access granted.') : ($button == 'setup' && $content['sudo']['user'] ?
 					lang('Wrong username or password!') : lang('Root access stopped.'));
 				unset($content['sudo']);
 				$content['is_owner'] = egw_vfs::has_owner_rights($path);
 			}
-			if (in_array($button,array('save','apply')))
+			if (in_array($button, array('save', 'apply')))
 			{
 				$props = array();
 				$perm_changed = $perm_failed = 0;
-				foreach($content['old'] as $name => $old_value)
+				foreach ($content['old'] as $name => $old_value)
 				{
 					if (isset($content[$name]) && ($old_value != $content[$name] ||
 						// do not check for modification, if modify_subs is checked!
-						$content['modify_subs'] && in_array($name,array('uid','gid','perms'))) &&
+						$content['modify_subs'] && in_array($name, array('uid', 'gid', 'perms'))) &&
 						($name != 'uid' || egw_vfs::$is_root))
 					{
 						if ($name == 'name')
 						{
-							$to = egw_vfs::concat(egw_vfs::dirname($path),$content['name']);
+							$to = egw_vfs::concat(egw_vfs::dirname($path), $content['name']);
 							if (file_exists(egw_vfs::PREFIX.$to) && $content['confirm_overwrite'] !== $to)
 							{
-								$tpl->set_validation_error('name',lang("There's already a file with that name!").'<br />'.
-									lang('To overwrite the existing file store again.',lang($button)));
+								$tpl->set_validation_error('name', lang("There's already a file with that name!").'<br />'.
+									lang('To overwrite the existing file store again.', lang($button)));
 								$content['confirm_overwrite'] = $to;
 								if ($button == 'save') $button = 'apply';
 								continue;
 							}
-							if (egw_vfs::rename($path,$to))
+							if (egw_vfs::rename($path, $to))
 							{
-								$msg .= lang('Renamed %1 to %2.',egw_vfs::decodePath(basename($path)),egw_vfs::decodePath(basename($to))).' ';
+								$msg .= lang('Renamed %1 to %2.', egw_vfs::decodePath(basename($path)), egw_vfs::decodePath(basename($to))).' ';
 								$content['old']['name'] = $content[$name];
 								$path = $to;
-								$content['mime'] = mime_magic::filename2mime($path);	// recheck mime type
-								$refresh_path = egw_vfs::dirname($path);	// for renames, we have to refresh the parent
+								$content['mime'] = mime_magic::filename2mime($path); // recheck mime type
+								$refresh_path = egw_vfs::dirname($path); // for renames, we have to refresh the parent
 							}
 							else
 							{
-								$msg .= lang('Rename of %1 to %2 failed!',egw_vfs::decodePath(basename($path)),egw_vfs::decodePath(basename($to))).' ';
+								$msg .= lang('Rename of %1 to %2 failed!', egw_vfs::decodePath(basename($path)), egw_vfs::decodePath(basename($to))).' ';
 								if (egw_vfs::deny_script($to))
 								{
 									$msg .= lang('You are NOT allowed to upload a script!').' ';
@@ -1053,7 +1051,7 @@ 
 									'val'	=> (!empty($content[$name]) ? $content[$name] : null),
 								),
 							);
-							if (egw_vfs::proppatch($path,$mergeprop))
+							if (egw_vfs::proppatch($path, $mergeprop))
 							{
 								$content['old'][$name] = $content[$name];
 								$msg .= lang('Setting for document merge saved.');
@@ -1065,22 +1063,22 @@ 
 						}
 						else
 						{
-							static $name2cmd = array('uid' => 'chown','gid' => 'chgrp','perms' => 'chmod');
-							$cmd = array('egw_vfs',$name2cmd[$name]);
+							static $name2cmd = array('uid' => 'chown', 'gid' => 'chgrp', 'perms' => 'chmod');
+							$cmd = array('egw_vfs', $name2cmd[$name]);
 							$value = $name == 'perms' ? static::perms2mode($content['perms']) : $content[$name];
 							if ($content['modify_subs'])
 							{
 								if ($name == 'perms')
 								{
-									$changed = egw_vfs::find($path,array('type'=>'d'),$cmd,array($value));
-									$changed += egw_vfs::find($path,array('type'=>'f'),$cmd,array($value & 0666));	// no execute for files
+									$changed = egw_vfs::find($path, array('type'=>'d'), $cmd, array($value));
+									$changed += egw_vfs::find($path, array('type'=>'f'), $cmd, array($value&0666)); // no execute for files
 								}
 								else
 								{
-									$changed = egw_vfs::find($path,null,$cmd,array($value));
+									$changed = egw_vfs::find($path, null, $cmd, array($value));
 								}
 								$ok = $failed = 0;
-								foreach($changed as &$r)
+								foreach ($changed as &$r)
 								{
 									if ($r)
 									{
@@ -1093,32 +1091,32 @@ 
 								}
 								if ($ok && !$failed)
 								{
-									if(!$perm_changed++) $msg .= lang('Permissions of %1 changed.',$path.' '.lang('and all it\'s childeren'));
+									if (!$perm_changed++) $msg .= lang('Permissions of %1 changed.', $path.' '.lang('and all it\'s childeren'));
 									$content['old'][$name] = $content[$name];
 								}
-								elseif($failed)
+								elseif ($failed)
 								{
-									if(!$perm_failed++) $msg .= lang('Failed to change permissions of %1!',$path.lang('and all it\'s childeren').
-										($ok ? ' ('.lang('%1 failed, %2 succeded',$failed,$ok).')' : ''));
+									if (!$perm_failed++) $msg .= lang('Failed to change permissions of %1!', $path.lang('and all it\'s childeren').
+										($ok ? ' ('.lang('%1 failed, %2 succeded', $failed, $ok).')' : ''));
 								}
 							}
-							elseif (call_user_func_array($cmd,array($path,$value)))
+							elseif (call_user_func_array($cmd, array($path, $value)))
 							{
-								$msg .= lang('Permissions of %1 changed.',$path);
+								$msg .= lang('Permissions of %1 changed.', $path);
 								$content['old'][$name] = $content[$name];
 							}
 							else
 							{
-								$msg .= lang('Failed to change permissions of %1!',$path);
+								$msg .= lang('Failed to change permissions of %1!', $path);
 							}
 						}
 					}
 				}
 				if ($props)
 				{
-					if (egw_vfs::proppatch($path,$props))
+					if (egw_vfs::proppatch($path, $props))
 					{
-						foreach($props as $prop)
+						foreach ($props as $prop)
 						{
 							$content['old'][$prop['name']] = $prop['val'];
 						}
@@ -1135,8 +1133,8 @@ 
 				if ($content['eacl']['delete'])
 				{
 					list($ino_owner) = each($content['eacl']['delete']);
-					list(, $owner) = explode('-',$ino_owner,2);	// $owner is a group and starts with a minus!
-					$msg .= egw_vfs::eacl($path,null,$owner) ? lang('ACL deleted.') : lang('Error deleting the ACL entry!');
+					list(, $owner) = explode('-', $ino_owner, 2); // $owner is a group and starts with a minus!
+					$msg .= egw_vfs::eacl($path, null, $owner) ? lang('ACL deleted.') : lang('Error deleting the ACL entry!');
 				}
 				elseif ($button == 'eacl')
 				{
@@ -1146,7 +1144,7 @@ 
 					}
 					else
 					{
-						$msg .= egw_vfs::eacl($path,$content['eacl']['rights'],$content['eacl_owner']) ?
+						$msg .= egw_vfs::eacl($path, $content['eacl']['rights'], $content['eacl_owner']) ?
 							lang('ACL added.') : lang('Error adding the ACL!');
 					}
 				}
@@ -1156,7 +1154,7 @@ 
 		}
 		if ($content['is_link'] && !egw_vfs::stat($path))
 		{
-			$msg .= ($msg ? "\n" : '').lang('Link target %1 not found!',$content['symlink']);
+			$msg .= ($msg ? "\n" : '').lang('Link target %1 not found!', $content['symlink']);
 		}
 		$content['link'] = egw::link(egw_vfs::download_url($path));
 		$content['icon'] = egw_vfs::mime_icon($content['mime']);
@@ -1165,10 +1163,10 @@ 
 		if (($readonlys['uid'] = !egw_vfs::$is_root) && !$content['uid']) $content['ro_uid_root'] = 'root';
 		// only owner can change group & perms
 		if (($readonlys['gid'] = !$content['is_owner'] ||
-			egw_vfs::parse_url(egw_vfs::resolve_url($content['path']),PHP_URL_SCHEME) == 'oldvfs'))	// no uid, gid or perms in oldvfs
+			egw_vfs::parse_url(egw_vfs::resolve_url($content['path']), PHP_URL_SCHEME) == 'oldvfs'))	// no uid, gid or perms in oldvfs
 		{
 			if (!$content['gid']) $content['ro_gid_root'] = 'root';
-			foreach($content['perms'] as $name => $value)
+			foreach ($content['perms'] as $name => $value)
 			{
 				$readonlys['perms['.$name.']'] = true;
 			}
@@ -1186,37 +1184,37 @@ 
 		}
 		elseif (!egw_vfs::is_writable($path))
 		{
-			foreach($cfs as $name => $data)
+			foreach ($cfs as $name => $data)
 			{
 				$readonlys['#'.$name] = true;
 			}
 		}
-		$readonlys['tabs']['filemanager.file.eacl'] = true;	// eacl off by default
+		$readonlys['tabs']['filemanager.file.eacl'] = true; // eacl off by default
 		if ($content['is_dir'])
 		{
-			$readonlys['tabs']['filemanager.file.preview'] = true;	// no preview tab for dirs
-			$sel_options['rights']=$sel_options['owner']=$sel_options['group']=$sel_options['other'] = array(
+			$readonlys['tabs']['filemanager.file.preview'] = true; // no preview tab for dirs
+			$sel_options['rights'] = $sel_options['owner'] = $sel_options['group'] = $sel_options['other'] = array(
 				7 => lang('Display and modification of content'),
 				5 => lang('Display of content'),
 				0 => lang('No access'),
 			);
-			if(($content['eacl'] = egw_vfs::get_eacl($content['path'])) !== false)	// backend supports eacl
+			if (($content['eacl'] = egw_vfs::get_eacl($content['path'])) !== false)	// backend supports eacl
 			{
-				unset($readonlys['tabs']['filemanager.file.eacl']);	// --> switch the tab on again
-				foreach($content['eacl'] as &$eacl)
+				unset($readonlys['tabs']['filemanager.file.eacl']); // --> switch the tab on again
+				foreach ($content['eacl'] as &$eacl)
 				{
-					$eacl['path'] = rtrim(egw_vfs::parse_url($eacl['path'],PHP_URL_PATH),'/');
+					$eacl['path'] = rtrim(egw_vfs::parse_url($eacl['path'], PHP_URL_PATH), '/');
 					$readonlys['delete['.$eacl['ino'].'-'.$eacl['owner'].']'] = $eacl['ino'] != $content['ino'] ||
 						$eacl['path'] != $content['path'] || !$content['is_owner'];
 				}
-				array_unshift($content['eacl'],false);	// make the keys start with 1, not 0
+				array_unshift($content['eacl'], false); // make the keys start with 1, not 0
 				$content['eacl']['owner'] = 0;
 				$content['eacl']['rights'] = 5;
 			}
 		}
 		else
 		{
-			$sel_options['owner']=$sel_options['group']=$sel_options['other'] = array(
+			$sel_options['owner'] = $sel_options['group'] = $sel_options['other'] = array(
 				6 => lang('Read & write access'),
 				4 => lang('Read access only'),
 				0 => lang('No access'),
@@ -1226,11 +1224,11 @@ 
 		// mergeapp
 		$content['mergeapp'] = static::get_mergeapp($path, 'self');
 		$content['mergeapp_parent'] = static::get_mergeapp($path, 'parents');
-		if(!empty($content['mergeapp']))
+		if (!empty($content['mergeapp']))
 		{
 			$content['mergeapp_effective'] = $content['mergeapp'];
 		}
-		elseif(!empty($content['mergeapp_parent']))
+		elseif (!empty($content['mergeapp_parent']))
 		{
 			$content['mergeapp_effective'] = $content['mergeapp_parent'];
 		}
@@ -1242,7 +1240,7 @@ 
 		$mergeapp_list = egw_link::app_list('merge');
 		unset($mergeapp_list[$GLOBALS['egw_info']['flags']['currentapp']]); // exclude filemanager from list
 		$mergeapp_empty = !empty($content['mergeapp_parent'])
-			? $mergeapp_list[$content['mergeapp_parent']] . ' (parent setting)' : '';
+			? $mergeapp_list[$content['mergeapp_parent']].' (parent setting)' : '';
 		$sel_options['mergeapp'] = array(''	=> $mergeapp_empty);
 		$sel_options['mergeapp'] = $sel_options['mergeapp'] + $mergeapp_list;
 		// mergeapp other gui options
@@ -1259,7 +1257,7 @@ 
 				'comment' => (string)$content['comment'],
 				'mergeapp' => $content['mergeapp']
 			);
-			if ($cfs) foreach($cfs as $name => $data)
+			if ($cfs) foreach ($cfs as $name => $data)
 			{
 				$preserve['old']['#'.$name] = (string)$content['#'.$name];
 			}
@@ -1267,26 +1265,26 @@ 
 		if (egw_vfs::$is_root)
 		{
 			$tpl->setElementAttribute('sudouser', 'label', 'Logout');
-			$tpl->setElementAttribute('sudouser', 'help','Log out as superuser');
+			$tpl->setElementAttribute('sudouser', 'help', 'Log out as superuser');
 			// Need a more complex submit because button type is buttononly, which doesn't submit
-			$tpl->setElementAttribute('sudouser', 'onclick','app.filemanager.set_sudoButton(widget,"login")');
+			$tpl->setElementAttribute('sudouser', 'onclick', 'app.filemanager.set_sudoButton(widget,"login")');
 
 		}
 		elseif ($button == 'sudo')
 		{
 			$tpl->setElementAttribute('sudouser', 'label', 'Superuser');
-			$tpl->setElementAttribute('sudouser', 'help','Enter setup user and password to get root rights');
-			$tpl->setElementAttribute('sudouser', 'onclick','app.filemanager.set_sudoButton(widget,"logout")');
+			$tpl->setElementAttribute('sudouser', 'help', 'Enter setup user and password to get root rights');
+			$tpl->setElementAttribute('sudouser', 'onclick', 'app.filemanager.set_sudoButton(widget,"logout")');
 		}
-		if (($extra_tabs = egw_vfs::getExtraInfo($path,$content)))
+		if (($extra_tabs = egw_vfs::getExtraInfo($path, $content)))
 		{
 			// add to existing tabs in template
 			$tpl->setElementAttribute('tabs', 'add_tabs', true);
 
-			$tabs =& $tpl->getElementAttribute('tabs','tabs');
+			$tabs = & $tpl->getElementAttribute('tabs', 'tabs');
 			if (true) $tabs = array();
 
-			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
+			foreach (isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
 			{
 				$tabs[] = array(
 					'label' =>	$extra_tab['label'],
@@ -1309,7 +1307,7 @@ 
 		egw_framework::window_focus();
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Preferences').' '.egw_vfs::decodePath($path);
 
-		$tpl->exec('filemanager.filemanager_ui.file',$content,$sel_options,$readonlys,$preserve,2);
+		$tpl->exec('filemanager.filemanager_ui.file', $content, $sel_options, $readonlys, $preserve, 2);
 	}
 
 	/**
@@ -1320,10 +1318,10 @@ 
 	 * @param string $dir=null current directory
 	 * @see static::action()
 	 */
-	public static function ajax_action($action, $selected, $dir=null, $props=null)
+	public static function ajax_action($action, $selected, $dir = null, $props = null)
 	{
 		// do we have root rights, need to run here too, as method is static and therefore does NOT run __construct
-		if (egw_session::appsession('is_root','filemanager'))
+		if (egw_session::appsession('is_root', 'filemanager'))
 		{
 			egw_vfs::$is_root = true;
 		}
@@ -1339,15 +1337,15 @@ 
 
 		if (!isset($dir)) $dir = array_pop($selected);
 
-		switch($action)
+		switch ($action)
 		{
 			case 'upload':
 				$script_error = 0;
-				foreach($selected as $tmp_name => &$data)
+				foreach ($selected as $tmp_name => &$data)
 				{
 					$path = egw_vfs::concat($dir, egw_vfs::encodePathComponent($data['name']));
 
-					if(egw_vfs::deny_script($path))
+					if (egw_vfs::deny_script($path))
 					{
 						if (!isset($script_error))
 						{
@@ -1369,7 +1367,7 @@ 
 					{
 						if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 						{
-							$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'] . '/' . basename($tmp_name);
+							$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.basename($tmp_name);
 						}
 						else
 						{
@@ -1404,16 +1402,16 @@ 
 			case 'link':
 				// First upload
 				$arr = static::ajax_action('upload', $selected, $dir, $props);
-				$app_dir = egw_link::vfs_path($props['entry']['app'],$props['entry']['id'],'',true);
+				$app_dir = egw_link::vfs_path($props['entry']['app'], $props['entry']['id'], '', true);
 
-				foreach($arr['uploaded'] as $file)
+				foreach ($arr['uploaded'] as $file)
 				{
-					$target=egw_vfs::concat($dir,egw_vfs::encodePathComponent($file['name']));
+					$target = egw_vfs::concat($dir, egw_vfs::encodePathComponent($file['name']));
 					if (egw_vfs::file_exists($target) && $app_dir)
 					{
 						if (!egw_vfs::file_exists($app_dir)) egw_vfs::mkdir($app_dir);
 						error_log("Symlinking $target to $app_dir");
-						egw_vfs::symlink($target, egw_vfs::concat($app_dir,egw_vfs::encodePathComponent($file['name'])));
+						egw_vfs::symlink($target, egw_vfs::concat($app_dir, egw_vfs::encodePathComponent($file['name'])));
 					}
 				}
 				// Must return to avoid adding to $response again
@@ -1435,7 +1433,7 @@ 
 	 */
 	private function perms2mode(array $perms)
 	{
-		$mode = $perms['owner'] << 6 | $perms['group'] << 3 | $perms['other'];
+		$mode = $perms['owner'] << 6|$perms['group'] << 3|$perms['other'];
 		if ($mode['executable'])
 		{
 			$mode |= 0111;

home/inc/class.home_list_portlet.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
 	/**
 	 * This portlet accepts files and links
 	 *
-	 * @return boolean|String[]
+	 * @return string[]
 	 */
 	public function accept_drop()
 	{

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	 * Construct the portlet
 	 *
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 
@@ -113,7 +113,7 @@ 
 		$content = $this->context;
 		if(!is_array($content['list']))
 		{
-			$content['list'] = Array();
+			$content['list'] = array();
 		}
 		// Filemanager support - links need app = 'file' and type set
 		foreach($content['list'] as &$list)

Spacing +15 added lines, -15 removed lines

@@ -38,16 +38,16 @@ 
 	 */
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
-		if(!is_array($context['list'])) $context['list'] = array();
+		if (!is_array($context['list'])) $context['list'] = array();
 
 		// Process dropped data (Should be GUIDs) into something useable
-		if($context['dropped_data'])
+		if ($context['dropped_data'])
 		{
-			foreach((Array)$context['dropped_data'] as $dropped)
+			foreach ((Array)$context['dropped_data'] as $dropped)
 			{
 				$add = array();
 				list($add['app'], $add['id']) = explode('::', $dropped, 2);
-				if($add['app'] && $add['id'])
+				if ($add['app'] && $add['id'])
 				{
 					$context['list'][] = $add;
 				}
@@ -56,13 +56,13 @@ 
 			unset($context['dropped_data']);
 			$need_reload = true;
 		}
-		if($context['title'])
+		if ($context['title'])
 		{
 			$this->title = $context['title'];
 		}
-		foreach($context['list'] as &$item)
+		foreach ($context['list'] as &$item)
 		{
-			if($item['app'] == 'filemanager' || $item['app'] == 'file')
+			if ($item['app'] == 'filemanager' || $item['app'] == 'file')
 			{
 				$item['app'] = 'file';
 				$item['type'] = egw_vfs::mime_content_type($item['id']);
@@ -101,21 +101,21 @@ 
 	 * 	unique, if needed.
 	 * @return string HTML fragment for display
 	 */
-	public function exec($id = null, etemplate_new &$etemplate = null)
+	public function exec($id = null, etemplate_new&$etemplate = null)
 	{
 		$etemplate->read('home.list');
 
 		$etemplate->set_dom_id($id);
 		$content = $this->context;
-		if(!is_array($content['list']))
+		if (!is_array($content['list']))
 		{
 			$content['list'] = Array();
 		}
 		// Filemanager support - links need app = 'file' and type set
-		foreach($content['list'] as &$list)
+		foreach ($content['list'] as &$list)
 		{
-			if($list['app'] == 'filemanager') $list['app'] = 'file';
-			if($list['app'] == 'file')
+			if ($list['app'] == 'filemanager') $list['app'] = 'file';
+			if ($list['app'] == 'file')
 			{
 				$list['app'] = 'file';
 				$list['path'] = $list['title'] = $list['icon'] = $list['id'];
@@ -123,7 +123,7 @@ 
 			}
 		}
 
-		$etemplate->exec('home.home_list_portlet.exec',$content);
+		$etemplate->exec('home.home_list_portlet.exec', $content);
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 				'type' => 'drop',
 				'caption' => lang('add'),
 				'onExecute' => 'javaScript:app.home.add_link',
-				'acceptedTypes' => array('file','link') + array_keys($GLOBALS['egw_info']['apps']),
+				'acceptedTypes' => array('file', 'link') + array_keys($GLOBALS['egw_info']['apps']),
 			)
 		);
 		return $actions;
@@ -198,6 +198,6 @@ 
 	 */
 	public function accept_drop()
 	{
-		return array('file','link');
+		return array('file', 'link');
 	}
 }

Braces +8 added lines, -2 removed lines

@@ -38,7 +38,10 @@ 
 	 */
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
-		if(!is_array($context['list'])) $context['list'] = array();
+		if(!is_array($context['list']))
+		{
+			$context['list'] = array();
+		}
 
 		// Process dropped data (Should be GUIDs) into something useable
 		if($context['dropped_data'])
@@ -114,7 +117,10 @@ 
 		// Filemanager support - links need app = 'file' and type set
 		foreach($content['list'] as &$list)
 		{
-			if($list['app'] == 'filemanager') $list['app'] = 'file';
+			if($list['app'] == 'filemanager')
+			{
+				$list['app'] = 'file';
+			}
 			if($list['app'] == 'file')
 			{
 				$list['app'] = 'file';

home/inc/class.home_portlet.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 	 * If this portlet can be created by dropping, these are the drop types
 	 * that are accepted
 	 *
-	 * @return boolean|String[]
+	 * @return boolean
 	 */
 	public function accept_drop()
 	{

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 * @param context Array portlet settings such as size, as well as values for properties
 	 * @param boolean $need_reload Flag to indicate that the portlet needs to be reloaded (exec will be called)
 	 */
-	public abstract function __construct(Array &$context = array(), &$need_reload = false);
+	public abstract function __construct(array &$context = array(), &$need_reload = false);
 
 	/**
 	 * Some descriptive information about the portlet, so that users can decide if

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
 	 * 	unique, if needed.
 	 * @param etemplate etemplate_new Etemplate to generate content
 	 */
-	public abstract function exec($id = null, etemplate_new &$etemplate = null);
+	public abstract function exec($id = null, etemplate_new&$etemplate = null);
 
 	/**
 	 * Return a list of settings to customize the portlet.
@@ -76,7 +76,7 @@ 
 	{
 		// Include the common attributes, or they won't get saved
 		$properties = array();
-		foreach(self::$common_attributes as $prop)
+		foreach (self::$common_attributes as $prop)
 		{
 			$properties[$prop] = array('name' => $prop);
 		}
@@ -121,6 +121,6 @@ 
 
 	public function __toString()
 	{
-		return get_called_class() . ' Context:' . array2string($this->context);
+		return get_called_class().' Context:'.array2string($this->context);
 	}
 }

importexport/inc/class.importexport_basic_import_csv.inc.php

Doc Comments +5 added lines, -6 removed lines

@@ -118,8 +118,7 @@ 
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		$import_csv = new importexport_import_csv( $_stream, array(
@@ -222,7 +221,7 @@ 
 	*
 	* Updates the count of actions taken
 	*
-	* @return boolean success
+	* @return null|boolean success
 	*/
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
@@ -274,7 +273,7 @@ 
 	 * @param condition array = array('string' => field name)
 	 * @param matches - On return, will be filled with matching records
 	 *
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$matches = array())
 	{
@@ -451,7 +450,7 @@ 
 	/**
 	 * Allows an extending class to alter a row for preview
 	 *
-	 * @param egw_record $row_entry
+	 * @param importexport_iface_egw_record $row_entry
 	 */
 	protected function row_preview(importexport_iface_egw_record &$row_entry)
 	{
@@ -523,7 +522,7 @@ 
 	 * Get the primary key for an entry based on a custom field
 	 * Returns key, so regular linking can take over
 	 *
-	 * @param int $record_number Row number, used for errors
+	 * @param int $record_num Row number, used for errors
 	 * @param string $app Target application name
 	 * @param string $value CSV value in the form of custom_field_name:value
 	 */

Indentation +32 added lines, -32 removed lines

@@ -163,7 +163,7 @@ 
 		$record_class = isset(static::$record_class) ? static::$record_class : "{$app}_egw_record";
 
 		// Needed for categories to work right
-        $GLOBALS['egw_info']['flags']['currentapp'] = $app;
+		$GLOBALS['egw_info']['flags']['currentapp'] = $app;
 
 		$this->init($_definition);
 
@@ -215,15 +215,15 @@ 
 	}
 
 	/**
-	*Import a single record
-	*
-	* You don't need to worry about mappings or translations, they've been done already.
-	* You do need to handle the conditions and the actions taken.
-	*
-	* Updates the count of actions taken
-	*
-	* @return boolean success
-	*/
+	 *Import a single record
+	 *
+	 * You don't need to worry about mappings or translations, they've been done already.
+	 * You do need to handle the conditions and the actions taken.
+	 *
+	 * Updates the count of actions taken
+	 *
+	 * @return boolean success
+	 */
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
 		if ( $this->definition->plugin_options['conditions'] ) {
@@ -403,7 +403,7 @@ 
 	 * @param stream $stream
 	 * @param importexport_definition $definition
 	 * @return String HTML for preview
-         */
+	 */
 	public function preview( $stream, importexport_definition $definition )
 	{
 		$this->import($stream, $definition);
@@ -639,37 +639,37 @@ 
 	}
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => warning message
-	*       )
-	*/
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
 	public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-	* Returns errors that were encountered during importing
-	* Maximum of one error message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => error message
-	*       )
-	*/
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
 	public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-	* Returns a list of actions taken, and the number of records for that action.
-	* Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-	*
-	* @return Array (
-	*       action => record count
-	* )
-	*/
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
 	public function get_results() {
 			return $this->results;
 	}

Braces +96 added lines, -36 removed lines

@@ -18,7 +18,8 @@ 
  * should get you started on building a CSV plugin for an application fairly quickly.
  *
  */
-abstract class importexport_basic_import_csv implements importexport_iface_import_plugin  {
+abstract class importexport_basic_import_csv implements importexport_iface_import_plugin
+{
 
 	protected static $plugin_options = array(
 		'fieldsep', 		// char
@@ -121,7 +122,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 		$import_csv = new importexport_import_csv( $_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
@@ -143,9 +145,12 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0)
+		{
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		}
+		elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line'])
+		{
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -167,15 +172,22 @@ 
 
 		$this->init($_definition);
 
-		while ( $record = $import_csv->get_record() ) {
+		while ( $record = $import_csv->get_record() )
+		{
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
 
 			$warning = importexport_import_csv::convert($record, $record_class::$types, $app, $this->lookups, $_definition->plugin_options['convert']);
-				if($warning) $this->warnings[$import_csv->get_current_position()] = $warning;
+				if($warning)
+				{
+					$this->warnings[$import_csv->get_current_position()] = $warning;
+				}
 
 			$egw_record = new $record_class();
 			$egw_record->set_record($record);
@@ -185,7 +197,10 @@ 
 			{
 				$this->do_special_fields($egw_record, $import_csv);
 			}
-			if($success) $count++;
+			if($success)
+			{
+				$count++;
+			}
 
 			// Add some more time
 			if($success && $import_csv->get_current_position() > 0 && $import_csv->get_current_position() % 100 == 0)
@@ -226,10 +241,13 @@ 
 	*/
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
-		if ( $this->definition->plugin_options['conditions'] ) {
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+		if ( $this->definition->plugin_options['conditions'] )
+		{
+			foreach ( $this->definition->plugin_options['conditions'] as $condition )
+			{
 				$result = false;
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
 						// Check for that record
@@ -257,9 +275,14 @@ 
 					$action = $condition['false'];
 					$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 				}
-				if ($action['stop']) break;
+				if ($action['stop'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -343,9 +366,14 @@ 
 			return;
 		}
 
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$record->$field) continue;
-			if(strpos($field, 'link') === 0) {
+		foreach(self::$special_fields as $field => $desc)
+		{
+			if(!$record->$field)
+			{
+				continue;
+			}
+			if(strpos($field, 'link') === 0)
+			{
 				list($app, $app_id) = explode(':', $record->$field,2);
 
 				list($link, $type) = explode('_',$field);
@@ -364,7 +392,9 @@ 
 						shift($result);
 					} while($result && !$app_id);
 				}
-			} else if (in_array($field, array_keys($GLOBALS['egw_info']['apps']))) {
+			}
+			else if (in_array($field, array_keys($GLOBALS['egw_info']['apps'])))
+			{
 				$app = $field;
 				$app_id = $record->$field;
 
@@ -425,11 +455,16 @@ 
 			$fields = $wizard->get_import_fields();
 			foreach($labels as $field => &$label)
 			{
-				if($fields[$field]) $label = $fields[$field];
+				if($fields[$field])
+				{
+					$label = $fields[$field];
+				}
 			}
-		} catch (Exception $e) {
+		}
+		catch (Exception $e) {
 			Api\Translation::add_app($definition->application);
-			foreach($labels as $field => &$label) {
+			foreach($labels as $field => &$label)
+			{
 				$label = lang($label);
 			}
 		}
@@ -468,7 +503,8 @@ 
 	 * @param string $org_name
 	 * @return int|boolean Contact ID of first match, or false if none found
 	 */
-	public static function addr_id( $n_family,$n_given=null,$org_name=null, &$record=null) {
+	public static function addr_id( $n_family,$n_given=null,$org_name=null, &$record=null)
+	{
 
 		// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
 		static $contacts;
@@ -478,28 +514,40 @@ 
 			list($n_family, $n_given, $org_name) = explode(',', $n_family);
 		}
 		$n_family = trim($n_family);
-		if(!is_null($n_given)) $n_given = trim($n_given);
+		if(!is_null($n_given))
+		{
+			$n_given = trim($n_given);
+		}
 		if (!is_object($contacts))
 		{
 			$contacts = new Api\Contacts();
 		}
-		if (!is_null($org_name))	// org_name given?
+		if (!is_null($org_name))
+		{
+			// org_name given?
 		{
 			$org_name = trim($org_name);
+		}
 			$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
 			if (!count($addrs))
 			{
 				$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name",'','n_family,org_name');
 			}
 		}
-		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))       // first name given and no result so far
+		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))
+		{
+			// first name given and no result so far
 		{
 			$addrs = $contacts->search(array('n_family' => $n_family, 'n_given' => $n_given));
 		}
-		if (is_null($n_given) && is_null($org_name))    // just one name given, check against fn (= full name)
+		}
+		if (is_null($n_given) && is_null($org_name))
+		{
+			// just one name given, check against fn (= full name)
 		{
 			$addrs = $contacts->read( 0,0,array('id'),'',"n_fn=$n_family",'','n_fn' );
 		}
+		}
 		if (count($addrs))
 		{
 			if(!$record || !$record->get_identifier())
@@ -551,13 +599,17 @@ 
 			}
 
 			// Couldn't find field, give an error - something's wrong
-			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)]) {
+			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)])
+			{
 				$this->errors[$record_num] .= lang('No custom field "%1" for %2.',
 					$custom_field, lang($app));
 				return false;
 			}
-			if($custom_field[0] != '#') $custom_field = '#' . $custom_field;
-error_log("Searching for $custom_field = $value");
+			if($custom_field[0] != '#')
+			{
+				$custom_field = '#' . $custom_field;
+			}
+			error_log("Searching for $custom_field = $value");
 			// Search
 			if(Link::get_registry($app, 'query'))
 			{
@@ -591,7 +643,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Basic CSV import');
 	}
 
@@ -600,7 +653,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports information from a CSV file.  This is only a base class, and doesn't do anything on its own.");
 	}
 
@@ -609,7 +663,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -625,7 +680,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -634,7 +690,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -646,7 +703,8 @@ 
 	*       record_# => warning message
 	*       )
 	*/
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -658,7 +716,8 @@ 
 	*       record_# => error message
 	*       )
 	*/
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -670,7 +729,8 @@ 
 	*       action => record count
 	* )
 	*/
-	public function get_results() {
+	public function get_results()
+	{
 			return $this->results;
 	}
 } // end of iface_export_plugin

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -276,7 +276,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$matches = array())
+	protected function exists(importexport_iface_egw_record &$record, array &$condition, &$matches = array())
 	{
 	}
 
@@ -288,7 +288,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function equal(importexport_iface_egw_record &$record, Array &$condition)
+	protected function equal(importexport_iface_egw_record &$record, array &$condition)
 	{
 		$field = $condition['string'];
 		return $record->$field == $condition['op_2'];
@@ -303,7 +303,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function less_than(importexport_iface_egw_record &$record, Array &$condition)
+	protected function less_than(importexport_iface_egw_record &$record, array &$condition)
 	{
 		$field = $condition['string'];
 		return $record->$field < $condition['op_2'];

Spacing +80 added lines, -80 removed lines

@@ -16,19 +16,19 @@ 
  * should get you started on building a CSV plugin for an application fairly quickly.
  *
  */
-abstract class importexport_basic_import_csv implements importexport_iface_import_plugin  {
+abstract class importexport_basic_import_csv implements importexport_iface_import_plugin {
 
 	protected static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 			// string
-		'record_owner', 	// int
-		'update_cats', 			// string {override|add} overides record
+		'fieldsep', // char
+		'charset', // string
+		'record_owner', // int
+		'update_cats', // string {override|add} overides record
 								// with cat(s) from csv OR add the cat from
 								// csv file to exeisting cat(s) of record
 		'num_header_lines', // int number of header lines
 		'field_conversion', // array( $csv_col_num => conversion)
-		'field_mapping',	// array( $csv_col_num => adb_filed)
-		'conditions',		/* => array containing condition arrays:
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -46,7 +46,7 @@ 
 	 * Actions wich could be done to data entries
 	 * If your plugin supports different actions, be sure to modify this array
 	 */
-	protected static $actions = array( 'none', 'update', 'insert', 'delete', );
+	protected static $actions = array('none', 'update', 'insert', 'delete',);
 
 	/**
 	 * Conditions for actions
@@ -54,7 +54,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists', 'equal', 'less_than');
+	protected static $conditions = array('exists', 'equal', 'less_than');
 
 	/**
 	 * This is the definition that will be used to deal with the CSV file
@@ -119,8 +119,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
-		$import_csv = new importexport_import_csv( $_stream, array(
+	public function import($_stream, importexport_definition $_definition) {
+		$import_csv = new importexport_import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -128,11 +128,11 @@ 
 		$this->definition = $_definition;
 
 		// user, is admin ?
-		$this->is_admin = isset( $GLOBALS['egw_info']['user']['apps']['admin'] ) && $GLOBALS['egw_info']['user']['apps']['admin'];
+		$this->is_admin = isset($GLOBALS['egw_info']['user']['apps']['admin']) && $GLOBALS['egw_info']['user']['apps']['admin'];
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		// set FieldMapping.
 		$import_csv->mapping = $_definition->plugin_options['field_mapping'];
@@ -141,9 +141,9 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if (isset($_definition->plugin_options['num_header_lines']) && $_definition->plugin_options['num_header_lines'] > 0) {
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		} elseif (isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -165,38 +165,38 @@ 
 
 		$this->init($_definition);
 
-		while ( $record = $import_csv->get_record() ) {
+		while ($record = $import_csv->get_record()) {
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
 
 			$warning = importexport_import_csv::convert($record, $record_class::$types, $app, $this->lookups, $_definition->plugin_options['convert']);
-				if($warning) $this->warnings[$import_csv->get_current_position()] = $warning;
+				if ($warning) $this->warnings[$import_csv->get_current_position()] = $warning;
 
 			$egw_record = new $record_class();
 			$egw_record->set_record($record);
 			$success = $this->import_record($egw_record, $import_csv);
 
-			if($success)
+			if ($success)
 			{
 				$this->do_special_fields($egw_record, $import_csv);
 			}
-			if($success) $count++;
+			if ($success) $count++;
 
 			// Add some more time
-			if($success && $import_csv->get_current_position() > 0 && $import_csv->get_current_position() % 100 == 0)
+			if ($success && $import_csv->get_current_position() > 0 && $import_csv->get_current_position() % 100 == 0)
 			{
 				set_time_limit(10);
 			}
 			
 			// Keep a few records for preview, but process the whole file
-			if($this->dry_run && $import_csv->get_current_position() < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])
+			if ($this->dry_run && $import_csv->get_current_position() < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])
 			{
 				$this->preview_records[] = $egw_record;
 			}
-			if(count($this->warnings) > self::MAX_MESSAGES || count($this->errors) > self::MAX_MESSAGES)
+			if (count($this->warnings) > self::MAX_MESSAGES || count($this->errors) > self::MAX_MESSAGES)
 			{
 				$this->errors[] = 'Too many errors, aborted';
 				break;
@@ -208,7 +208,7 @@ 
 	/**
 	 * Stub to hook into import initialization - set lookups, etc.
 	 */
-	protected function init(importexport_definition &$definition)
+	protected function init(importexport_definition&$definition)
 	{
 	}
 
@@ -222,12 +222,12 @@ 
 	*
 	* @return boolean success
 	*/
-	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
+	protected function import_record(importexport_iface_egw_record&$record, &$import_csv)
 	{
-		if ( $this->definition->plugin_options['conditions'] ) {
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+		if ($this->definition->plugin_options['conditions']) {
+			foreach ($this->definition->plugin_options['conditions'] as $condition) {
 				$result = false;
-				switch ( $condition['type'] ) {
+				switch ($condition['type']) {
 					// exists
 					case 'exists' :
 						// Check for that record
@@ -243,23 +243,23 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if($result)
+				if ($result)
 				{
 					// Apply true action to any matching records found
 					$action = $condition['true'];
-					$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+					$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 				}
 				else
 				{
 					// Apply false action if no matching records found
 					$action = $condition['false'];
-					$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+					$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 				}
 				if ($action['stop']) break;
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 
 		return $success;
@@ -274,7 +274,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$matches = array())
+	protected function exists(importexport_iface_egw_record&$record, Array &$condition, &$matches = array())
 	{
 	}
 
@@ -286,7 +286,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function equal(importexport_iface_egw_record &$record, Array &$condition)
+	protected function equal(importexport_iface_egw_record&$record, Array &$condition)
 	{
 		$field = $condition['string'];
 		return $record->$field == $condition['op_2'];
@@ -301,7 +301,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function less_than(importexport_iface_egw_record &$record, Array &$condition)
+	protected function less_than(importexport_iface_egw_record&$record, Array &$condition)
 	{
 		$field = $condition['string'];
 		return $record->$field < $condition['op_2'];
@@ -320,7 +320,7 @@ 
 	 * @param int $record_num Which record number is being dealt with.  Used for error messages.
 	 * @return bool success or not
 	 */
-	protected abstract function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 );
+	protected abstract function action($_action, importexport_iface_egw_record&$record, $record_num = 0);
 
 	/**
 	 * Handle special fields
@@ -330,51 +330,51 @@ 
 	 *
 	 * @param importexport_iface_egw_record $record
 	 */
-	protected function do_special_fields(importexport_iface_egw_record &$record, &$import_csv)
+	protected function do_special_fields(importexport_iface_egw_record&$record, &$import_csv)
 	{
 		$id = $record->get_identifier();
 
 		// Warn if there's no ID unless it's a dry_run because there probably won't be an ID then
-		if(!$this->dry_run && !$id)
+		if (!$this->dry_run && !$id)
 		{
 			$this->warnings[$import_csv->get_current_position()] .= "Unable to link, no identifier for record";
 			return;
 		}
 
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$record->$field) continue;
-			if(strpos($field, 'link') === 0) {
-				list($app, $app_id) = explode(':', $record->$field,2);
+		foreach (self::$special_fields as $field => $desc) {
+			if (!$record->$field) continue;
+			if (strpos($field, 'link') === 0) {
+				list($app, $app_id) = explode(':', $record->$field, 2);
 
-				list($link, $type) = explode('_',$field);
+				list($link, $type) = explode('_', $field);
 
 				// Searching, take first result
-				if($type == 'custom')
+				if ($type == 'custom')
 				{
 					$app_id = $this->link_by_cf($record, $app, $app_id, $import_csv->get_current_position());
 				}
-				else if($type == 'search')
+				else if ($type == 'search')
 				{
 					$result = egw_link::query($app, $app_id);
 					do
 					{
 						$app_id = key($result);
 						shift($result);
-					} while($result && !$app_id);
+					} while ($result && !$app_id);
 				}
 			} else if (in_array($field, array_keys($GLOBALS['egw_info']['apps']))) {
 				$app = $field;
 				$app_id = $record->$field;
 
 				// Searching, take first result
-				if(!is_numeric($app_id))
+				if (!is_numeric($app_id))
 				{
 					$result = egw_link::query($app, $app_id);
 					do
 					{
 						$app_id = key($result);
 						shift($result);
-					} while($result && !$app_id);
+					} while ($result && !$app_id);
 				}
 			}
 			else if ($field == 'contact')
@@ -385,7 +385,7 @@ 
 			}
 			if (!$this->dry_run && $app && $app_id && ($app != $this->definition->application || $app_id != $id))
 			{
-				$link_id = egw_link::link($this->definition->application,$id,$app,$app_id);
+				$link_id = egw_link::link($this->definition->application, $id, $app, $app_id);
 			}
 		}
 	}
@@ -402,13 +402,13 @@ 
 	 * @param importexport_definition $definition
 	 * @return String HTML for preview
          */
-	public function preview( $stream, importexport_definition $definition )
+	public function preview($stream, importexport_definition $definition)
 	{
 		$this->import($stream, $definition);
 		rewind($stream);
 
 		// Set up result
-		$rows = array('h1'=>array(),'f1'=>array(),'.h1'=>'class=th');
+		$rows = array('h1'=>array(), 'f1'=>array(), '.h1'=>'class=th');
 
 		// Load labels for app
 		$record_class = get_class($this->preview_records[0]);
@@ -417,27 +417,27 @@ 
 		$labels = array_combine($definition->plugin_options['field_mapping'], $definition->plugin_options['field_mapping']);
 
 		$plugin = get_called_class();
-		$wizard_name = $definition->application . '_wizard_' . str_replace($definition->application . '_', '', $plugin);
+		$wizard_name = $definition->application.'_wizard_'.str_replace($definition->application.'_', '', $plugin);
 		try {
 			$wizard = new $wizard_name;
 			$fields = $wizard->get_import_fields();
-			foreach($labels as $field => &$label)
+			foreach ($labels as $field => &$label)
 			{
-				if($fields[$field]) $label = $fields[$field];
+				if ($fields[$field]) $label = $fields[$field];
 			}
 		} catch (Exception $e) {
 			translation::add_app($definition->application);
-			foreach($labels as $field => &$label) {
+			foreach ($labels as $field => &$label) {
 				$label = lang($label);
 			}
 		}
 
 		// Set up HTML
 		$rows['h1'] = $labels;
-		foreach($this->preview_records as $i => $row_data)
+		foreach ($this->preview_records as $i => $row_data)
 		{
 			// Convert to human-friendly
-			importexport_export_csv::convert($row_data,$record_class::$types,$definition->application,$this->lookups);
+			importexport_export_csv::convert($row_data, $record_class::$types, $definition->application, $this->lookups);
 			$this->row_preview($row_data);
 			$rows[] = $row_data->get_record_array();
 		}
@@ -451,7 +451,7 @@ 
 	 *
 	 * @param egw_record $row_entry
 	 */
-	protected function row_preview(importexport_iface_egw_record &$row_entry)
+	protected function row_preview(importexport_iface_egw_record&$row_entry)
 	{
 	}
 
@@ -466,7 +466,7 @@ 
 	 * @param string $org_name
 	 * @return int|boolean Contact ID of first match, or false if none found
 	 */
-	public static function addr_id( $n_family,$n_given=null,$org_name=null, &$record=null) {
+	public static function addr_id($n_family, $n_given = null, $org_name = null, &$record = null) {
 
 		// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
 		static $contacts;
@@ -476,18 +476,18 @@ 
 			list($n_family, $n_given, $org_name) = explode(',', $n_family);
 		}
 		$n_family = trim($n_family);
-		if(!is_null($n_given)) $n_given = trim($n_given);
+		if (!is_null($n_given)) $n_given = trim($n_given);
 		if (!is_object($contacts))
 		{
-			$contacts =& CreateObject('phpgwapi.contacts');
+			$contacts = & CreateObject('phpgwapi.contacts');
 		}
 		if (!is_null($org_name))	// org_name given?
 		{
 			$org_name = trim($org_name);
-			$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
+			$addrs = $contacts->read(0, 0, array('id'), '', "n_family=$n_family,n_given=$n_given,org_name=$org_name");
 			if (!count($addrs))
 			{
-				$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name",'','n_family,org_name');
+				$addrs = $contacts->read(0, 0, array('id'), '', "n_family=$n_family,org_name=$org_name", '', 'n_family,org_name');
 			}
 		}
 		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))       // first name given and no result so far
@@ -496,11 +496,11 @@ 
 		}
 		if (is_null($n_given) && is_null($org_name))    // just one name given, check against fn (= full name)
 		{
-			$addrs = $contacts->read( 0,0,array('id'),'',"n_fn=$n_family",'','n_fn' );
+			$addrs = $contacts->read(0, 0, array('id'), '', "n_fn=$n_family", '', 'n_fn');
 		}
 		if (count($addrs))
 		{
-			if(!$record || !$record->get_identifier())
+			if (!$record || !$record->get_identifier())
 			{
 				return $addrs[0]['id'];
 			}
@@ -510,7 +510,7 @@ 
 				{
 					$id = key($addrs);
 					array_shift($addrs);
-				} while($addrs && !$id && $id == $record->get_identifier());
+				} while ($addrs && !$id && $id == $record->get_identifier());
 				return $id;
 			}
 		}
@@ -525,22 +525,22 @@ 
 	 * @param string $app Target application name
 	 * @param string $value CSV value in the form of custom_field_name:value
 	 */
-	protected function link_by_cf(importexport_iface_egw_record &$record, $app, $value,$record_num)
+	protected function link_by_cf(importexport_iface_egw_record&$record, $app, $value, $record_num)
 	{
 		$app_id = false;
 
-		list($custom_field, $value) = explode(':',$value);
+		list($custom_field, $value) = explode(':', $value);
 		// Find matching entry
-		if($app && $custom_field && $value)
+		if ($app && $custom_field && $value)
 		{
 			$cfs = config::get_customfields($app);
 			// Error if no custom fields, probably something wrong in definition
-			if(!$cfs[$custom_field])
+			if (!$cfs[$custom_field])
 			{
 				// Check for users specifing label instead of name
-				foreach($cfs as $name => $settings)
+				foreach ($cfs as $name => $settings)
 				{
-					if(strtolower($settings['label']) == strtolower($custom_field))
+					if (strtolower($settings['label']) == strtolower($custom_field))
 					{
 						$custom_field = $name;
 						break;
@@ -549,30 +549,30 @@ 
 			}
 
 			// Couldn't find field, give an error - something's wrong
-			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)]) {
+			if (!$cfs[$custom_field] && !$cfs[substr($custom_field, 1)]) {
 				$this->errors[$record_num] .= lang('No custom field "%1" for %2.',
 					$custom_field, lang($app));
 				return false;
 			}
-			if($custom_field[0] != '#') $custom_field = '#' . $custom_field;
+			if ($custom_field[0] != '#') $custom_field = '#'.$custom_field;
 error_log("Searching for $custom_field = $value");
 			// Search
-			if(egw_link::get_registry($app, 'query'))
+			if (egw_link::get_registry($app, 'query'))
 			{
-				$options = array('filter' => array("$custom_field = " . $GLOBALS['egw']->db->quote($value)));
+				$options = array('filter' => array("$custom_field = ".$GLOBALS['egw']->db->quote($value)));
 				$result = egw_link::query($app, '', $options);
 
 				// Only one allowed
-				if($record->get_identifier())
+				if ($record->get_identifier())
 				{
-					while(key($result) == $record->get_identifier())
+					while (key($result) == $record->get_identifier())
 					{
 						array_shift($result);
 					}
 				}
-				if(count($result) != 1)
+				if (count($result) != 1)
 				{
-					$this->warnings[$record_num] .= ($this->warnings[$record_num] ? "\n" : '') .
+					$this->warnings[$record_num] .= ($this->warnings[$record_num] ? "\n" : '').
 						lang('Unable to link to %3 by custom field "%1": "%4".  %2 matches.',
 						$custom_field, count($result), lang($app), $options['filter'][0]
 					);

importexport/inc/class.importexport_definition.inc.php

Doc Comments -1 removed lines

@@ -176,7 +176,6 @@
 	/**
 	 * sets options
 	 *
-	 * @param array $options
 	 */
 	private function set_options(array $_plugin_options) {
 		$this->definition['plugin_options'] = $_plugin_options;

Braces +82 added lines, -39 removed lines

@@ -20,7 +20,8 @@ 
  * are in one assiozative array which is complely managed by {Im|Ex}port plugins
  * @todo testing
  */
-class importexport_definition implements importexport_iface_egw_record {
+class importexport_definition implements importexport_iface_egw_record
+{
 
 	const _appname = 'importexport';
 	const _defintion_talbe = 'egw_importexport_definitions';
@@ -65,26 +66,36 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
+	public function __construct( $_identifier='' )
+	{
 		$this->so_sql = new Api\Storage\Base(self::_appname ,self::_defintion_talbe);
 		$this->user = $GLOBALS['egw_info']['user']['user_id'];
 		$this->is_admin = $GLOBALS['egw_info']['user']['apps']['admin'] || $GLOBALS['egw_setup'] ? true : false;
 		// compability to string identifiers
-		if (!is_numeric($_identifier) && strlen($_identifier) > 3) $_identifier = $this->name2identifier($_identifier);
+		if (!is_numeric($_identifier) && strlen($_identifier) > 3)
+		{
+			$_identifier = $this->name2identifier($_identifier);
+		}
 
-		if ((int)$_identifier != 0) {
+		if ((int)$_identifier != 0)
+		{
 			$this->definition = $this->so_sql->read(array('definition_id' => $_identifier));
-			if ( empty( $this->definition ) ) {
+			if ( empty( $this->definition ) )
+			{
 				throw new Exception('Error: No such definition with identifier :"'.$_identifier.'"!');
 			}
-			if ( !( importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin)) {
+			if ( !( importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin))
+			{
 				throw new Exception('Error: User "'.$this->user.'" is not permitted to get definition with identifier "'.$_identifier.'"!');
 			}
 			try
 			{
 				$options_data = importexport_arrayxml::xml2array( $this->definition['plugin_options'] );
 				$this->definition['plugin_options'] = $options_data['root'];
-				if($this->definition['filter']) $filter = importexport_arrayxml::xml2array( $this->definition['filter']  );
+				if($this->definition['filter'])
+				{
+					$filter = importexport_arrayxml::xml2array( $this->definition['filter']  );
+				}
 				$this->definition['filter'] = $filter['root'];
 			}
 			catch (Exception $e)
@@ -100,12 +111,15 @@ 
 	 * @param string $_name
 	 * @return int
 	 */
-	private function name2identifier( $_name ) {
+	private function name2identifier( $_name )
+	{
 		$identifiers = $this->so_sql->search(array('name' => $_name),true);
-		if (isset($identifiers[1])) {
+		if (isset($identifiers[1]))
+		{
 			throw new Exception('Error: Definition: "'.$_name. '" is not unique! Can\'t convert to identifier');
 		}
-		if ( empty( $identifiers[0] ) ) {
+		if ( empty( $identifiers[0] ) )
+		{
 			// not a good idea, till we don't have different exceptions so far
 			// throw new Exception('Error: No such definition :"'.$_name.'"!');
 			$identifiers = array( array( 'definition_id' => 0 ) );
@@ -113,11 +127,14 @@ 
 		return $identifiers[0]['definition_id'];
 	}
 
-	public function __get($_attribute_name) {
-		if (!array_key_exists($_attribute_name,$this->attributes)) {
+	public function __get($_attribute_name)
+	{
+		if (!array_key_exists($_attribute_name,$this->attributes))
+		{
 			throw new Exception('Error: "'. $_attribute_name. '" is not an attribute defintion');
 		}
-		switch ($_attribute_name) {
+		switch ($_attribute_name)
+		{
 			case 'allowed_users' :
 				return $this->get_allowed_users();
 			case 'plugin_options' :
@@ -129,11 +146,14 @@ 
 		}
 	}
 
-	public function __set($_attribute_name,$_data) {
-		if (!array_key_exists($_attribute_name,$this->attributes)) {
+	public function __set($_attribute_name,$_data)
+	{
+		if (!array_key_exists($_attribute_name,$this->attributes))
+		{
 			throw new Exception('Error: "'. $_attribute_name. '" is not an attribute defintion');
 		}
-		switch ($_attribute_name) {
+		switch ($_attribute_name)
+		{
 			case 'allowed_users' :
 				return $this->set_allowed_users($_data);
 			case 'plugin_options' :
@@ -151,7 +171,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_allowed_users() {
+	private function get_allowed_users()
+	{
 		return explode(',',substr($this->definition['allowed_users'],1,-1));
 	}
 
@@ -160,7 +181,8 @@ 
 	 *
 	 * @param array $_allowed_users
 	 */
-	private function set_allowed_users( $_allowed_users ) {
+	private function set_allowed_users( $_allowed_users )
+	{
 		$this->definition['allowed_users'] = ','.implode(',',(array)$_allowed_users) .',';
 	}
 
@@ -169,7 +191,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_options() {
+	private function get_options()
+	{
 		return $this->definition['plugin_options'];
 	}
 
@@ -178,7 +201,8 @@ 
 	 *
 	 * @param array $options
 	 */
-	private function set_options(array $_plugin_options) {
+	private function set_options(array $_plugin_options)
+	{
 		$this->definition['plugin_options'] = $_plugin_options;
 	}
 
@@ -187,7 +211,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_filter() {
+	private function get_filter()
+	{
 		return $this->definition['filter'];
 	}
 
@@ -196,7 +221,8 @@ 
 	 *
 	 * @param filter array of field => settings
 	 */
-	private function set_filter(Array $filter) {
+	private function set_filter(Array $filter)
+	{
 		$this->definition['filter'] = $filter;
 	}
 
@@ -208,7 +234,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		$definition = $this->definition;
 		$definition['allowed_users'] = $this->get_allowed_users();
 		$definition['plugin_options'] = $this->get_options();
@@ -221,7 +248,8 @@ 
 	 *
 	 *@return string tiltle
 	 */
-	public function get_title() {
+	public function get_title()
+	{
 		return $this->definition['name'];
 	}
 
@@ -230,13 +258,16 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_record( array $_record ) {
+	public function set_record( array $_record )
+	{
 		$this->definition = array_intersect_key( $_record, $this->attributes );
 
 		// anything which is not an attribute is perhaps a plugin_option.
 		// If not, it gets whiped out on save time.
-		foreach ( $_record as $attribute => $value) {
-			if ( !array_key_exists( $attribute, $this->attributes ) ) {
+		foreach ( $_record as $attribute => $value)
+		{
+			if ( !array_key_exists( $attribute, $this->attributes ) )
+			{
 				$this->definition['plugin_options'][$attribute] = $value;
 			}
 		}
@@ -254,7 +285,8 @@ 
 	 *
 	 * @return int identifier of this record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->definition['definition_id'];
 	}
 
@@ -265,7 +297,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return self::_appname . '/navbar';
 	}
 
@@ -274,8 +307,10 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
-		if ( strlen($this->definition['name']) < 3 ) {
+	public function save ( $_dst_identifier )
+	{
+		if ( strlen($this->definition['name']) < 3 )
+		{
 			throw new Exception('Error: Can\'t save definition, no valid name given!');
 		}
 
@@ -283,7 +318,8 @@ 
 		$this->so_sql->data['plugin_options'] = importexport_arrayxml::array2xml( $this->definition['plugin_options'] );
 		$this->so_sql->data['filter'] = importexport_arrayxml::array2xml( $this->definition['filter'] );
 		$this->so_sql->data['modified'] = time();
-		if ($this->so_sql->save( array( 'definition_id' => $_dst_identifier ))) {
+		if ($this->so_sql->save( array( 'definition_id' => $_dst_identifier )))
+		{
 			throw new Exception('Error: Api\Storage\Base was not able to save definition: '.$this->get_identifier());
 		}
 
@@ -296,7 +332,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		$dst_object = clone $this;
 		try {
 			$dst_object->set_owner($this->user);
@@ -317,8 +354,10 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		if ($this->user != $this->get_owner() && !$this->is_admin) {
+	public function move ( $_dst_identifier )
+	{
+		if ($this->user != $this->get_owner() && !$this->is_admin)
+		{
 			throw('Error: User '. $this->user. 'does not have permissions to move definition '.$this->get_identifier());
 		}
 		$old_object = clone $this;
@@ -339,11 +378,14 @@ 
 	 * @return void
 	 *
 	 */
-	public function delete () {
-		if($this->user != $this->get_owner() && !$this->is_admin) {
+	public function delete ()
+	{
+		if($this->user != $this->get_owner() && !$this->is_admin)
+		{
 			throw('Error: User '. $this->user. 'does not have permissions to delete definition '.$this->get_identifier());
 		}
-		if(!$this->so_sql->delete()) {
+		if(!$this->so_sql->delete())
+		{
 			throw('Error: Api\Storage\Base was not able to delete definition: '.$this->get_identifier());
 		}
 	}
@@ -352,7 +394,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset($this->so_sql);
 	}
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
 	 *
 	 * @param filter array of field => settings
 	 */
-	private function set_filter(Array $filter) {
+	private function set_filter(array $filter) {
 		$this->definition['filter'] = $filter;
 	}
 

Spacing +41 added lines, -41 removed lines

@@ -63,8 +63,8 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		$this->so_sql = new so_sql(self::_appname ,self::_defintion_talbe);
+	public function __construct($_identifier = '') {
+		$this->so_sql = new so_sql(self::_appname, self::_defintion_talbe);
 		$this->user = $GLOBALS['egw_info']['user']['user_id'];
 		$this->is_admin = $GLOBALS['egw_info']['user']['apps']['admin'] || $GLOBALS['egw_setup'] ? true : false;
 		// compability to string identifiers
@@ -72,17 +72,17 @@ 
 
 		if ((int)$_identifier != 0) {
 			$this->definition = $this->so_sql->read(array('definition_id' => $_identifier));
-			if ( empty( $this->definition ) ) {
+			if (empty($this->definition)) {
 				throw new Exception('Error: No such definition with identifier :"'.$_identifier.'"!');
 			}
-			if ( !( importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin)) {
+			if (!(importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin)) {
 				throw new Exception('Error: User "'.$this->user.'" is not permitted to get definition with identifier "'.$_identifier.'"!');
 			}
 			try
 			{
-				$options_data = importexport_arrayxml::xml2array( $this->definition['plugin_options'] );
+				$options_data = importexport_arrayxml::xml2array($this->definition['plugin_options']);
 				$this->definition['plugin_options'] = $options_data['root'];
-				if($this->definition['filter']) $filter = importexport_arrayxml::xml2array( $this->definition['filter']  );
+				if ($this->definition['filter']) $filter = importexport_arrayxml::xml2array($this->definition['filter']);
 				$this->definition['filter'] = $filter['root'];
 			}
 			catch (Exception $e)
@@ -98,22 +98,22 @@ 
 	 * @param string $_name
 	 * @return int
 	 */
-	private function name2identifier( $_name ) {
-		$identifiers = $this->so_sql->search(array('name' => $_name),true);
+	private function name2identifier($_name) {
+		$identifiers = $this->so_sql->search(array('name' => $_name), true);
 		if (isset($identifiers[1])) {
-			throw new Exception('Error: Definition: "'.$_name. '" is not unique! Can\'t convert to identifier');
+			throw new Exception('Error: Definition: "'.$_name.'" is not unique! Can\'t convert to identifier');
 		}
-		if ( empty( $identifiers[0] ) ) {
+		if (empty($identifiers[0])) {
 			// not a good idea, till we don't have different exceptions so far
 			// throw new Exception('Error: No such definition :"'.$_name.'"!');
-			$identifiers = array( array( 'definition_id' => 0 ) );
+			$identifiers = array(array('definition_id' => 0));
 		}
 		return $identifiers[0]['definition_id'];
 	}
 
 	public function __get($_attribute_name) {
-		if (!array_key_exists($_attribute_name,$this->attributes)) {
-			throw new Exception('Error: "'. $_attribute_name. '" is not an attribute defintion');
+		if (!array_key_exists($_attribute_name, $this->attributes)) {
+			throw new Exception('Error: "'.$_attribute_name.'" is not an attribute defintion');
 		}
 		switch ($_attribute_name) {
 			case 'allowed_users' :
@@ -127,9 +127,9 @@ 
 		}
 	}
 
-	public function __set($_attribute_name,$_data) {
-		if (!array_key_exists($_attribute_name,$this->attributes)) {
-			throw new Exception('Error: "'. $_attribute_name. '" is not an attribute defintion');
+	public function __set($_attribute_name, $_data) {
+		if (!array_key_exists($_attribute_name, $this->attributes)) {
+			throw new Exception('Error: "'.$_attribute_name.'" is not an attribute defintion');
 		}
 		switch ($_attribute_name) {
 			case 'allowed_users' :
@@ -150,7 +150,7 @@ 
 	 * @return array
 	 */
 	private function get_allowed_users() {
-		return explode(',',substr($this->definition['allowed_users'],1,-1));
+		return explode(',', substr($this->definition['allowed_users'], 1, -1));
 	}
 
 	/**
@@ -158,8 +158,8 @@ 
 	 *
 	 * @param array $_allowed_users
 	 */
-	private function set_allowed_users( $_allowed_users ) {
-		$this->definition['allowed_users'] = ','.implode(',',(array)$_allowed_users) .',';
+	private function set_allowed_users($_allowed_users) {
+		$this->definition['allowed_users'] = ','.implode(',', (array)$_allowed_users).',';
 	}
 
 	/**
@@ -228,13 +228,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_record( array $_record ) {
-		$this->definition = array_intersect_key( $_record, $this->attributes );
+	public function set_record(array $_record) {
+		$this->definition = array_intersect_key($_record, $this->attributes);
 
 		// anything which is not an attribute is perhaps a plugin_option.
 		// If not, it gets whiped out on save time.
-		foreach ( $_record as $attribute => $value) {
-			if ( !array_key_exists( $attribute, $this->attributes ) ) {
+		foreach ($_record as $attribute => $value) {
+			if (!array_key_exists($attribute, $this->attributes)) {
 				$this->definition['plugin_options'][$attribute] = $value;
 			}
 		}
@@ -242,9 +242,9 @@ 
 		$this->plugin = $_record['plugin'];
 
 		// convert plugin_options into internal representation
-		$this->set_allowed_users( $this->definition['allowed_users'] );
-		$this->set_options( $this->definition['plugin_options'] ? $this->definition['plugin_options'] : array());
-		$this->set_filter( $this->definition['filter'] ? $this->definition['filter'] : array());
+		$this->set_allowed_users($this->definition['allowed_users']);
+		$this->set_options($this->definition['plugin_options'] ? $this->definition['plugin_options'] : array());
+		$this->set_filter($this->definition['filter'] ? $this->definition['filter'] : array());
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
 	public function get_icon() {
-		return self::_appname . '/navbar';
+		return self::_appname.'/navbar';
 	}
 
 	/**
@@ -272,16 +272,16 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
-		if ( strlen($this->definition['name']) < 3 ) {
+	public function save($_dst_identifier) {
+		if (strlen($this->definition['name']) < 3) {
 			throw new Exception('Error: Can\'t save definition, no valid name given!');
 		}
 
 		$this->so_sql->data = $this->definition;
-		$this->so_sql->data['plugin_options'] = importexport_arrayxml::array2xml( $this->definition['plugin_options'] );
-		$this->so_sql->data['filter'] = importexport_arrayxml::array2xml( $this->definition['filter'] );
+		$this->so_sql->data['plugin_options'] = importexport_arrayxml::array2xml($this->definition['plugin_options']);
+		$this->so_sql->data['filter'] = importexport_arrayxml::array2xml($this->definition['filter']);
 		$this->so_sql->data['modified'] = time();
-		if ($this->so_sql->save( array( 'definition_id' => $_dst_identifier ))) {
+		if ($this->so_sql->save(array('definition_id' => $_dst_identifier))) {
 			throw new Exception('Error: so_sql was not able to save definition: '.$this->get_identifier());
 		}
 
@@ -294,13 +294,13 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy($_dst_identifier) {
 		$dst_object = clone $this;
 		try {
 			$dst_object->set_owner($this->user);
 			$dst_identifier = $dst_object->save($_dst_identifier);
 		}
-		catch(exception $Exception) {
+		catch (exception $Exception) {
 			unset($dst_object);
 			throw $Exception;
 		}
@@ -315,16 +315,16 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move($_dst_identifier) {
 		if ($this->user != $this->get_owner() && !$this->is_admin) {
-			throw('Error: User '. $this->user. 'does not have permissions to move definition '.$this->get_identifier());
+			throw('Error: User '.$this->user.'does not have permissions to move definition '.$this->get_identifier());
 		}
 		$old_object = clone $this;
 		try {
 			$dst_identifier = $this->save($_dst_identifier);
 			$old_object->delete();
 		}
-		catch(exception $Exception) {
+		catch (exception $Exception) {
 			unset($old_object);
 			throw $Exception;
 		}
@@ -337,11 +337,11 @@ 
 	 * @return void
 	 *
 	 */
-	public function delete () {
-		if($this->user != $this->get_owner() && !$this->is_admin) {
-			throw('Error: User '. $this->user. 'does not have permissions to delete definition '.$this->get_identifier());
+	public function delete() {
+		if ($this->user != $this->get_owner() && !$this->is_admin) {
+			throw('Error: User '.$this->user.'does not have permissions to delete definition '.$this->get_identifier());
 		}
-		if(!$this->so_sql->delete()) {
+		if (!$this->so_sql->delete()) {
 			throw('Error: so_sql was not able to delete definition: '.$this->get_identifier());
 		}
 	}

importexport/inc/class.importexport_definitions_bo.inc.php

Doc Comments +1 added lines, -3 removed lines

@@ -139,7 +139,6 @@ 
 	/**
 	* Save a definition
 	*
-	* @param definition $definition
 	*/
 	public function save(Array $data) {
 		$definition = new importexport_definition();
@@ -209,7 +208,7 @@ 
 	/**
 	 * imports definitions from file
 	 *
-	 * @param string $import_file
+	 * @param string $_import_file
 	 * @throws Exeption
 	 * @return void
 	 */
@@ -268,7 +267,6 @@ 
 	 * It is not possible to handle some plugin options automatically, because they
 	 * just don't have equivalents.  (eg: What to do with unknown categories)
 	 *
-	 * @param importexport_definition $definition Import definition
 	 *
 	 * @return importexport_definition Export definition
 	 */

Indentation +4 added lines, -4 removed lines

@@ -137,10 +137,10 @@
 	}
 
 	/**
-	* Save a definition
-	*
-	* @param definition $definition
-	*/
+	 * Save a definition
+	 *
+	 * @param definition $definition
+	 */
 	public function save(Array $data) {
 		$definition = new importexport_definition();
 		$definition->set_record($data);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 	*
 	* @param definition $definition
 	*/
-	public function save(Array $data) {
+	public function save(array $data) {
 		$definition = new importexport_definition();
 		$definition->set_record($data);
 		$definition->save($data['definition_id']);

Spacing +49 added lines, -49 removed lines

@@ -29,13 +29,13 @@ 
 	 */
 	private $definitions;
 
-	public function __construct($_query=false, $ignore_acl = false)
+	public function __construct($_query = false, $ignore_acl = false)
 	{
-		$this->so_sql = new so_sql(self::_appname, self::_defintion_table );
+		$this->so_sql = new so_sql(self::_appname, self::_defintion_table);
 		if ($_query) {
 			$definitions = $this->so_sql->search($_query, false);
 			foreach ((array)$definitions as $definition) {
-				if(self::is_permitted($definition) || $ignore_acl) $this->definitions[] = $definition['definition_id'];
+				if (self::is_permitted($definition) || $ignore_acl) $this->definitions[] = $definition['definition_id'];
 			}
 		}
 	}
@@ -43,16 +43,16 @@ 
 	public function get_rows(&$query, &$rows, &$readonlys)
 	{
 		// Filter only definitions user is allowed to use
-		if(!$GLOBALS['egw_info']['user']['apps']['admin']) {
+		if (!$GLOBALS['egw_info']['user']['apps']['admin']) {
 			$this_membership = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 			$this_membership[] = $GLOBALS['egw_info']['user']['account_id'];
 			$sql .= ' (';
 			$read = array();
-			foreach($this_membership as $id)
+			foreach ($this_membership as $id)
 			{
 				$read[] = 'allowed_users '.
 					$GLOBALS['egw']->db->capabilities['case_insensitive_like'].' '.
-					$GLOBALS['egw']->db->quote('%,'.str_replace('_','\\_',$id) .',%');
+					$GLOBALS['egw']->db->quote('%,'.str_replace('_', '\\_', $id).',%');
 			}
 			$sql .= implode(' OR ', $read);
 			$sql .= ') OR owner = '.$GLOBALS['egw_info']['user']['account_id'];
@@ -60,37 +60,37 @@ 
 		}
 		
 		// Handle allowed filter
-		if($query['col_filter']['allowed_users'])
+		if ($query['col_filter']['allowed_users'])
 		{
 			$allowed = array();
-			foreach((array)$query['col_filter']['allowed_users'] as $id)
+			foreach ((array)$query['col_filter']['allowed_users'] as $id)
 			{
 				$allowed[] = 'allowed_users '.
 					$GLOBALS['egw']->db->capabilities['case_insensitive_like'].' '.
-					$GLOBALS['egw']->db->quote('%,'.str_replace('_','\\_',$id) .',%');
+					$GLOBALS['egw']->db->quote('%,'.str_replace('_', '\\_', $id).',%');
 			}
-			if($allowed)
+			if ($allowed)
 			{
 				unset($query['col_filter']['allowed_users']);
-				$query['col_filter'][] = '('.implode(' OR ', $allowed) . ')';
+				$query['col_filter'][] = '('.implode(' OR ', $allowed).')';
 			}
 		}
 		
 		$total = $this->so_sql->get_rows($query, $rows, $readonlys);
 		$ro_count = 0;
-		foreach($rows as &$row) {
+		foreach ($rows as &$row) {
 			// Strip off leading + trailing ,
-			$row['allowed_users'] = substr($row['allowed_users'],1,-1);
+			$row['allowed_users'] = substr($row['allowed_users'], 1, -1);
 
 			$readonlys["edit[{$row['definition_id']}]"] = $readonlys["delete[{$row['definition_id']}]"] =
 				($row['owner'] != $GLOBALS['egw_info']['user']['account_id']) &&
 				!$GLOBALS['egw_info']['user']['apps']['admin'];
-			if($readonlys["edit[{$row['definition_id']}]"])
+			if ($readonlys["edit[{$row['definition_id']}]"])
 			{
 				$row['class'] .= 'rowNoEdit rowNoDelete';
 				$ro_count++;
 			}
-			$row['class'] .= ' ' . $row['type'];
+			$row['class'] .= ' '.$row['type'];
 		}
 		$readonlys['delete_selected'] = $ro_count == count($rows);
 		return $total;
@@ -105,11 +105,11 @@ 
 		return $this->definitions;
 	}
 	public function read($definition_id) {
-		if(is_numeric($definition_id)) {
+		if (is_numeric($definition_id)) {
 			$this->so_sql->read($definition_id);
 			$definition = new importexport_definition($this->so_sql->data['name']);
 		} else {
-			$definition = new importexport_definition( $definition_id['name'] );
+			$definition = new importexport_definition($definition_id['name']);
 		}
 		return $definition->get_record_array();
 	}
@@ -122,14 +122,14 @@ 
 		foreach ($keys as $index => $key) {
 			// Check for ownership
 			$definition = $this->read($key);
-			if($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+			if ($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'] || $GLOBALS['egw_info']['user']['apps']['admin']) {
 				// clear private cache
-				unset($this->definitions[array_search($key,$this->definitions)]);
+				unset($this->definitions[array_search($key, $this->definitions)]);
 			} else {
 				unset($keys[$index]);
 			}
 		}
-		if(count($keys) > 0) {
+		if (count($keys) > 0) {
 			$this->so_sql->delete(array('definition_id' => $keys));
 		}
 	}
@@ -152,12 +152,12 @@ 
 	 * @return bool
 	 */
 	static public function is_permitted($_definition) {
-		$allowed_user = is_array($_definition['allowed_users']) ? $_definition['allowed_users'] : explode(',',$_definition['allowed_users']);
+		$allowed_user = is_array($_definition['allowed_users']) ? $_definition['allowed_users'] : explode(',', $_definition['allowed_users']);
 		$this_user_id = $GLOBALS['egw_info']['user']['account_id'];
 		$this_membership = $GLOBALS['egw']->accounts->memberships($this_user_id, true);
 		$this_membership[] = $this_user_id;
 		$this_membership[] = 'all';
-		$alluser = array_intersect($allowed_user,$this_membership);
+		$alluser = array_intersect($allowed_user, $this_membership);
 		return ($this_user_id == $_definition['owner'] || count($alluser) > 0);
 	}
 
@@ -176,13 +176,13 @@ 
 
 		$export_data['definitions'] = array();
 		foreach ($keys as $definition_id) {
-			$definition = new importexport_definition( $definition_id );
+			$definition = new importexport_definition($definition_id);
 			$export_data['definitions'][$definition->name] = $definition->get_record_array();
 			$export_data['definitions'][$definition->name]['allowed_users'] =
 				importexport_helper_functions::account_id2name(
 					$export_data['definitions'][$definition->name]['allowed_users']
 				);
-			if($export_date['definitions'][$definition->name]['owner']) {
+			if ($export_date['definitions'][$definition->name]['owner']) {
 				$export_data['definitions'][$definition->name]['owner'] =
 					importexport_helper_functions::account_id2name(
 						$export_data['definitions'][$definition->name]['owner']
@@ -193,7 +193,7 @@ 
 			unset($export_data['definitions'][$definition->name]['definition_id']);
 			unset($export_data['definitions'][$definition->name]['description']);
 			unset($export_data['definitions'][$definition->name]['user_timezone_read']);
-			if(is_array($export_data['definitions'][$definition->name]['plugin_options'])) {
+			if (is_array($export_data['definitions'][$definition->name]['plugin_options'])) {
 				unset($export_data['definitions'][$definition->name]['plugin_options']['user_timezone_read']);
 			}
 			unset($definition);
@@ -211,17 +211,17 @@ 
 	 * @throws Exeption
 	 * @return void
 	 */
-	public static function import( $_import_file )
+	public static function import($_import_file)
 	{
-		if ( !is_file( $_import_file ) ) {
-			throw new Exception("'$_import_file' does not exist or is not readable" );
+		if (!is_file($_import_file)) {
+			throw new Exception("'$_import_file' does not exist or is not readable");
 		}
 
-		$data = importexport_arrayxml::xml2array( file_get_contents( $_import_file ) );
+		$data = importexport_arrayxml::xml2array(file_get_contents($_import_file));
 
 		$metainfo = $data['importExportDefinitions']['metainfo'];
 		$definitions = $data['importExportDefinitions']['definitions'];
-		unset ( $data );
+		unset ($data);
 
 		// convert charset into internal used charset
 		$definitions = translation::convert(
@@ -231,26 +231,26 @@ 
 		);
 
 		// Avoid warning if no definitions found
-		if(!is_array($definitions)) return lang('None found');
+		if (!is_array($definitions)) return lang('None found');
 
 		// save definition(s) into internal table
-		foreach ( $definitions as $name => $definition_data )
+		foreach ($definitions as $name => $definition_data)
 		{
 			// convert allowed_user
-			$definition_data['allowed_users'] = importexport_helper_functions::account_name2id( $definition_data['allowed_users'] );
-			if($definition_data['all_users'] && !$definition_data['allowed_users']) $definition_data['allowed_users'] = 'all';
+			$definition_data['allowed_users'] = importexport_helper_functions::account_name2id($definition_data['allowed_users']);
+			if ($definition_data['all_users'] && !$definition_data['allowed_users']) $definition_data['allowed_users'] = 'all';
 
-			$definition_data['owner'] = importexport_helper_functions::account_name2id( $definition_data['owner'] );
+			$definition_data['owner'] = importexport_helper_functions::account_name2id($definition_data['owner']);
 
-			$definition = new importexport_definition( $definition_data['name'] );
+			$definition = new importexport_definition($definition_data['name']);
 
 			// Only update if the imported is newer
-			if(strtotime($definition->modified) < strtotime($definition_data['modified']) || $definition->modified == 0)
+			if (strtotime($definition->modified) < strtotime($definition_data['modified']) || $definition->modified == 0)
 			{
 				$definition_id = $definition->get_identifier() ? $definition->get_identifier() : NULL;
 
-				$definition->set_record( $definition_data );
-				$definition->save( $definition_id );
+				$definition->set_record($definition_data);
+				$definition->save($definition_id);
 			}
 		}
 		return $definitions;
@@ -273,28 +273,28 @@ 
 	public static function export_from_import(importexport_definition $import)
 	{
 		// Only operates on import definitions
-		if($import->type != 'import') throw new egw_exception_wrong_parameter('Only import definitions');
+		if ($import->type != 'import') throw new egw_exception_wrong_parameter('Only import definitions');
 
 		// Find export plugin
-		$plugin = str_replace('import', 'export',$import->plugin);
+		$plugin = str_replace('import', 'export', $import->plugin);
 		$plugin_list = importexport_helper_functions::get_plugins($import->application, 'export');
-		foreach($plugin_list as $appname => $type)
+		foreach ($plugin_list as $appname => $type)
 		{
 			$plugins = $type['export'];
-			foreach($plugins as $name => $label)
+			foreach ($plugins as $name => $label)
 			{
-				if($plugin == $name) break;
+				if ($plugin == $name) break;
 			}
-			if($plugin !== $name) $plugin = $name;
+			if ($plugin !== $name) $plugin = $name;
 		}
 
 		$export = new importexport_definition();
 
 		// Common settings
-		$export->name = str_replace('import', 'export',$import->name);
-		if($export->name == $import->name) $export->name = $export->name . '-export';
+		$export->name = str_replace('import', 'export', $import->name);
+		if ($export->name == $import->name) $export->name = $export->name.'-export';
 		$test = new importexport_definition($export->name);
-		if($test->name) $export->name = $export->name .'-'.$GLOBALS['egw_info']['user']['account_lid'];
+		if ($test->name) $export->name = $export->name.'-'.$GLOBALS['egw_info']['user']['account_lid'];
 
 		$export->application = $import->application;
 		$export->plugin = $plugin;
@@ -310,7 +310,7 @@ 
 		);
 
 		// Mapping
-		foreach($i_options['field_mapping'] as $col_num => $field)
+		foreach ($i_options['field_mapping'] as $col_num => $field)
 		{
 			// Try to use heading from import file, if possible
 			$e_options['mapping'][$field] = $i_options['csv_fields'][$col_num] ? $i_options['csv_fields'][$col_num] : $field;

Braces +77 added lines, -29 removed lines

@@ -14,7 +14,8 @@ 
  *
  * @todo make this class an egw_record_pool!
  */
-class importexport_definitions_bo {
+class importexport_definitions_bo
+{
 
 	const _appname = 'importexport';
 	const _defintion_table = 'egw_importexport_definitions';
@@ -32,10 +33,15 @@ 
 	public function __construct($_query=false, $ignore_acl = false)
 	{
 		$this->so_sql = new so_sql(self::_appname, self::_defintion_table );
-		if ($_query) {
+		if ($_query)
+		{
 			$definitions = $this->so_sql->search($_query, false);
-			foreach ((array)$definitions as $definition) {
-				if(self::is_permitted($definition) || $ignore_acl) $this->definitions[] = $definition['definition_id'];
+			foreach ((array)$definitions as $definition)
+			{
+				if(self::is_permitted($definition) || $ignore_acl)
+				{
+					$this->definitions[] = $definition['definition_id'];
+				}
 			}
 		}
 	}
@@ -43,7 +49,8 @@ 
 	public function get_rows(&$query, &$rows, &$readonlys)
 	{
 		// Filter only definitions user is allowed to use
-		if(!$GLOBALS['egw_info']['user']['apps']['admin']) {
+		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		{
 			$this_membership = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 			$this_membership[] = $GLOBALS['egw_info']['user']['account_id'];
 			$sql .= ' (';
@@ -78,7 +85,8 @@ 
 		
 		$total = $this->so_sql->get_rows($query, $rows, $readonlys);
 		$ro_count = 0;
-		foreach($rows as &$row) {
+		foreach($rows as &$row)
+		{
 			// Strip off leading + trailing ,
 			$row['allowed_users'] = substr($row['allowed_users'],1,-1);
 
@@ -101,14 +109,19 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_definitions() {
+	public function get_definitions()
+	{
 		return $this->definitions;
 	}
-	public function read($definition_id) {
-		if(is_numeric($definition_id)) {
+	public function read($definition_id)
+	{
+		if(is_numeric($definition_id))
+		{
 			$this->so_sql->read($definition_id);
 			$definition = new importexport_definition($this->so_sql->data['name']);
-		} else {
+		}
+		else
+		{
 			$definition = new importexport_definition( $definition_id['name'] );
 		}
 		return $definition->get_record_array();
@@ -118,18 +131,24 @@ 
 	 *
 	 * @param array $keys
 	 */
-	public function delete($keys) {
-		foreach ($keys as $index => $key) {
+	public function delete($keys)
+	{
+		foreach ($keys as $index => $key)
+		{
 			// Check for ownership
 			$definition = $this->read($key);
-			if($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+			if($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'] || $GLOBALS['egw_info']['user']['apps']['admin'])
+			{
 				// clear private cache
 				unset($this->definitions[array_search($key,$this->definitions)]);
-			} else {
+			}
+			else
+			{
 				unset($keys[$index]);
 			}
 		}
-		if(count($keys) > 0) {
+		if(count($keys) > 0)
+		{
 			$this->so_sql->delete(array('definition_id' => $keys));
 		}
 	}
@@ -139,7 +158,8 @@ 
 	*
 	* @param definition $definition
 	*/
-	public function save(Array $data) {
+	public function save(Array $data)
+	{
 		$definition = new importexport_definition();
 		$definition->set_record($data);
 		$definition->save($data['definition_id']);
@@ -151,7 +171,8 @@ 
 	 * @param array $_definition
 	 * @return bool
 	 */
-	static public function is_permitted($_definition) {
+	static public function is_permitted($_definition)
+	{
 		$allowed_user = is_array($_definition['allowed_users']) ? $_definition['allowed_users'] : explode(',',$_definition['allowed_users']);
 		$this_user_id = $GLOBALS['egw_info']['user']['account_id'];
 		$this_membership = $GLOBALS['egw']->accounts->memberships($this_user_id, true);
@@ -175,25 +196,30 @@ 
 		));
 
 		$export_data['definitions'] = array();
-		foreach ($keys as $definition_id) {
+		foreach ($keys as $definition_id)
+		{
 			$definition = new importexport_definition( $definition_id );
 			$export_data['definitions'][$definition->name] = $definition->get_record_array();
 			$export_data['definitions'][$definition->name]['allowed_users'] =
 				importexport_helper_functions::account_id2name(
 					$export_data['definitions'][$definition->name]['allowed_users']
 				);
-			if($export_date['definitions'][$definition->name]['owner']) {
+			if($export_date['definitions'][$definition->name]['owner'])
+			{
 				$export_data['definitions'][$definition->name]['owner'] =
 					importexport_helper_functions::account_id2name(
 						$export_data['definitions'][$definition->name]['owner']
 					);
-			} else {
+			}
+			else
+			{
 				unset($export_data['definitions'][$definition->name]['owner']);
 			}
 			unset($export_data['definitions'][$definition->name]['definition_id']);
 			unset($export_data['definitions'][$definition->name]['description']);
 			unset($export_data['definitions'][$definition->name]['user_timezone_read']);
-			if(is_array($export_data['definitions'][$definition->name]['plugin_options'])) {
+			if(is_array($export_data['definitions'][$definition->name]['plugin_options']))
+			{
 				unset($export_data['definitions'][$definition->name]['plugin_options']['user_timezone_read']);
 			}
 			unset($definition);
@@ -213,7 +239,8 @@ 
 	 */
 	public static function import( $_import_file )
 	{
-		if ( !is_file( $_import_file ) ) {
+		if ( !is_file( $_import_file ) )
+		{
 			throw new Exception("'$_import_file' does not exist or is not readable" );
 		}
 
@@ -231,14 +258,20 @@ 
 		);
 
 		// Avoid warning if no definitions found
-		if(!is_array($definitions)) return lang('None found');
+		if(!is_array($definitions))
+		{
+			return lang('None found');
+		}
 
 		// save definition(s) into internal table
 		foreach ( $definitions as $name => $definition_data )
 		{
 			// convert allowed_user
 			$definition_data['allowed_users'] = importexport_helper_functions::account_name2id( $definition_data['allowed_users'] );
-			if($definition_data['all_users'] && !$definition_data['allowed_users']) $definition_data['allowed_users'] = 'all';
+			if($definition_data['all_users'] && !$definition_data['allowed_users'])
+			{
+				$definition_data['allowed_users'] = 'all';
+			}
 
 			$definition_data['owner'] = importexport_helper_functions::account_name2id( $definition_data['owner'] );
 
@@ -273,7 +306,10 @@ 
 	public static function export_from_import(importexport_definition $import)
 	{
 		// Only operates on import definitions
-		if($import->type != 'import') throw new egw_exception_wrong_parameter('Only import definitions');
+		if($import->type != 'import')
+		{
+			throw new egw_exception_wrong_parameter('Only import definitions');
+		}
 
 		// Find export plugin
 		$plugin = str_replace('import', 'export',$import->plugin);
@@ -283,18 +319,30 @@ 
 			$plugins = $type['export'];
 			foreach($plugins as $name => $label)
 			{
-				if($plugin == $name) break;
+				if($plugin == $name)
+				{
+					break;
+				}
+			}
+			if($plugin !== $name)
+			{
+				$plugin = $name;
 			}
-			if($plugin !== $name) $plugin = $name;
 		}
 
 		$export = new importexport_definition();
 
 		// Common settings
 		$export->name = str_replace('import', 'export',$import->name);
-		if($export->name == $import->name) $export->name = $export->name . '-export';
+		if($export->name == $import->name)
+		{
+			$export->name = $export->name . '-export';
+		}
 		$test = new importexport_definition($export->name);
-		if($test->name) $export->name = $export->name .'-'.$GLOBALS['egw_info']['user']['account_lid'];
+		if($test->name)
+		{
+			$export->name = $export->name .'-'.$GLOBALS['egw_info']['user']['account_lid'];
+		}
 
 		$export->application = $import->application;
 		$export->plugin = $plugin;

importexport/inc/class.importexport_export_csv.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
 	 *
 	 * @param stram $_stream resource where records are exported to.
 	 * @param array _options options for specific backends
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function __construct( $_stream, array $_options ) {
 		if (!is_object($GLOBALS['egw']->translation)) {
@@ -151,7 +151,7 @@ 
 	 * exports a record into resource of handle
 	 *
 	 * @param importexport_iface_egw_record record
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function export_record( importexport_iface_egw_record $_record ) {
 		$this->record = $_record;
@@ -284,7 +284,7 @@ 
 	 *
 	 * Uses the static variable $types to convert various datatypes.
 	 *
-	 * @param record Record to be converted
+	 * @param record importexport_iface_egw_record to be converted
 	 * @parem fields List of field types => field names to be converted
 	 * @param appname Current appname if you want to do custom fields too
 	 */

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -288,7 +288,7 @@ 
 	 * @parem fields List of field types => field names to be converted
 	 * @param appname Current appname if you want to do custom fields too
 	 */
-	public static function convert(importexport_iface_egw_record &$record, Array $fields = array(), $appname = null, $selects = array()) {
+	public static function convert(importexport_iface_egw_record &$record, array $fields = array(), $appname = null, $selects = array()) {
 		if($appname) {
 			if(!self::$cf_parse_cache[$appname]) {
 				$c_fields = self::convert_parse_custom_fields($appname, $selects, $links, $methods);
@@ -452,7 +452,7 @@ 
 	 * @param char $delimiter
 	 * @param char $enclosure
 	 */
-	protected function fputcsv($filePointer, Array $dataArray, $delimiter, $enclosure){
+	protected function fputcsv($filePointer, array $dataArray, $delimiter, $enclosure){
 		$string = "";
 		$writeDelimiter = false;
 		foreach($dataArray as $dataElement) {

Spacing +77 added lines, -77 removed lines

@@ -94,22 +94,22 @@ 
 	 * @param array _options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options ) {
+	public function __construct($_stream, array $_options) {
 		if (!is_object($GLOBALS['egw']->translation)) {
 			$GLOBALS['egw']->translation = new translation();
 		}
 		$this->translation = &$GLOBALS['egw']->translation;
 		$this->handle = $_stream;
-		if($_options['charset'] == 'user') $_options['charset'] = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
+		if ($_options['charset'] == 'user') $_options['charset'] = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
 		$this->csv_charset = $_options['charset'] ? $_options['charset'] : 'utf-8';
-		if ( !empty( $_options ) ) {
-			$this->csv_options = array_merge( $this->csv_options, $_options );
+		if (!empty($_options)) {
+			$this->csv_options = array_merge($this->csv_options, $_options);
 		}
 		//error_log(__METHOD__.__LINE__.array2string($_options['appname']));
-		if(!bo_merge::is_export_limit_excepted()) {
+		if (!bo_merge::is_export_limit_excepted()) {
 			$this->export_limit = bo_merge::getExportLimit($_options['appname']);
 			//error_log(__METHOD__.__LINE__.' app:'.$_options['appname'].' limit:'.$this->export_limit);
-			if($this->export_limit == 'no') throw new egw_exception_no_permission_admin('Export disabled');
+			if ($this->export_limit == 'no') throw new egw_exception_no_permission_admin('Export disabled');
 		}
 	}
 	
@@ -118,15 +118,15 @@ 
 	 *
 	 * @param array $_mapping egw_field_name => csv_field_name
 	 */
-	public function set_mapping( array &$_mapping) {
+	public function set_mapping(array &$_mapping) {
 		if ($this->num_of_records > 0) {
 			throw new Exception('Error: Field mapping can\'t be set during ongoing export!');
 		}
-		if($_mapping['all_custom_fields']) {
+		if ($_mapping['all_custom_fields']) {
 			// Field value is the appname, so we can pull the fields
 			$custom = config::get_customfields($_mapping['all_custom_fields']);
 			unset($_mapping['all_custom_fields']);
-			foreach($custom as $field => $info) {
+			foreach ($custom as $field => $info) {
 				$_mapping['#'.$field] = $this->csv_options['begin_with_fieldnames'] == 'label' ? $info['label'] : $field;
 			}
 		}
@@ -139,7 +139,7 @@ 
 	 *
 	 * @param array $_conversion
 	 */
-	public function set_conversion( array $_conversion) {
+	public function set_conversion(array $_conversion) {
 		$this->conversion = $_conversion;
 	}
 	
@@ -149,59 +149,59 @@ 
 	 * @param importexport_iface_egw_record record
 	 * @return bool
 	 */
-	public function export_record( importexport_iface_egw_record $_record ) {
+	public function export_record(importexport_iface_egw_record $_record) {
 		$this->record = $_record;
 		$this->record_array = $_record->get_record_array();
 		
 		// begin with fieldnames ?
-		if ($this->num_of_records == 0 && $this->csv_options['begin_with_fieldnames'] ) {
-			if($this->csv_options['begin_with_fieldnames'] == 'label') {
+		if ($this->num_of_records == 0 && $this->csv_options['begin_with_fieldnames']) {
+			if ($this->csv_options['begin_with_fieldnames'] == 'label') {
 				// Load translations for app
 				list($appname, $part2) = explode('_', get_class($_record));
-				if(!$GLOBALS['egw_info']['apps'][$appname]) $appname .= $part2; // Handle apps with _ in the name
+				if (!$GLOBALS['egw_info']['apps'][$appname]) $appname .= $part2; // Handle apps with _ in the name
 
 				// Get translations from wizard, if possible
-				if(!$this->csv_options['no_header_translation'])
+				if (!$this->csv_options['no_header_translation'])
 				{
 					$backtrace = debug_backtrace();
 					$plugin = $backtrace[1]['class'];
-					$wizard_name = $appname . '_wizard_' . str_replace($appname . '_', '', $plugin);
+					$wizard_name = $appname.'_wizard_'.str_replace($appname.'_', '', $plugin);
 					try {
 						$wizard = new $wizard_name;
 						$fields = $wizard->get_export_fields();
-						foreach($this->mapping as $field => &$label)
+						foreach ($this->mapping as $field => &$label)
 						{
-							if($fields[$field])
+							if ($fields[$field])
 							{
 								$label = $label != $fields[$field] ? $fields[$field] : lang($label);
 							}
 							// Make sure no *
-							if(substr($label,-1) == '*') $label = substr($label,0,-1);
+							if (substr($label, -1) == '*') $label = substr($label, 0, -1);
 						}
 					} catch (Exception $e) {
 						translation::add_app($appname);
-						foreach($this->mapping as $field => &$label) {
+						foreach ($this->mapping as $field => &$label) {
 							$label = lang($label);
 						}
 					}
 				}
 			}
-			$mapping = ! empty( $this->mapping ) ? $this->mapping : array_keys ( $this->record_array );
-			self::fputcsv( $this->handle ,$mapping ,$this->csv_options['delimiter'], $this->csv_options['enclosure'] );
+			$mapping = !empty($this->mapping) ? $this->mapping : array_keys($this->record_array);
+			self::fputcsv($this->handle, $mapping, $this->csv_options['delimiter'], $this->csv_options['enclosure']);
 		}
 
 		// Check for limit
-		if($this->export_limit && $this->num_of_records >= $this->export_limit) {
+		if ($this->export_limit && $this->num_of_records >= $this->export_limit) {
 			return;
 		}
 		
 		// do conversions
-		if ( !empty( $this->conversion )) {
-			$this->record_array = importexport_helper_functions::conversion( $this->record_array, $this->conversion );
+		if (!empty($this->conversion)) {
+			$this->record_array = importexport_helper_functions::conversion($this->record_array, $this->conversion);
 		}
 		
 		// do fieldmapping
-		if ( !empty( $this->mapping ) ) {
+		if (!empty($this->mapping)) {
 			$record_data = $this->record_array;
 			$this->record_array = array();
 			foreach ($this->mapping as $egw_field => $csv_field) {
@@ -209,7 +209,7 @@ 
 			}
 		}
 		
-		self::fputcsv( $this->handle, $this->record_array, $this->csv_options['delimiter'], $this->csv_options['enclosure'] );
+		self::fputcsv($this->handle, $this->record_array, $this->csv_options['delimiter'], $this->csv_options['enclosure']);
 		$this->num_of_records++;
 	}
 
@@ -233,13 +233,13 @@ 
 	 * @return Array of fields to be added to list of fields needing conversion
 	 */
 	public static function convert_parse_custom_fields($appname, &$selects = array(), &$links = array(), &$methods = array()) {
-		if(!$appname) return;
+		if (!$appname) return;
 
 		$fields = array();
 		$custom = config::get_customfields($appname);
-		foreach($custom as $name => $c_field) {
-			$name = '#' . $name;
-			switch($c_field['type']) {
+		foreach ($custom as $name => $c_field) {
+			$name = '#'.$name;
+			switch ($c_field['type']) {
 				case 'date':
 					$fields['date'][] = $name;
 					break;
@@ -250,7 +250,7 @@ 
 					$fields['select-account'][] = $name;
 					break;
 				case 'ajax_select':
-					if($c_field['values']['get_title']) {
+					if ($c_field['values']['get_title']) {
 						$methods[$name] = $c_field['values']['get_title'];
 						break;
 					}
@@ -264,8 +264,8 @@ 
 					$selects[$name] = $c_field['values'];
 					break;
 				default:
-					list($type) = explode('-',$c_field['type'],2);
-					if(in_array($type, array_keys($GLOBALS['egw_info']['apps']))) {
+					list($type) = explode('-', $c_field['type'], 2);
+					if (in_array($type, array_keys($GLOBALS['egw_info']['apps']))) {
 						$fields['links'][] = $name;
 						$links[$name] = $c_field['type'];
 					}
@@ -284,18 +284,18 @@ 
 	 * @parem fields List of field types => field names to be converted
 	 * @param appname Current appname if you want to do custom fields too
 	 */
-	public static function convert(importexport_iface_egw_record &$record, Array $fields = array(), $appname = null, $selects = array()) {
-		if($appname) {
-			if(!self::$cf_parse_cache[$appname]) {
+	public static function convert(importexport_iface_egw_record&$record, Array $fields = array(), $appname = null, $selects = array()) {
+		if ($appname) {
+			if (!self::$cf_parse_cache[$appname]) {
 				$c_fields = self::convert_parse_custom_fields($appname, $selects, $links, $methods);
 				self::$cf_parse_cache[$appname] = array($c_fields, $selects, $links, $methods);
 			}
 			list($c_fields, $c_selects, $links, $methods) = self::$cf_parse_cache[$appname];
 
 			// Add in any fields that are keys to another app
-			foreach((array)$fields['links'] as $link_field => $app)
+			foreach ((array)$fields['links'] as $link_field => $app)
 			{
-				if(is_numeric($link_field)) continue;
+				if (is_numeric($link_field)) continue;
 				$links[$link_field] = $app;
 				// Set it as a normal link field
 				$fields['links'][] = $link_field;
@@ -303,8 +303,8 @@ 
 			}
 
 			// Not quite a recursive merge, since only one level
-			foreach($fields as $type => &$list) {
-				if($c_fields[$type]) {
+			foreach ($fields as $type => &$list) {
+				if ($c_fields[$type]) {
 					$list = array_merge($c_fields[$type], $list);
 					unset($c_fields[$type]);
 				}
@@ -312,12 +312,12 @@ 
 			$fields += $c_fields;
 			$selects += $c_selects;
 		}
-		foreach((array)$fields['select'] as $name) {
-			if($record->$name != null && is_array($selects) && $selects[$name]) {
+		foreach ((array)$fields['select'] as $name) {
+			if ($record->$name != null && is_array($selects) && $selects[$name]) {
 				$record->$name = explode(',', $record->$name);
-				if(is_array($record->$name)) {
+				if (is_array($record->$name)) {
 					$names = array();
-					foreach($record->$name as $_name) {
+					foreach ($record->$name as $_name) {
 						$names[] = lang($selects[$name][$_name]);
 					}
 					$record->$name = implode(', ', $names);
@@ -330,14 +330,14 @@ 
 				$record->$name = '';
 			}
 		}
-		foreach((array)$fields['links'] as $name) {
-			if($record->$name) {
-				if(is_numeric($record->$name) && !$links[$name]) {
+		foreach ((array)$fields['links'] as $name) {
+			if ($record->$name) {
+				if (is_numeric($record->$name) && !$links[$name]) {
 					$link = egw_link::get_link($record->$name);
 					$links[$name] = ($link['link_app1'] == $appname ? $link['link_app2'] : $link['link_app1']);
 					$record->$name = ($link['link_app1'] == $appname ? $link['link_id2'] : $link['link_id1']);
 				}
-				if($links[$name]) {
+				if ($links[$name]) {
 					$record->$name = egw_link::title($links[$name], $record->$name);
 				}
 			}
@@ -346,12 +346,12 @@ 
 				$record->$name = '';
 			}
 		}
-		foreach((array)$fields['select-account'] as $name) {
+		foreach ((array)$fields['select-account'] as $name) {
 			// Compare against null to deal with empty arrays
 			if ($record->$name !== null) {
-				if(is_array($record->$name)) {
+				if (is_array($record->$name)) {
 					$names = array();
-					foreach($record->$name as $_name) {
+					foreach ($record->$name as $_name) {
 						$names[] = common::grab_owner_name($_name);
 					}
 					$record->$name = implode(', ', $names);
@@ -364,64 +364,64 @@ 
 				$record->$name = '';
 			}
 		}
-		foreach((array)$fields['select-bool'] as $name) {
-			if($record->$name !== null) {
+		foreach ((array)$fields['select-bool'] as $name) {
+			if ($record->$name !== null) {
 				$record->$name = $record->$name ? lang('Yes') : lang('No');
 			}
 		}
-		foreach((array)$fields['date-time'] as $name) {
+		foreach ((array)$fields['date-time'] as $name) {
 			//if ($record->$name) $record->$name = date('Y-m-d H:i:s',$record->$name); // Standard date format
 			if ($record->$name && !is_numeric($record->$name)) $record->$name = strtotime($record->$name); // Custom fields stored as string
-			if ($record->$name && is_numeric($record->$name)) $record->$name = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] . ' '.
-				($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '24' ? 'H:i:s' : 'h:i:s a'),$record->$name); // User date format
+			if ($record->$name && is_numeric($record->$name)) $record->$name = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' '.
+				($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '24' ? 'H:i:s' : 'h:i:s a'), $record->$name); // User date format
 			if (!$record->$name) $record->$name = '';
 		}
-		foreach((array)$fields['date'] as $name) {
+		foreach ((array)$fields['date'] as $name) {
 			//if ($record->$name) $record->$name = date('Y-m-d',$record->$name); // Standard date format
 			if ($record->$name && !is_numeric($record->$name)) $record->$name = strtotime($record->$name); // Custom fields stored as string
 			if ($record->$name && is_numeric($record->$name)) $record->$name = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], $record->$name); // User date format
 			if (!$record->$name) $record->$name = '';
 		}
-		foreach((array)$fields['float'] as $name)
+		foreach ((array)$fields['float'] as $name)
 		{
-			static $dec_separator,$thousands_separator;
+			static $dec_separator, $thousands_separator;
 			if (is_null($dec_separator))
 			{
 				$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
 				if (empty($dec_separator)) $dec_separator = '.';
 				$thousands_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][1];
 			}
-			if($record->$name && (string)$record->$name != '')
+			if ($record->$name && (string)$record->$name != '')
 			{
-				if(!is_numeric($record->$name))
+				if (!is_numeric($record->$name))
 				{
 					$record->$name = floatval(str_replace($dec_separator, '.', preg_replace('/[^\d'.preg_quote($dec_separator).']/', '', $record->$name)));
 				}
-				$record->$name = number_format(str_replace(' ','',$record->$name), 2,
-					$dec_separator,$thousands_separator
+				$record->$name = number_format(str_replace(' ', '', $record->$name), 2,
+					$dec_separator, $thousands_separator
 				);
 			}
 		}
 
 		// Some custom methods for conversion
-		foreach((array)$methods as $name => $method) {
-			if($record->$name) $record->$name = ExecMethod($method, $record->$name);
+		foreach ((array)$methods as $name => $method) {
+			if ($record->$name) $record->$name = ExecMethod($method, $record->$name);
 		}
 
 		static $cat_object;
-		if(is_null($cat_object)) $cat_object = new categories(false,$appname);
-		foreach((array)$fields['select-cat'] as $name) {
-			if($record->$name) {
+		if (is_null($cat_object)) $cat_object = new categories(false, $appname);
+		foreach ((array)$fields['select-cat'] as $name) {
+			if ($record->$name) {
 				$cats = array();
 				$ids = is_array($record->$name) ? $record->$name : explode(',', $record->$name);
-				foreach($ids as $n => $cat_id) {
+				foreach ($ids as $n => $cat_id) {
 
-					if ($cat_id && $cat_object->check_perms(EGW_ACL_READ,$cat_id))
+					if ($cat_id && $cat_object->check_perms(EGW_ACL_READ, $cat_id))
 					{
 						$cats[] = $cat_object->id2name($cat_id);
 					}
 				}
-				$record->$name = implode(', ',$cats);
+				$record->$name = implode(', ', $cats);
 			}
 			else
 			{
@@ -448,18 +448,18 @@ 
 	 * @param char $delimiter
 	 * @param char $enclosure
 	 */
-	protected function fputcsv($filePointer, Array $dataArray, $delimiter, $enclosure){
+	protected function fputcsv($filePointer, Array $dataArray, $delimiter, $enclosure) {
 		$string = "";
 		$writeDelimiter = false;
-		foreach($dataArray as $dataElement) {
-			if($writeDelimiter) $string .= $delimiter;
-			$string .= $enclosure . str_replace(array("\r\n", '"'), array("\n",'""'), $dataElement) . $enclosure;
+		foreach ($dataArray as $dataElement) {
+			if ($writeDelimiter) $string .= $delimiter;
+			$string .= $enclosure.str_replace(array("\r\n", '"'), array("\n", '""'), $dataElement).$enclosure;
 			$writeDelimiter = true;
 		}
 		$string .= "\n";
 		
 		// do charset translation
-		$string = $this->translation->convert( $string, $this->translation->charset(), $this->csv_charset );
+		$string = $this->translation->convert($string, $this->translation->charset(), $this->csv_charset);
 		
 		fwrite($filePointer, $string);
 			

Braces +180 added lines, -71 removed lines

@@ -94,22 +94,32 @@ 
 	 * @param array _options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options ) {
-		if (!is_object($GLOBALS['egw']->translation)) {
+	public function __construct( $_stream, array $_options )
+	{
+		if (!is_object($GLOBALS['egw']->translation))
+		{
 			$GLOBALS['egw']->translation = new translation();
 		}
 		$this->translation = &$GLOBALS['egw']->translation;
 		$this->handle = $_stream;
-		if($_options['charset'] == 'user') $_options['charset'] = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
+		if($_options['charset'] == 'user')
+		{
+			$_options['charset'] = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
+		}
 		$this->csv_charset = $_options['charset'] ? $_options['charset'] : 'utf-8';
-		if ( !empty( $_options ) ) {
+		if ( !empty( $_options ) )
+		{
 			$this->csv_options = array_merge( $this->csv_options, $_options );
 		}
 		//error_log(__METHOD__.__LINE__.array2string($_options['appname']));
-		if(!bo_merge::is_export_limit_excepted()) {
+		if(!bo_merge::is_export_limit_excepted())
+		{
 			$this->export_limit = bo_merge::getExportLimit($_options['appname']);
 			//error_log(__METHOD__.__LINE__.' app:'.$_options['appname'].' limit:'.$this->export_limit);
-			if($this->export_limit == 'no') throw new egw_exception_no_permission_admin('Export disabled');
+			if($this->export_limit == 'no')
+			{
+				throw new egw_exception_no_permission_admin('Export disabled');
+			}
 		}
 	}
 	
@@ -118,15 +128,19 @@ 
 	 *
 	 * @param array $_mapping egw_field_name => csv_field_name
 	 */
-	public function set_mapping( array &$_mapping) {
-		if ($this->num_of_records > 0) {
+	public function set_mapping( array &$_mapping)
+	{
+		if ($this->num_of_records > 0)
+		{
 			throw new Exception('Error: Field mapping can\'t be set during ongoing export!');
 		}
-		if($_mapping['all_custom_fields']) {
+		if($_mapping['all_custom_fields'])
+		{
 			// Field value is the appname, so we can pull the fields
 			$custom = config::get_customfields($_mapping['all_custom_fields']);
 			unset($_mapping['all_custom_fields']);
-			foreach($custom as $field => $info) {
+			foreach($custom as $field => $info)
+			{
 				$_mapping['#'.$field] = $this->csv_options['begin_with_fieldnames'] == 'label' ? $info['label'] : $field;
 			}
 		}
@@ -139,7 +153,8 @@ 
 	 *
 	 * @param array $_conversion
 	 */
-	public function set_conversion( array $_conversion) {
+	public function set_conversion( array $_conversion)
+	{
 		$this->conversion = $_conversion;
 	}
 	
@@ -149,16 +164,23 @@ 
 	 * @param importexport_iface_egw_record record
 	 * @return bool
 	 */
-	public function export_record( importexport_iface_egw_record $_record ) {
+	public function export_record( importexport_iface_egw_record $_record )
+	{
 		$this->record = $_record;
 		$this->record_array = $_record->get_record_array();
 		
 		// begin with fieldnames ?
-		if ($this->num_of_records == 0 && $this->csv_options['begin_with_fieldnames'] ) {
-			if($this->csv_options['begin_with_fieldnames'] == 'label') {
+		if ($this->num_of_records == 0 && $this->csv_options['begin_with_fieldnames'] )
+		{
+			if($this->csv_options['begin_with_fieldnames'] == 'label')
+			{
 				// Load translations for app
 				list($appname, $part2) = explode('_', get_class($_record));
-				if(!$GLOBALS['egw_info']['apps'][$appname]) $appname .= $part2; // Handle apps with _ in the name
+				if(!$GLOBALS['egw_info']['apps'][$appname])
+				{
+					$appname .= $part2;
+				}
+				// Handle apps with _ in the name
 
 				// Get translations from wizard, if possible
 				if(!$this->csv_options['no_header_translation'])
@@ -176,11 +198,16 @@ 
 								$label = $label != $fields[$field] ? $fields[$field] : lang($label);
 							}
 							// Make sure no *
-							if(substr($label,-1) == '*') $label = substr($label,0,-1);
+							if(substr($label,-1) == '*')
+							{
+								$label = substr($label,0,-1);
+							}
 						}
-					} catch (Exception $e) {
+					}
+					catch (Exception $e) {
 						translation::add_app($appname);
-						foreach($this->mapping as $field => &$label) {
+						foreach($this->mapping as $field => &$label)
+						{
 							$label = lang($label);
 						}
 					}
@@ -191,20 +218,24 @@ 
 		}
 
 		// Check for limit
-		if($this->export_limit && $this->num_of_records >= $this->export_limit) {
+		if($this->export_limit && $this->num_of_records >= $this->export_limit)
+		{
 			return;
 		}
 		
 		// do conversions
-		if ( !empty( $this->conversion )) {
+		if ( !empty( $this->conversion ))
+		{
 			$this->record_array = importexport_helper_functions::conversion( $this->record_array, $this->conversion );
 		}
 		
 		// do fieldmapping
-		if ( !empty( $this->mapping ) ) {
+		if ( !empty( $this->mapping ) )
+		{
 			$record_data = $this->record_array;
 			$this->record_array = array();
-			foreach ($this->mapping as $egw_field => $csv_field) {
+			foreach ($this->mapping as $egw_field => $csv_field)
+			{
 				$this->record_array[$csv_field] = $record_data[$egw_field];
 			}
 		}
@@ -218,7 +249,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function get_num_of_records() {
+	public function get_num_of_records()
+	{
 		return $this->num_of_records;
 	}
 
@@ -232,14 +264,20 @@ 
 	 *
 	 * @return Array of fields to be added to list of fields needing conversion
 	 */
-	public static function convert_parse_custom_fields($appname, &$selects = array(), &$links = array(), &$methods = array()) {
-		if(!$appname) return;
+	public static function convert_parse_custom_fields($appname, &$selects = array(), &$links = array(), &$methods = array())
+	{
+		if(!$appname)
+		{
+			return;
+		}
 
 		$fields = array();
 		$custom = config::get_customfields($appname);
-		foreach($custom as $name => $c_field) {
+		foreach($custom as $name => $c_field)
+		{
 			$name = '#' . $name;
-			switch($c_field['type']) {
+			switch($c_field['type'])
+			{
 				case 'date':
 					$fields['date'][] = $name;
 					break;
@@ -250,7 +288,8 @@ 
 					$fields['select-account'][] = $name;
 					break;
 				case 'ajax_select':
-					if($c_field['values']['get_title']) {
+					if($c_field['values']['get_title'])
+					{
 						$methods[$name] = $c_field['values']['get_title'];
 						break;
 					}
@@ -265,7 +304,8 @@ 
 					break;
 				default:
 					list($type) = explode('-',$c_field['type'],2);
-					if(in_array($type, array_keys($GLOBALS['egw_info']['apps']))) {
+					if(in_array($type, array_keys($GLOBALS['egw_info']['apps'])))
+					{
 						$fields['links'][] = $name;
 						$links[$name] = $c_field['type'];
 					}
@@ -284,9 +324,12 @@ 
 	 * @parem fields List of field types => field names to be converted
 	 * @param appname Current appname if you want to do custom fields too
 	 */
-	public static function convert(importexport_iface_egw_record &$record, Array $fields = array(), $appname = null, $selects = array()) {
-		if($appname) {
-			if(!self::$cf_parse_cache[$appname]) {
+	public static function convert(importexport_iface_egw_record &$record, Array $fields = array(), $appname = null, $selects = array())
+	{
+		if($appname)
+		{
+			if(!self::$cf_parse_cache[$appname])
+			{
 				$c_fields = self::convert_parse_custom_fields($appname, $selects, $links, $methods);
 				self::$cf_parse_cache[$appname] = array($c_fields, $selects, $links, $methods);
 			}
@@ -295,7 +338,10 @@ 
 			// Add in any fields that are keys to another app
 			foreach((array)$fields['links'] as $link_field => $app)
 			{
-				if(is_numeric($link_field)) continue;
+				if(is_numeric($link_field))
+				{
+					continue;
+				}
 				$links[$link_field] = $app;
 				// Set it as a normal link field
 				$fields['links'][] = $link_field;
@@ -303,8 +349,10 @@ 
 			}
 
 			// Not quite a recursive merge, since only one level
-			foreach($fields as $type => &$list) {
-				if($c_fields[$type]) {
+			foreach($fields as $type => &$list)
+			{
+				if($c_fields[$type])
+				{
 					$list = array_merge($c_fields[$type], $list);
 					unset($c_fields[$type]);
 				}
@@ -312,16 +360,22 @@ 
 			$fields += $c_fields;
 			$selects += $c_selects;
 		}
-		foreach((array)$fields['select'] as $name) {
-			if($record->$name != null && is_array($selects) && $selects[$name]) {
+		foreach((array)$fields['select'] as $name)
+		{
+			if($record->$name != null && is_array($selects) && $selects[$name])
+			{
 				$record->$name = explode(',', $record->$name);
-				if(is_array($record->$name)) {
+				if(is_array($record->$name))
+				{
 					$names = array();
-					foreach($record->$name as $_name) {
+					foreach($record->$name as $_name)
+					{
 						$names[] = lang($selects[$name][$_name]);
 					}
 					$record->$name = implode(', ', $names);
-				} else {
+				}
+				else
+				{
 					$record->$name = lang($selects[$name][$record->$name]);
 				}
 			}
@@ -330,14 +384,18 @@ 
 				$record->$name = '';
 			}
 		}
-		foreach((array)$fields['links'] as $name) {
-			if($record->$name) {
-				if(is_numeric($record->$name) && !$links[$name]) {
+		foreach((array)$fields['links'] as $name)
+		{
+			if($record->$name)
+			{
+				if(is_numeric($record->$name) && !$links[$name])
+				{
 					$link = egw_link::get_link($record->$name);
 					$links[$name] = ($link['link_app1'] == $appname ? $link['link_app2'] : $link['link_app1']);
 					$record->$name = ($link['link_app1'] == $appname ? $link['link_id2'] : $link['link_id1']);
 				}
-				if($links[$name]) {
+				if($links[$name])
+				{
 					$record->$name = egw_link::title($links[$name], $record->$name);
 				}
 			}
@@ -346,16 +404,22 @@ 
 				$record->$name = '';
 			}
 		}
-		foreach((array)$fields['select-account'] as $name) {
+		foreach((array)$fields['select-account'] as $name)
+		{
 			// Compare against null to deal with empty arrays
-			if ($record->$name !== null) {
-				if(is_array($record->$name)) {
+			if ($record->$name !== null)
+			{
+				if(is_array($record->$name))
+				{
 					$names = array();
-					foreach($record->$name as $_name) {
+					foreach($record->$name as $_name)
+					{
 						$names[] = common::grab_owner_name($_name);
 					}
 					$record->$name = implode(', ', $names);
-				} else {
+				}
+				else
+				{
 					$record->$name = common::grab_owner_name($record->$name);
 				}
 			}
@@ -364,23 +428,49 @@ 
 				$record->$name = '';
 			}
 		}
-		foreach((array)$fields['select-bool'] as $name) {
-			if($record->$name !== null) {
+		foreach((array)$fields['select-bool'] as $name)
+		{
+			if($record->$name !== null)
+			{
 				$record->$name = $record->$name ? lang('Yes') : lang('No');
 			}
 		}
-		foreach((array)$fields['date-time'] as $name) {
+		foreach((array)$fields['date-time'] as $name)
+		{
 			//if ($record->$name) $record->$name = date('Y-m-d H:i:s',$record->$name); // Standard date format
-			if ($record->$name && !is_numeric($record->$name)) $record->$name = strtotime($record->$name); // Custom fields stored as string
-			if ($record->$name && is_numeric($record->$name)) $record->$name = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] . ' '.
-				($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '24' ? 'H:i:s' : 'h:i:s a'),$record->$name); // User date format
-			if (!$record->$name) $record->$name = '';
+			if ($record->$name && !is_numeric($record->$name))
+			{
+				$record->$name = strtotime($record->$name);
+			}
+			// Custom fields stored as string
+			if ($record->$name && is_numeric($record->$name))
+			{
+				$record->$name = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] . ' '.
+				($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '24' ? 'H:i:s' : 'h:i:s a'),$record->$name);
+			}
+			// User date format
+			if (!$record->$name)
+			{
+				$record->$name = '';
+			}
 		}
-		foreach((array)$fields['date'] as $name) {
+		foreach((array)$fields['date'] as $name)
+		{
 			//if ($record->$name) $record->$name = date('Y-m-d',$record->$name); // Standard date format
-			if ($record->$name && !is_numeric($record->$name)) $record->$name = strtotime($record->$name); // Custom fields stored as string
-			if ($record->$name && is_numeric($record->$name)) $record->$name = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], $record->$name); // User date format
-			if (!$record->$name) $record->$name = '';
+			if ($record->$name && !is_numeric($record->$name))
+			{
+				$record->$name = strtotime($record->$name);
+			}
+			// Custom fields stored as string
+			if ($record->$name && is_numeric($record->$name))
+			{
+				$record->$name = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], $record->$name);
+			}
+			// User date format
+			if (!$record->$name)
+			{
+				$record->$name = '';
+			}
 		}
 		foreach((array)$fields['float'] as $name)
 		{
@@ -388,7 +478,10 @@ 
 			if (is_null($dec_separator))
 			{
 				$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
-				if (empty($dec_separator)) $dec_separator = '.';
+				if (empty($dec_separator))
+				{
+					$dec_separator = '.';
+				}
 				$thousands_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][1];
 			}
 			if($record->$name && (string)$record->$name != '')
@@ -404,17 +497,27 @@ 
 		}
 
 		// Some custom methods for conversion
-		foreach((array)$methods as $name => $method) {
-			if($record->$name) $record->$name = ExecMethod($method, $record->$name);
+		foreach((array)$methods as $name => $method)
+		{
+			if($record->$name)
+			{
+				$record->$name = ExecMethod($method, $record->$name);
+			}
 		}
 
 		static $cat_object;
-		if(is_null($cat_object)) $cat_object = new categories(false,$appname);
-		foreach((array)$fields['select-cat'] as $name) {
-			if($record->$name) {
+		if(is_null($cat_object))
+		{
+			$cat_object = new categories(false,$appname);
+		}
+		foreach((array)$fields['select-cat'] as $name)
+		{
+			if($record->$name)
+			{
 				$cats = array();
 				$ids = is_array($record->$name) ? $record->$name : explode(',', $record->$name);
-				foreach($ids as $n => $cat_id) {
+				foreach($ids as $n => $cat_id)
+				{
 
 					if ($cat_id && $cat_object->check_perms(EGW_ACL_READ,$cat_id))
 					{
@@ -435,7 +538,8 @@ 
 	 *
 	 * @return
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		
 	}
 
@@ -448,11 +552,16 @@ 
 	 * @param char $delimiter
 	 * @param char $enclosure
 	 */
-	protected function fputcsv($filePointer, Array $dataArray, $delimiter, $enclosure){
+	protected function fputcsv($filePointer, Array $dataArray, $delimiter, $enclosure)
+	{
 		$string = "";
 		$writeDelimiter = false;
-		foreach($dataArray as $dataElement) {
-			if($writeDelimiter) $string .= $delimiter;
+		foreach($dataArray as $dataElement)
+		{
+			if($writeDelimiter)
+			{
+				$string .= $delimiter;
+			}
 			$string .= $enclosure . str_replace(array("\r\n", '"'), array("\n",'""'), $dataElement) . $enclosure;
 			$writeDelimiter = true;
 		}