EGroupware / egroupware

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'])));
 					}
 				}

Spacing +205 added lines, -207 removed lines

@@ -81,12 +81,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(Api\Hooks::process('filemanager_views') as $views)
+			foreach (Api\Hooks::process('filemanager_views') as $views)
 			{
 				if (is_array($views)) static::$views += $views;
 			}
@@ -102,7 +102,7 @@ 
 	 */
 	public static function get_view()
 	{
-		$view =& Api\Cache::getSession('filemanager', 'view');
+		$view = & Api\Cache::getSession('filemanager', 'view');
 		if (isset($_GET['view']))
 		{
 			$view = $_GET['view'];
@@ -120,12 +120,12 @@ 
 	 * @param type $actions
 	 * @return type
 	 */
-	public static function convertActionsToselOptions ($actions)
+	public static function convertActionsToselOptions($actions)
 	{
-		$sel_options = array ();
+		$sel_options = array();
 		foreach ($actions as $action => $value)
 		{
-			$sel_options[$action] = array (
+			$sel_options[$action] = array(
 				'label' => $value['caption'],
 				'icon'	=> $value['icon']
 			);
@@ -144,7 +144,7 @@ 
 			'open' => array(
 				'caption' => lang('Open'),
 				'icon' => '',
-				'group' => $group=1,
+				'group' => $group = 1,
 				'allowOnMultiple' => false,
 				'onExecute' => 'javaScript:app.filemanager.open',
 				'default' => true
@@ -153,8 +153,8 @@ 
 				'caption' => 'New',
 				'group' => $group,
 				'disableClass' => 'noEdit',
-				'children' => array (
-					'document' => array (
+				'children' => array(
+					'document' => array(
 						'caption' => 'Document',
 						'icon' => 'new',
 						'onExecute' => 'javaScript:app.filemanager.create_new',
@@ -173,7 +173,7 @@ 
 				'caption' => lang('Edit settings'),
 				'group' => $group,
 				'allowOnMultiple' => false,
-				'onExecute' => Api\Header\UserAgent::mobile()?'javaScript:app.filemanager.viewEntry':'javaScript:app.filemanager.editprefs',
+				'onExecute' => Api\Header\UserAgent::mobile() ? 'javaScript:app.filemanager.viewEntry' : 'javaScript:app.filemanager.editprefs',
 				'mobileViewTemplate' => 'file?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/filemanager/templates/mobile/file.xet'))
 			),
 			'share' => array(
@@ -252,7 +252,7 @@ 
 			),
 			// DRAG and DROP events
 			'file_drag' => array(
-				'dragType' => array('file','link'),
+				'dragType' => array('file', 'link'),
 				'type' => 'drag',
 				'onExecute' => 'javaScript:app.filemanager.drag'
 			),
@@ -287,7 +287,7 @@ 
 		);
 
 		if (isset($GLOBALS['egw_info']['user']['apps']['mail'])) {
-			foreach(Vfs\Sharing::$modes as $mode => $data)
+			foreach (Vfs\Sharing::$modes as $mode => $data)
 			{
 				$actions['share']['children']['mail_'.$mode] = array(
 					'caption' => $data['label'],
@@ -303,12 +303,12 @@ 
 		}
 
 		// This would be done automatically, but we're overriding
-		foreach($actions as $action_id => $action)
+		foreach ($actions as $action_id => $action)
 		{
-			if($action['type'] == 'drop' && $action['caption'])
+			if ($action['type'] == 'drop' && $action['caption'])
 			{
 				$action['type'] = 'popup';
-				if($action['acceptedTypes'] == 'file')
+				if ($action['acceptedTypes'] == 'file')
 				{
 					$action['enabled'] = 'javaScript:app.filemanager.paste_enabled';
 				}
@@ -328,10 +328,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 = Vfs::propfind($path, static::$merge_prop_namespace);
@@ -340,10 +340,10 @@ 
 			case 'parents':
 				// search for props in parent directories
 				$currentpath = $path;
-				while($dir = Vfs::dirname($currentpath))
+				while ($dir = Vfs::dirname($currentpath))
 				{
 					$props = Vfs::propfind($dir, static::$merge_prop_namespace);
-					if(!empty($props))
+					if (!empty($props))
 					{
 						// found prop in parent directory
 						return $app = $props[0]['val'];
@@ -362,7 +362,7 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function index(array $content=null,$msg=null)
+	function index(array $content = null, $msg = null)
 	{
 		if (!is_array($content))
 		{
@@ -372,16 +372,16 @@ 
 			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)
 					'row_id'         => 'path',
@@ -389,7 +389,7 @@ 
 					'parent_id'      => 'dir',
 					'is_parent'      => 'is_dir',
 					'favorites'      => true,
-					'placeholder_actions' => array('mkdir','paste','file_drop_mail','file_drop_move','file_drop_copy','file_drop_symlink')
+					'placeholder_actions' => array('mkdir', 'paste', 'file_drop_mail', 'file_drop_move', 'file_drop_copy', 'file_drop_symlink')
 				);
 				$content['nm']['path'] = static::get_home_dir();
 			}
@@ -411,7 +411,7 @@ 
 			}
 			if (isset($_GET['path']) && ($path = $_GET['path']))
 			{
-				switch($path)
+				switch ($path)
 				{
 					case '..':
 						$path = Vfs::dirname($content['nm']['path']);
@@ -420,7 +420,7 @@ 
 						$path = static::get_home_dir();
 						break;
 				}
-				if ($path && $path[0] == '/' && Vfs::stat($path,true) && Vfs::is_dir($path) && Vfs::check_access($path,Vfs::READABLE))
+				if ($path && $path[0] == '/' && Vfs::stat($path, true) && Vfs::is_dir($path) && Vfs::check_access($path, Vfs::READABLE))
 				{
 					$content['nm']['path'] = $path;
 				}
@@ -436,7 +436,7 @@ 
 		}
 		$view = static::get_view();
 
-		call_user_func($view,$content,$msg);
+		call_user_func($view, $content, $msg);
 	}
 
 	/**
@@ -449,7 +449,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)
 		{
@@ -458,15 +458,15 @@ 
 		else
 		{
 			// config user & password
-			$is_setup = Api\Session::user_pw_hash($user,$password) === $GLOBALS['egw_info']['server']['config_hash'];
+			$is_setup = Api\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');
 		}
 		//error_log(__METHOD__."('$user','$password',$is_setup) user_pw_hash(...)='".Api\Session::user_pw_hash($user,$password)."', config_hash='{$GLOBALS['egw_info']['server']['config_hash']}' --> returning ".array2string($is_root));
-		Api\Cache::setSession('filemanager', 'is_setup',$is_setup);
-		Api\Cache::setSession('filemanager', 'is_root',Vfs::$is_root = $is_root);
+		Api\Cache::setSession('filemanager', 'is_setup', $is_setup);
+		Api\Cache::setSession('filemanager', 'is_root', Vfs::$is_root = $is_root);
 		return Vfs::$is_root;
 	}
 
@@ -476,18 +476,18 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function listview(array $content=null,$msg=null)
+	function listview(array $content = null, $msg = null)
 	{
 		$tpl = new Etemplate('filemanager.index');
 
-		if($msg) Framework::message($msg);
+		if ($msg) 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) Framework::message($msg);
+				$msg = static::action($content['nm']['action'], $content['nm']['selected'], $content['nm']['path']);
+				if ($msg) Framework::message($msg);
 
 				// clean up after action
 				unset($content['nm']['selected']);
@@ -498,10 +498,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) Framework::message($msg);
+				$msg = static::action('delete', array_keys($content['nm']['rows']['delete']), $content['nm']['path']);
+				if ($msg) Framework::message($msg);
 
 				// clean up after action
 				unset($content['nm']['rows']['delete']);
@@ -513,11 +513,11 @@ 
 				if (isset($content['nm']['selected'])) unset($content['nm']['selected']);
 			}
 			unset($content['nm']['rows']);
-			Api\Cache::setSession('filemanager', 'index',$content['nm']);
+			Api\Cache::setSession('filemanager', 'index', $content['nm']);
 		}
 
 		// be tolerant with (in previous versions) not correct urlencoded pathes
-		if ($content['nm']['path'][0] == '/' && !Vfs::stat($content['nm']['path'],true) && Vfs::stat(urldecode($content['nm']['path'])))
+		if ($content['nm']['path'][0] == '/' && !Vfs::stat($content['nm']['path'], true) && Vfs::stat(urldecode($content['nm']['path'])))
 		{
 			$content['nm']['path'] = urldecode($content['nm']['path']);
 		}
@@ -528,22 +528,22 @@ 
 				list($button) = each($content['button']);
 				unset($content['button']);
 			}
-			switch($button)
+			switch ($button)
 			{
 				case 'upload':
 					if (!$content['upload'])
 					{
-						Framework::message(lang('You need to select some files first!'),'error');
+						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 = Vfs::concat($content['nm']['path'],Vfs::encodePathComponent($upload['name']));
+						$to = Vfs::concat($content['nm']['path'], Vfs::encodePathComponent($upload['name']));
 						if ($upload &&
 							(Vfs::is_writable($content['nm']['path']) || Vfs::is_writable($to)) &&
-							copy($upload['tmp_name'],Vfs::PREFIX.$to))
+							copy($upload['tmp_name'], Vfs::PREFIX.$to))
 						{
 							$upload_success[] = $upload['name'];
 						}
@@ -555,12 +555,11 @@ 
 					$content['nm']['msg'] = '';
 					if ($upload_success)
 					{
-						Framework::message( count($upload_success) == 1 && !$upload_failure ? lang('File successful uploaded.') :
-							lang('%1 successful uploaded.',implode(', ',$upload_success)));
+						Framework::message(count($upload_success) == 1 && !$upload_failure ? lang('File successful uploaded.') : lang('%1 successful uploaded.', implode(', ', $upload_success)));
 					}
 					if ($upload_failure)
 					{
-						Framework::message(lang('Error uploading file!')."\n".etemplate::max_upload_size_message(),'error');
+						Framework::message(lang('Error uploading file!')."\n".etemplate::max_upload_size_message(), 'error');
 					}
 					break;
 			}
@@ -584,16 +583,16 @@ 
 			$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[button][change_view]','statustext',lang('List view'));
-			$tpl->setElementAttribute('nm[button][change_view]','image','list_row');
+			$tpl->setElementAttribute('nm[button][change_view]', 'statustext', lang('List view'));
+			$tpl->setElementAttribute('nm[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'] = !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']));
 	}
 
 	/**
@@ -629,7 +628,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))
 		{
@@ -637,20 +636,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.vfsSaveMessages', $path, $dir))
+						if (ExecMethod2('mail.mail_ui.vfsSaveMessages', $path, $dir))
 						{
 							++$files;
 						}
@@ -661,8 +660,8 @@ 
 					}
 					elseif (!Vfs::is_dir($path))
 					{
-						$to = Vfs::concat($dir,Vfs::basename($path));
-						if ($path != $to && Vfs::copy($path,$to))
+						$to = Vfs::concat($dir, Vfs::basename($path));
+						if ($path != $to && Vfs::copy($path, $to))
 						{
 							++$files;
 						}
@@ -674,19 +673,19 @@ 
 					else
 					{
 						$len = strlen(dirname($path));
-						foreach(Vfs::find($path) as $p)
+						foreach (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 = Vfs::is_dir($p)) && Vfs::mkdir($to,null,STREAM_MKDIR_RECURSIVE))
+							if (($is_dir = Vfs::is_dir($p)) && Vfs::mkdir($to, null, STREAM_MKDIR_RECURSIVE))
 							{
 								++$dirs;
 							}
-							elseif(!$is_dir && Vfs::copy($p,$to))
+							elseif (!$is_dir && Vfs::copy($p, $to))
 							{
 								++$files;
 							}
@@ -699,15 +698,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 = Vfs::is_dir($dir) || count($selected) > 1 ? Vfs::concat($dir,Vfs::basename($path)) : $dir;
-					if ($path != $to && Vfs::rename($path,$to))
+					$to = Vfs::is_dir($dir) || count($selected) > 1 ? Vfs::concat($dir, Vfs::basename($path)) : $dir;
+					if ($path != $to && Vfs::rename($path, $to))
 					{
 						++$files;
 					}
@@ -718,17 +717,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 = Vfs::concat($dir, Vfs::basename($target));
-					if (!Vfs::stat($dir) || ($ok = Vfs::mkdir($dir,0,true)))
+					if (!Vfs::stat($dir) || ($ok = Vfs::mkdir($dir, 0, true)))
 					{
-						if(!$ok)
+						if (!$ok)
 						{
 							$errs++;
 							continue;
@@ -750,15 +749,14 @@ 
 				}
 				if (count((array)$selected) == 1)
 				{
-					return $files ? lang('Symlink to %1 created.', Vfs::decodePath($target)) :
-						lang('Error creating symlink to target %1!', Vfs::decodePath($target));
+					return $files ? lang('Symlink to %1 created.', Vfs::decodePath($target)) : lang('Error creating symlink to target %1!', 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;//." Vfs::symlink('$target', '$link')";
+				return $ret; //." Vfs::symlink('$target', '$link')";
 
 			case 'createdir':
 				$dst = Vfs::concat($dir, is_array($selected) ? $selected[0] : $selected);
@@ -774,13 +772,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(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;
 				}
@@ -797,12 +795,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 Vfs::find() deletes the content of the dirs, not just the link!
-		foreach($selected as $key => $path)
+		foreach ($selected as $key => $path)
 		{
 			if (!Vfs::is_dir($path) || Vfs::is_link($path))
 			{
@@ -820,21 +818,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 (Vfs::isProtectedDir($path))
 				{
 					$errs++;
-					return lang("Cautiously rejecting to remove folder '%1'!",Vfs::decodePath($path));
+					return lang("Cautiously rejecting to remove folder '%1'!", 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(Vfs::find($selected,array('depth'=>true,'hidden'=>true,'show-deleted'=>false)) as $path)
+			foreach (Vfs::find($selected, array('depth'=>true, 'hidden'=>true, 'show-deleted'=>false)) as $path)
 			{
-				if (($is_dir = Vfs::is_dir($path) && !Vfs::is_link($path)) && Vfs::rmdir($path,0))
+				if (($is_dir = Vfs::is_dir($path) && !Vfs::is_link($path)) && Vfs::rmdir($path, 0))
 				{
 					++$dirs;
 				}
@@ -850,13 +848,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);
 	}
 
 	/**
@@ -871,37 +869,37 @@ 
 		if (!$query['csv_export'])
 		{
 			Api\Cache::setSession('filemanager', 'index',
-				array_diff_key ($query, array_flip(array('rows','actions','action_links','placeholder_actions'))));
+				array_diff_key($query, array_flip(array('rows', 'actions', 'action_links', 'placeholder_actions'))));
 		}
-		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 (!Vfs::stat($query['path'],true) && Vfs::stat(urldecode($query['path'])))
+		if (!Vfs::stat($query['path'], true) && Vfs::stat(urldecode($query['path'])))
 		{
 			$query['path'] = urldecode($query['path']);
 		}
-		if (!Vfs::stat($query['path'],true) || !Vfs::is_dir($query['path']) || !Vfs::check_access($query['path'],Vfs::READABLE))
+		if (!Vfs::stat($query['path'], true) || !Vfs::is_dir($query['path']) || !Vfs::check_access($query['path'], 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.',Vfs::decodePath($query['path'])),
+					'msg' => lang('The requested path %1 is not available.', Vfs::decodePath($query['path'])),
 					'ajax' => 'true'
 				));
 			}
@@ -910,7 +908,7 @@ 
 		}
 		$rows = $dir_is_writable = array();
 		$vfs_options = $this->get_vfs_options($query);
-		foreach(Vfs::find(!empty($query['col_filter']['dir']) ? $query['col_filter']['dir'] : $query['path'],$vfs_options,true) as $path => $row)
+		foreach (Vfs::find(!empty($query['col_filter']['dir']) ? $query['col_filter']['dir'] : $query['path'], $vfs_options, true) as $path => $row)
 		{
 			//echo $path; _debug_array($row);
 
@@ -928,7 +926,7 @@ 
 
 				$row['class'] .= 'isDir ';
 				$row['is_dir'] = 1;
-				if(!$dir_is_writable[$path])
+				if (!$dir_is_writable[$path])
 				{
 					$row['class'] .= 'noEdit ';
 				}
@@ -940,32 +938,32 @@ 
 
 			$row['class'] .= !$dir_is_writable[$dir] ? 'noDelete' : '';
 			$row['download_url'] = 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 = 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).' ...';
 				}
 			}
 		}
@@ -977,7 +975,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';
 			}
@@ -993,35 +991,35 @@ 
 	 */
 	protected function get_vfs_options($query)
 	{
-		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,
@@ -1029,7 +1027,7 @@ 
 			'hidden' => $filter == 3,
 			'follow' => $filter == 5,
 		);
-		if($query['col_filter']['mime'])
+		if ($query['col_filter']['mime'])
 		{
 			$vfs_options['mime'] = $query['col_filter']['mime'];
 		}
@@ -1043,7 +1041,7 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function file(array $content=null,$msg='')
+	function file(array $content = null, $msg = '')
 	{
 		$tpl = new Etemplate('filemanager.file');
 
@@ -1053,9 +1051,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 = Vfs::lstat($path)))
 			{
 				$msg .= lang('File or directory not found!')." path='$path', stat=".array2string($stat);
@@ -1068,10 +1066,10 @@ 
 				$content['path'] = $path;
 				$content['hsize'] = Vfs::hsize($stat['size']);
 				$content['mime'] = 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 = Vfs::propfind($path)))
 				{
-					foreach($props as $prop)
+					foreach ($props as $prop)
 					{
 						$content[$prop['name']] = $prop['val'];
 					}
@@ -1084,9 +1082,9 @@ 
 			$content['tabs'] = $_GET['tabs'];
 			if (!($content['is_dir'] = Vfs::is_dir($path) && !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(Vfs::PREFIX.$path);
 				}
@@ -1096,19 +1094,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'] = Vfs::has_owner_rights($path,$content);
+			$content['is_owner'] = 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';
@@ -1117,21 +1115,21 @@ 
 			// need to check 'setup' button (submit button in sudo popup), as some browsers (eg. chrome) also fill the hidden field
 			if ($button == 'sudo' && 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'] = 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' || Vfs::$is_root))
 					{
 						if ($name == 'name')
@@ -1145,23 +1143,23 @@ 
 							$to = Vfs::concat($dir, $content['name']);
 							if (file_exists(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 (Vfs::rename($path,$to))
+							if (Vfs::rename($path, $to))
 							{
-								$msg .= lang('Renamed %1 to %2.',Vfs::decodePath(basename($path)),Vfs::decodePath(basename($to))).' ';
+								$msg .= lang('Renamed %1 to %2.', Vfs::decodePath(basename($path)), Vfs::decodePath(basename($to))).' ';
 								$content['old']['name'] = $content[$name];
 								$path = $to;
-								$content['mime'] = Api\MimeMagic::filename2mime($path);	// recheck mime type
-								$refresh_path = Vfs::dirname($path);	// for renames, we have to refresh the parent
+								$content['mime'] = Api\MimeMagic::filename2mime($path); // recheck mime type
+								$refresh_path = Vfs::dirname($path); // for renames, we have to refresh the parent
 							}
 							else
 							{
-								$msg .= lang('Rename of %1 to %2 failed!',Vfs::decodePath(basename($path)),Vfs::decodePath(basename($to))).' ';
+								$msg .= lang('Rename of %1 to %2 failed!', Vfs::decodePath(basename($path)), Vfs::decodePath(basename($to))).' ';
 								if (Vfs::deny_script($to))
 								{
 									$msg .= lang('You are NOT allowed to upload a script!').' ';
@@ -1181,7 +1179,7 @@ 
 									'val'	=> (!empty($content[$name]) ? $content[$name] : null),
 								),
 							);
-							if (Vfs::proppatch($path,$mergeprop))
+							if (Vfs::proppatch($path, $mergeprop))
 							{
 								$content['old'][$name] = $content[$name];
 								$msg .= lang('Setting for document merge saved.');
@@ -1193,22 +1191,22 @@ 
 						}
 						else
 						{
-							static $name2cmd = array('uid' => 'chown','gid' => 'chgrp','perms' => 'chmod');
-							$cmd = array('EGroupware\\Api\\Vfs',$name2cmd[$name]);
+							static $name2cmd = array('uid' => 'chown', 'gid' => 'chgrp', 'perms' => 'chmod');
+							$cmd = array('EGroupware\\Api\\Vfs', $name2cmd[$name]);
 							$value = $name == 'perms' ? static::perms2mode($content['perms']) : $content[$name];
 							if ($content['modify_subs'])
 							{
 								if ($name == 'perms')
 								{
-									$changed = Vfs::find($path,array('type'=>'d'),$cmd,array($value));
-									$changed += Vfs::find($path,array('type'=>'f'),$cmd,array($value & 0666));	// no execute for files
+									$changed = Vfs::find($path, array('type'=>'d'), $cmd, array($value));
+									$changed += Vfs::find($path, array('type'=>'f'), $cmd, array($value&0666)); // no execute for files
 								}
 								else
 								{
-									$changed = Vfs::find($path,null,$cmd,array($value));
+									$changed = Vfs::find($path, null, $cmd, array($value));
 								}
 								$ok = $failed = 0;
-								foreach($changed as &$r)
+								foreach ($changed as &$r)
 								{
 									if ($r)
 									{
@@ -1221,32 +1219,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 (Vfs::proppatch($path,$props))
+					if (Vfs::proppatch($path, $props))
 					{
-						foreach($props as $prop)
+						foreach ($props as $prop)
 						{
 							$content['old'][$prop['name']] = $prop['val'];
 						}
@@ -1263,8 +1261,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 .= 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 .= Vfs::eacl($path, null, $owner) ? lang('ACL deleted.') : lang('Error deleting the ACL entry!');
 				}
 				elseif ($button == 'eacl')
 				{
@@ -1274,7 +1272,7 @@ 
 					}
 					else
 					{
-						$msg .= Vfs::eacl($path,$content['eacl']['rights'],$content['eacl_owner']) ?
+						$msg .= Vfs::eacl($path, $content['eacl']['rights'], $content['eacl_owner']) ?
 							lang('ACL added.') : lang('Error adding the ACL!');
 					}
 				}
@@ -1284,7 +1282,7 @@ 
 		}
 		if ($content['is_link'] && !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(Vfs::download_url($path));
 		$content['icon'] = Vfs::mime_icon($content['mime']);
@@ -1293,11 +1291,11 @@ 
 		if (($readonlys['uid'] = !Vfs::$is_root) && !$content['uid']) $content['ro_uid_root'] = 'root';
 		// only owner can change group & perms
 		if (($readonlys['gid'] = !$content['is_owner'] ||
-			Vfs::parse_url(Vfs::resolve_url($content['path']),PHP_URL_SCHEME) == 'oldvfs') ||// no uid, gid or perms in oldvfs
+			Vfs::parse_url(Vfs::resolve_url($content['path']), PHP_URL_SCHEME) == 'oldvfs') || // no uid, gid or perms in oldvfs
 				 !Vfs::is_writable($path))
 		{
 			if (!$content['gid']) $content['ro_gid_root'] = 'root';
-			foreach($content['perms'] as $name => $value)
+			foreach ($content['perms'] as $name => $value)
 			{
 				$readonlys['perms['.$name.']'] = true;
 			}
@@ -1316,38 +1314,38 @@ 
 		}
 		elseif (!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'] = Vfs::get_eacl($content['path'])) !== false &&	// backend supports eacl
+			if (($content['eacl'] = Vfs::get_eacl($content['path'])) !== false && // backend supports eacl
 				$GLOBALS['egw_info']['user']['account_id'] == Vfs::$user)	// leave eACL tab disabled for sharing
 			{
-				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(Vfs::parse_url($eacl['path'],PHP_URL_PATH),'/');
+					$eacl['path'] = rtrim(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'),
@@ -1357,11 +1355,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'];
 		}
@@ -1373,7 +1371,7 @@ 
 		$mergeapp_list = 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
@@ -1390,7 +1388,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];
 			}
@@ -1398,31 +1396,31 @@ 
 		if (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")');
 		}
 		else if (self::is_anonymous($GLOBALS['egw_info']['user']['account_id']))
 		{
 			// Just hide sudo for anonymous users
 			$readonlys['sudouser'] = true;
 		}
-		if (($extra_tabs = Vfs::getExtraInfo($path,$content)))
+		if (($extra_tabs = 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'],
@@ -1445,7 +1443,7 @@ 
 		Framework::window_focus();
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Preferences').' '.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);
 	}
 
 	/**
@@ -1467,7 +1465,7 @@ 
 	 * @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 (Api\Cache::getSession('filemanager', 'is_root'))
@@ -1486,15 +1484,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 = Vfs::concat($dir, Vfs::encodePathComponent($data['name']));
 
-					if(Vfs::deny_script($path))
+					if (Vfs::deny_script($path))
 					{
 						if (!isset($script_error))
 						{
@@ -1516,7 +1514,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
 						{
@@ -1575,16 +1573,16 @@ 
 			case 'link':
 				// First upload
 				$arr = static::ajax_action('upload', $selected, $dir, $props);
-				$app_dir = Link::vfs_path($props['entry']['app'],$props['entry']['id'],'',true);
+				$app_dir = Link::vfs_path($props['entry']['app'], $props['entry']['id'], '', true);
 
-				foreach($arr['uploaded'] as $file)
+				foreach ($arr['uploaded'] as $file)
 				{
-					$target=Vfs::concat($dir,Vfs::encodePathComponent($file['name']));
+					$target = Vfs::concat($dir, Vfs::encodePathComponent($file['name']));
 					if (Vfs::file_exists($target) && $app_dir)
 					{
 						if (!Vfs::file_exists($app_dir)) Vfs::mkdir($app_dir);
 						error_log("Symlinking $target to $app_dir");
-						Vfs::symlink($target, Vfs::concat($app_dir,Vfs::encodePathComponent($file['name'])));
+						Vfs::symlink($target, Vfs::concat($app_dir, Vfs::encodePathComponent($file['name'])));
 					}
 				}
 				// Must return to avoid adding to $response again
@@ -1606,7 +1604,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;

Braces +144 added lines, -37 removed lines

@@ -88,7 +88,10 @@ 
 			// search for plugins with additional filemanager views
 			foreach(Api\Hooks::process('filemanager_views') as $views)
 			{
-				if (is_array($views)) static::$views += $views;
+				if (is_array($views))
+				{
+					static::$views += $views;
+				}
 			}
 			static::$views_init = true;
 		}
@@ -286,7 +289,8 @@ 
 			)
 		);
 
-		if (isset($GLOBALS['egw_info']['user']['apps']['mail'])) {
+		if (isset($GLOBALS['egw_info']['user']['apps']['mail']))
+		{
 			foreach(Vfs\Sharing::$modes as $mode => $data)
 			{
 				$actions['share']['children']['mail_'.$mode] = array(
@@ -397,7 +401,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')
@@ -431,7 +438,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();
@@ -480,37 +490,70 @@ 
 	{
 		$tpl = new Etemplate('filemanager.index');
 
-		if($msg) Framework::message($msg);
+		if($msg)
+		{
+			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) Framework::message($msg);
+				if($msg)
+				{
+					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) Framework::message($msg);
+				if($msg)
+				{
+					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']);
 			Api\Cache::setSession('filemanager', 'index',$content['nm']);
@@ -677,9 +720,12 @@ 
 						foreach(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 = Vfs::is_dir($p)) && Vfs::mkdir($to,null,STREAM_MKDIR_RECURSIVE))
@@ -734,7 +780,10 @@ 
 							continue;
 						}
 					}
-					if ($target[0] != '/') $target = Vfs::concat($dir, $target);
+					if ($target[0] != '/')
+					{
+						$target = Vfs::concat($dir, $target);
+					}
 					if (!Vfs::stat($target))
 					{
 						return lang('Link target %1 not found!', Vfs::decodePath($target));
@@ -777,10 +826,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(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;
 				}
@@ -817,7 +872,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)
@@ -825,6 +882,7 @@ 
 				if (Vfs::isProtectedDir($path))
 				{
 					$errs++;
+		}
 					return lang("Cautiously rejecting to remove folder '%1'!",Vfs::decodePath($path));
 				}
 			}
@@ -873,7 +931,10 @@ 
 			Api\Cache::setSession('filemanager', 'index',
 				array_diff_key ($query, array_flip(array('rows','actions','action_links','placeholder_actions'))));
 		}
-		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'])
@@ -961,10 +1022,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).' ...';
 				}
 			}
@@ -1015,7 +1082,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,
@@ -1139,7 +1209,10 @@ 
 							if (!($dir = Vfs::dirname($path)))
 							{
 								$msg .= lang('File or directory not found!')." Vfs::dirname('$path')===false";
-								if ($button == 'save') $button = 'apply';
+								if ($button == 'save')
+								{
+									$button = 'apply';
+								}
 								continue;
 							}
 							$to = Vfs::concat($dir, $content['name']);
@@ -1148,7 +1221,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 (Vfs::rename($path,$to))
@@ -1221,13 +1297,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)))
@@ -1280,7 +1362,10 @@ 
 				}
 			}
 			Framework::refresh_opener($msg, 'filemanager', $refresh_path ? $refresh_path : $path, 'edit', null, '&path=[^&]*');
-			if ($button == 'save') Framework::window_close();
+			if ($button == 'save')
+			{
+				Framework::window_close();
+			}
 		}
 		if ($content['is_link'] && !Vfs::stat($path))
 		{
@@ -1290,13 +1375,19 @@ 
 		$content['icon'] = Vfs::mime_icon($content['mime']);
 		$content['msg'] = $msg;
 
-		if (($readonlys['uid'] = !Vfs::$is_root) && !$content['uid']) $content['ro_uid_root'] = 'root';
+		if (($readonlys['uid'] = !Vfs::$is_root) && !$content['uid'])
+		{
+			$content['ro_uid_root'] = 'root';
+		}
 		// only owner can change group & perms
 		if (($readonlys['gid'] = !$content['is_owner'] ||
 			Vfs::parse_url(Vfs::resolve_url($content['path']),PHP_URL_SCHEME) == 'oldvfs') ||// no uid, gid or perms in oldvfs
 				 !Vfs::is_writable($path))
 		{
-			if (!$content['gid']) $content['ro_gid_root'] = 'root';
+			if (!$content['gid'])
+			{
+				$content['ro_gid_root'] = 'root';
+			}
 			foreach($content['perms'] as $name => $value)
 			{
 				$readonlys['perms['.$name.']'] = true;
@@ -1331,9 +1422,13 @@ 
 				0 => lang('No access'),
 			);
 			if(($content['eacl'] = Vfs::get_eacl($content['path'])) !== false &&	// backend supports eacl
-				$GLOBALS['egw_info']['user']['account_id'] == Vfs::$user)	// leave eACL tab disabled for sharing
+				$GLOBALS['egw_info']['user']['account_id'] == Vfs::$user)
+			{
+				// leave eACL tab disabled for sharing
 			{
-				unset($readonlys['tabs']['filemanager.file.eacl']);	// --> switch the tab on again
+				unset($readonlys['tabs']['filemanager.file.eacl']);
+			}
+			// --> switch the tab on again
 				foreach($content['eacl'] as &$eacl)
 				{
 					$eacl['path'] = rtrim(Vfs::parse_url($eacl['path'],PHP_URL_PATH),'/');
@@ -1390,10 +1485,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 (Vfs::$is_root)
 		{
@@ -1420,7 +1518,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)
 			{
@@ -1484,7 +1585,10 @@ 
 			'files' => 0,
 		);
 
-		if (!isset($dir)) $dir = array_pop($selected);
+		if (!isset($dir))
+		{
+			$dir = array_pop($selected);
+		}
 
 		switch($action)
 		{
@@ -1582,7 +1686,10 @@ 
 					$target=Vfs::concat($dir,Vfs::encodePathComponent($file['name']));
 					if (Vfs::file_exists($target) && $app_dir)
 					{
-						if (!Vfs::file_exists($app_dir)) Vfs::mkdir($app_dir);
+						if (!Vfs::file_exists($app_dir))
+						{
+							Vfs::mkdir($app_dir);
+						}
 						error_log("Symlinking $target to $app_dir");
 						Vfs::symlink($target, Vfs::concat($app_dir,Vfs::encodePathComponent($file['name'])));
 					}

home/inc/class.home_ui.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 	 * Get a list of the user's portlets, and their associated values & settings, for display
 	 *
 	 * Actual portlet content is provided by each portlet.
-	 * @param template etemplate so attributes can be set
+	 * @param template Etemplate so attributes can be set
 	 */
 	protected function get_user_portlets(Etemplate &$template)
 	{

Braces +58 added lines, -16 removed lines

@@ -76,7 +76,10 @@ 
 		{
 			$id = $p_data['id'];
 
-			if(!$id) continue;
+			if(!$id)
+			{
+				continue;
+			}
 			$portlet = $this->get_portlet($id, $p_data, $content, $attrs, true);
 		}
 
@@ -135,7 +138,10 @@ 
 			{
 				foreach($children['children'] as $portlet => $app_portlet)
 				{
-					if(!is_array($app_portlet)) continue;
+					if(!is_array($app_portlet))
+					{
+						continue;
+					}
 					$app_portlet['class'] = $portlet;
 					$app_portlet['id'] = 'drop_' . $app_portlet['id'];
 					$app_portlet['onExecute'] = $drop_execute;
@@ -166,14 +172,21 @@ 
 			if(strpos($id,'portlet_') !== 0 || // Not a portlet
 				in_array($id, array_keys($GLOBALS['egw_info']['user']['apps'])) || // Some other app put it's pref in here
 				!is_array($context) // Not a valid portlet (probably user deleted a default)
-			) continue;
+			)
+			{
+				continue;
+			}
 
 			$classname = $context['class'];
 
 			// Avoid portlets for apps user can't use (eg. from defaults/forced)
 			list($app,$other) = explode('_',$classname);
-			if(!$GLOBALS['egw_info']['apps'][$app]) $app .='_'.$other;
-			if(!$GLOBALS['egw_info']['user']['apps'][$app]) {
+			if(!$GLOBALS['egw_info']['apps'][$app])
+			{
+				$app .='_'.$other;
+			}
+			if(!$GLOBALS['egw_info']['user']['apps'][$app])
+			{
 				continue;
 			}
 
@@ -189,7 +202,10 @@ 
 			$settings = $portlet->get_properties();
 			foreach($settings as $key => $setting)
 			{
-				if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+				if(is_array($setting) && !array_key_exists('type',$setting))
+				{
+					unset($settings[$key]);
+				}
 			}
 			$settings += $context;
 			foreach(home_portlet::$common_attributes as $attr)
@@ -229,7 +245,10 @@ 
 	 */
 	protected function get_portlet($id, &$context, &$content, &$attributes, $full_exec = false)
 	{
-		if(!$context['class']) $context['class'] = 'home_link_portlet';
+		if(!$context['class'])
+		{
+			$context['class'] = 'home_link_portlet';
+		}
 
 		// This should be set already, but just in case the execution path
 		// is different from normal...
@@ -250,7 +269,10 @@ 
 		$settings = $portlet->get_properties();
 		foreach($settings as $key => $setting)
 		{
-			if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+			if(is_array($setting) && !array_key_exists('type',$setting))
+			{
+				unset($settings[$key]);
+			}
 		}
 		$settings += $context;
 		foreach(home_portlet::$common_attributes as $attr)
@@ -314,7 +336,10 @@ 
 		foreach($sorted_apps as $appname)
 		{
 			// If there's already [new] settings, or no preference, skip it
-			if($content[$appname]) continue;
+			if($content[$appname])
+			{
+				continue;
+			}
 			$no_pref = true;
 			foreach($portal_oldvarnames as $varcheck)
 			{
@@ -349,7 +374,8 @@ 
 	 */
 	protected function get_portlet_list()
 	{
-		$list = Api\Cache::getTree('home', 'portlet_classes', function() {
+		$list = Api\Cache::getTree('home', 'portlet_classes', function()
+		{
 			$list = array();
 			$classes = array();
 
@@ -363,9 +389,15 @@ 
 			// Look through all known classes for portlets - for now, they need 'portlet' in the file name
 			foreach(array_keys($GLOBALS['egw_info']['apps']) as $appname)
 			{
-				if(in_array($appname, array('phpgwapi', 'felamimail'))) continue;
+				if(in_array($appname, array('phpgwapi', 'felamimail')))
+				{
+					continue;
+				}
 				$files = (array)@scandir(EGW_SERVER_ROOT . '/'.$appname .'/inc/');
-				if(!$files) continue;
+				if(!$files)
+				{
+					continue;
+				}
 
 				foreach($files as $entry)
 				{
@@ -384,7 +416,10 @@ 
 					}
 				}
 
-				if(!$classes[$appname]) continue;
+				if(!$classes[$appname])
+				{
+					continue;
+				}
 
 				// Build 'Add' actions for each discovered portlet.
 				// Portlets from other apps go in sub-actions
@@ -418,7 +453,8 @@ 
 		// Filter list by current user's permissions
 		foreach(array_keys($list) as $appname)
 		{
-			if(in_array($appname, array_keys($GLOBALS['egw_info']['apps']))) {
+			if(in_array($appname, array_keys($GLOBALS['egw_info']['apps'])))
+			{
 				if(!in_array($appname, array_keys($GLOBALS['egw_info']['user']['apps'])))
 				{
 					unset($list[$appname]);
@@ -638,7 +674,10 @@ 
 	public static function ajax_set_default($action, $portlet_ids, $group)
 	{
 		// Admins only
-		if(!$GLOBALS['egw_info']['apps']['admin']) return;
+		if(!$GLOBALS['egw_info']['apps']['admin'])
+		{
+			return;
+		}
 
 		// Load the appropriate group
 		if($group)
@@ -701,7 +740,10 @@ 
 		$preferences = $GLOBALS['egw']->preferences;
 		$preferences->read_repository();
 		$lang = $preferences->default['common']['lang'];
-		if (empty($lang)) $lang = 'en';
+		if (empty($lang))
+		{
+			$lang = 'en';
+		}
 
 		Api\Translation::add_app('calendar', $lang);
 		$weekview = lang('Weekview');

Spacing +107 added lines, -107 removed lines

@@ -49,21 +49,21 @@ 
 		$content = array(
 			'portlets' => $this->get_user_portlets($template)
 		);
-		$template->setElementAttribute('home.index','actions',$this->get_actions());
+		$template->setElementAttribute('home.index', 'actions', $this->get_actions());
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('home');
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'home';
 
 		// Main screen message
 		Api\Translation::add_app('mainscreen');
-		$greeting = Api\Translation::translate('mainscreen_message',false,'');
+		$greeting = Api\Translation::translate('mainscreen_message', false, '');
 
-		if($greeting == 'mainscreen_message'|| empty($greeting))
+		if ($greeting == 'mainscreen_message' || empty($greeting))
 		{
-			Api\Translation::add_app('mainscreen','en');    // trying the en one
-			$greeting = Api\Translation::translate('mainscreen_message',false,'');
+			Api\Translation::add_app('mainscreen', 'en'); // trying the en one
+			$greeting = Api\Translation::translate('mainscreen_message', false, '');
 		}
-		if(!($greeting == 'mainscreen_message'|| empty($greeting)))
+		if (!($greeting == 'mainscreen_message' || empty($greeting)))
 		{
 			$content['mainscreen_message'] = $greeting;
 		}
@@ -72,11 +72,11 @@ 
 
 		// Now run the portlets themselves
 		$attrs = array();
-		foreach($content['portlets'] as $portlet => $p_data)
+		foreach ($content['portlets'] as $portlet => $p_data)
 		{
 			$id = $p_data['id'];
 
-			if(!$id) continue;
+			if (!$id) continue;
 			$portlet = $this->get_portlet($id, $p_data, $content, $attrs, true);
 		}
 
@@ -94,15 +94,15 @@ 
 		$add_portlets = $portlets;
 		$change_for_add = function(&$add_portlets) use (&$change_for_add)
 		{
-			foreach($add_portlets as $id => &$add)
+			foreach ($add_portlets as $id => &$add)
 			{
-				if(is_array($add['children']))
+				if (is_array($add['children']))
 				{
 					$change_for_add($add['children']);
 				}
-				if($id && !$add['children'])
+				if ($id && !$add['children'])
 				{
-					$add['id'] = 'add_' . $id;
+					$add['id'] = 'add_'.$id;
 					$add['class'] = 'add_'.$id;
 				}
 			}
@@ -121,10 +121,10 @@ 
 
 		// Add all known portlets as drop actions too.  If there are multiple matches, there will be a menu
 		$drop_execute = 'javaScript:app.home.add_from_drop';
-		foreach($portlets as $app => &$children)
+		foreach ($portlets as $app => &$children)
 		{
 			// Home portlets - uses link system, so all apps that support that are accepted
-			if(!$children['children'])
+			if (!$children['children'])
 			{
 				$children['class'] = $app;
 				$children['onExecute'] = $drop_execute;
@@ -133,11 +133,11 @@ 
 			}
 			else
 			{
-				foreach($children['children'] as $portlet => $app_portlet)
+				foreach ($children['children'] as $portlet => $app_portlet)
 				{
-					if(!is_array($app_portlet)) continue;
+					if (!is_array($app_portlet)) continue;
 					$app_portlet['class'] = $portlet;
-					$app_portlet['id'] = 'drop_' . $app_portlet['id'];
+					$app_portlet['id'] = 'drop_'.$app_portlet['id'];
 					$app_portlet['onExecute'] = $drop_execute;
 					$app_portlet['acceptedTypes'] = $app;
 					$app_portlet['type'] = 'drop';
@@ -161,9 +161,9 @@ 
 	{
 		$portlets = array();
 
-		foreach((array)$GLOBALS['egw_info']['user']['preferences']['home']as $id => $context)
+		foreach ((array)$GLOBALS['egw_info']['user']['preferences']['home']as $id => $context)
 		{
-			if(strpos($id,'portlet_') !== 0 || // Not a portlet
+			if (strpos($id, 'portlet_') !== 0 || // Not a portlet
 				in_array($id, array_keys($GLOBALS['egw_info']['user']['apps'])) || // Some other app put it's pref in here
 				!is_array($context) // Not a valid portlet (probably user deleted a default)
 			) continue;
@@ -171,9 +171,9 @@ 
 			$classname = $context['class'];
 
 			// Avoid portlets for apps user can't use (eg. from defaults/forced)
-			list($app,$other) = explode('_',$classname);
-			if(!$GLOBALS['egw_info']['apps'][$app]) $app .='_'.$other;
-			if(!$GLOBALS['egw_info']['user']['apps'][$app]) {
+			list($app, $other) = explode('_', $classname);
+			if (!$GLOBALS['egw_info']['apps'][$app]) $app .= '_'.$other;
+			if (!$GLOBALS['egw_info']['user']['apps'][$app]) {
 				continue;
 			}
 
@@ -187,12 +187,12 @@ 
 			// Get settings
 			// Exclude common attributes changed through UI and settings lacking a type
 			$settings = $portlet->get_properties();
-			foreach($settings as $key => $setting)
+			foreach ($settings as $key => $setting)
 			{
-				if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+				if (is_array($setting) && !array_key_exists('type', $setting)) unset($settings[$key]);
 			}
 			$settings += $context;
-			foreach(home_portlet::$common_attributes as $attr)
+			foreach (home_portlet::$common_attributes as $attr)
 			{
 				unset($settings[$attr]);
 			}
@@ -205,7 +205,7 @@ 
 			// Add in default for admins
 			self::create_default_actions($actions, $id);
 
-			$template->setElementAttribute("portlets[" . count($portlets) . "[$id]", 'actions', $actions);
+			$template->setElementAttribute("portlets[".count($portlets)."[$id]", 'actions', $actions);
 
 			$portlets[] = $portlet_content;
 		}
@@ -229,11 +229,11 @@ 
 	 */
 	protected function get_portlet($id, &$context, &$content, &$attributes, $full_exec = false)
 	{
-		if(!$context['class']) $context['class'] = 'home_link_portlet';
+		if (!$context['class']) $context['class'] = 'home_link_portlet';
 
 		// This should be set already, but just in case the execution path
 		// is different from normal...
-		if(Api\Json\Response::isJSONResponse())
+		if (Api\Json\Response::isJSONResponse())
 		{
 			$GLOBALS['egw']->framework->response = Api\Json\Response::get();
 		}
@@ -248,12 +248,12 @@ 
 
 		// Exclude common attributes changed through UI and settings lacking a type
 		$settings = $portlet->get_properties();
-		foreach($settings as $key => $setting)
+		foreach ($settings as $key => $setting)
 		{
-			if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+			if (is_array($setting) && !array_key_exists('type', $setting)) unset($settings[$key]);
 		}
 		$settings += $context;
-		foreach(home_portlet::$common_attributes as $attr)
+		foreach (home_portlet::$common_attributes as $attr)
 		{
 			unset($settings[$attr]);
 		}
@@ -268,31 +268,31 @@ 
 		self::create_default_actions($attributes['actions'], $id);
 
 		// Set any provided common attributes (size, etc)
-		foreach(home_portlet::$common_attributes as $name)
+		foreach (home_portlet::$common_attributes as $name)
 		{
-			if(array_key_exists($name, $context))
+			if (array_key_exists($name, $context))
 			{
 				$attributes[$name] = $context[$name];
 			}
 		}
-		foreach($attributes as $attr => $value)
+		foreach ($attributes as $attr => $value)
 		{
 			$etemplate->setElementAttribute($id, $attr, $value);
 		}
 
 		// Make sure custom javascript is loaded
 		$appname = $context['appname'];
-		if(!$appname)
+		if (!$appname)
 		{
-			list($app) = explode('_',$classname);
-			if($GLOBALS['egw_info']['apps'][$app])
+			list($app) = explode('_', $classname);
+			if ($GLOBALS['egw_info']['apps'][$app])
 			{
 				$appname = $app;
 			}
 		}
 		Framework::includeJS('', $classname, $appname ? $appname : 'home');
 
-		if($full_exec)
+		if ($full_exec)
 		{
 			$content = $portlet->exec($id, $etemplate, $full_exec ? 2 : -1);
 		}
@@ -309,23 +309,23 @@ 
 	protected function get_legacy_portlets(&$content, &$attributes)
 	{
 		$sorted_apps = array_keys($GLOBALS['egw_info']['user']['apps']);
-		$portal_oldvarnames = array('mainscreen_showevents', 'homeShowEvents','homeShowLatest','mainscreen_showmail','mainscreen_showbirthdays','mainscreen_show_new_updated', 'homepage_display');
+		$portal_oldvarnames = array('mainscreen_showevents', 'homeShowEvents', 'homeShowLatest', 'mainscreen_showmail', 'mainscreen_showbirthdays', 'mainscreen_show_new_updated', 'homepage_display');
 
-		foreach($sorted_apps as $appname)
+		foreach ($sorted_apps as $appname)
 		{
 			// If there's already [new] settings, or no preference, skip it
-			if($content[$appname]) continue;
+			if ($content[$appname]) continue;
 			$no_pref = true;
-			foreach($portal_oldvarnames as $varcheck)
+			foreach ($portal_oldvarnames as $varcheck)
 			{
 				$thisd = $GLOBALS['egw_info']['user']['preferences'][$appname][$varcheck];
-				if($thisd)
+				if ($thisd)
 				{
 					$no_pref = false;
 					break;
 				}
 			}
-			if($no_pref || !Api\Hooks::exists('home', $appname))
+			if ($no_pref || !Api\Hooks::exists('home', $appname))
 			{
 				continue;
 			}
@@ -336,7 +336,7 @@ 
 			$_content = '';
 			$_attributes = array();
 			$this->get_portlet($appname, $context, $_content, $_attributes);
-			if(trim($_content))
+			if (trim($_content))
 			{
 				$content[$appname] = $_content;
 				$attributes[$appname] = $_attributes;
@@ -355,24 +355,24 @@ 
 
 			// Ignore some problem files and base classes that shouldn't be options
 			$ignore = array(
-				'.','..',
+				'.', '..',
 				'class.home_portlet.inc.php',
 				'class.home_legacy_portlet.inc.php',
 				'class.home_favorite_portlet.inc.php'
 			);
 			// Look through all known classes for portlets - for now, they need 'portlet' in the file name
-			foreach(array_keys($GLOBALS['egw_info']['apps']) as $appname)
+			foreach (array_keys($GLOBALS['egw_info']['apps']) as $appname)
 			{
-				if(in_array($appname, array('phpgwapi', 'felamimail'))) continue;
-				$files = (array)@scandir(EGW_SERVER_ROOT . '/'.$appname .'/inc/');
-				if(!$files) continue;
+				if (in_array($appname, array('phpgwapi', 'felamimail'))) continue;
+				$files = (array)@scandir(EGW_SERVER_ROOT.'/'.$appname.'/inc/');
+				if (!$files) continue;
 
-				foreach($files as $entry)
+				foreach ($files as $entry)
 				{
-					if (!in_array($entry, $ignore) && substr($entry,-8) == '.inc.php' && strpos($entry,'portlet'))
+					if (!in_array($entry, $ignore) && substr($entry, -8) == '.inc.php' && strpos($entry, 'portlet'))
 					{
 						list(,$classname) = explode('.', $entry);
-						if(class_exists($classname) &&
+						if (class_exists($classname) &&
 							in_array('home_portlet', class_parents($classname, false)))
 						{
 							$classes[$appname][] = $classname;
@@ -384,19 +384,19 @@ 
 					}
 				}
 
-				if(!$classes[$appname]) continue;
+				if (!$classes[$appname]) continue;
 
 				// Build 'Add' actions for each discovered portlet.
 				// Portlets from other apps go in sub-actions
-				$add_to =& $list;
-				if($classes[$appname] && $appname != 'home')
+				$add_to = & $list;
+				if ($classes[$appname] && $appname != 'home')
 				{
 					$list[$appname] = array(
 						'caption' => lang($appname),
 					);
-					$add_to =& $list[$appname]['children'];
+					$add_to = & $list[$appname]['children'];
 				}
-				foreach($classes[$appname] as $portlet)
+				foreach ($classes[$appname] as $portlet)
 				{
 					$instance = new $portlet();
 					$desc = $instance->get_description();
@@ -416,10 +416,10 @@ 
 		}, array(), 60);
 
 		// Filter list by current user's permissions
-		foreach(array_keys($list) as $appname)
+		foreach (array_keys($list) as $appname)
 		{
-			if(in_array($appname, array_keys($GLOBALS['egw_info']['apps']))) {
-				if(!in_array($appname, array_keys($GLOBALS['egw_info']['user']['apps'])))
+			if (in_array($appname, array_keys($GLOBALS['egw_info']['apps']))) {
+				if (!in_array($appname, array_keys($GLOBALS['egw_info']['user']['apps'])))
 				{
 					unset($list[$appname]);
 				}
@@ -436,7 +436,7 @@ 
 	 */
 	protected static function create_default_actions(&$actions, $portlet_id = null)
 	{
-		if($GLOBALS['egw_info']['user']['apps']['admin'])
+		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$actions['add_default'] = array(
 				'type'		=> 'popup',
@@ -446,25 +446,25 @@ 
 				'icon'		=> 'preference'
 			);
 			// Customize for the given portlet
-			if($portlet_id !== null)
+			if ($portlet_id !== null)
 			{
-				foreach(array('forced','group','default') as $location)
+				foreach (array('forced', 'group', 'default') as $location)
 				{
 					$loc = $GLOBALS['egw']->preferences->$location;
 
-					if($loc['home'][$portlet_id])
+					if ($loc['home'][$portlet_id])
 					{
 						// If it's forced, no point in setting default
-						if($location == 'forced')
+						if ($location == 'forced')
 						{
 							unset($actions['add_default']);
 						}
 						// If it's a group, we'd like to know which
-						if($location == 'group')
+						if ($location == 'group')
 						{
 							$options = array('account_type' => 'groups');
-							$groups = Api\Accounts::link_query('',$options);
-							foreach(array_keys($groups) as $gid)
+							$groups = Api\Accounts::link_query('', $options);
+							foreach (array_keys($groups) as $gid)
 							{
 								$prefs = new Api\Preferences($gid);
 								$prefs->read_repository();
@@ -477,7 +477,7 @@ 
 						}
 						$actions['remove_default_'.$location] = array(
 							'type'		=> 'popup',
-							'caption'	=> lang('Remove as default for %1',is_numeric($location) ? Api\Accounts::id2name($location,'account_fullname') : $location),
+							'caption'	=> lang('Remove as default for %1', is_numeric($location) ? Api\Accounts::id2name($location, 'account_fullname') : $location),
 							'onExecute'	=> 'javaScript:app.home.set_default',
 							'group'		=> 'Admins',
 							'portlet_group' => $location
@@ -488,14 +488,14 @@ 
 		}
 
 		// Change action for forced
-		if($portlet_id && $GLOBALS['egw']->preferences->forced['home'][$portlet_id])
+		if ($portlet_id && $GLOBALS['egw']->preferences->forced['home'][$portlet_id])
 		{
 			// No one can remove it
 			$actions['remove_portlet']['enabled'] = false;
-			$actions['remove_portlet']['caption'] .= ' ('.lang('Forced') .')';
+			$actions['remove_portlet']['caption'] .= ' ('.lang('Forced').')';
 
 			// Non-admins can't edit it
-			if($actions['edit_settings'] && !$GLOBALS['egw_info']['user']['apps']['admin'])
+			if ($actions['edit_settings'] && !$GLOBALS['egw_info']['user']['apps']['admin'])
 			{
 				$actions['edit_settings']['enabled'] = false;
 				$actions['edit_settings']['visible'] = false;
@@ -514,14 +514,14 @@ 
 	public function ajax_set_properties($portlet_id, $attributes, $values, $group = false)
 	{
 		//error_log(__METHOD__ . "($portlet_id, " .array2string($attributes).','.array2string($values).",$group)");
-		if(!$attributes)
+		if (!$attributes)
 		{
 			$attributes = array();
 		}
 
-		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			if($group == 'forced')
+			if ($group == 'forced')
 			{
 				// Quietly reject
 				return;
@@ -529,7 +529,7 @@ 
 			// Not an admin, can only override.
 			$group = false;
 		}
-		if($group && $GLOBALS['egw_info']['user']['apps']['admin'])
+		if ($group && $GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$prefs = new Api\Preferences(is_numeric($group) ? $group : $GLOBALS['egw_info']['user']['account_id']);
 		}
@@ -543,23 +543,23 @@ 
 
 		$response = Api\Json\Response::get();
 
-		if($values =='~reload~')
+		if ($values == '~reload~')
 		{
 			$full_exec = true;
 			$values = array();
 		}
-		if($values == '~remove~')
+		if ($values == '~remove~')
 		{
 			// Already removed client side, needs to be removed permanently
-			$default = $prefs->default_prefs('home',$portlet_id) || $prefs->group['home'][$portlet_id];
+			$default = $prefs->default_prefs('home', $portlet_id) || $prefs->group['home'][$portlet_id];
 
-			if($default)
+			if ($default)
 			{
 				// Can't delete forced - not a UI option though
-				if(!$GLOBALS['egw']->preferences->forced['home'][$portlet_id])
+				if (!$GLOBALS['egw']->preferences->forced['home'][$portlet_id])
 				{
 					// Set a flag to override default instead of just delete
-					$GLOBALS['egw']->preferences->add('home',$portlet_id, 'deleted');
+					$GLOBALS['egw']->preferences->add('home', $portlet_id, 'deleted');
 					$GLOBALS['egw']->preferences->save_repository();
 				}
 			}
@@ -576,19 +576,19 @@ 
 			// Remove some constant stuff that winds up here
 			unset($values['edit_template']);
 			unset($values['readonly']);
-			unset($values['disabled']);unset($values['no_lang']);
+			unset($values['disabled']); unset($values['no_lang']);
 			unset($values['actions']);
 			unset($values['statustext']);
-			unset($values['type']);unset($values['label']);unset($values['status']);
-			unset($values['value']);unset($values['align']);
+			unset($values['type']); unset($values['label']); unset($values['status']);
+			unset($values['value']); unset($values['align']);
 
 			// Get portlet settings, and merge new with old
 			$context = array_merge((array)$portlets[$portlet_id], $values);
 			$context['group'] = $group;
 
 			// Handle add IDs
-			$classname =& $context['class'];
-			if(strpos($classname,'add_') == 0 && !class_exists($classname))
+			$classname = & $context['class'];
+			if (strpos($classname, 'add_') == 0 && !class_exists($classname))
 			{
 				$add = true;
 				$classname = substr($classname, 4);
@@ -597,13 +597,13 @@ 
 			$portlet = $this->get_portlet($portlet_id, $context, $content, $attributes, $full_exec);
 
 			$context['class'] = get_class($portlet);
-			foreach($portlet->get_properties() as $property)
+			foreach ($portlet->get_properties() as $property)
 			{
-				if($values[$property['name']])
+				if ($values[$property['name']])
 				{
 					$context[$property['name']] = $values[$property['name']];
 				}
-				elseif($portlets[$portlet_id][$property['name']])
+				elseif ($portlets[$portlet_id][$property['name']])
 				{
 					$context[$property['name']] = $portlets[$portlet_id][$property['name']];
 				}
@@ -613,7 +613,7 @@ 
 			$update = array('attributes' => $attributes);
 
 			// New portlet?  Flag going straight to edit mode
-			if($add)
+			if ($add)
 			{
 				$update['edit_settings'] = true;
 			}
@@ -625,7 +625,7 @@ 
 		}
 
 		// Save updated preferences
-		$prefs->save_repository(True,$type);
+		$prefs->save_repository(True, $type);
 	}
 
 	/**
@@ -638,10 +638,10 @@ 
 	public static function ajax_set_default($action, $portlet_ids, $group)
 	{
 		// Admins only
-		if(!$GLOBALS['egw_info']['apps']['admin']) return;
+		if (!$GLOBALS['egw_info']['apps']['admin']) return;
 
 		// Load the appropriate group
-		if($group)
+		if ($group)
 		{
 			$prefs = new Api\Preferences(is_numeric($group) ? $group : $GLOBALS['egw_info']['user']['account_id']);
 		}
@@ -653,30 +653,30 @@ 
 
 		$type = is_numeric($group) ? "user" : $group;
 
-		if($action == 'add')
+		if ($action == 'add')
 		{
-			foreach($portlet_ids as $id)
+			foreach ($portlet_ids as $id)
 			{
 				Api\Json\Response::get()->call('egw.message', lang("Set default"));
 				// Current user is setting the default, copy their settings
 				$settings = $GLOBALS['egw_info']['user']['preferences']['home'][$id];
 				$settings['group'] = $group;
-				$prefs->add('home',$id,$settings,$type);
+				$prefs->add('home', $id, $settings, $type);
 
 				// Remove user's copy
-				$GLOBALS['egw']->preferences->delete('home',$id);
+				$GLOBALS['egw']->preferences->delete('home', $id);
 				$GLOBALS['egw']->preferences->save_repository(true);
 			}
 		}
 		else if ($action == "delete")
 		{
-			foreach($portlet_ids as $id)
+			foreach ($portlet_ids as $id)
 			{
 				Api\Json\Response::get()->call('egw.message', lang("Removed default"));
-				$prefs->delete('home',$id, $type);
+				$prefs->delete('home', $id, $type);
 			}
 		}
-		$prefs->save_repository(false,$type);
+		$prefs->save_repository(false, $type);
 
 		// Update Api\Preferences client side for consistency
 		$prefs = $GLOBALS['egw']->preferences;
@@ -729,7 +729,7 @@ 
 						'state' => array(
 							'cat_id' => '0',
 							'filter' => 'default',
-							'owner' => 0,	// current user
+							'owner' => 0, // current user
 							'sortby' => 'user',
 							'planner_days' => '0',
 							'view' => 'week',
@@ -778,9 +778,9 @@ 
 		{
 			unset($app_prefs['home']['portlet_setup142n']);
 		}
-		foreach($app_prefs as $app => $prefs)
+		foreach ($app_prefs as $app => $prefs)
 		{
-			foreach($prefs as $name => $value)
+			foreach ($prefs as $name => $value)
 			{
 				Api\Preferences::delete_preference($app, $name, 'default');
 				$preferences->add($app, $name, $value, 'default');
@@ -801,10 +801,10 @@ 
 	 */
 	public static function setup_default_home()
 	{
-		switch($GLOBALS['egw_info']['server'][self::HOME_VERSION])
+		switch ($GLOBALS['egw_info']['server'][self::HOME_VERSION])
 		{
 			case self::CURRENT_HOME_VERSION:
-				return;	// already up to date --> nothing to do
+				return; // already up to date --> nothing to do
 
 			default:
 				call_user_func(array(__CLASS__, 'setup_default_home_'.str_replace('.', '_', self::CURRENT_HOME_VERSION)));

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 +72 added lines, -72 removed lines

@@ -18,19 +18,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(
@@ -48,7 +48,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
@@ -56,7 +56,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
@@ -121,8 +121,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'],
 		));
@@ -130,11 +130,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'];
@@ -143,9 +143,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);
 		}
@@ -167,38 +167,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;
@@ -226,10 +226,10 @@ 
 	*/
 	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
@@ -244,23 +244,23 @@ 
 					default :
 						die('condition / action not supported!!!');
 				}
-				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;
@@ -321,7 +321,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
@@ -336,46 +336,46 @@ 
 		$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 = 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 = Link::query($app, $app_id);
 					do
 					{
 						$app_id = key($result);
 						shift($result);
-					} while($result && !$app_id);
+					} while ($result && !$app_id);
 				}
 			}
 			else if ($field == 'contact')
@@ -386,7 +386,7 @@ 
 			}
 			if (!$this->dry_run && $app && $app_id && ($app != $this->definition->application || $app_id != $id))
 			{
-				$link_id = Link::link($this->definition->application,$id,$app,$app_id);
+				$link_id = Link::link($this->definition->application, $id, $app, $app_id);
 			}
 		}
 	}
@@ -403,13 +403,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]);
@@ -418,27 +418,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) {
 			Api\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();
 		}
@@ -467,7 +467,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;
@@ -477,7 +477,7 @@ 
 			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();
@@ -485,10 +485,10 @@ 
 		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
@@ -497,11 +497,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'];
 			}
@@ -511,7 +511,7 @@ 
 				{
 					$id = key($addrs);
 					array_shift($addrs);
-				} while($addrs && !$id && $id == $record->get_identifier());
+				} while ($addrs && !$id && $id == $record->get_identifier());
 				return $id;
 			}
 		}
@@ -526,22 +526,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 = Api\Storage\Customfields::get($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;
@@ -550,30 +550,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(Link::get_registry($app, 'query'))
+			if (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 = 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_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);

Spacing +49 added lines, -49 removed lines

@@ -31,13 +31,13 @@ 
 	 */
 	private $definitions;
 
-	public function __construct($_query=false, $ignore_acl = false)
+	public function __construct($_query = false, $ignore_acl = false)
 	{
-		$this->so_sql = new Api\Storage\Base(self::_appname, self::_defintion_table );
+		$this->so_sql = new Api\Storage\Base(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'];
 			}
 		}
 	}
@@ -45,16 +45,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'];
@@ -62,37 +62,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;
@@ -107,11 +107,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();
 	}
@@ -124,14 +124,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));
 		}
 	}
@@ -154,12 +154,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);
 	}
 
@@ -178,13 +178,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']
@@ -195,7 +195,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);
@@ -213,17 +213,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 = Api\Translation::convert(
@@ -233,26 +233,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;
@@ -275,28 +275,28 @@ 
 	public static function export_from_import(importexport_definition $import)
 	{
 		// Only operates on import definitions
-		if($import->type != 'import') throw new Api\Exception\WrongParameter('Only import definitions');
+		if ($import->type != 'import') throw new Api\Exception\WrongParameter('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;
@@ -312,7 +312,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

@@ -16,7 +16,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';
@@ -34,10 +35,15 @@ 
 	public function __construct($_query=false, $ignore_acl = false)
 	{
 		$this->so_sql = new Api\Storage\Base(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'];
+				}
 			}
 		}
 	}
@@ -45,7 +51,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 .= ' (';
@@ -80,7 +87,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);
 
@@ -103,14 +111,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();
@@ -120,18 +133,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));
 		}
 	}
@@ -141,7 +160,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']);
@@ -153,7 +173,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);
@@ -177,25 +198,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);
@@ -215,7 +241,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" );
 		}
 
@@ -233,14 +260,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'] );
 
@@ -275,7 +308,10 @@ 
 	public static function export_from_import(importexport_definition $import)
 	{
 		// Only operates on import definitions
-		if($import->type != 'import') throw new Api\Exception\WrongParameter('Only import definitions');
+		if($import->type != 'import')
+		{
+			throw new Api\Exception\WrongParameter('Only import definitions');
+		}
 
 		// Find export plugin
 		$plugin = str_replace('import', 'export',$import->plugin);
@@ -285,18 +321,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;

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']);

importexport/inc/class.importexport_definitions_ui.inc.php

Doc Comments +4 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
 	/**
 	 * List defined {im|ex}ports
 	 *
-	 * @param array $content=null
+	 * @param array $content
 	 */
 	function index($content = null,$msg='')
 	{
@@ -309,8 +309,9 @@ 
 	 * @param int &$success number of succeded actions
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 entries 'deleted'
-	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
-	 * @return boolean true if all actions succeded, false otherwise
+	 * @param string $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
+	 * @param string $msg
+	 * @return null|boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$selected,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)
 	{

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

@@ -940,7 +940,7 @@
 	 * Determine if the user is allowed to edit the definition
 	 *
 	 */
-	protected function can_edit(Array $definition)
+	protected function can_edit(array $definition)
 	{
 		if($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'])
 		{

Spacing +139 added lines, -140 removed lines

@@ -60,7 +60,7 @@ 
 		$GLOBALS['egw_info']['flags']['currentapp'] = self::_appname;
 
 		$this->etpl = new Etemplate();
-		$this->clock = Api\Html::image(self::_appname,'clock');
+		$this->clock = Api\Html::image(self::_appname, 'clock');
 		$this->steps = array(
 			'wizard_step10' => lang('Choose an application'),
 			'wizard_step20' => lang('Choose a plugin'),
@@ -77,18 +77,18 @@ 
 	 *
 	 * @param array $content=null
 	 */
-	function index($content = null,$msg='')
+	function index($content = null, $msg = '')
 	{
 		$filter = array('name' => '*');
 
-		if($GLOBALS['egw_info']['user']['apps']['admin']) {
+		if ($GLOBALS['egw_info']['user']['apps']['admin']) {
 			// Any public definition
-			$filter[] = '(owner=0 OR owner IS NULL OR allowed_users IS NOT NULL OR owner = ' . $GLOBALS['egw_info']['user']['account_id'] . ')';
+			$filter[] = '(owner=0 OR owner IS NULL OR allowed_users IS NOT NULL OR owner = '.$GLOBALS['egw_info']['user']['account_id'].')';
 		} else {
 			// Filter private definitions
 			$filter['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			$config = Api\Config::read('phpgwapi');
-			if($config['export_limit'] == 'no' && !Api\Storage\Merge::is_export_limit_excepted()) {
+			if ($config['export_limit'] == 'no' && !Api\Storage\Merge::is_export_limit_excepted()) {
 				$filter['type'] = 'import';
 			}
 		}
@@ -99,12 +99,12 @@ 
 			if (isset($content['nm']['rows']['delete']))
 			{
 				$content['nm']['action'] = 'delete';
-				$content['nm']['selected'] = array_keys($content['nm']['rows']['delete'],'pressed');
+				$content['nm']['selected'] = array_keys($content['nm']['rows']['delete'], 'pressed');
 			}
-			elseif(($button = array_search('pressed',$content['nm']['rows'])) !== false)
+			elseif (($button = array_search('pressed', $content['nm']['rows'])) !== false)
 			{
 				$selected = $content['nm']['rows']['selected'];
-				if(count($selected) < 1 || !is_array($selected)) exit();
+				if (count($selected) < 1 || !is_array($selected)) exit();
 				switch ($button)
 				{
 					case 'delete_selected' :
@@ -126,54 +126,54 @@ 
 				else
 				{
 					// Action has an additional parameter
-					if(in_array($content['nm']['action'], array('owner', 'allowed')))
+					if (in_array($content['nm']['action'], array('owner', 'allowed')))
 					{
 						$action = $content['nm']['action'];
-						if($content['nm']['action'] == 'allowed')
+						if ($content['nm']['action'] == 'allowed')
 						{
 							$content['allowed'] = $content['allowed_popup']['allowed_private'] == 'true' ? null : (
-								$content['allowed_popup']['all_users']=='true' ? 'all' : implode(',',$content['allowed_popup']['allowed'])
+								$content['allowed_popup']['all_users'] == 'true' ? 'all' : implode(',', $content['allowed_popup']['allowed'])
 							);
 						}
 						else
 						{
 							$content['owner'] = $content['owner_popup']['owner'];
 						}
-						if(is_array($content[$content['nm']['action']]))
+						if (is_array($content[$content['nm']['action']]))
 						{
-							$content[$content['nm']['action']] = implode(',',$content[$content['nm']['action']]);
+							$content[$content['nm']['action']] = implode(',', $content[$content['nm']['action']]);
 						}
-						$content['nm']['action'] .= '_' . $content[$action];
+						$content['nm']['action'] .= '_'.$content[$action];
 						unset($content[$action]);
 						unset($content['allowed_popup']);
 					}
-					if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-						$success,$failed,$action_msg,'index',$msg))
+					if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+						$success, $failed, $action_msg, 'index', $msg))
 					{
-						$msg .= lang('%1 definition(s) %2',$success,$action_msg);
+						$msg .= lang('%1 definition(s) %2', $success, $action_msg);
 					}
-					elseif(empty($msg))
+					elseif (empty($msg))
 					{
-						$msg .= lang('%1 definition(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+						$msg .= lang('%1 definition(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 					}
 				}
 			}
 		}
 
-		if(!is_array($content['nm'])) {
+		if (!is_array($content['nm'])) {
 			$content['nm'] = array(
 				'get_rows'	=> 'importexport.importexport_definitions_ui.get_rows',
 				'no_cat'	=> true,
 				'no_filter'	=> true,
 				'no_filter2'	=> true,
-				'csv_fields'	=> false,	// Disable CSV export, uses own export
-				'default_cols'  => '!actions',  // switch legacy actions column and row off by default
+				'csv_fields'	=> false, // Disable CSV export, uses own export
+				'default_cols'  => '!actions', // switch legacy actions column and row off by default
 				'row_id'	=> 'definition_id',
 				'placeholder_actions' => array('add')
 			);
-			if($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
+			if ($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
 		}
-		if(Api\Cache::getSession('importexport', 'index'))
+		if (Api\Cache::getSession('importexport', 'index'))
 		{
 			$content['nm'] = array_merge($content['nm'], Api\Cache::getSession('importexport', 'index'));
 		}
@@ -190,14 +190,14 @@ 
 		);
 		foreach ($this->plugins as $appname => $options)
 		{
-			if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+			if ($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
 				$sel_options['application'][$appname] = lang($appname);
 			}
 		}
-		if($msg) $content['msg'] = $msg;
+		if ($msg) $content['msg'] = $msg;
 
 		$etpl = new Etemplate(self::_appname.'.definition_index');
-		return $etpl->exec( self::_appname.'.importexport_definitions_ui.index', $content, $sel_options, $readonlys, $preserv );
+		return $etpl->exec(self::_appname.'.importexport_definitions_ui.index', $content, $sel_options, $readonlys, $preserv);
 	}
 
 	private function get_actions() {
@@ -286,7 +286,7 @@ 
 		);
 
 		// Unset admin actions
-		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			unset($actions['schedule']);
 		}
@@ -305,7 +305,7 @@ 
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$selected,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)
+	function action($action, $selected, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg)
 	{
 		//error_log( __METHOD__."('$action', ".array2string($selected).', '.array2string($use_all).",,, '$session_name')");
 		if ($use_all)
@@ -313,16 +313,16 @@ 
 			// get the whole selection
 			$old_query = $query = is_array($session_name) ? $session_name : Api\Cache::getSession('importexport', $session_name);
 
-			@set_time_limit(0);				// switch off the execution time limit, as it's for big selections to small
-			$query['num_rows'] = -1;		// all
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$this->get_rows($query,$rows,$readonlys);
+			@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+			$query['num_rows'] = -1; // all
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$this->get_rows($query, $rows, $readonlys);
 
 			$selected = array();
-			foreach($rows as $row) {
+			foreach ($rows as $row) {
 				$selected[] = $row['definition_id'];
 			}
-			if(!is_array($session_name))
+			if (!is_array($session_name))
 			{
 				// Restore old query
 				Api\Cache::setSession('importexport', $session_name, $old_query);
@@ -334,18 +334,18 @@ 
 
 		$bodefinitions = new importexport_definitions_bo(false, true);
 
-		switch($action) {
+		switch ($action) {
 			case 'allowed':
 				// Field is allowed_users, popup doesn't like _
 				$action = 'allowed_users';
 				// Fall through
 			case 'owner':
-				$action_msg = lang('changed'. ' ' . $action);
-				foreach($selected as $id) {
+				$action_msg = lang('changed'.' '.$action);
+				foreach ($selected as $id) {
 					$definition = $bodefinitions->read((int)$id);
-					if($definition['definition_id']) {
+					if ($definition['definition_id']) {
 						// Prevent private with no owner
-						if(!$definition['owner'] && !$settings) $definition['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+						if (!$definition['owner'] && !$settings) $definition['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
 						$definition[$action] = $settings;
 						$bodefinitions->save($definition);
@@ -363,7 +363,7 @@ 
 				$mime_type = ($GLOBALS['egw']->html->user_agent == 'msie' || $GLOBALS['egw']->html->user_agent == 'opera') ?
 					'application/octetstream' : 'application/octet-stream';
 				$name = 'importexport_definition.xml';
-				header('Content-Type: ' . $mime_type);
+				header('Content-Type: '.$mime_type);
 				header('Content-Disposition: attachment; filename="'.$name.'"');
 				echo $bodefinitions->export($selected);
 				exit();
@@ -372,16 +372,16 @@ 
 			case 'copy':
 				$action_msg = lang('copied');
 				// Should only be one selected
-				foreach($selected as $id) {
+				foreach ($selected as $id) {
 					$definition = $bodefinitions->read((int)$id);
-					if($definition['definition_id']) {
+					if ($definition['definition_id']) {
 						unset($definition['definition_id']);
-						$definition['name'] = $settings ? $settings : $definition['name'] . ' copy';
+						$definition['name'] = $settings ? $settings : $definition['name'].' copy';
 						try {
 							$bodefinitions->save($definition);
 						} catch (Exception $e) {
 							try {
-								$definition['name'] .= ' ' . $GLOBALS['egw_info']['user']['account_lid'];
+								$definition['name'] .= ' '.$GLOBALS['egw_info']['user']['account_lid'];
 								$bodefinitions->save($definition);
 							} catch (Exception $ex) {
 								$failed++;
@@ -396,16 +396,16 @@ 
 			case 'createexport':
 				$action_msg = lang('created');
 				// Should only be one selected
-				foreach($selected as $id) {
+				foreach ($selected as $id) {
 					$definition = new importexport_definition($id);
 					try {
 						$export = $bodefinitions->export_from_import($definition);
 						$export->save();
 					} catch (Exception $e) {
-						if($export)
+						if ($export)
 						{
 							try {
-								$export->name = $export->name.' ' . $GLOBALS['egw_info']['user']['account_lid'];
+								$export->name = $export->name.' '.$GLOBALS['egw_info']['user']['account_lid'];
 								$export->save();
 							} catch (Exception $ex) {
 								$failed++;
@@ -430,10 +430,10 @@ 
 		Api\Cache::setSession('importexport', 'index', $query);
 
 		// Special handling for allowed users 'private'
-		if($query['col_filter']['allowed_users'] == 'private')
+		if ($query['col_filter']['allowed_users'] == 'private')
 		{
 			unset($query['col_filter']['allowed_users']);
-			$query['col_filter'][] = 'allowed_users = ' . $GLOBALS['egw']->db->quote(',,');
+			$query['col_filter'][] = 'allowed_users = '.$GLOBALS['egw']->db->quote(',,');
 		}
 		$bodefinitions = new importexport_definitions_bo($query['col_filter'], true);
 		// We don't care about readonlys for the UI
@@ -448,7 +448,7 @@ 
 	 */
 	function edit()
 	{
-		if(!$_definition = $_GET['definition'])
+		if (!$_definition = $_GET['definition'])
 		{
 			$content = array(
 				'edit'		=> true,
@@ -457,11 +457,11 @@ 
 			);
 
 			// Jump to a step
-			if($_GET['step'])
+			if ($_GET['step'])
 			{
 				$content['edit'] = false;
 				// Wizard will process previous step, then advance
-				$content['step'] = $this->get_step($_GET['step'],-1);
+				$content['step'] = $this->get_step($_GET['step'], -1);
 				$content['button']['next'] = 'pressed';
 				$this->wizard($content);
 			}
@@ -472,7 +472,7 @@ 
 			}
 			return;
 		}
-		if(is_numeric($_GET['definition']))
+		if (is_numeric($_GET['definition']))
 		{
 			$definition = (int)$_GET['definition'];
 		}
@@ -484,31 +484,31 @@ 
 		$definition = $bodefinitions->read($definition);
 		$definition['edit'] = true;
 		// Jump to a step
-		if($_GET['step'])
+		if ($_GET['step'])
 		{
 			$definition['edit'] = false;
 			// Wizard will process previous step, then advance
-			$definition['step'] = $_GET['step'];;
+			$definition['step'] = $_GET['step']; ;
 			$definition['button'] = array('next' => 'pressed');
 		}
 		$this->wizard($definition);
 	}
 
-	function wizard($content = null, $msg='')
+	function wizard($content = null, $msg = '')
 	{
 		$this->etpl->read('importexport.wizardbox');
 
-		if(is_array($content) &&! $content['edit'])
+		if (is_array($content) && !$content['edit'])
 		{
-			if(self::_debug) error_log('importexport.wizard->$content '. print_r($content,true));
+			if (self::_debug) error_log('importexport.wizard->$content '.print_r($content, true));
 			//foreach($content as $key => $val) error_log(" $key : ".array2string($val));
 			// fetch plugin object
-			if($content['plugin'] && $content['application'])
+			if ($content['plugin'] && $content['application'])
 			{
-				$wizard_name = $content['application'] . '_wizard_' . str_replace($content['application'] . '_', '', $content['plugin']);
+				$wizard_name = $content['application'].'_wizard_'.str_replace($content['application'].'_', '', $content['plugin']);
 
 				// we need to deal with the wizard object if exists
-				if (file_exists(EGW_SERVER_ROOT . '/'. $content['application']."/inc/class.$wizard_name.inc.php"))
+				if (file_exists(EGW_SERVER_ROOT.'/'.$content['application']."/inc/class.$wizard_name.inc.php"))
 				{
 					$wizard_plugin = $wizard_name;
 				}
@@ -517,38 +517,38 @@ 
 					$wizard_plugin = $content['plugin'];
 				}
 				// App translations
-				if($content['application']) Api\Translation::add_app($content['application']);
+				if ($content['application']) Api\Translation::add_app($content['application']);
 
 				$this->plugin = is_object($GLOBALS['egw']->$wizard_plugin) ? $GLOBALS['egw']->$wizard_plugin : new $wizard_plugin;
 
 				// Global object needs to be the same, or references to plugin don't work
-				if(!is_object($GLOBALS['egw']->importexport_definitions_ui) || $GLOBALS['egw']->importexport_definitions_ui !== $this)
-					$GLOBALS['egw']->importexport_definitions_ui =& $this;
+				if (!is_object($GLOBALS['egw']->importexport_definitions_ui) || $GLOBALS['egw']->importexport_definitions_ui !== $this)
+					$GLOBALS['egw']->importexport_definitions_ui = & $this;
 			}
 			// deal with buttons even if we are not on ajax
-			if(isset($content['button']) && array_search('pressed',$content['button']) === false && count($content['button']) == 1)
+			if (isset($content['button']) && array_search('pressed', $content['button']) === false && count($content['button']) == 1)
 			{
 				$button = array_keys($content['button']);
 				$content['button'] = array($button[0] => 'pressed');
 			}
 
 			// post process submitted step
-			if($content['step'])
+			if ($content['step'])
 			{
-				if(!$this->can_edit($content))
+				if (!$this->can_edit($content))
 				{
 					// Each step changes definition, reload it
 					$bodefinitions = new importexport_definitions_bo();
 					$definition = $bodefinitions->read($content);
 					$content = $definition + array('step' => $content['step'], 'button' => $content['button']);
 				}
-				if(!key_exists($content['step'],$this->steps))
+				if (!key_exists($content['step'], $this->steps))
 				{
-					$next_step = $this->plugin->{$content['step']}($content,$sel_options,$readonlys,$preserv);
+					$next_step = $this->plugin->{$content['step']}($content, $sel_options, $readonlys, $preserv);
 				}
 				else
 				{
-					$next_step = $this->{$content['step']}($content,$sel_options,$readonlys,$preserv);
+					$next_step = $this->{$content['step']}($content, $sel_options, $readonlys, $preserv);
 				}
 			}
 			else
@@ -560,23 +560,23 @@ 
 			$sel_options = $readonlys = $preserv = array();
 
 			// Disable finish button if required fields are missing
-			if(!$content['name'] || !$content['type'] || !$content['plugin'])
+			if (!$content['name'] || !$content['type'] || !$content['plugin'])
 			{
 				$readonlys['button[finish]'] = true;
 			}
 			do
 			{
-				if(!key_exists($next_step,$this->steps))
+				if (!key_exists($next_step, $this->steps))
 				{
-					$this->wizard_content_template = $this->plugin->$next_step($content,$sel_options,$readonlys,$preserv);
+					$this->wizard_content_template = $this->plugin->$next_step($content, $sel_options, $readonlys, $preserv);
 				}
 				else
 				{
-					$this->wizard_content_template = $this->$next_step($content,$sel_options,$readonlys,$preserv);
+					$this->wizard_content_template = $this->$next_step($content, $sel_options, $readonlys, $preserv);
 				}
-				if($this->wizard_content_template == self::SKIP)
+				if ($this->wizard_content_template == self::SKIP)
 				{
-					if(!key_exists($content['step'],$this->steps))
+					if (!key_exists($content['step'], $this->steps))
 					{
 						$next_step = $this->plugin->{$content['step']}($content);
 					}
@@ -585,9 +585,9 @@ 
 						$next_step = $this->{$content['step']}($content);
 					}
 				}
-			} while($this->wizard_content_template == self::SKIP);
+			} while ($this->wizard_content_template == self::SKIP);
 
-			if(!$this->can_edit($content))
+			if (!$this->can_edit($content))
 			{
 				$readonlys[$this->wizard_content_template] = true;
 				$preserve = $content;
@@ -596,21 +596,21 @@ 
 
 			unset($content['button']);
 			$content['wizard_content'] = $this->wizard_content_template;
-			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard',$content,$sel_options,$readonlys,$preserv,2);
+			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard', $content, $sel_options, $readonlys, $preserv, 2);
 		}
 		else
 		{
 			// initial content
 			$sel_options = $readonlys = $preserv = array();
 			$readonlys['button[previous]'] = true;
-			if($content['edit'])
+			if ($content['edit'])
 			{
 				unset ($content['edit']);
 			}
 
 			$this->wizard_content_template = $this->wizard_step10($content, $sel_options, $readonlys, $preserv);
 
-			if(!$this->can_edit($content))
+			if (!$this->can_edit($content))
 			{
 				$readonlys[$this->wizard_content_template] = true;
 				$preserve = $content;
@@ -618,7 +618,7 @@ 
 			}
 
 			$content['wizard_content'] = $this->wizard_content_template;
-			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard',$content,$sel_options,$readonlys,$preserv,2);
+			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard', $content, $sel_options, $readonlys, $preserv, 2);
 		}
 	}
 
@@ -629,31 +629,31 @@ 
 	 * @param int $step_width
 	 * @return string containing function name of next step
 	 */
-	function get_step ($curr_step, $step_width)
+	function get_step($curr_step, $step_width)
 	{
 		/*if($content['plugin'] && $content['application']&& !is_object($this->plugin))
 		{
 			$plugin_definition =  $this->plugins[$content['application']][$content['plugin']]['definition'];
 			if($plugin_definition) $this->plugin = new $plugin_definition;
 		}*/
-		if(is_object($this->plugin) && is_array($this->plugin->steps))
+		if (is_object($this->plugin) && is_array($this->plugin->steps))
 		{
-			$steps = array_merge($this->steps,$this->plugin->steps);
-			$steps = array_flip($steps); asort($steps);	$steps = array_flip($steps);
+			$steps = array_merge($this->steps, $this->plugin->steps);
+			$steps = array_flip($steps); asort($steps); $steps = array_flip($steps);
 		}
 		else
 		{
 			$steps = $this->steps;
 		}
 		$step_keys = array_keys($steps);
-		$nn = array_search($curr_step,$step_keys)+(int)$step_width;
-		return (key_exists($nn,$step_keys)) ? $step_keys[$nn] : 'wizard_finish';
+		$nn = array_search($curr_step, $step_keys) + (int)$step_width;
+		return (key_exists($nn, $step_keys)) ? $step_keys[$nn] : 'wizard_finish';
 	}
 
 
 	function wizard_step10(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step10->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step10->$content '.print_r($content, true));
 
 		// return from step10
 		if ($content['step'] == 'wizard_step10')
@@ -661,11 +661,11 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $this->get_step($content['step'],1);
+					return $this->get_step($content['step'], 1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step10($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step10($content, $sel_options, $readonlys, $preserv);
 			}
 
 		}
@@ -675,7 +675,7 @@ 
 			$content['text'] = $this->steps['wizard_step10'];
 			foreach ($this->plugins as $appname => $options)
 			{
-				if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+				if ($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
 					$sel_options['application'][$appname] = lang($appname);
 				}
 			}
@@ -691,7 +691,7 @@ 
 	// get plugin
 	function wizard_step20(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.' . get_class($this) . '::wizard_step20->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.'.get_class($this).'::wizard_step20->$content '.print_r($content, true));
 
 		// return from step20
 		if ($content['step'] == 'wizard_step20')
@@ -700,21 +700,21 @@ 
 			{
 				case 'next':
 					// There's no real reason the plugin has to come from any of these, as long as it has a $steps variable
-					if($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv || strpos(get_class($this->plugin), 'import') !== false) {
+					if ($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv || strpos(get_class($this->plugin), 'import') !== false) {
 						$content['type'] = 'import';
-					} elseif($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv || strpos(get_class($this->plugin),'export') !== false) {
+					} elseif ($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv || strpos(get_class($this->plugin), 'export') !== false) {
 						$content['type'] = 'export';
 					} else {
 						throw new Api\Exception('Invalid plugin');
 					}
-					return $this->get_step($content['step'],1);
+					return $this->get_step($content['step'], 1);
 				case 'previous' :
 					$readonlys['button[previous]'] = true;
-					return $this->get_step($content['step'],-1);
+					return $this->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step20($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step20($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step20
@@ -723,8 +723,8 @@ 
 			$content['text'] = $this->steps['wizard_step20'];
 			$config = Api\Config::read('phpgwapi');
 			foreach ($this->plugins[$content['application']] as $type => $plugins) {
-				if($config['export_limit'] == 'no' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $type == 'export') continue;
-				foreach($plugins as $plugin => $name) {
+				if ($config['export_limit'] == 'no' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $type == 'export') continue;
+				foreach ($plugins as $plugin => $name) {
 					$sel_options['plugin'][$plugin] = $name;
 				}
 			}
@@ -740,15 +740,15 @@ 
 	// name
 	function wizard_step21(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step21->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step21->$content '.print_r($content, true));
 
 		// Check for duplicate name
 		$duplicate = isset($content['duplicate_error']);
-		if($content['name'] && !$duplicate)
+		if ($content['name'] && !$duplicate)
 		{
 			try {
 				$check_definition = new importexport_definition($content['name']);
-				if($check_definition && $check_definition->definition_id && $check_definition->definition_id != $content['definition_id'])
+				if ($check_definition && $check_definition->definition_id && $check_definition->definition_id != $content['definition_id'])
 				{
 					throw new Exception('Already exists');
 				}
@@ -758,21 +758,21 @@ 
 
 				// Try some suggestions
 				$suggestions = array(
-					$content['name'] .'-'. $GLOBALS['egw_info']['user']['account_lid'],
-					$content['name'] .'-'. $GLOBALS['egw_info']['user']['account_id'],
-					$content['name'] .'-'. Api\DateTime::to('now', true),
+					$content['name'].'-'.$GLOBALS['egw_info']['user']['account_lid'],
+					$content['name'].'-'.$GLOBALS['egw_info']['user']['account_id'],
+					$content['name'].'-'.Api\DateTime::to('now', true),
 					//$content['name'] .'-'. rand(0,100),
 				);
-				foreach($suggestions as $key => $suggestion) {
+				foreach ($suggestions as $key => $suggestion) {
 					$sug_definition = new importexport_definition($suggestion);
-					if($sug_definition->definition_id) {
+					if ($sug_definition->definition_id) {
 						unset($suggestions[$key]);
 					}
 				}
-				if($suggestions) {
-					$content['duplicate_error'] .= '  '. lang('Try')." \n" . implode("\n", $suggestions);
+				if ($suggestions) {
+					$content['duplicate_error'] .= '  '.lang('Try')." \n".implode("\n", $suggestions);
 				}
-				return $this->get_step($content['step'],0);
+				return $this->get_step($content['step'], 0);
 			}
 		}
 
@@ -782,19 +782,19 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $this->get_step($content['step'],1);
+					return $this->get_step($content['step'], 1);
 				case 'previous' :
-					return $this->get_step($content['step'],-1);
+					return $this->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step21($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step21($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step21
 		else
 		{
-			$content['text'] = $this->steps['wizard_step21'] . ($duplicate ? "\n".$content['duplicate_error'] : '');
+			$content['text'] = $this->steps['wizard_step21'].($duplicate ? "\n".$content['duplicate_error'] : '');
 			$content['step'] = 'wizard_step21';
 			unset($content['duplicate_error']);
 			$preserv = $content;
@@ -806,17 +806,16 @@ 
 	// allowed users
 	function wizard_step90(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step90->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step90->$content '.print_r($content, true));
 
 		// return from step90
 		if ($content['step'] == 'wizard_step90')
 		{
-			if($this->can_edit($content))
+			if ($this->can_edit($content))
 			{
-				$content['owner'] = $content['just_me'] || !$GLOBALS['egw']->acl->check('share_definitions', Acl::READ,'importexport') ?
-					($content['owner'] ? $content['owner'] : $GLOBALS['egw_info']['user']['account_id']) :
-					null;
-				$content['allowed_users'] = $content['just_me'] ? '' : ($content['all_users'] ? 'all' : implode(',',$content['allowed_users']));
+				$content['owner'] = $content['just_me'] || !$GLOBALS['egw']->acl->check('share_definitions', Acl::READ, 'importexport') ?
+					($content['owner'] ? $content['owner'] : $GLOBALS['egw_info']['user']['account_id']) : null;
+				$content['allowed_users'] = $content['just_me'] ? '' : ($content['all_users'] ? 'all' : implode(',', $content['allowed_users']));
 				unset($content['just_me']);
 			}
 
@@ -824,12 +823,12 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'previous' :
-					return $this->get_step($content['step'],-1);
+					return $this->get_step($content['step'], -1);
 				case 'next':
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step90($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step90($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step90
@@ -840,10 +839,10 @@ 
 			$preserv = $content;
 
 			// Set owner for non-admins
-			$content['just_me'] = ((!$content['allowed_users'] || !$content['allowed_users'][0] && count($content['allowed_users']) ==1) && $content['owner']);
-			$content['all_users'] = is_array($content['allowed_users']) && array_key_exists('0',$content['allowed_users']) && $content['allowed_users'][0] == 'all' ||
+			$content['just_me'] = ((!$content['allowed_users'] || !$content['allowed_users'][0] && count($content['allowed_users']) == 1) && $content['owner']);
+			$content['all_users'] = is_array($content['allowed_users']) && array_key_exists('0', $content['allowed_users']) && $content['allowed_users'][0] == 'all' ||
 			$content['allowed_users'] == 'all';
-			if(!$GLOBALS['egw']->acl->check('share_definition', Acl::READ, 'importexport') && !$GLOBALS['egw_info']['user']['apps']['admin'])
+			if (!$GLOBALS['egw']->acl->check('share_definition', Acl::READ, 'importexport') && !$GLOBALS['egw_info']['user']['apps']['admin'])
 			{
 				$content['allowed_users'] = array();
 				$readonlys['allowed_users'] = true;
@@ -859,11 +858,11 @@ 
 				)
 			);
 			// Hide 'just me' checkbox, users get confused by read-only
-			if($readonlys['just_me'] || !$this->can_edit($content))
+			if ($readonlys['just_me'] || !$this->can_edit($content))
 			{
 				$content['no_just_me'] = true;
 			}
-			if($readonlys['all_users'] || !$this->can_edit($content))
+			if ($readonlys['all_users'] || !$this->can_edit($content))
 			{
 				$content['no_all_users'] = true;
 			}
@@ -876,7 +875,7 @@ 
 
 	function wizard_finish(&$content)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_finish->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_finish->$content '.print_r($content, true));
 		// Take out some UI leavings
 		unset($content['text']);
 		unset($content['step']);
@@ -886,26 +885,26 @@ 
 		$bodefinitions->save($content);
 		// This message is displayed if browser cant close window
 		$content['msg'] = lang('ImportExport wizard finished successfully!');
-		Framework::refresh_opener('','importexport');
+		Framework::refresh_opener('', 'importexport');
 		Framework::window_close();
 		return 'importexport.wizard_close';
 	}
 
-	function import_definition($content='')
+	function import_definition($content = '')
 	{
 		$bodefinitions = new importexport_definitions_bo();
 		if (is_array($content))
 		{
-			if($content['import_file']['tmp_name'])
+			if ($content['import_file']['tmp_name'])
 			{
 				$result = $bodefinitions->import($content['import_file']['tmp_name']);
-				$msg = lang('%1 definitions %2', count($result), lang('imported')) ."\n". implode("\n", array_keys($result));
+				$msg = lang('%1 definitions %2', count($result), lang('imported'))."\n".implode("\n", array_keys($result));
 				return $this->index(null, $msg);
 			}
-			if($content['update'])
+			if ($content['update'])
 			{
 				$applist = importexport_helper_functions::get_apps('all', true);
-				foreach($applist as $appname) {
+				foreach ($applist as $appname) {
 					importexport_helper_functions::load_defaults($appname);
 				}
 				return $this->index();
@@ -915,7 +914,7 @@ 
 		{
 			$content = array();
 			$etpl = new etemplate(self::_appname.'.import_definition');
-			return $etpl->exec(self::_appname.'.importexport_definitions_ui.import_definition',$content,array(),$readonlys,$preserv);
+			return $etpl->exec(self::_appname.'.importexport_definitions_ui.import_definition', $content, array(), $readonlys, $preserv);
 		}
 	}
 
@@ -925,17 +924,17 @@ 
 	 */
 	protected function can_edit(Array $definition)
 	{
-		if($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'])
+		if ($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'])
 		{
 			// Definition belongs to user
 			return true;
 		}
-		elseif($definition['definition_id'] && !$definition['owner'] && $GLOBALS['egw_info']['user']['apps']['admin'])
+		elseif ($definition['definition_id'] && !$definition['owner'] && $GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			// Definition is unowned, and user is an admin
 			return true;
 		}
-		elseif(!$definition['definition_id'])
+		elseif (!$definition['definition_id'])
 		{
 			// Definition is in-progress, not saved yet
 			return true;

Braces +112 added lines, -42 removed lines

@@ -81,14 +81,18 @@ 
 	{
 		$filter = array('name' => '*');
 
-		if($GLOBALS['egw_info']['user']['apps']['admin']) {
+		if($GLOBALS['egw_info']['user']['apps']['admin'])
+		{
 			// Any public definition
 			$filter[] = '(owner=0 OR owner IS NULL OR allowed_users IS NOT NULL OR owner = ' . $GLOBALS['egw_info']['user']['account_id'] . ')';
-		} else {
+		}
+		else
+		{
 			// Filter private definitions
 			$filter['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			$config = Api\Config::read('phpgwapi');
-			if($config['export_limit'] == 'no' && !Api\Storage\Merge::is_export_limit_excepted()) {
+			if($config['export_limit'] == 'no' && !Api\Storage\Merge::is_export_limit_excepted())
+			{
 				$filter['type'] = 'import';
 			}
 		}
@@ -104,7 +108,10 @@ 
 			elseif(($button = array_search('pressed',$content['nm']['rows'])) !== false)
 			{
 				$selected = $content['nm']['rows']['selected'];
-				if(count($selected) < 1 || !is_array($selected)) exit();
+				if(count($selected) < 1 || !is_array($selected))
+				{
+					exit();
+				}
 				switch ($button)
 				{
 					case 'delete_selected' :
@@ -160,7 +167,8 @@ 
 			}
 		}
 
-		if(!is_array($content['nm'])) {
+		if(!is_array($content['nm']))
+		{
 			$content['nm'] = array(
 				'get_rows'	=> 'importexport.importexport_definitions_ui.get_rows',
 				'no_cat'	=> true,
@@ -171,7 +179,10 @@ 
 				'row_id'	=> 'definition_id',
 				'placeholder_actions' => array('add')
 			);
-			if($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
+			if($_GET['application'])
+			{
+				$content['nm']['col_filter']['application'] = $_GET['application'];
+			}
 		}
 		if(Api\Cache::getSession('importexport', 'index'))
 		{
@@ -190,17 +201,22 @@ 
 		);
 		foreach ($this->plugins as $appname => $options)
 		{
-			if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+			if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin'])
+			{
 				$sel_options['application'][$appname] = lang($appname);
 			}
 		}
-		if($msg) $content['msg'] = $msg;
+		if($msg)
+		{
+			$content['msg'] = $msg;
+		}
 
 		$etpl = new Etemplate(self::_appname.'.definition_index');
 		return $etpl->exec( self::_appname.'.importexport_definitions_ui.index', $content, $sel_options, $readonlys, $preserv );
 	}
 
-	private function get_actions() {
+	private function get_actions()
+	{
 		$group = 0;
 		$actions = array(
 			'edit' => array(
@@ -319,7 +335,8 @@ 
 			$this->get_rows($query,$rows,$readonlys);
 
 			$selected = array();
-			foreach($rows as $row) {
+			foreach($rows as $row)
+			{
 				$selected[] = $row['definition_id'];
 			}
 			if(!is_array($session_name))
@@ -334,18 +351,24 @@ 
 
 		$bodefinitions = new importexport_definitions_bo(false, true);
 
-		switch($action) {
+		switch($action)
+		{
 			case 'allowed':
 				// Field is allowed_users, popup doesn't like _
 				$action = 'allowed_users';
 				// Fall through
 			case 'owner':
 				$action_msg = lang('changed'. ' ' . $action);
-				foreach($selected as $id) {
+				foreach($selected as $id)
+				{
 					$definition = $bodefinitions->read((int)$id);
-					if($definition['definition_id']) {
+					if($definition['definition_id'])
+					{
 						// Prevent private with no owner
-						if(!$definition['owner'] && !$settings) $definition['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+						if(!$definition['owner'] && !$settings)
+						{
+							$definition['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+						}
 
 						$definition[$action] = $settings;
 						$bodefinitions->save($definition);
@@ -372,18 +395,22 @@ 
 			case 'copy':
 				$action_msg = lang('copied');
 				// Should only be one selected
-				foreach($selected as $id) {
+				foreach($selected as $id)
+				{
 					$definition = $bodefinitions->read((int)$id);
-					if($definition['definition_id']) {
+					if($definition['definition_id'])
+					{
 						unset($definition['definition_id']);
 						$definition['name'] = $settings ? $settings : $definition['name'] . ' copy';
 						try {
 							$bodefinitions->save($definition);
-						} catch (Exception $e) {
+						}
+						catch (Exception $e) {
 							try {
 								$definition['name'] .= ' ' . $GLOBALS['egw_info']['user']['account_lid'];
 								$bodefinitions->save($definition);
-							} catch (Exception $ex) {
+							}
+							catch (Exception $ex) {
 								$failed++;
 								$msg .= lang('Duplicate name, please choose another.');
 								continue;
@@ -396,18 +423,21 @@ 
 			case 'createexport':
 				$action_msg = lang('created');
 				// Should only be one selected
-				foreach($selected as $id) {
+				foreach($selected as $id)
+				{
 					$definition = new importexport_definition($id);
 					try {
 						$export = $bodefinitions->export_from_import($definition);
 						$export->save();
-					} catch (Exception $e) {
+					}
+					catch (Exception $e) {
 						if($export)
 						{
 							try {
 								$export->name = $export->name.' ' . $GLOBALS['egw_info']['user']['account_lid'];
 								$export->save();
-							} catch (Exception $ex) {
+							}
+							catch (Exception $ex) {
 								$failed++;
 								$msg .= lang('Duplicate name, please choose another.');
 								continue;
@@ -425,7 +455,8 @@ 
 		return !$failed;
 	}
 
-	public function get_rows(&$query, &$rows, &$readonlys) {
+	public function get_rows(&$query, &$rows, &$readonlys)
+	{
 		$rows = array();
 		Api\Cache::setSession('importexport', 'index', $query);
 
@@ -500,7 +531,10 @@ 
 
 		if(is_array($content) &&! $content['edit'])
 		{
-			if(self::_debug) error_log('importexport.wizard->$content '. print_r($content,true));
+			if(self::_debug)
+			{
+				error_log('importexport.wizard->$content '. print_r($content,true));
+			}
 			//foreach($content as $key => $val) error_log(" $key : ".array2string($val));
 			// fetch plugin object
 			if($content['plugin'] && $content['application'])
@@ -517,13 +551,18 @@ 
 					$wizard_plugin = $content['plugin'];
 				}
 				// App translations
-				if($content['application']) Api\Translation::add_app($content['application']);
+				if($content['application'])
+				{
+					Api\Translation::add_app($content['application']);
+				}
 
 				$this->plugin = is_object($GLOBALS['egw']->$wizard_plugin) ? $GLOBALS['egw']->$wizard_plugin : new $wizard_plugin;
 
 				// Global object needs to be the same, or references to plugin don't work
 				if(!is_object($GLOBALS['egw']->importexport_definitions_ui) || $GLOBALS['egw']->importexport_definitions_ui !== $this)
-					$GLOBALS['egw']->importexport_definitions_ui =& $this;
+				{
+									$GLOBALS['egw']->importexport_definitions_ui =& $this;
+				}
 			}
 			// deal with buttons even if we are not on ajax
 			if(isset($content['button']) && array_search('pressed',$content['button']) === false && count($content['button']) == 1)
@@ -653,7 +692,10 @@ 
 
 	function wizard_step10(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step10->$content '.print_r($content,true));
+		if(self::_debug)
+		{
+			error_log('importexport.importexport_definitions_ui::wizard_step10->$content '.print_r($content,true));
+		}
 
 		// return from step10
 		if ($content['step'] == 'wizard_step10')
@@ -675,7 +717,8 @@ 
 			$content['text'] = $this->steps['wizard_step10'];
 			foreach ($this->plugins as $appname => $options)
 			{
-				if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+				if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin'])
+				{
 					$sel_options['application'][$appname] = lang($appname);
 				}
 			}
@@ -691,7 +734,10 @@ 
 	// get plugin
 	function wizard_step20(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.' . get_class($this) . '::wizard_step20->$content '.print_r($content,true));
+		if(self::_debug)
+		{
+			error_log('importexport.' . get_class($this) . '::wizard_step20->$content '.print_r($content,true));
+		}
 
 		// return from step20
 		if ($content['step'] == 'wizard_step20')
@@ -700,11 +746,16 @@ 
 			{
 				case 'next':
 					// There's no real reason the plugin has to come from any of these, as long as it has a $steps variable
-					if($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv || strpos(get_class($this->plugin), 'import') !== false) {
+					if($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv || strpos(get_class($this->plugin), 'import') !== false)
+					{
 						$content['type'] = 'import';
-					} elseif($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv || strpos(get_class($this->plugin),'export') !== false) {
+					}
+					elseif($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv || strpos(get_class($this->plugin),'export') !== false)
+					{
 						$content['type'] = 'export';
-					} else {
+					}
+					else
+					{
 						throw new Api\Exception('Invalid plugin');
 					}
 					return $this->get_step($content['step'],1);
@@ -722,9 +773,14 @@ 
 		{
 			$content['text'] = $this->steps['wizard_step20'];
 			$config = Api\Config::read('phpgwapi');
-			foreach ($this->plugins[$content['application']] as $type => $plugins) {
-				if($config['export_limit'] == 'no' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $type == 'export') continue;
-				foreach($plugins as $plugin => $name) {
+			foreach ($this->plugins[$content['application']] as $type => $plugins)
+			{
+				if($config['export_limit'] == 'no' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $type == 'export')
+				{
+					continue;
+				}
+				foreach($plugins as $plugin => $name)
+				{
 					$sel_options['plugin'][$plugin] = $name;
 				}
 			}
@@ -740,7 +796,10 @@ 
 	// name
 	function wizard_step21(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step21->$content '.print_r($content,true));
+		if(self::_debug)
+		{
+			error_log('importexport.importexport_definitions_ui::wizard_step21->$content '.print_r($content,true));
+		}
 
 		// Check for duplicate name
 		$duplicate = isset($content['duplicate_error']);
@@ -752,7 +811,8 @@ 
 				{
 					throw new Exception('Already exists');
 				}
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 			//		throw new Exception('Already exists');
 				$content['duplicate_error'] = lang('Duplicate name, please choose another.');
 
@@ -763,13 +823,16 @@ 
 					$content['name'] .'-'. Api\DateTime::to('now', true),
 					//$content['name'] .'-'. rand(0,100),
 				);
-				foreach($suggestions as $key => $suggestion) {
+				foreach($suggestions as $key => $suggestion)
+				{
 					$sug_definition = new importexport_definition($suggestion);
-					if($sug_definition->definition_id) {
+					if($sug_definition->definition_id)
+					{
 						unset($suggestions[$key]);
 					}
 				}
-				if($suggestions) {
+				if($suggestions)
+				{
 					$content['duplicate_error'] .= '  '. lang('Try')." \n" . implode("\n", $suggestions);
 				}
 				return $this->get_step($content['step'],0);
@@ -806,7 +869,10 @@ 
 	// allowed users
 	function wizard_step90(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step90->$content '.print_r($content,true));
+		if(self::_debug)
+		{
+			error_log('importexport.importexport_definitions_ui::wizard_step90->$content '.print_r($content,true));
+		}
 
 		// return from step90
 		if ($content['step'] == 'wizard_step90')
@@ -876,7 +942,10 @@ 
 
 	function wizard_finish(&$content)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_finish->$content '.print_r($content,true));
+		if(self::_debug)
+		{
+			error_log('importexport.importexport_definitions_ui::wizard_finish->$content '.print_r($content,true));
+		}
 		// Take out some UI leavings
 		unset($content['text']);
 		unset($content['step']);
@@ -905,7 +974,8 @@ 
 			if($content['update'])
 			{
 				$applist = importexport_helper_functions::get_apps('all', true);
-				foreach($applist as $appname) {
+				foreach($applist as $appname)
+				{
 					importexport_helper_functions::load_defaults($appname);
 				}
 				return $this->index();

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

Braces +178 added lines, -70 removed lines

@@ -98,22 +98,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 Api\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(!Api\Storage\Merge::is_export_limit_excepted()) {
+		if(!Api\Storage\Merge::is_export_limit_excepted())
+		{
 			$this->export_limit = Api\Storage\Merge::getExportLimit($_options['appname']);
 			//error_log(__METHOD__.__LINE__.' app:'.$_options['appname'].' limit:'.$this->export_limit);
-			if($this->export_limit == 'no') throw new Api\Exception\NoPermission\Admin('Export disabled');
+			if($this->export_limit == 'no')
+			{
+				throw new Api\Exception\NoPermission\Admin('Export disabled');
+			}
 		}
 	}
 	
@@ -122,15 +132,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 = Api\Storage\Customfields::get($_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;
 			}
 		}
@@ -143,7 +157,8 @@ 
 	 *
 	 * @param array $_conversion
 	 */
-	public function set_conversion( array $_conversion) {
+	public function set_conversion( array $_conversion)
+	{
 		$this->conversion = $_conversion;
 	}
 	
@@ -153,16 +168,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'])
@@ -180,11 +202,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) {
 						Api\Translation::add_app($appname);
-						foreach($this->mapping as $field => &$label) {
+						foreach($this->mapping as $field => &$label)
+						{
 							$label = lang($label);
 						}
 					}
@@ -195,20 +222,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];
 			}
 		}
@@ -222,7 +253,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function get_num_of_records() {
+	public function get_num_of_records()
+	{
 		return $this->num_of_records;
 	}
 
@@ -236,14 +268,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 = Api\Storage\Customfields::get($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;
@@ -254,7 +292,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;
 					}
@@ -269,7 +308,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'];
 					}
@@ -288,9 +328,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);
 			}
@@ -299,7 +342,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;
@@ -307,8 +353,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]);
 				}
@@ -316,16 +364,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 = is_string($record->$name) ? explode(',', $record->$name) : $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]);
 				}
 			}
@@ -334,9 +388,12 @@ 
 				$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 = 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']);
@@ -355,16 +412,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[] = Api\Accounts::username($_name);
 					}
 					$record->$name = implode(', ', $names);
-				} else {
+				}
+				else
+				{
 					$record->$name = Api\Accounts::username($record->$name);
 				}
 			}
@@ -373,23 +436,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)
 		{
@@ -397,7 +486,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 != '')
@@ -413,17 +505,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 Api\Categories(false,$appname);
-		foreach((array)$fields['select-cat'] as $name) {
-			if($record->$name) {
+		if(is_null($cat_object))
+		{
+			$cat_object = new Api\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(Acl::READ,$cat_id))
 					{
@@ -444,7 +546,8 @@ 
 	 *
 	 * @return
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		
 	}
 
@@ -457,11 +560,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;
 		}

Spacing +77 added lines, -77 removed lines

@@ -98,22 +98,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 Api\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(!Api\Storage\Merge::is_export_limit_excepted()) {
+		if (!Api\Storage\Merge::is_export_limit_excepted()) {
 			$this->export_limit = Api\Storage\Merge::getExportLimit($_options['appname']);
 			//error_log(__METHOD__.__LINE__.' app:'.$_options['appname'].' limit:'.$this->export_limit);
-			if($this->export_limit == 'no') throw new Api\Exception\NoPermission\Admin('Export disabled');
+			if ($this->export_limit == 'no') throw new Api\Exception\NoPermission\Admin('Export disabled');
 		}
 	}
 	
@@ -122,15 +122,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 = Api\Storage\Customfields::get($_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;
 			}
 		}
@@ -143,7 +143,7 @@ 
 	 *
 	 * @param array $_conversion
 	 */
-	public function set_conversion( array $_conversion) {
+	public function set_conversion(array $_conversion) {
 		$this->conversion = $_conversion;
 	}
 	
@@ -153,59 +153,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) {
 						Api\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) {
@@ -213,7 +213,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++;
 	}
 
@@ -237,13 +237,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 = Api\Storage\Customfields::get($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;
@@ -254,7 +254,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;
 					}
@@ -268,8 +268,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'];
 					}
@@ -289,17 +289,17 @@ 
 	 * @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]) {
+		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;
@@ -307,8 +307,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]);
 				}
@@ -316,12 +316,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 = is_string($record->$name) ? explode(',', $record->$name) : $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);
@@ -334,18 +334,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 = 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 = Link::title($links[$name], $record->$name);
 				}
-				else if ( is_array($record->$name) && $record->$name['app'] && $record->$name['id'])
+				else if (is_array($record->$name) && $record->$name['app'] && $record->$name['id'])
 				{
 					$record->$name = Link::title($record->$name['app'], $record->$name['id']);
 				}
@@ -355,12 +355,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[] = Api\Accounts::username($_name);
 					}
 					$record->$name = implode(', ', $names);
@@ -373,64 +373,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 Api\Categories(false,$appname);
-		foreach((array)$fields['select-cat'] as $name) {
-			if($record->$name) {
+		if (is_null($cat_object)) $cat_object = new Api\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(Acl::READ,$cat_id))
+					if ($cat_id && $cat_object->check_perms(Acl::READ, $cat_id))
 					{
 						$cats[] = $cat_object->id2name($cat_id);
 					}
 				}
-				$record->$name = implode(', ',$cats);
+				$record->$name = implode(', ', $cats);
 			}
 			else
 			{
@@ -457,18 +457,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);
 			

importexport/inc/class.importexport_helper_functions.inc.php

Doc Comments +4 added lines, -3 removed lines

@@ -123,7 +123,7 @@ 
 	/**
 	 * converts accound_lid to account_id
 	 *
-	 * @param mixed $_account_lid comma seperated list or array with lids
+	 * @param mixed $_account_lids comma seperated list or array with lids
 	 * @return mixed comma seperated list or array with ids
 	 */
 	public static function account_name2id( &$_account_lids ) {
@@ -203,7 +203,7 @@ 
 	/**
 	 * converts account_ids to account_lids
 	 *
-	 * @param mixed $_account_ids comma seperated list or array with ids
+	 * @param mixed $_account_id comma seperated list or array with ids
 	 * @return mixed comma seperated list or array with lids
 	 */
 	public static function account_id2name( $_account_id ) {
@@ -419,7 +419,7 @@ 
 	/**
 	 * returns a list of importexport plugins
 	 *
-	 * @param string $_tpye {import | export | all}
+	 * @param string $_type {import | export | all}
 	 * @param string $_appname {<appname> | all}
 	 * @return array(<appname> => array( <type> => array(<plugin> => <title>)))
 	 */
@@ -591,6 +591,7 @@ 
 	 *
 	 * @param $app_name String name of app
 	 * @param $plugin_name Name of the plugin
+	 * @param importexport_wizard_basic_export_csv $wizard_plugin
 	 *
 	 * @return Array ([fieldname] => array(widget settings), ...)
 	 */

Indentation +21 added lines, -21 removed lines

@@ -32,25 +32,25 @@ 
 	 * Relative date ranges for filtering
 	 */
 	public static $relative_dates = array(      // Start: year,month,day,week, End: year,month,day,week
-                'Today'       => array(0,0,0,0,  0,0,1,0),
-                'Yesterday'   => array(0,0,-1,0, 0,0,0,0),
-                'This week'   => array(0,0,0,0,  0,0,0,1),
-                'Last week'   => array(0,0,0,-1, 0,0,0,0),
-                'This month'  => array(0,0,0,0,  0,1,0,0),
-                'Last month'  => array(0,-1,0,0, 0,0,0,0),
-                'Last 3 months' => array(0,-3,0,0, 0,0,0,0),
-                'This quarter'=> array(0,0,0,0,  0,0,0,0),      // Just a marker, needs special handling
-                'Last quarter'=> array(0,-4,0,0, 0,-4,0,0),     // Just a marker
-                'This year'   => array(0,0,0,0,  1,0,0,0),
-                'Last year'   => array(-1,0,0,0, 0,0,0,0),
-                '2 years ago' => array(-2,0,0,0, -1,0,0,0),
-                '3 years ago' => array(-3,0,0,0, -2,0,0,0),
-        );
+				'Today'       => array(0,0,0,0,  0,0,1,0),
+				'Yesterday'   => array(0,0,-1,0, 0,0,0,0),
+				'This week'   => array(0,0,0,0,  0,0,0,1),
+				'Last week'   => array(0,0,0,-1, 0,0,0,0),
+				'This month'  => array(0,0,0,0,  0,1,0,0),
+				'Last month'  => array(0,-1,0,0, 0,0,0,0),
+				'Last 3 months' => array(0,-3,0,0, 0,0,0,0),
+				'This quarter'=> array(0,0,0,0,  0,0,0,0),      // Just a marker, needs special handling
+				'Last quarter'=> array(0,-4,0,0, 0,-4,0,0),     // Just a marker
+				'This year'   => array(0,0,0,0,  1,0,0,0),
+				'Last year'   => array(-1,0,0,0, 0,0,0,0),
+				'2 years ago' => array(-2,0,0,0, -1,0,0,0),
+				'3 years ago' => array(-3,0,0,0, -2,0,0,0),
+		);
 
 	/**
-	* Files known to cause problems, and will be skipped in a plugin scan
-	* If you put appname => true, the whole app will be skipped.
-	*/
+	 * Files known to cause problems, and will be skipped in a plugin scan
+	 * If you put appname => true, the whole app will be skipped.
+	 */
 	protected static $blacklist_files = array(
 		'api' => true,
 		'etemplate' => true,
@@ -64,10 +64,10 @@ 
 	);
 
 	/**
-	* Class used to provide extra conversion functions
-	*
-	* Passed in as a param to conversion()
-	*/
+	 * Class used to provide extra conversion functions
+	 *
+	 * Passed in as a param to conversion()
+	 */
 	protected static $cclass = null;
 
 	/**

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

@@ -445,7 +445,7 @@ 
 		return $plugins;
 	}
 
-	public static function _get_plugins(Array $appnames, Array $types) {
+	public static function _get_plugins(array $appnames, array $types) {
 		$plugins = array();
 		foreach ($appnames as $appname) {
 			if(array_key_exists($appname, self::$blacklist_files) && self::$blacklist_files[$appname] === true) continue;
@@ -562,7 +562,7 @@ 
 	}
 
 	// Api\Cache needs this public
-	public static function _has_definitions(Array $appnames, Array $types) {
+	public static function _has_definitions(array $appnames, array $types) {
 		$def = new importexport_definitions_bo(array('application'=>$appnames, 'type' => $types));
 		$list = array();
 		foreach((array)$def->get_definitions() as $id) {

Spacing +188 added lines, -188 removed lines

@@ -32,19 +32,19 @@ 
 	 * Relative date ranges for filtering
 	 */
 	public static $relative_dates = array(      // Start: year,month,day,week, End: year,month,day,week
-                'Today'       => array(0,0,0,0,  0,0,1,0),
-                'Yesterday'   => array(0,0,-1,0, 0,0,0,0),
-                'This week'   => array(0,0,0,0,  0,0,0,1),
-                'Last week'   => array(0,0,0,-1, 0,0,0,0),
-                'This month'  => array(0,0,0,0,  0,1,0,0),
-                'Last month'  => array(0,-1,0,0, 0,0,0,0),
-                'Last 3 months' => array(0,-3,0,0, 0,0,0,0),
-                'This quarter'=> array(0,0,0,0,  0,0,0,0),      // Just a marker, needs special handling
-                'Last quarter'=> array(0,-4,0,0, 0,-4,0,0),     // Just a marker
-                'This year'   => array(0,0,0,0,  1,0,0,0),
-                'Last year'   => array(-1,0,0,0, 0,0,0,0),
-                '2 years ago' => array(-2,0,0,0, -1,0,0,0),
-                '3 years ago' => array(-3,0,0,0, -2,0,0,0),
+                'Today'       => array(0, 0, 0, 0, 0, 0, 1, 0),
+                'Yesterday'   => array(0, 0, -1, 0, 0, 0, 0, 0),
+                'This week'   => array(0, 0, 0, 0, 0, 0, 0, 1),
+                'Last week'   => array(0, 0, 0, -1, 0, 0, 0, 0),
+                'This month'  => array(0, 0, 0, 0, 0, 1, 0, 0),
+                'Last month'  => array(0, -1, 0, 0, 0, 0, 0, 0),
+                'Last 3 months' => array(0, -3, 0, 0, 0, 0, 0, 0),
+                'This quarter'=> array(0, 0, 0, 0, 0, 0, 0, 0), // Just a marker, needs special handling
+                'Last quarter'=> array(0, -4, 0, 0, 0, -4, 0, 0), // Just a marker
+                'This year'   => array(0, 0, 0, 0, 1, 0, 0, 0),
+                'Last year'   => array(-1, 0, 0, 0, 0, 0, 0, 0),
+                '2 years ago' => array(-2, 0, 0, 0, -1, 0, 0, 0),
+                '3 years ago' => array(-3, 0, 0, 0, -2, 0, 0, 0),
         );
 
 	/**
@@ -85,22 +85,22 @@ 
 	 * @param string $_format format of time string e.g.: d.m.Y H:i
 	 * @param int $_is_dst is day light saving time? 0 = no, 1 = yes, -1 = system default
 	 */
-	public static function custom_strtotime( $_string, $_format='', $_is_dst = -1) {
-		if ( empty( $_format ) ) return strtotime( $_string );
-		$fparams = explode( ',', chunk_split( $_format, 1, ',' ) );
+	public static function custom_strtotime($_string, $_format = '', $_is_dst = -1) {
+		if (empty($_format)) return strtotime($_string);
+		$fparams = explode(',', chunk_split($_format, 1, ','));
 		$spos = 0;
-		foreach ( $fparams as $fparam ) {
-
-			switch ( $fparam ) {
-				case 'd': (int)$day = substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'm': (int)$mon = substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'y': (int)$year = substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'Y': (int)$year = substr( $_string, $spos, 4 ); $spos += 4; break;
-				case 'H': (int)$hour = substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'h': (int)$hour = substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'i': (int)$min =  substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 's': (int)$sec =  substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'O': (int)$offset = $year = substr( $_string, $spos, 5 ); $spos += 5; break;
+		foreach ($fparams as $fparam) {
+
+			switch ($fparam) {
+				case 'd': (int)$day = substr($_string, $spos, 2); $spos += 2; break;
+				case 'm': (int)$mon = substr($_string, $spos, 2); $spos += 2; break;
+				case 'y': (int)$year = substr($_string, $spos, 2); $spos += 2; break;
+				case 'Y': (int)$year = substr($_string, $spos, 4); $spos += 4; break;
+				case 'H': (int)$hour = substr($_string, $spos, 2); $spos += 2; break;
+				case 'h': (int)$hour = substr($_string, $spos, 2); $spos += 2; break;
+				case 'i': (int)$min = substr($_string, $spos, 2); $spos += 2; break;
+				case 's': (int)$sec = substr($_string, $spos, 2); $spos += 2; break;
+				case 'O': (int)$offset = $year = substr($_string, $spos, 5); $spos += 5; break;
 				case 'a': (int)$hour = $fparam == 'am' ? $hour : $hour + 12; break;
 				case 'A': (int)$hour = $fparam == 'AM' ? $hour : $hour + 12; break;
 				default: $spos++; // seperator
@@ -111,11 +111,11 @@ 
 		$timestamp = mktime($hour, $min, $sec, $mon, $day, $year, $_is_dst);
 
 		// offset given?
-		if ( isset( $offset ) && strlen( $offset == 5 ) ) {
+		if (isset($offset) && strlen($offset == 5)) {
 			$operator = $offset{0};
-			$ohour = 60 * 60 * (int)substr( $offset, 1, 2 );
-			$omin = 60 * (int)substr( $offset, 3, 2 );
-			if ( $operator == '+' ) $timestamp += $ohour + $omin;
+			$ohour = 60 * 60 * (int)substr($offset, 1, 2);
+			$omin = 60 * (int)substr($offset, 3, 2);
+			if ($operator == '+') $timestamp += $ohour + $omin;
 			else $timestamp -= $ohour + $omin;
 		}
 		return $timestamp;
@@ -126,11 +126,11 @@ 
 	 * @param mixed $_account_lid comma seperated list or array with lids
 	 * @return mixed comma seperated list or array with ids
 	 */
-	public static function account_name2id( &$_account_lids ) {
-		$account_lids = is_array( $_account_lids ) ? $_account_lids : explode( ',', $_account_lids );
+	public static function account_name2id(&$_account_lids) {
+		$account_lids = is_array($_account_lids) ? $_account_lids : explode(',', $_account_lids);
 		$skip = false;
-		foreach ( $account_lids as $key => $account_lid ) {
-			if($skip) {
+		foreach ($account_lids as $key => $account_lid) {
+			if ($skip) {
 				unset($account_lids[$key]);
 				$skip = false;
 				continue;
@@ -138,15 +138,15 @@ 
 			$account_lid = trim($account_lid);
 
 			// Handle any IDs that slip in
-			if(is_numeric($account_lid) && $GLOBALS['egw']->accounts->id2name($account_lid)) {
+			if (is_numeric($account_lid) && $GLOBALS['egw']->accounts->id2name($account_lid)) {
 				unset($account_lids[$key]);
 				$account_ids[] = (int)$account_lid;
 				continue;
 			}
 			// Check for [username]
-			if(strpos($account_lid,'[') !== false)
+			if (strpos($account_lid, '[') !== false)
 			{
-				if(preg_match('/\[(.+)\]/',$account_lid,$matches))
+				if (preg_match('/\[(.+)\]/', $account_lid, $matches))
 				{
 					$account_id = $GLOBALS['egw']->accounts->name2id($matches[1]);
 					unset($account_lids[$key]);
@@ -157,59 +157,59 @@ 
 
 			// Handle users listed as Lastname, Firstname instead of login ID
 			// Do this first, in case their first name matches a username
-			if ( $account_lids[$key+1][0] == ' ')
+			if ($account_lids[$key + 1][0] == ' ')
 			{
 				$query = array('type' => 'accounts', 'query_type' => 'exact');
-				$given = $GLOBALS['egw']->accounts->search($query + array('query' => trim($account_lids[$key+1])));
+				$given = $GLOBALS['egw']->accounts->search($query + array('query' => trim($account_lids[$key + 1])));
 				$family = $GLOBALS['egw']->accounts->search($query + array('query' => trim($account_lid)));
 				$ids = array_intersect_key($family, $given);
-				if($ids)
+				if ($ids)
 				{
 					$account_ids[] = key($ids);
 					unset($account_lids[$key]);
 					$skip = true; // Skip the next one, it's the first name
-					continue ;
+					continue;
 				}
 			}
 
 			// Deal with groups listed as <name> Group, remove the Group
-			if(substr(trim($account_lid),-strlen(lang('Group'))) == lang('Group'))
+			if (substr(trim($account_lid), -strlen(lang('Group'))) == lang('Group'))
 			{
 				$account_lid = trim(substr(trim($account_lid), 0, -strlen(lang('Group'))));
 			}
 			// Group <name> (no comma)
-			else if(strpos($account_lid, lang('Group')) === 0)
+			else if (strpos($account_lid, lang('Group')) === 0)
 			{
 				$account_lid = trim(substr(trim($account_lid), strlen(lang('Group'))));
 			}
 
-			if ( $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid )) {
+			if ($account_id = $GLOBALS['egw']->accounts->name2id($account_lid)) {
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				continue;
 			}
-			if ( $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lid), 'account_fullname' )) {
+			if ($account_id = $GLOBALS['egw']->accounts->name2id(trim($account_lid), 'account_fullname')) {
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				continue;
 			}
 
 			// Handle groups listed as Group, <name>
-			if ( $account_lids[$key][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid)) {
+			if ($account_lids[$key][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id($account_lid)) {
 				$account_ids[] = $account_id;
-				unset($account_lids[$key-1]);
+				unset($account_lids[$key - 1]);
 				unset($account_lids[$key]);
 				continue;
 			}
 			// Group, <name> - remove the Group part
-			if($account_lid == lang('Group'))
+			if ($account_lid == lang('Group'))
 			{
 				unset($account_lids[$key]);
 				continue;
 			}
 		}
-		$_account_lids = (is_array($_account_lids) ? $account_lids : implode(',',array_unique($account_lids)));
-		return is_array( $_account_lids ) ? array_unique($account_ids) : implode( ',', array_unique((array)$account_ids ));
+		$_account_lids = (is_array($_account_lids) ? $account_lids : implode(',', array_unique($account_lids)));
+		return is_array($_account_lids) ? array_unique($account_ids) : implode(',', array_unique((array)$account_ids));
 
 	} // end of member function account_lid2id
 
@@ -219,14 +219,14 @@ 
 	 * @param mixed $_account_ids comma seperated list or array with ids
 	 * @return mixed comma seperated list or array with lids
 	 */
-	public static function account_id2name( $_account_id ) {
-		$account_ids = is_array( $_account_id ) ? $_account_id : explode( ',', $_account_id );
-		foreach ( $account_ids as $account_id ) {
-			if ( $account_lid = $GLOBALS['egw']->accounts->id2name( $account_id )) {
+	public static function account_id2name($_account_id) {
+		$account_ids = is_array($_account_id) ? $_account_id : explode(',', $_account_id);
+		foreach ($account_ids as $account_id) {
+			if ($account_lid = $GLOBALS['egw']->accounts->id2name($account_id)) {
 				$account_lids[] = $account_lid;
 			}
 		}
-		return is_array( $_account_id ) ? $account_lids : implode( ',', (array)$account_lids );
+		return is_array($_account_id) ? $account_lids : implode(',', (array)$account_lids);
 	} // end of member function account_id2lid
 
 	/**
@@ -235,12 +235,12 @@ 
 	 * @param mixed _cat_ids comma seperated list or array
 	 * @return mixed comma seperated list or array with cat_names
 	 */
-	public static function cat_id2name( $_cat_ids ) {
-		$cat_ids = is_array( $_cat_ids ) ? $_cat_ids : explode( ',', $_cat_ids );
-		foreach ( $cat_ids as $cat_id ) {
-			$cat_names[] = Api\Categories::id2name( (int)$cat_id );
+	public static function cat_id2name($_cat_ids) {
+		$cat_ids = is_array($_cat_ids) ? $_cat_ids : explode(',', $_cat_ids);
+		foreach ($cat_ids as $cat_id) {
+			$cat_names[] = Api\Categories::id2name((int)$cat_id);
 		}
-		return is_array( $_cat_ids ) ? $cat_names : implode(',',(array)$cat_names);
+		return is_array($_cat_ids) ? $cat_names : implode(',', (array)$cat_names);
 	} // end of member function category_id2name
 
 	/**
@@ -251,24 +251,24 @@ 
 	 * @param int $parent Optional parent ID to use for new categories
 	 * @return mixed comma seperated list or array with cat_ids
 	 */
-	public static function cat_name2id( $_cat_names, $parent = 0 ) {
-		$cats = new Api\Categories();	// uses current user and app (egw_info[flags][currentapp])
+	public static function cat_name2id($_cat_names, $parent = 0) {
+		$cats = new Api\Categories(); // uses current user and app (egw_info[flags][currentapp])
 
-		$cat_names = is_array( $_cat_names ) ? $_cat_names : explode( ',', $_cat_names );
-		foreach ( $cat_names as $cat_name ) {
+		$cat_names = is_array($_cat_names) ? $_cat_names : explode(',', $_cat_names);
+		foreach ($cat_names as $cat_name) {
 			$cat_name = trim($cat_name);
-			if ( $cat_name == '' ) continue;
-			if ( ( $cat_id = $cats->name2id( $cat_name ) ) == 0 && !self::$dry_run) {
-				$cat_id = $cats->add( array(
+			if ($cat_name == '') continue;
+			if (($cat_id = $cats->name2id($cat_name)) == 0 && !self::$dry_run) {
+				$cat_id = $cats->add(array(
 					'name' => $cat_name,
 					'parent' => $parent,
 					'access' => 'public',
-					'descr' => $cat_name. ' ('. lang('Automatically created by importexport'). ')'
+					'descr' => $cat_name.' ('.lang('Automatically created by importexport').')'
 				));
 			}
 			$cat_ids[] = $cat_id;
 		}
-		return is_array( $_cat_names ) ? $cat_ids : implode( ',', (array)$cat_ids );
+		return is_array($_cat_names) ? $cat_ids : implode(',', (array)$cat_ids);
 
 	} // end of member function category_name2id
 
@@ -307,76 +307,76 @@ 
 	 * @param object &$cclass calling class to process the '@ evals'
 	 * @return bool
 	 */
-	public static function conversion( &$_record,  $_conversion, &$_cclass = null ) {
-		if (empty( $_conversion ) ) return $_record;
+	public static function conversion(&$_record, $_conversion, &$_cclass = null) {
+		if (empty($_conversion)) return $_record;
 
-		self::$cclass =& $_cclass;
+		self::$cclass = & $_cclass;
 
 		$PSep = '||'; // Pattern-Separator, separats the pattern-replacement-pairs in conversion
 		$ASep = '|>'; // Assignment-Separator, separats pattern and replacesment
-		$CPre = '|['; $CPos = ']';  // |[_record-idx] is expanded to the corespondig value
+		$CPre = '|['; $CPos = ']'; // |[_record-idx] is expanded to the corespondig value
 		$TPre = '|T{'; $TPos = '}'; // |{_record-idx} is trimmed
-		$CntlPre = '|TC{';		    // Filter all cntl-chars \x01-\x1f and trim
-		$CntlnCLPre  = '|TCnCL{';   // Like |C{ but allowes CR and LF
-		$INE = '|INE{';             // Only insert if stuff in ^^ is not empty
+		$CntlPre = '|TC{'; // Filter all cntl-chars \x01-\x1f and trim
+		$CntlnCLPre = '|TCnCL{'; // Like |C{ but allowes CR and LF
+		$INE = '|INE{'; // Only insert if stuff in ^^ is not empty
 
-		foreach ( $_conversion as $idx => $conversion_string ) {
-			if ( empty( $conversion_string ) ) continue;
+		foreach ($_conversion as $idx => $conversion_string) {
+			if (empty($conversion_string)) continue;
 
 			// fetch patterns ($rvalues)
 			$rvalues = array();
-			$pat_reps = explode( $PSep, stripslashes( $conversion_string ) );
-			foreach( $pat_reps as $k => $pat_rep ) {
-				list( $pattern, $replace ) = explode( $ASep, $pat_rep, 2 );
-				if( $replace == '' ) {
+			$pat_reps = explode($PSep, stripslashes($conversion_string));
+			foreach ($pat_reps as $k => $pat_rep) {
+				list($pattern, $replace) = explode($ASep, $pat_rep, 2);
+				if ($replace == '') {
 					$replace = $pattern; $pattern = '^.*$';
 				}
-				$rvalues[$pattern] = $replace;	// replace two with only one, added by the form
+				$rvalues[$pattern] = $replace; // replace two with only one, added by the form
 			}
 
 			// conversion list may be longer than $_record aka (no_csv)
-			$val = array_key_exists( $idx, $_record ) ? $_record[$idx] : '';
+			$val = array_key_exists($idx, $_record) ? $_record[$idx] : '';
 
 			$c_functions = array('cat', 'account', 'strtotime', 'list');
-			if($_cclass) {
+			if ($_cclass) {
 				// Add in additional methods
 				$reflection = new ReflectionClass(get_class($_cclass));
 				$methods = $reflection->getMethods(ReflectionMethod::IS_STATIC);
-				foreach($methods as $method) {
+				foreach ($methods as $method) {
 					$c_functions[] = $method->name;
 				}
 			}
 			$c_functions = implode('|', $c_functions);
-			foreach ( $rvalues as $pattern => $replace ) {
+			foreach ($rvalues as $pattern => $replace) {
 				// Allow to include record indexes in pattern
 				$reg = '/\|\[([0-9]+)\]/';
-				while( preg_match( $reg, $pattern, $vars ) ) {
+				while (preg_match($reg, $pattern, $vars)) {
 					// expand all _record fields
 					$pattern = str_replace(
-						$CPre . $vars[1] . $CPos,
+						$CPre.$vars[1].$CPos,
 						$_record[array_search($vars[1], array_keys($_record))],
 						$pattern
 					);
 				}
-				if( preg_match('/'. (string)$pattern.'/', $val) ) {
+				if (preg_match('/'.(string)$pattern.'/', $val)) {
 
-					$val = preg_replace( '/'.(string)$pattern.'/', $replace, (string)$val );
+					$val = preg_replace('/'.(string)$pattern.'/', $replace, (string)$val);
 
 					$reg = '/\|\[([a-zA-Z_0-9]+)\]/';
-					while( preg_match( $reg, $val, $vars ) ) {
+					while (preg_match($reg, $val, $vars)) {
 						// expand all _record fields
 						$val = str_replace(
-							$CPre . $vars[1] . $CPos,
+							$CPre.$vars[1].$CPos,
 							$_record[array_search($vars[1], array_keys($_record))],
 							$val
 						);
 					}
-					$val = preg_replace_callback( "/($c_functions)\(([^)]*)\)/i", array( self, 'c2_dispatcher') , $val );
+					$val = preg_replace_callback("/($c_functions)\(([^)]*)\)/i", array(self, 'c2_dispatcher'), $val);
 					break;
 				}
 			}
 			// clean each field
-			$val = preg_replace_callback("/(\|T\{|\|TC\{|\|TCnCL\{|\|INE\{)(.*)\}/", array( self, 'strclean'), $val );
+			$val = preg_replace_callback("/(\|T\{|\|TC\{|\|TCnCL\{|\|INE\{)(.*)\}/", array(self, 'strclean'), $val);
 
 			$_record[$idx] = $val;
 		}
@@ -390,42 +390,42 @@ 
 	 *
 	 * @param array $_matches
 	 */
-	private static function c2_dispatcher( $_matches ) {
+	private static function c2_dispatcher($_matches) {
 		$action = &$_matches[1]; // cat or account ...
-		$data = &$_matches[2];   // datas for action
+		$data = &$_matches[2]; // datas for action
 
-		switch ( $action ) {
+		switch ($action) {
 			case 'strtotime' :
-				list( $string, $format ) = explode( ',', $data );
-				return self::custom_strtotime( trim( $string ), trim( $format ) );
+				list($string, $format) = explode(',', $data);
+				return self::custom_strtotime(trim($string), trim($format));
 			case 'list':
-				list( $split, $data, $index) = explode(',',$data);
+				list($split, $data, $index) = explode(',', $data);
 				$exploded = explode($split, $data);
 				// 1 based indexing for user ease
 				return $exploded[$index - 1];
 			default :
-				if(self::$cclass && method_exists(self::$cclass, $action)) {
+				if (self::$cclass && method_exists(self::$cclass, $action)) {
 					$class = get_class(self::$cclass);
 					return call_user_func("$class::$action", $data);
 				}
-				$method = (string)$action. ( is_int( $data ) ? '_id2name' : '_name2id' );
-				if(self::$cclass && method_exists(self::$cclass, $method)) {
+				$method = (string)$action.(is_int($data) ? '_id2name' : '_name2id');
+				if (self::$cclass && method_exists(self::$cclass, $method)) {
 					$class = get_class(self::$cclass);
 					return call_user_func("$class::$action", $data);
 				} else {
-					return self::$method( $data );
+					return self::$method($data);
 				}
 		}
 	}
 
-	private static function strclean( $_matches ) {
-		switch( $_matches[1] ) {
-			case '|T{' : return trim( $_matches[2] );
-			case '|TC{' : return trim( preg_replace( '/[\x01-\x1F]+/', '', $_matches[2] ) );
-			case '|TCnCL{' : return trim( preg_replace( '/[\x01-\x09\x11\x12\x14-\x1F]+/', '', $_matches[2] ) );
-			case '|INE{' : return preg_match( '/\^.+\^/', $_matches[2] ) ? $_matches[2] : '';
+	private static function strclean($_matches) {
+		switch ($_matches[1]) {
+			case '|T{' : return trim($_matches[2]);
+			case '|TC{' : return trim(preg_replace('/[\x01-\x1F]+/', '', $_matches[2]));
+			case '|TCnCL{' : return trim(preg_replace('/[\x01-\x09\x11\x12\x14-\x1F]+/', '', $_matches[2]));
+			case '|INE{' : return preg_match('/\^.+\^/', $_matches[2]) ? $_matches[2] : '';
 			default:
-				throw new Exception('Error in conversion string! "'. substr( $_matches[1], 0, -1 ). '" is not valid!');
+				throw new Exception('Error in conversion string! "'.substr($_matches[1], 0, -1).'" is not valid!');
 		}
 	}
 
@@ -436,23 +436,23 @@ 
 	 * @param string $_appname {<appname> | all}
 	 * @return array(<appname> => array( <type> => array(<plugin> => <title>)))
 	 */
-	public static function get_plugins( $_appname = 'all', $_type = 'all' ) {
+	public static function get_plugins($_appname = 'all', $_type = 'all') {
 		$plugins = Api\Cache::getTree(
 			__CLASS__,
 			'plugins',
-			array('importexport_helper_functions','_get_plugins'),
+			array('importexport_helper_functions', '_get_plugins'),
 			array(array_keys($GLOBALS['egw_info']['apps']), array('import', 'export')),
 			self::CACHE_EXPIRATION
 		);
 		$appnames = $_appname == 'all' ? array_keys($GLOBALS['egw_info']['apps']) : (array)$_appname;
-		$types = $_type == 'all' ? array('import','export') : (array)$_type;
+		$types = $_type == 'all' ? array('import', 'export') : (array)$_type;
 
 		// Testing: comment out Api\Cache call, use this
 		//$plugins = self::_get_plugins($appnames, $types);
-		foreach($plugins as $appname => $_types) {
-			if(!in_array($appname, $appnames)) unset($plugins[$appname]);
+		foreach ($plugins as $appname => $_types) {
+			if (!in_array($appname, $appnames)) unset($plugins[$appname]);
 		}
-		foreach($plugins as $appname => $types) {
+		foreach ($plugins as $appname => $types) {
 			$plugins[$appname] = array_intersect_key($plugins[$appname], $types);
 		}
 		return $plugins;
@@ -461,25 +461,25 @@ 
 	public static function _get_plugins(Array $appnames, Array $types) {
 		$plugins = array();
 		foreach ($appnames as $appname) {
-			if(array_key_exists($appname, self::$blacklist_files) && self::$blacklist_files[$appname] === true) continue;
+			if (array_key_exists($appname, self::$blacklist_files) && self::$blacklist_files[$appname] === true) continue;
 
-			$appdir = EGW_INCLUDE_ROOT. "/$appname/inc";
-			if(!is_dir($appdir)) continue;
+			$appdir = EGW_INCLUDE_ROOT."/$appname/inc";
+			if (!is_dir($appdir)) continue;
 			$d = dir($appdir);
 
 			// step through each file in appdir
 			while (false !== ($entry = $d->read())) {
 				// Blacklisted?
-				if(is_array(self::$blacklist_files[$appname]) && in_array($entry, self::$blacklist_files[$appname]))  continue;
+				if (is_array(self::$blacklist_files[$appname]) && in_array($entry, self::$blacklist_files[$appname]))  continue;
 				if (!preg_match('/^class\.([^.]+)\.inc\.php$/', $entry, $matches)) continue;
 				$classname = $matches[1];
-				$file = $appdir. '/'. $entry;
+				$file = $appdir.'/'.$entry;
 
 				foreach ($types as $type) {
-					if( !is_file($file) || strpos($entry, $type) === false || strpos($entry,'wizard') !== false) continue;
+					if (!is_file($file) || strpos($entry, $type) === false || strpos($entry, 'wizard') !== false) continue;
 					require_once($file);
 					$reflectionClass = new ReflectionClass($classname);
-					if($reflectionClass->IsInstantiable() &&
+					if ($reflectionClass->IsInstantiable() &&
 							$reflectionClass->implementsInterface('importexport_iface_'.$type.'_plugin')) {
 						try {
 							$plugin_object = new $classname;
@@ -495,7 +495,7 @@ 
 			$d->close();
 
 			$config = Api\Config::read('importexport');
-			if($config['update'] == 'auto') {
+			if ($config['update'] == 'auto') {
 				self::load_defaults($appname);
 			}
 		}
@@ -510,37 +510,37 @@ 
 	 * @return array $num => $appname
 	 */
 	public static function get_apps($_type, $ignore_acl = false) {
-		$apps = array_keys(self::get_plugins('all',$_type));
-		if($ignore_acl) return $apps;
+		$apps = array_keys(self::get_plugins('all', $_type));
+		if ($ignore_acl) return $apps;
 
-		foreach($apps as $key => $app) {
-			if(!self::has_definitions($app, $_type)) unset($apps[$key]);
+		foreach ($apps as $key => $app) {
+			if (!self::has_definitions($app, $_type)) unset($apps[$key]);
 		}
 		return $apps;
 	}
 
 	public static function load_defaults($appname) {
 		// Check for new definitions to import from $appname/setup/*.xml
-		$appdir = EGW_INCLUDE_ROOT. "/$appname/setup";
-		if(!is_dir($appdir)) return;
+		$appdir = EGW_INCLUDE_ROOT."/$appname/setup";
+		if (!is_dir($appdir)) return;
 		$d = dir($appdir);
 
 		// step through each file in app's setup
 		while (false !== ($entry = $d->read())) {
-			$file = $appdir. '/'. $entry;
-			list( $filename, $extension) = explode('.',$entry);
-			if ( $extension != 'xml' ) continue;
+			$file = $appdir.'/'.$entry;
+			list($filename, $extension) = explode('.', $entry);
+			if ($extension != 'xml') continue;
 			try {
 				// import will skip invalid files
-				importexport_definitions_bo::import( $file );
+				importexport_definitions_bo::import($file);
 			} catch (Exception $e) {
-				error_log(__CLASS__.__FUNCTION__. " import $appname definitions: " . $e->getMessage());
+				error_log(__CLASS__.__FUNCTION__." import $appname definitions: ".$e->getMessage());
 			}
 		}
 		$d->close();
 	}
 
-	public static function guess_filetype( $_file ) {
+	public static function guess_filetype($_file) {
 
 	}
 
@@ -551,24 +551,24 @@ 
 	 * @param string $_type {import | export | all}
 	 * @return boolean
 	 */
-	public static function has_definitions( $_appname = 'all', $_type = 'all' ) {
+	public static function has_definitions($_appname = 'all', $_type = 'all') {
 		$definitions = Api\Cache::getSession(
 			__CLASS__,
 			'has_definitions',
-			array('importexport_helper_functions','_has_definitions'),
+			array('importexport_helper_functions', '_has_definitions'),
 			array(array_keys($GLOBALS['egw_info']['apps']), array('import', 'export')),
 			self::CACHE_EXPIRATION
 		);
 		$appnames = $_appname == 'all' ? array_keys($GLOBALS['egw_info']['apps']) : (array)$_appname;
-		$types = $_type == 'all' ? array('import','export') : (array)$_type;
+		$types = $_type == 'all' ? array('import', 'export') : (array)$_type;
 
 		// Testing: Comment out cache call above, use this
 		//$definitions = self::_has_definitions($appnames, $types);
 
-		foreach($definitions as $appname => $_types) {
-			if(!in_array($appname, $appnames)) unset($definitions[$appname]);
+		foreach ($definitions as $appname => $_types) {
+			if (!in_array($appname, $appnames)) unset($definitions[$appname]);
 		}
-		foreach($definitions as $appname => $_types) {
+		foreach ($definitions as $appname => $_types) {
 			$definitions[$appname] = array_intersect_key($definitions[$appname], array_flip($types));
 		}
 		return !empty($definitions[$appname]);
@@ -578,11 +578,11 @@ 
 	public static function _has_definitions(Array $appnames, Array $types) {
 		$def = new importexport_definitions_bo(array('application'=>$appnames, 'type' => $types));
 		$list = array();
-		foreach((array)$def->get_definitions() as $id) {
+		foreach ((array)$def->get_definitions() as $id) {
 			// Need to instanciate it to check, but if the user doesn't have permission, it throws an exception
 			try {
 				$definition = new importexport_definition($id);
-				if($def->is_permitted($definition->get_record_array())) {
+				if ($def->is_permitted($definition->get_record_array())) {
 					$list[$definition->application][$definition->type][] = $id;
 				}
 			} catch (Exception $e) {
@@ -614,13 +614,13 @@ 
 			$plugin = is_object($plugin_name) ? $plugin_name : new $plugin_name();
 			$plugin_name = get_class($plugin);
 
-			if($record_classname == null) $record_classname = $plugin::get_egw_record_class();
-			if(!class_exists($record_classname)) throw new Exception('Bad class name ' . $record_classname);
+			if ($record_classname == null) $record_classname = $plugin::get_egw_record_class();
+			if (!class_exists($record_classname)) throw new Exception('Bad class name '.$record_classname);
 
-			if(!$wizard_plugin)
+			if (!$wizard_plugin)
 			{
-				$wizard_name = $app_name . '_wizard_' . str_replace($app_name . '_', '', $plugin_name);
-				if(!class_exists($wizard_name)) throw new Exception('Bad wizard name ' . $wizard_name);
+				$wizard_name = $app_name.'_wizard_'.str_replace($app_name.'_', '', $plugin_name);
+				if (!class_exists($wizard_name)) throw new Exception('Bad wizard name '.$wizard_name);
 				$wizard_plugin = new $wizard_name;
 			}
 		}
@@ -632,16 +632,16 @@ 
 
 		// Get field -> label map and initialize fields using wizard field order
 		$fields = $export_fields = array();
-		if(method_exists($wizard_plugin, 'get_export_fields'))
+		if (method_exists($wizard_plugin, 'get_export_fields'))
 		{
 			$fields = $export_fields = $wizard_plugin->get_export_fields();
 		}
 
-		foreach($record_classname::$types as $type => $type_fields)
+		foreach ($record_classname::$types as $type => $type_fields)
 		{
 			// Only these for now, until filter methods for others are figured out
-			if(!in_array($type, array('select','select-cat','select-account','date','date-time'))) continue;
-			foreach($type_fields as $field_name)
+			if (!in_array($type, array('select', 'select-cat', 'select-account', 'date', 'date-time'))) continue;
+			foreach ($type_fields as $field_name)
 			{
 				$fields[$field_name] = array(
 					'name' => $field_name,
@@ -652,21 +652,21 @@ 
 		}
 		// Add custom fields
 		$custom = Api\Storage\Customfields::get($app_name);
-		foreach($custom as $field_name => $settings)
+		foreach ($custom as $field_name => $settings)
 		{
 			$settings['name'] = '#'.$field_name;
 			$fields['#'.$field_name] = $settings;
 		}
 
-		foreach($fields as $field_name => &$settings) {
+		foreach ($fields as $field_name => &$settings) {
 			// Can't really filter on these (or at least no generic, sane way figured out yet)
-			if(!is_array($settings) || in_array($settings['type'], array('text','button', 'label','url','url-email','url-phone','htmlarea')))
+			if (!is_array($settings) || in_array($settings['type'], array('text', 'button', 'label', 'url', 'url-email', 'url-phone', 'htmlarea')))
 			{
 				unset($fields[$field_name]);
 				continue;
 			}
-			if($settings['type'] == 'radio') $settings['type'] = 'select';
-			switch($settings['type'])
+			if ($settings['type'] == 'radio') $settings['type'] = 'select';
+			switch ($settings['type'])
 			{
 				case 'checkbox':
 					// This isn't quite right - there's only 2 options and you can select both
@@ -689,7 +689,7 @@ 
 			}
 		}
 
-		if(method_exists($plugin, 'get_filter_fields'))
+		if (method_exists($plugin, 'get_filter_fields'))
 		{
 			$plugin->get_filter_fields($fields);
 		}
@@ -705,65 +705,65 @@ 
 	 */
 	public static function date_rel2abs($value)
 	{
-		if(is_array($value))
+		if (is_array($value))
 		{
 			$abs = array();
-			foreach($value as $key => $val)
+			foreach ($value as $key => $val)
 			{
 				$abs[$key] = self::date_rel2abs($val);
 			}
 			return $abs;
 		}
-		if($date = self::$relative_dates[$value])
+		if ($date = self::$relative_dates[$value])
 		{
-			$year  = (int) date('Y');
-			$month = (int) date('m');
-			$day   = (int) date('d');
-			$today = mktime(0,0,0,date('m'),date('d'),date('Y'));
+			$year  = (int)date('Y');
+			$month = (int)date('m');
+			$day   = (int)date('d');
+			$today = mktime(0, 0, 0, date('m'), date('d'), date('Y'));
 
-			list($syear,$smonth,$sday,$sweek,$eyear,$emonth,$eday,$eweek) = $date;
+			list($syear, $smonth, $sday, $sweek, $eyear, $emonth, $eday, $eweek) = $date;
 
-			if(stripos($value, 'quarter') !== false)
+			if (stripos($value, 'quarter') !== false)
 			{
 				// Handle quarters
-				$start = mktime(0,0,0,((int)floor(($smonth+$month) / 3.1)) * 3 + 1, 1, $year);
-				$end = mktime(0,0,0,((int)floor(($emonth+$month) / 3.1)+1) * 3 + 1, 1, $year);
+				$start = mktime(0, 0, 0, ((int)floor(($smonth + $month) / 3.1)) * 3 + 1, 1, $year);
+				$end = mktime(0, 0, 0, ((int)floor(($emonth + $month) / 3.1) + 1) * 3 + 1, 1, $year);
 			}
 			elseif ($syear || $eyear)
 			{
-				$start = mktime(0,0,0,1,1,$syear+$year);
-				$end   = mktime(0,0,0,1,1,$eyear+$year);
+				$start = mktime(0, 0, 0, 1, 1, $syear + $year);
+				$end   = mktime(0, 0, 0, 1, 1, $eyear + $year);
 			}
 			elseif ($smonth || $emonth)
 			{
-				$start = mktime(0,0,0,$smonth+$month,1,$year);
-				$end   = mktime(0,0,0,$emonth+$month,1,$year);
+				$start = mktime(0, 0, 0, $smonth + $month, 1, $year);
+				$end   = mktime(0, 0, 0, $emonth + $month, 1, $year);
 			}
 			elseif ($sday || $eday)
 			{
-				$start = mktime(0,0,0,$month,$sday+$day,$year);
-				$end   = mktime(0,0,0,$month,$eday+$day,$year);
+				$start = mktime(0, 0, 0, $month, $sday + $day, $year);
+				$end   = mktime(0, 0, 0, $month, $eday + $day, $year);
 			}
 			elseif ($sweek || $eweek)
 			{
-				$wday = (int) date('w'); // 0=sun, ..., 6=sat
-				switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
+				$wday = (int)date('w'); // 0=sun, ..., 6=sat
+				switch ($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
 				{
 					case 'Sunday':
-						$weekstart = $today - $wday * 24*60*60;
+						$weekstart = $today - $wday * 24 * 60 * 60;
 						break;
 					case 'Saturday':
-						$weekstart = $today - (6-$wday) * 24*60*60;
+						$weekstart = $today - (6 - $wday) * 24 * 60 * 60;
 						break;
 					case 'Moday':
 					default:
-						$weekstart = $today - ($wday ? $wday-1 : 6) * 24*60*60;
+						$weekstart = $today - ($wday ? $wday - 1 : 6) * 24 * 60 * 60;
 						break;
 				}
-				$start = $weekstart + $sweek*7*24*60*60;
-				$end   = $weekstart + $eweek*7*24*60*60;
+				$start = $weekstart + $sweek * 7 * 24 * 60 * 60;
+				$end   = $weekstart + $eweek * 7 * 24 * 60 * 60;
 			}
-			$end_param = $end - 24*60*60;
+			$end_param = $end - 24 * 60 * 60;
 
 			// Take 1 second off end to provide an inclusive range.for filtering
 			$end -= 1;

Braces +208 added lines, -82 removed lines

@@ -16,7 +16,8 @@ 
  * class importexport_helper_functions (only static methods)
  * use importexport_helper_functions::method
  */
-class importexport_helper_functions {
+class importexport_helper_functions
+{
 
 	/**
 	 * Plugins are scanned and cached for all instances using this source path for given time (in seconds)
@@ -85,13 +86,19 @@ 
 	 * @param string $_format format of time string e.g.: d.m.Y H:i
 	 * @param int $_is_dst is day light saving time? 0 = no, 1 = yes, -1 = system default
 	 */
-	public static function custom_strtotime( $_string, $_format='', $_is_dst = -1) {
-		if ( empty( $_format ) ) return strtotime( $_string );
+	public static function custom_strtotime( $_string, $_format='', $_is_dst = -1)
+	{
+		if ( empty( $_format ) )
+		{
+			return strtotime( $_string );
+		}
 		$fparams = explode( ',', chunk_split( $_format, 1, ',' ) );
 		$spos = 0;
-		foreach ( $fparams as $fparam ) {
+		foreach ( $fparams as $fparam )
+		{
 
-			switch ( $fparam ) {
+			switch ( $fparam )
+			{
 				case 'd': (int)$day = substr( $_string, $spos, 2 ); $spos += 2; break;
 				case 'm': (int)$mon = substr( $_string, $spos, 2 ); $spos += 2; break;
 				case 'y': (int)$year = substr( $_string, $spos, 2 ); $spos += 2; break;
@@ -111,12 +118,18 @@ 
 		$timestamp = mktime($hour, $min, $sec, $mon, $day, $year, $_is_dst);
 
 		// offset given?
-		if ( isset( $offset ) && strlen( $offset == 5 ) ) {
+		if ( isset( $offset ) && strlen( $offset == 5 ) )
+		{
 			$operator = $offset{0};
 			$ohour = 60 * 60 * (int)substr( $offset, 1, 2 );
 			$omin = 60 * (int)substr( $offset, 3, 2 );
-			if ( $operator == '+' ) $timestamp += $ohour + $omin;
-			else $timestamp -= $ohour + $omin;
+			if ( $operator == '+' )
+			{
+				$timestamp += $ohour + $omin;
+			}
+			else {
+				$timestamp -= $ohour + $omin;
+			}
 		}
 		return $timestamp;
 	}
@@ -126,11 +139,14 @@ 
 	 * @param mixed $_account_lid comma seperated list or array with lids
 	 * @return mixed comma seperated list or array with ids
 	 */
-	public static function account_name2id( &$_account_lids ) {
+	public static function account_name2id( &$_account_lids )
+	{
 		$account_lids = is_array( $_account_lids ) ? $_account_lids : explode( ',', $_account_lids );
 		$skip = false;
-		foreach ( $account_lids as $key => $account_lid ) {
-			if($skip) {
+		foreach ( $account_lids as $key => $account_lid )
+		{
+			if($skip)
+			{
 				unset($account_lids[$key]);
 				$skip = false;
 				continue;
@@ -138,7 +154,8 @@ 
 			$account_lid = trim($account_lid);
 
 			// Handle any IDs that slip in
-			if(is_numeric($account_lid) && $GLOBALS['egw']->accounts->id2name($account_lid)) {
+			if(is_numeric($account_lid) && $GLOBALS['egw']->accounts->id2name($account_lid))
+			{
 				unset($account_lids[$key]);
 				$account_ids[] = (int)$account_lid;
 				continue;
@@ -183,19 +200,22 @@ 
 				$account_lid = trim(substr(trim($account_lid), strlen(lang('Group'))));
 			}
 
-			if ( $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid )) {
+			if ( $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid ))
+			{
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				continue;
 			}
-			if ( $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lid), 'account_fullname' )) {
+			if ( $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lid), 'account_fullname' ))
+			{
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				continue;
 			}
 
 			// Handle groups listed as Group, <name>
-			if ( $account_lids[$key][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid)) {
+			if ( $account_lids[$key][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid))
+			{
 				$account_ids[] = $account_id;
 				unset($account_lids[$key-1]);
 				unset($account_lids[$key]);
@@ -219,10 +239,13 @@ 
 	 * @param mixed $_account_ids comma seperated list or array with ids
 	 * @return mixed comma seperated list or array with lids
 	 */
-	public static function account_id2name( $_account_id ) {
+	public static function account_id2name( $_account_id )
+	{
 		$account_ids = is_array( $_account_id ) ? $_account_id : explode( ',', $_account_id );
-		foreach ( $account_ids as $account_id ) {
-			if ( $account_lid = $GLOBALS['egw']->accounts->id2name( $account_id )) {
+		foreach ( $account_ids as $account_id )
+		{
+			if ( $account_lid = $GLOBALS['egw']->accounts->id2name( $account_id ))
+			{
 				$account_lids[] = $account_lid;
 			}
 		}
@@ -235,9 +258,11 @@ 
 	 * @param mixed _cat_ids comma seperated list or array
 	 * @return mixed comma seperated list or array with cat_names
 	 */
-	public static function cat_id2name( $_cat_ids ) {
+	public static function cat_id2name( $_cat_ids )
+	{
 		$cat_ids = is_array( $_cat_ids ) ? $_cat_ids : explode( ',', $_cat_ids );
-		foreach ( $cat_ids as $cat_id ) {
+		foreach ( $cat_ids as $cat_id )
+		{
 			$cat_names[] = Api\Categories::id2name( (int)$cat_id );
 		}
 		return is_array( $_cat_ids ) ? $cat_names : implode(',',(array)$cat_names);
@@ -251,14 +276,20 @@ 
 	 * @param int $parent Optional parent ID to use for new categories
 	 * @return mixed comma seperated list or array with cat_ids
 	 */
-	public static function cat_name2id( $_cat_names, $parent = 0 ) {
+	public static function cat_name2id( $_cat_names, $parent = 0 )
+	{
 		$cats = new Api\Categories();	// uses current user and app (egw_info[flags][currentapp])
 
 		$cat_names = is_array( $_cat_names ) ? $_cat_names : explode( ',', $_cat_names );
-		foreach ( $cat_names as $cat_name ) {
+		foreach ( $cat_names as $cat_name )
+		{
 			$cat_name = trim($cat_name);
-			if ( $cat_name == '' ) continue;
-			if ( ( $cat_id = $cats->name2id( $cat_name ) ) == 0 && !self::$dry_run) {
+			if ( $cat_name == '' )
+			{
+				continue;
+			}
+			if ( ( $cat_id = $cats->name2id( $cat_name ) ) == 0 && !self::$dry_run)
+			{
 				$cat_id = $cats->add( array(
 					'name' => $cat_name,
 					'parent' => $parent,
@@ -307,8 +338,12 @@ 
 	 * @param object &$cclass calling class to process the '@ evals'
 	 * @return bool
 	 */
-	public static function conversion( &$_record,  $_conversion, &$_cclass = null ) {
-		if (empty( $_conversion ) ) return $_record;
+	public static function conversion( &$_record,  $_conversion, &$_cclass = null )
+	{
+		if (empty( $_conversion ) )
+		{
+			return $_record;
+		}
 
 		self::$cclass =& $_cclass;
 
@@ -320,15 +355,21 @@ 
 		$CntlnCLPre  = '|TCnCL{';   // Like |C{ but allowes CR and LF
 		$INE = '|INE{';             // Only insert if stuff in ^^ is not empty
 
-		foreach ( $_conversion as $idx => $conversion_string ) {
-			if ( empty( $conversion_string ) ) continue;
+		foreach ( $_conversion as $idx => $conversion_string )
+		{
+			if ( empty( $conversion_string ) )
+			{
+				continue;
+			}
 
 			// fetch patterns ($rvalues)
 			$rvalues = array();
 			$pat_reps = explode( $PSep, stripslashes( $conversion_string ) );
-			foreach( $pat_reps as $k => $pat_rep ) {
+			foreach( $pat_reps as $k => $pat_rep )
+			{
 				list( $pattern, $replace ) = explode( $ASep, $pat_rep, 2 );
-				if( $replace == '' ) {
+				if( $replace == '' )
+				{
 					$replace = $pattern; $pattern = '^.*$';
 				}
 				$rvalues[$pattern] = $replace;	// replace two with only one, added by the form
@@ -338,19 +379,23 @@ 
 			$val = array_key_exists( $idx, $_record ) ? $_record[$idx] : '';
 
 			$c_functions = array('cat', 'account', 'strtotime', 'list');
-			if($_cclass) {
+			if($_cclass)
+			{
 				// Add in additional methods
 				$reflection = new ReflectionClass(get_class($_cclass));
 				$methods = $reflection->getMethods(ReflectionMethod::IS_STATIC);
-				foreach($methods as $method) {
+				foreach($methods as $method)
+				{
 					$c_functions[] = $method->name;
 				}
 			}
 			$c_functions = implode('|', $c_functions);
-			foreach ( $rvalues as $pattern => $replace ) {
+			foreach ( $rvalues as $pattern => $replace )
+			{
 				// Allow to include record indexes in pattern
 				$reg = '/\|\[([0-9]+)\]/';
-				while( preg_match( $reg, $pattern, $vars ) ) {
+				while( preg_match( $reg, $pattern, $vars ) )
+				{
 					// expand all _record fields
 					$pattern = str_replace(
 						$CPre . $vars[1] . $CPos,
@@ -358,12 +403,14 @@ 
 						$pattern
 					);
 				}
-				if( preg_match('/'. (string)$pattern.'/', $val) ) {
+				if( preg_match('/'. (string)$pattern.'/', $val) )
+				{
 
 					$val = preg_replace( '/'.(string)$pattern.'/', $replace, (string)$val );
 
 					$reg = '/\|\[([a-zA-Z_0-9]+)\]/';
-					while( preg_match( $reg, $val, $vars ) ) {
+					while( preg_match( $reg, $val, $vars ) )
+					{
 						// expand all _record fields
 						$val = str_replace(
 							$CPre . $vars[1] . $CPos,
@@ -390,11 +437,13 @@ 
 	 *
 	 * @param array $_matches
 	 */
-	private static function c2_dispatcher( $_matches ) {
+	private static function c2_dispatcher( $_matches )
+	{
 		$action = &$_matches[1]; // cat or account ...
 		$data = &$_matches[2];   // datas for action
 
-		switch ( $action ) {
+		switch ( $action )
+		{
 			case 'strtotime' :
 				list( $string, $format ) = explode( ',', $data );
 				return self::custom_strtotime( trim( $string ), trim( $format ) );
@@ -404,22 +453,28 @@ 
 				// 1 based indexing for user ease
 				return $exploded[$index - 1];
 			default :
-				if(self::$cclass && method_exists(self::$cclass, $action)) {
+				if(self::$cclass && method_exists(self::$cclass, $action))
+				{
 					$class = get_class(self::$cclass);
 					return call_user_func("$class::$action", $data);
 				}
 				$method = (string)$action. ( is_int( $data ) ? '_id2name' : '_name2id' );
-				if(self::$cclass && method_exists(self::$cclass, $method)) {
+				if(self::$cclass && method_exists(self::$cclass, $method))
+				{
 					$class = get_class(self::$cclass);
 					return call_user_func("$class::$action", $data);
-				} else {
+				}
+				else
+				{
 					return self::$method( $data );
 				}
 		}
 	}
 
-	private static function strclean( $_matches ) {
-		switch( $_matches[1] ) {
+	private static function strclean( $_matches )
+	{
+		switch( $_matches[1] )
+		{
 			case '|T{' : return trim( $_matches[2] );
 			case '|TC{' : return trim( preg_replace( '/[\x01-\x1F]+/', '', $_matches[2] ) );
 			case '|TCnCL{' : return trim( preg_replace( '/[\x01-\x09\x11\x12\x14-\x1F]+/', '', $_matches[2] ) );
@@ -436,7 +491,8 @@ 
 	 * @param string $_appname {<appname> | all}
 	 * @return array(<appname> => array( <type> => array(<plugin> => <title>)))
 	 */
-	public static function get_plugins( $_appname = 'all', $_type = 'all' ) {
+	public static function get_plugins( $_appname = 'all', $_type = 'all' )
+	{
 		$plugins = Api\Cache::getTree(
 			__CLASS__,
 			'plugins',
@@ -449,38 +505,63 @@ 
 
 		// Testing: comment out Api\Cache call, use this
 		//$plugins = self::_get_plugins($appnames, $types);
-		foreach($plugins as $appname => $_types) {
-			if(!in_array($appname, $appnames)) unset($plugins[$appname]);
+		foreach($plugins as $appname => $_types)
+		{
+			if(!in_array($appname, $appnames))
+			{
+				unset($plugins[$appname]);
+			}
 		}
-		foreach($plugins as $appname => $types) {
+		foreach($plugins as $appname => $types)
+		{
 			$plugins[$appname] = array_intersect_key($plugins[$appname], $types);
 		}
 		return $plugins;
 	}
 
-	public static function _get_plugins(Array $appnames, Array $types) {
+	public static function _get_plugins(Array $appnames, Array $types)
+	{
 		$plugins = array();
-		foreach ($appnames as $appname) {
-			if(array_key_exists($appname, self::$blacklist_files) && self::$blacklist_files[$appname] === true) continue;
+		foreach ($appnames as $appname)
+		{
+			if(array_key_exists($appname, self::$blacklist_files) && self::$blacklist_files[$appname] === true)
+			{
+				continue;
+			}
 
 			$appdir = EGW_INCLUDE_ROOT. "/$appname/inc";
-			if(!is_dir($appdir)) continue;
+			if(!is_dir($appdir))
+			{
+				continue;
+			}
 			$d = dir($appdir);
 
 			// step through each file in appdir
-			while (false !== ($entry = $d->read())) {
+			while (false !== ($entry = $d->read()))
+			{
 				// Blacklisted?
-				if(is_array(self::$blacklist_files[$appname]) && in_array($entry, self::$blacklist_files[$appname]))  continue;
-				if (!preg_match('/^class\.([^.]+)\.inc\.php$/', $entry, $matches)) continue;
+				if(is_array(self::$blacklist_files[$appname]) && in_array($entry, self::$blacklist_files[$appname]))
+				{
+					continue;
+				}
+				if (!preg_match('/^class\.([^.]+)\.inc\.php$/', $entry, $matches))
+				{
+					continue;
+				}
 				$classname = $matches[1];
 				$file = $appdir. '/'. $entry;
 
-				foreach ($types as $type) {
-					if( !is_file($file) || strpos($entry, $type) === false || strpos($entry,'wizard') !== false) continue;
+				foreach ($types as $type)
+				{
+					if( !is_file($file) || strpos($entry, $type) === false || strpos($entry,'wizard') !== false)
+					{
+						continue;
+					}
 					require_once($file);
 					$reflectionClass = new ReflectionClass($classname);
 					if($reflectionClass->IsInstantiable() &&
-							$reflectionClass->implementsInterface('importexport_iface_'.$type.'_plugin')) {
+							$reflectionClass->implementsInterface('importexport_iface_'.$type.'_plugin'))
+					{
 						try {
 							$plugin_object = new $classname;
 						}
@@ -495,7 +576,8 @@ 
 			$d->close();
 
 			$config = Api\Config::read('importexport');
-			if($config['update'] == 'auto') {
+			if($config['update'] == 'auto')
+			{
 				self::load_defaults($appname);
 			}
 		}
@@ -509,38 +591,56 @@ 
 	 * @param string $_type
 	 * @return array $num => $appname
 	 */
-	public static function get_apps($_type, $ignore_acl = false) {
+	public static function get_apps($_type, $ignore_acl = false)
+	{
 		$apps = array_keys(self::get_plugins('all',$_type));
-		if($ignore_acl) return $apps;
+		if($ignore_acl)
+		{
+			return $apps;
+		}
 
-		foreach($apps as $key => $app) {
-			if(!self::has_definitions($app, $_type)) unset($apps[$key]);
+		foreach($apps as $key => $app)
+		{
+			if(!self::has_definitions($app, $_type))
+			{
+				unset($apps[$key]);
+			}
 		}
 		return $apps;
 	}
 
-	public static function load_defaults($appname) {
+	public static function load_defaults($appname)
+	{
 		// Check for new definitions to import from $appname/setup/*.xml
 		$appdir = EGW_INCLUDE_ROOT. "/$appname/setup";
-		if(!is_dir($appdir)) return;
+		if(!is_dir($appdir))
+		{
+			return;
+		}
 		$d = dir($appdir);
 
 		// step through each file in app's setup
-		while (false !== ($entry = $d->read())) {
+		while (false !== ($entry = $d->read()))
+		{
 			$file = $appdir. '/'. $entry;
 			list( $filename, $extension) = explode('.',$entry);
-			if ( $extension != 'xml' ) continue;
+			if ( $extension != 'xml' )
+			{
+				continue;
+			}
 			try {
 				// import will skip invalid files
 				importexport_definitions_bo::import( $file );
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				error_log(__CLASS__.__FUNCTION__. " import $appname definitions: " . $e->getMessage());
 			}
 		}
 		$d->close();
 	}
 
-	public static function guess_filetype( $_file ) {
+	public static function guess_filetype( $_file )
+	{
 
 	}
 
@@ -551,7 +651,8 @@ 
 	 * @param string $_type {import | export | all}
 	 * @return boolean
 	 */
-	public static function has_definitions( $_appname = 'all', $_type = 'all' ) {
+	public static function has_definitions( $_appname = 'all', $_type = 'all' )
+	{
 		$definitions = Api\Cache::getSession(
 			__CLASS__,
 			'has_definitions',
@@ -565,27 +666,36 @@ 
 		// Testing: Comment out cache call above, use this
 		//$definitions = self::_has_definitions($appnames, $types);
 
-		foreach($definitions as $appname => $_types) {
-			if(!in_array($appname, $appnames)) unset($definitions[$appname]);
+		foreach($definitions as $appname => $_types)
+		{
+			if(!in_array($appname, $appnames))
+			{
+				unset($definitions[$appname]);
+			}
 		}
-		foreach($definitions as $appname => $_types) {
+		foreach($definitions as $appname => $_types)
+		{
 			$definitions[$appname] = array_intersect_key($definitions[$appname], array_flip($types));
 		}
 		return !empty($definitions[$appname]);
 	}
 
 	// Api\Cache needs this public
-	public static function _has_definitions(Array $appnames, Array $types) {
+	public static function _has_definitions(Array $appnames, Array $types)
+	{
 		$def = new importexport_definitions_bo(array('application'=>$appnames, 'type' => $types));
 		$list = array();
-		foreach((array)$def->get_definitions() as $id) {
+		foreach((array)$def->get_definitions() as $id)
+		{
 			// Need to instanciate it to check, but if the user doesn't have permission, it throws an exception
 			try {
 				$definition = new importexport_definition($id);
-				if($def->is_permitted($definition->get_record_array())) {
+				if($def->is_permitted($definition->get_record_array()))
+				{
 					$list[$definition->application][$definition->type][] = $id;
 				}
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				// That one doesn't work, keep going
 			}
 			$definition = null;
@@ -614,13 +724,22 @@ 
 			$plugin = is_object($plugin_name) ? $plugin_name : new $plugin_name();
 			$plugin_name = get_class($plugin);
 
-			if($record_classname == null) $record_classname = $plugin::get_egw_record_class();
-			if(!class_exists($record_classname)) throw new Exception('Bad class name ' . $record_classname);
+			if($record_classname == null)
+			{
+				$record_classname = $plugin::get_egw_record_class();
+			}
+			if(!class_exists($record_classname))
+			{
+				throw new Exception('Bad class name ' . $record_classname);
+			}
 
 			if(!$wizard_plugin)
 			{
 				$wizard_name = $app_name . '_wizard_' . str_replace($app_name . '_', '', $plugin_name);
-				if(!class_exists($wizard_name)) throw new Exception('Bad wizard name ' . $wizard_name);
+				if(!class_exists($wizard_name))
+				{
+					throw new Exception('Bad wizard name ' . $wizard_name);
+				}
 				$wizard_plugin = new $wizard_name;
 			}
 		}
@@ -640,7 +759,10 @@ 
 		foreach($record_classname::$types as $type => $type_fields)
 		{
 			// Only these for now, until filter methods for others are figured out
-			if(!in_array($type, array('select','select-cat','select-account','date','date-time'))) continue;
+			if(!in_array($type, array('select','select-cat','select-account','date','date-time')))
+			{
+				continue;
+			}
 			foreach($type_fields as $field_name)
 			{
 				$fields[$field_name] = array(
@@ -658,14 +780,18 @@ 
 			$fields['#'.$field_name] = $settings;
 		}
 
-		foreach($fields as $field_name => &$settings) {
+		foreach($fields as $field_name => &$settings)
+		{
 			// Can't really filter on these (or at least no generic, sane way figured out yet)
 			if(!is_array($settings) || in_array($settings['type'], array('text','button', 'label','url','url-email','url-phone','htmlarea')))
 			{
 				unset($fields[$field_name]);
 				continue;
 			}
-			if($settings['type'] == 'radio') $settings['type'] = 'select';
+			if($settings['type'] == 'radio')
+			{
+				$settings['type'] = 'select';
+			}
 			switch($settings['type'])
 			{
 				case 'checkbox':

importexport/inc/class.importexport_iface_egw_record.inc.php

Doc Comments +3 added lines

@@ -35,6 +35,7 @@ 
 	 * reads record from backend if identifier is given.
 	 *
 	 * @param string $_identifier
+	 * @return void
 	 */
 	public function __construct( $_identifier='' );
 	
@@ -50,6 +51,7 @@ 
 	 *
 	 * @param string $_attribute_name
 	 * @param data $data
+	 * @return void
 	 */
 	public function __set($_attribute_name, $data);
 	
@@ -126,6 +128,7 @@ 
 	/**
 	 * destructor
 	 *
+	 * @return void
 	 */
 	public function __destruct();
 

Spacing +5 added lines, -5 removed lines

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

importexport/inc/class.importexport_iface_export_plugin.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 	 * and automatic conversions.  In most cases they are named <appname>_egw_record,
 	 * but projectmanager is an exception to this.
 	 *
-	 * @return string;
+	 * @return string
 	 */
 	public static function get_egw_record_class();
 } // end of iface_export_plugin

Braces +2 added lines, -1 removed lines

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