EGroupware / egroupware

importexport/inc/class.importexport_iface_egw_record.inc.php

Spacing +5 added lines, -5 removed lines

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

importexport/inc/class.importexport_helper_functions.inc.php

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_schedule_ui.inc.php

Indentation +16 added lines, -16 removed lines

@@ -196,8 +196,8 @@ 
 	}
 
 	/**
-	* Get options for select boxes
-	*/
+	 * Get options for select boxes
+	 */
 	public static function get_select_options(Array $data)
 	{
 		$options = array(
@@ -261,8 +261,8 @@ 
 	}
 
 	/**
-	* Generate a async key
-	*/
+	 * Generate a async key
+	 */
 	public static function generate_id($data)
 	{
 
@@ -278,11 +278,11 @@ 
 	}
 
 	/**
-	* Check that the target is valid for the type (readable or writable)
-	* and that they're not trying to write directly to the filesystem
-	*
-	* $data should contain target & type
-	*/
+	 * Check that the target is valid for the type (readable or writable)
+	 * and that they're not trying to write directly to the filesystem
+	 *
+	 * $data should contain target & type
+	 */
 	public static function check_target(Array $data) {
 		$scheme = parse_url($data['target'], PHP_URL_SCHEME);
 		if($scheme == '' || $scheme == 'file')
@@ -329,11 +329,11 @@ 
 	}
 
 	/**
-	* Writable that checks the folder too, in case the file does not exist yet
-	* http://ca3.php.net/manual/en/function.is-writable.php#73596
-	*
-	* @param path Path to check
-	*/
+	 * Writable that checks the folder too, in case the file does not exist yet
+	 * http://ca3.php.net/manual/en/function.is-writable.php#73596
+	 *
+	 * @param path Path to check
+	 */
 	private static function is__writable($path)
 	{
 		if ($path{strlen($path)-1}=='/')
@@ -365,8 +365,8 @@ 
 	}
 
 	/**
-	* Execute a scheduled import or export
-	*/
+	 * Execute a scheduled import or export
+	 */
 	public static function exec($data)
 	{
 		ob_start();

Braces +16 added lines, -5 removed lines

@@ -113,7 +113,10 @@ 
 			// Remove any left blank
 			foreach($schedule as $key => &$value)
 			{
-				if($value == '') unset($schedule[$key]);
+				if($value == '')
+				{
+					unset($schedule[$key]);
+				}
 			}
 			$result = $async->set_timer(
 				$schedule,
@@ -283,14 +286,16 @@ 
 	*
 	* $data should contain target & type
 	*/
-	public static function check_target(Array $data) {
+	public static function check_target(Array $data)
+	{
 		$scheme = parse_url($data['target'], PHP_URL_SCHEME);
 		if($scheme == '' || $scheme == 'file')
 		{
 			return 'Direct file access not allowed';
 		}
 
-		if($scheme == Vfs::SCHEME  && !in_array(Vfs::SCHEME, stream_get_wrappers())) {
+		if($scheme == Vfs::SCHEME  && !in_array(Vfs::SCHEME, stream_get_wrappers()))
+		{
 			stream_wrapper_register(Vfs::SCHEME, 'vfs_stream_wrapper', STREAM_IS_URL);
 		}
 
@@ -315,8 +320,14 @@ 
 			// Response code has an integer key, but redirects may add more responses
 			for($i = 0; $i < count($headers); $i++)
 			{
-				if(!$headers[$i]) break;
-				if(strpos($headers[$i],'200') !== false) return true;
+				if(!$headers[$i])
+				{
+					break;
+				}
+				if(strpos($headers[$i],'200') !== false)
+				{
+					return true;
+				}
 			}
 			return lang('%1 is not readable',$data['target']);
 		}

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

@@ -198,7 +198,7 @@ 
 	/**
 	* Get options for select boxes
 	*/
-	public static function get_select_options(Array $data)
+	public static function get_select_options(array $data)
 	{
 		$options = array(
 			'type'	=>	array(
@@ -283,7 +283,7 @@ 
 	*
 	* $data should contain target & type
 	*/
-	public static function check_target(Array $data) {
+	public static function check_target(array $data) {
 		$scheme = parse_url($data['target'], PHP_URL_SCHEME);
 		if($scheme == '' || $scheme == 'file')
 		{

Spacing +99 added lines, -99 removed lines

@@ -37,11 +37,11 @@ 
 	public function index($content = array())
 	{
 		$async = new Api\Asyncservice();
-		if(is_array($content['scheduled']))
+		if (is_array($content['scheduled']))
 		{
-			foreach($content['scheduled'] as $row)
+			foreach ($content['scheduled'] as $row)
 			{
-				if($row['delete'])
+				if ($row['delete'])
 				{
 					$key = urldecode(key($row['delete']));
 					$async->cancel_timer($key);
@@ -50,16 +50,16 @@ 
 		}
 		$async_list = $async->read('importexport%');
 		$data = array();
-		if(is_array($async_list))
+		if (is_array($async_list))
 		{
-			foreach($async_list as $id => $async)
+			foreach ($async_list as $id => $async)
 			{
-				foreach(array('errors', 'warnings', 'result') as $messages)
+				foreach (array('errors', 'warnings', 'result') as $messages)
 				{
-					if(is_array($async['data'][$messages]))
+					if (is_array($async['data'][$messages]))
 					{
 						$list = array();
-						foreach($async['data'][$messages] as $target => $message)
+						foreach ($async['data'][$messages] as $target => $message)
 						{
 							$list[] = array(
 								'target' => (is_numeric($target) ? '' : $target),
@@ -69,7 +69,7 @@ 
 						$async['data'][$messages] = $list;
 					}
 				}
-				if(is_numeric($async['data']['record_count']))
+				if (is_numeric($async['data']['record_count']))
 				{
 					$async['data']['record_count'] = lang('%1 records processed', $async['data']['record_count']);
 				}
@@ -100,7 +100,7 @@ 
 		$data = $content;
 
 		// Deal with incoming
-		if($content['save'] && self::check_target($content) === true)
+		if ($content['save'] && self::check_target($content) === true)
 		{
 			unset($content['save']);
 			$async->cancel_timer($id);
@@ -111,9 +111,9 @@ 
 			unset($content['schedule']);
 
 			// Remove any left blank
-			foreach($schedule as $key => &$value)
+			foreach ($schedule as $key => &$value)
 			{
-				if($value == '') unset($schedule[$key]);
+				if ($value == '') unset($schedule[$key]);
 			}
 			$result = $async->set_timer(
 				$schedule,
@@ -121,9 +121,9 @@ 
 				'importexport.importexport_schedule_ui.exec',
 				$content
 			);
-			if($result)
+			if ($result)
 			{
-				Framework::refresh_opener('', 'admin',$id,'update','admin');
+				Framework::refresh_opener('', 'admin', $id, 'update', 'admin');
 				Framework::window_close();
 			}
 			else
@@ -133,19 +133,19 @@ 
 			}
 		}
 
-		if($id)
+		if ($id)
 		{
 
 			$preserve['id'] = $id;
 			$async = $async->read($id);
-			if(is_array($async[$id]['data']))
+			if (is_array($async[$id]['data']))
 			{
 				$data += $async[$id]['data'];
 				$data['schedule'] = $async[$id]['times'];
 				unset($data['times']);
 
 				// Async sometimes changes minutes to an array - show user what they typed
-				if(is_array($data['schedule']['min']))
+				if (is_array($data['schedule']['min']))
 				{
 					$data['schedule']['min'] = $data['min'];
 				}
@@ -159,11 +159,11 @@ 
 		{
 			$data['type'] = $content['type'] ? $content['type'] : 'import';
 
-			if((int)$definition_id)
+			if ((int)$definition_id)
 			{
 				$bo = new importexport_definitions_bo();
 				$definition = $bo->read($definition_id);
-				if($definition['definition_id'])
+				if ($definition['definition_id'])
 				{
 					$data['type'] = $definition['type'];
 					$data['appname'] = $definition['application'];
@@ -173,12 +173,12 @@ 
 			}
 		}
 
-		if($data['target'] && $data['type'])
+		if ($data['target'] && $data['type'])
 		{
 			$file_check = self::check_target($data);
-			if($file_check !== true)
+			if ($file_check !== true)
 			{
-				$data['message'] .= ($data['message'] ? "\n" . $file_check : $file_check);
+				$data['message'] .= ($data['message'] ? "\n".$file_check : $file_check);
 			}
 		}
 
@@ -188,7 +188,7 @@ 
 		$data['current_time'] = time();
 
 		$sel_options = self::get_select_options($data);
-		Framework::includeJS('.','importexport','importexport');
+		Framework::includeJS('.', 'importexport', 'importexport');
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Schedule import / export');
 		$this->template->read('importexport.schedule_edit');
@@ -208,21 +208,21 @@ 
 		);
 
 		(array)$apps = importexport_helper_functions::get_apps($data['type'] ? $data['type'] : 'all');
-		if(count($apps))
+		if (count($apps))
 		{
-			$options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
+			$options['appname'] = array('' => lang('Select one')) + array_combine($apps, $apps);
 		}
 
 		$plugins = importexport_helper_functions::get_plugins($data['appname'] ? $data['appname'] : 'all', $data['type']);
-		if(is_array($plugins))
+		if (is_array($plugins))
 		{
-			foreach($plugins as $types)
+			foreach ($plugins as $types)
 			{
-				if(!is_array($types[$data['type']]))
+				if (!is_array($types[$data['type']]))
 				{
 					continue;
 				}
-				foreach($types[$data['type']] as $key => $title)
+				foreach ($types[$data['type']] as $key => $title)
 				{
 					$options['plugin'][$key] = $title;
 				}
@@ -288,27 +288,27 @@ 
 	*/
 	public static function check_target(Array $data) {
 		$scheme = parse_url($data['target'], PHP_URL_SCHEME);
-		if($scheme == '' || $scheme == 'file')
+		if ($scheme == '' || $scheme == 'file')
 		{
 			return 'Direct file access not allowed';
 		}
 
-		if($scheme == Vfs::SCHEME  && !in_array(Vfs::SCHEME, stream_get_wrappers())) {
+		if ($scheme == Vfs::SCHEME && !in_array(Vfs::SCHEME, stream_get_wrappers())) {
 			stream_wrapper_register(Vfs::SCHEME, 'vfs_stream_wrapper', STREAM_IS_URL);
 		}
 
 		if ($data['type'] == 'import' && ($scheme == Vfs::SCHEME && !Vfs::is_readable($data['target'])))
 		{
-			return lang('%1 is not readable',$data['target']);
+			return lang('%1 is not readable', $data['target']);
 		}
-		elseif ($data['type'] == 'import' && in_array($scheme, array('http','https')))
+		elseif ($data['type'] == 'import' && in_array($scheme, array('http', 'https')))
 		{
 			// Not supported by is_readable, try headers...
 			stream_context_set_default(array('http'=>array(
 				'method'	=> 'HEAD',
 				'ignore_errors'	=> 1
 			)));
-			$headers = get_headers($data['target'],1);
+			$headers = get_headers($data['target'], 1);
 
 			// Reset...
 			stream_context_set_default(array('http'=>array(
@@ -316,16 +316,16 @@ 
 				'ignore_errors'	=> 0
 			)));
 			// Response code has an integer key, but redirects may add more responses
-			for($i = 0; $i < count($headers); $i++)
+			for ($i = 0; $i < count($headers); $i++)
 			{
-				if(!$headers[$i]) break;
-				if(strpos($headers[$i],'200') !== false) return true;
+				if (!$headers[$i]) break;
+				if (strpos($headers[$i], '200') !== false) return true;
 			}
-			return lang('%1 is not readable',$data['target']);
+			return lang('%1 is not readable', $data['target']);
 		}
 		elseif ($data['type'] == 'export' && !self::is__writable($data['target']))
 		{
-			return lang('%1 is not writable',$data['target']);
+			return lang('%1 is not writable', $data['target']);
 		}
 
 		return true;
@@ -339,7 +339,7 @@ 
 	*/
 	private static function is__writable($path)
 	{
-		if ($path{strlen($path)-1}=='/')
+		if ($path{strlen($path) - 1} == '/')
 		{
 			// recursively return a temporary file path
 			return self::is__writable($path.uniqid(mt_rand()).'.tmp');
@@ -353,7 +353,7 @@ 
 		$rm = file_exists($path);
 		$f = @fopen($path, 'a');
 
-		if ($f===false)
+		if ($f === false)
 		{
 			return false;
 		}
@@ -379,10 +379,10 @@ 
 		unset($data['warnings']);
 		unset($data['result']);
 
-		if($data['lock'])
+		if ($data['lock'])
 		{
 			// Lock expires
-			if($data['lock'] < time())
+			if ($data['lock'] < time())
 			{
 				unset($data['lock']);
 				$data['warnings'][][] = lang('Lock expired on previous run');
@@ -403,25 +403,25 @@ 
 
 		// check file
 		$file_check = self::check_target($data);
-		if($file_check !== true)
+		if ($file_check !== true)
 		{
 			$data['errors'] = array($file_check=>'');
 			// Update job with results
 			self::update_job($data);
 
-			error_log('importexport_schedule: ' . date('c') . ": $file_check \n");
+			error_log('importexport_schedule: '.date('c').": $file_check \n");
 			error_log(ob_get_flush());
 			return;
 		}
 
 		$definition = new importexport_definition($data['definition']);
-		if( $definition->get_identifier() < 1 )
+		if ($definition->get_identifier() < 1)
 		{
 			$data['errors'] = array('Definition not found!');
 			// Update job with results
 			self::update_job($data);
 
-			error_log('importexport_schedule: ' . date('c') . ": Definition not found! \n");
+			error_log('importexport_schedule: '.date('c').": Definition not found! \n");
 			return;
 		}
 		$GLOBALS['egw_info']['flags']['currentapp'] = $definition->application;
@@ -430,30 +430,30 @@ 
 
 		$type = $data['type'];
 
-		if(is_dir($data['target']))
+		if (is_dir($data['target']))
 		{
-			if($data['type'] == 'import')
+			if ($data['type'] == 'import')
 			{
 				$targets = array();
-				foreach(scandir($data['target']) as $target)
+				foreach (scandir($data['target']) as $target)
 				{
 					if ($target == '.' || $target == '..')
 					{
 						continue;
 					}
-					$target = $data['target'].(substr($data['target'],-1) == '/' ? '' : '/').$target;
+					$target = $data['target'].(substr($data['target'], -1) == '/' ? '' : '/').$target;
 
 					// Check modification time, make sure it's not currently being written
 					// Skip files modified in the last 10 seconds
 					$mod_time = filemtime($target);
-					if($mod_time >= time() - 10)
+					if ($mod_time >= time() - 10)
 					{
 						$data['result'][$target] = lang('Skipped');
 						continue;
 					}
 					$targets[$mod_time.$target] = $target;
 				}
-				if($targets)
+				if ($targets)
 				{
 					ksort($targets);
 				}
@@ -469,27 +469,27 @@ 
 			$targets = array($data['target']);
 		}
 
-		if($type == 'export')
+		if ($type == 'export')
 		{
 			// Set to export all or filter, if set
 			$selection = array('selection' => 'all');
-			if($definition->filter)
+			if ($definition->filter)
 			{
 				$fields = importexport_helper_functions::get_filter_fields($definition->application, $po);
 				$selection = array('selection' => 'filter');
 				$filters = array();
-				foreach($definition->filter as $field => $value)
+				foreach ($definition->filter as $field => $value)
 				{
 					 // Handle multiple values
-					if(!is_array($value) && strpos($value,',') !== false)
+					if (!is_array($value) && strpos($value, ',') !== false)
 					{
-						$value = explode(',',$value);
+						$value = explode(',', $value);
 					}
 
 					$filters[$field] = $value;
 
 					// Process relative dates into the current absolute date
-					if($filters[$field] && strpos($fields[$field]['type'],'date') === 0)
+					if ($filters[$field] && strpos($fields[$field]['type'], 'date') === 0)
 					{
 						$filters[$field] = importexport_helper_functions::date_rel2abs($value);
 					}
@@ -497,7 +497,7 @@ 
 				// Update filter to use current absolute dates
 				$definition->filter = $filters;
 			}
-			if(!is_array($definition->plugin_options))
+			if (!is_array($definition->plugin_options))
 			{
 				$definition->plugin_options = array();
 			}
@@ -505,10 +505,10 @@ 
 		}
 		// Set some automatic admin history data, if the plugin wants it
 		$definition->plugin_options = array_merge($definition->plugin_options, array('admin_cmd' => array(
-			'comment' => lang('schedule import / export') . "\n" . $definition->get_title() . "\n" . $target
+			'comment' => lang('schedule import / export')."\n".$definition->get_title()."\n".$target
 		)));
 
-		foreach($targets as $target)
+		foreach ($targets as $target)
 		{
 			// Update lock timeout
 			$data['lock'] = time() + 3600;
@@ -517,16 +517,16 @@ 
 			$resource = null;
 			try
 			{
-				if (($resource = @fopen( $target, $data['type'] == 'import' ? 'rb' : 'wb' )))
+				if (($resource = @fopen($target, $data['type'] == 'import' ? 'rb' : 'wb')))
 				{
-					$result = $po->$type( $resource, $definition );
+					$result = $po->$type($resource, $definition);
 
 					fclose($resource);
 				}
 				else
 				{
-					error_log('importexport_schedule: ' . date('c') . ": File $target not readable! \n");
-					$data['errors'][$target][] = lang('%1 is not readable',$target);
+					error_log('importexport_schedule: '.date('c').": File $target not readable! \n");
+					$data['errors'][$target][] = lang('%1 is not readable', $target);
 				}
 			}
 			catch (Exception $i_ex)
@@ -536,20 +536,20 @@ 
 			}
 
 
-			if(method_exists($po, 'get_warnings') && $po->get_warnings())
+			if (method_exists($po, 'get_warnings') && $po->get_warnings())
 			{
-				$buffer = 'importexport_schedule: ' . date('c') . ": Import warnings:\n#\tWarning\n";
-				foreach($po->get_warnings() as $record => $msg)
+				$buffer = 'importexport_schedule: '.date('c').": Import warnings:\n#\tWarning\n";
+				foreach ($po->get_warnings() as $record => $msg)
 				{
 					$data['warnings'][$target][] = "#$record: $msg";
 					$buffer += "$record\t$msg\n";
 				}
 				error_log($buffer);
 			}
-			if(method_exists($po, 'get_errors') && $po->get_errors())
+			if (method_exists($po, 'get_errors') && $po->get_errors())
 			{
-				$buffer = 'importexport_schedule: ' . date('c') . ": Import errors:\n#\tError\n";
-				foreach($po->get_errors() as $record => $error)
+				$buffer = 'importexport_schedule: '.date('c').": Import errors:\n#\tError\n";
+				foreach ($po->get_errors() as $record => $error)
 				{
 					$data['errors'][$target][] = "#$record: $error";
 					$buffer += "$record\t$error\n";
@@ -557,22 +557,22 @@ 
 				error_log($buffer);
 			}
 
-			if($po instanceof importexport_iface_import_plugin)
+			if ($po instanceof importexport_iface_import_plugin)
 			{
-				if(is_numeric($result))
+				if (is_numeric($result))
 				{
 					$data['record_count'] += $result;
 					$data['result'][$target][] = lang('%1 records processed', $result);
 				}
 				$data['result'][$target] = array();
-				foreach($po->get_results() as $action => $count)
+				foreach ($po->get_results() as $action => $count)
 				{
-					$data['result'][$target][] = lang($action) . ": $count";
+					$data['result'][$target][] = lang($action).": $count";
 				}
 			}
 			else
 			{
-				if($result instanceof importexport_iface_export_record)
+				if ($result instanceof importexport_iface_export_record)
 				{
 					$data['record_count'] += $result->get_num_of_records();
 					$data['result'][$target][] = lang('%1 records processed', $result->get_num_of_records());
@@ -581,23 +581,23 @@ 
 		}
 
 		// Delete file?
-		if($data['delete_files'] && $type == 'import' && !$data['errors'])
+		if ($data['delete_files'] && $type == 'import' && !$data['errors'])
 		{
-			foreach($targets as $target)
+			foreach ($targets as $target)
 			{
-				if(unlink($target))
+				if (unlink($target))
 				{
-					$data['result'][$target][] .= "\n..." . lang('deleted');
+					$data['result'][$target][] .= "\n...".lang('deleted');
 				}
 				else
 				{
-					$data['errors'][$target][] .= "\n..." . lang('Unable to delete');
+					$data['errors'][$target][] .= "\n...".lang('Unable to delete');
 				}
 			}
 		}
 
 		// Run time in minutes
-		$data['run_time'] = round((time() - $data['last_run']) / 60,1);
+		$data['run_time'] = round((time() - $data['last_run']) / 60, 1);
 
 		// Clear lock
 		$data['lock'] = 0;
@@ -608,9 +608,9 @@ 
 		$contents = ob_get_contents();
 
 		// Log to error log
-		if($contents)
+		if ($contents)
 		{
-			error_log('importexport_schedule: ' . date('c') . ": \n".$contents);
+			error_log('importexport_schedule: '.date('c').": \n".$contents);
 		}
 
 		ob_end_clean();
@@ -627,7 +627,7 @@ 
 		$jobs = $async->read($id);
 		$job = $jobs[$id];
 
-		if(is_array($job))
+		if (is_array($job))
 		{
 			$async->cancel_timer($id);
 			$result = $async->set_timer(
@@ -637,37 +637,37 @@ 
 				$data
 			);
 		}
-		if($no_notification)
+		if ($no_notification)
 		{
 			return $result;
 		}
 
 		// Send notification to user
-		if($data['warnings'] || $data['errors'])
+		if ($data['warnings'] || $data['errors'])
 		{
 			$notify = new notifications();
 			$notify->set_sender($data['account_id']);
 			$notify->add_receiver($data['account_id']);
-			$notify->set_subject(lang('Schedule import | export'). ' ' . lang('errors'));
+			$notify->set_subject(lang('Schedule import | export').' '.lang('errors'));
 			$contents = '';
 
-			if($data['warnings'])
+			if ($data['warnings'])
 			{
-				$contents .= lang($data['type']) . ' ' . lang('Warnings') . ' ' . Api\DateTime::to() . ':';
-				foreach($data['warnings'] as $target => $message)
+				$contents .= lang($data['type']).' '.lang('Warnings').' '.Api\DateTime::to().':';
+				foreach ($data['warnings'] as $target => $message)
 				{
-					$contents .= "\n". (is_numeric($target) ? '' : $target."\n");
-					$contents .= is_array($message) ? implode("\n",$message) : $message;
+					$contents .= "\n".(is_numeric($target) ? '' : $target."\n");
+					$contents .= is_array($message) ? implode("\n", $message) : $message;
 				}
 				$contents .= "\n";
 			}
-			if($data['errors'])
+			if ($data['errors'])
 			{
-				$contents .= lang($data['type']) . ' ' . lang('Errors') . ' ' . Api\DateTime::to() . ':';
-				foreach($data['errors'] as $target => $errors)
+				$contents .= lang($data['type']).' '.lang('Errors').' '.Api\DateTime::to().':';
+				foreach ($data['errors'] as $target => $errors)
 				{
-					$contents .= "\n". (is_numeric($target) ? '' : $target."\n");
-					$contents .= is_array($errors) ? implode("\n",$errors) : $errors;
+					$contents .= "\n".(is_numeric($target) ? '' : $target."\n");
+					$contents .= is_array($errors) ? implode("\n", $errors) : $errors;
 				}
 				$contents .= "\n";
 			}

importexport/inc/class.importexport_definitions_bo.inc.php

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

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

Spacing +51 added lines, -51 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;
@@ -339,7 +339,7 @@ 
 	 */
 	function change_delete_owner(array $args)  // new_owner=0 means delete
 	{
-		if (!(int) $args['new_owner'])
+		if (!(int)$args['new_owner'])
 		{
 			$this->so_sql->delete(array('owner'=>$args['account_id']));
 		}
@@ -349,7 +349,7 @@ 
 				self::_defintion_table,
 				array('owner'=>$args['new_owner']),
 				array('owner'=>$args['account_id']),
-				__LINE__,__FILE__,'importexport'
+				__LINE__, __FILE__, 'importexport'
 			);
 		}
 	}

importexport/inc/class.importexport_wizard_basic_export_csv.inc.php

Indentation +22 added lines, -22 removed lines

@@ -23,13 +23,13 @@ 
 	const TEMPLATE_MARKER = '-eTemplate-';
 
 	/**
-	* List of steps.  Key is the function, value is the translated title.
-	*/
+	 * List of steps.  Key is the function, value is the translated title.
+	 */
 	public $steps;
 
 	/**
-	* List of eTemplates to use for each step.  You can override this with your own etemplates steps.
-	*/
+	 * List of eTemplates to use for each step.  You can override this with your own etemplates steps.
+	 */
 	protected $step_templates = array(
 		'wizard_step30' => 'importexport.wizard_basic_export_csv.choose_fields',
 		'wizard_step40' => 'importexport.wizard_basic_export_csv.choosesepncharset',
@@ -38,19 +38,19 @@ 
 		
 
 	/**
-	* Destination fields for the export
-	* Key is the field name, value is the human version
-	*/
+	 * Destination fields for the export
+	 * Key is the field name, value is the human version
+	 */
 	protected $export_fields = array();
 	
 	/**
-	* List of conditions your plugin supports
-	*/
+	 * List of conditions your plugin supports
+	 */
 	protected $conditions = array();
 
 	/**
-	* List of actions your plugin supports
-	*/
+	 * List of actions your plugin supports
+	 */
 	protected $actions = array();
 
 	/**
@@ -69,8 +69,8 @@ 
 	}
 
 	/**
-	* Choose fields to export
-	*/
+	 * Choose fields to export
+	 */
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
@@ -206,16 +206,16 @@ 
 			);
 			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
 			array(
-                                'user'  => lang('User preference'),
-                        );
+								'user'  => lang('User preference'),
+						);
 
-                        // Add in extra allowed charsets
-                        $config = Api\Config::read('importexport');
-                        $extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
-                        if($extra_charsets)
-                        {
-                                $sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
-                        }
+						// Add in extra allowed charsets
+						$config = Api\Config::read('importexport');
+						$extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
+						if($extra_charsets)
+						{
+								$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
+						}
 			$sel_options['convert'] = array(
 				0	=> lang('Database values'),
 				1	=> lang('Human friendly values')

Spacing +36 added lines, -36 removed lines

@@ -64,7 +64,7 @@ 
 			'wizard_step80' => lang('Filters'),
 		);
 		list($appname, $part2) = explode('_', get_class($this));
-		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
 		Api\Translation::add_app($appname);
 	}
 
@@ -73,14 +73,14 @@ 
 	*/
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step30->$content '.print_r($content, true));
 		// return from step30
 		if ($content['step'] == 'wizard_step30')
 		{
-			foreach($content['fields']['export'] as $field_name)
+			foreach ($content['fields']['export'] as $field_name)
 			{
 				// Preserve original field names, where available
-				if($content['plugin_options']['no_header_translation'] && $content['plugin_options']['mapping'][$field_name])
+				if ($content['plugin_options']['no_header_translation'] && $content['plugin_options']['mapping'][$field_name])
 				{
 					$content['mapping'][$field_name] = $content['plugin_options']['mapping'][$field_name];
 				}
@@ -89,12 +89,12 @@ 
 					$content['mapping'][$field_name] = $field_name;
 				}
 			}
-			if($content['mapping']['all_custom_fields']) {
+			if ($content['mapping']['all_custom_fields']) {
 				// Need the appname during actual export, to fetch the fields
 				$parts = explode('_', get_class($this));
 				$appname = $parts[0];
-				foreach($parts as $name_part) {
-					if($GLOBALS['egw_info']['apps'][$appname]) break;
+				foreach ($parts as $name_part) {
+					if ($GLOBALS['egw_info']['apps'][$appname]) break;
 					$appname .= '_'.$name_part; // Handle apps with _ in the name
 				}
 				$content['mapping']['all_custom_fields'] = $appname;
@@ -105,13 +105,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step30($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step30($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step30
@@ -125,15 +125,15 @@ 
 			unset ($preserv['button']);
 			unset ($preserv['fields']);
 			$content['fields'] = array('');
-			if(!$content['mapping']) $content['mapping'] = $content['plugin_options']['mapping'];
+			if (!$content['mapping']) $content['mapping'] = $content['plugin_options']['mapping'];
 		
 			$row = 1;
-			foreach($this->export_fields as $field => $name) {
+			foreach ($this->export_fields as $field => $name) {
 				$content['fields'][] = array(
 					'field'	=>	$field,
 					'name'	=>	lang($name),
 				);
-				if($content['mapping'][$field]) {
+				if ($content['mapping'][$field]) {
 					$content['fields']['export'][$row] = $field;
 				}
 				$row++;
@@ -155,11 +155,11 @@ 
 	 */
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step40->$content '.print_r($content, true));
 		// return from step40
 		if ($content['step'] == 'wizard_step40') {
-			if($content['begin_with_fieldnames'] == 'label') {
-				foreach($content['mapping'] as $field => &$label) {
+			if ($content['begin_with_fieldnames'] == 'label') {
+				foreach ($content['mapping'] as $field => &$label) {
 					// Check first, to avoid clearing any pseudo-columns (ex: All custom fields)
 					$label = $this->export_fields[$field] ? $this->export_fields[$field] : $label;
 				}
@@ -167,13 +167,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step40($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step40
@@ -183,18 +183,18 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['delimiter'] && $content['plugin_options']['delimiter']) {
+			if (!$content['delimiter'] && $content['plugin_options']['delimiter']) {
 				$content['delimiter'] = $content['plugin_options']['delimiter'];
 			} elseif (!$content['delimiter']) {
 				$content['delimiter'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if (!$content['charset'] && $content['plugin_options']['charset']) {
 				$content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
 			}
-			if(!array_key_exists('begin_with_fieldnames', $content) && array_key_exists('begin_with_fieldnames', $content['plugin_options'])) {
+			if (!array_key_exists('begin_with_fieldnames', $content) && array_key_exists('begin_with_fieldnames', $content['plugin_options'])) {
 				$content['begin_with_fieldnames'] = $content['plugin_options']['begin_with_fieldnames'];
 			}
-			if(!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options'])) {
+			if (!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options'])) {
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 
@@ -204,17 +204,17 @@ 
 				1	=> lang('Field names'),
 				'label'	=> lang('Field labels')
 			);
-			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
+			$sel_options['charset'] = Api\Translation::get_installed_charsets() +
 			array(
                                 'user'  => lang('User preference'),
                         );
 
                         // Add in extra allowed charsets
                         $config = Api\Config::read('importexport');
-                        $extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
-                        if($extra_charsets)
+                        $extra_charsets = array_intersect(explode(',', $config['import_charsets']), mb_list_encodings());
+                        if ($extra_charsets)
                         {
-                                $sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
+                                $sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets, $extra_charsets));
                         }
 			$sel_options['convert'] = array(
 				0	=> lang('Database values'),
@@ -238,15 +238,15 @@ 
 	 */
 	function wizard_step80(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::' . __METHOD__ .'->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::'.__METHOD__.'->$content '.print_r($content, true));
 		// return from submit
 		if ($content['step'] == 'wizard_step80') {
 			// Process submitted
 			unset($content['filter']);
 			unset($content['set_filter']['fields']);
-			foreach($content['set_filter'] as $key => $value)
+			foreach ($content['set_filter'] as $key => $value)
 			{
-				if($value) {
+				if ($value) {
 					$content['filter'][$key] = $value;
 				}
 			}
@@ -256,13 +256,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step80($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step80($content, $sel_options, $readonlys, $preserv);
 			}
 		} else {
 
@@ -273,15 +273,15 @@ 
 			unset ($preserv['button']);
 
 			$content['set_filter']['fields'] = importexport_helper_functions::get_filter_fields(
-				$content['application'],$content['plugin'],$this
+				$content['application'], $content['plugin'], $this
 			);
 			// Load existing filter from either content or definition
-			foreach($content['set_filter']['fields'] as $field => $settings)
+			foreach ($content['set_filter']['fields'] as $field => $settings)
 			{
 				$content['set_filter'][$field] = $content['filter'][$field];
 			}
 
-			if(!$content['set_filter']['fields'])
+			if (!$content['set_filter']['fields'])
 			{
 				// No fields
 				return importexport_definitions_ui::SKIP;

Braces +57 added lines, -21 removed lines

@@ -64,7 +64,11 @@ 
 			'wizard_step80' => lang('Filters'),
 		);
 		list($appname, $part2) = explode('_', get_class($this));
-		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
 		Api\Translation::add_app($appname);
 	}
 
@@ -73,7 +77,10 @@ 
 	*/
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		}
 		// return from step30
 		if ($content['step'] == 'wizard_step30')
 		{
@@ -89,12 +96,17 @@ 
 					$content['mapping'][$field_name] = $field_name;
 				}
 			}
-			if($content['mapping']['all_custom_fields']) {
+			if($content['mapping']['all_custom_fields'])
+			{
 				// Need the appname during actual export, to fetch the fields
 				$parts = explode('_', get_class($this));
 				$appname = $parts[0];
-				foreach($parts as $name_part) {
-					if($GLOBALS['egw_info']['apps'][$appname]) break;
+				foreach($parts as $name_part)
+				{
+					if($GLOBALS['egw_info']['apps'][$appname])
+					{
+						break;
+					}
 					$appname .= '_'.$name_part; // Handle apps with _ in the name
 				}
 				$content['mapping']['all_custom_fields'] = $appname;
@@ -125,15 +137,20 @@ 
 			unset ($preserv['button']);
 			unset ($preserv['fields']);
 			$content['fields'] = array('');
-			if(!$content['mapping']) $content['mapping'] = $content['plugin_options']['mapping'];
+			if(!$content['mapping'])
+			{
+				$content['mapping'] = $content['plugin_options']['mapping'];
+			}
 		
 			$row = 1;
-			foreach($this->export_fields as $field => $name) {
+			foreach($this->export_fields as $field => $name)
+			{
 				$content['fields'][] = array(
 					'field'	=>	$field,
 					'name'	=>	lang($name),
 				);
-				if($content['mapping'][$field]) {
+				if($content['mapping'][$field])
+				{
 					$content['fields']['export'][$row] = $field;
 				}
 				$row++;
@@ -155,11 +172,17 @@ 
 	 */
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		}
 		// return from step40
-		if ($content['step'] == 'wizard_step40') {
-			if($content['begin_with_fieldnames'] == 'label') {
-				foreach($content['mapping'] as $field => &$label) {
+		if ($content['step'] == 'wizard_step40')
+		{
+			if($content['begin_with_fieldnames'] == 'label')
+			{
+				foreach($content['mapping'] as $field => &$label)
+				{
 					// Check first, to avoid clearing any pseudo-columns (ex: All custom fields)
 					$label = $this->export_fields[$field] ? $this->export_fields[$field] : $label;
 				}
@@ -183,18 +206,24 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['delimiter'] && $content['plugin_options']['delimiter']) {
+			if(!$content['delimiter'] && $content['plugin_options']['delimiter'])
+			{
 				$content['delimiter'] = $content['plugin_options']['delimiter'];
-			} elseif (!$content['delimiter']) {
+			}
+			elseif (!$content['delimiter'])
+			{
 				$content['delimiter'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if(!$content['charset'] && $content['plugin_options']['charset'])
+			{
 				$content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
 			}
-			if(!array_key_exists('begin_with_fieldnames', $content) && array_key_exists('begin_with_fieldnames', $content['plugin_options'])) {
+			if(!array_key_exists('begin_with_fieldnames', $content) && array_key_exists('begin_with_fieldnames', $content['plugin_options']))
+			{
 				$content['begin_with_fieldnames'] = $content['plugin_options']['begin_with_fieldnames'];
 			}
-			if(!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options'])) {
+			if(!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options']))
+			{
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 
@@ -238,15 +267,20 @@ 
 	 */
 	function wizard_step80(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::' . __METHOD__ .'->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::' . __METHOD__ .'->$content '.print_r($content,true));
+		}
 		// return from submit
-		if ($content['step'] == 'wizard_step80') {
+		if ($content['step'] == 'wizard_step80')
+		{
 			// Process submitted
 			unset($content['filter']);
 			unset($content['set_filter']['fields']);
 			foreach($content['set_filter'] as $key => $value)
 			{
-				if($value) {
+				if($value)
+				{
 					$content['filter'][$key] = $value;
 				}
 			}
@@ -264,7 +298,9 @@ 
 				default :
 					return $this->wizard_step80($content,$sel_options,$readonlys,$preserv);
 			}
-		} else {
+		}
+		else
+		{
 
 			// Step 50 - filters
 			$content['text'] = $this->steps['wizard_step80'];

importexport/inc/class.importexport_wizard_basic_import_csv.inc.php

Indentation +20 added lines, -20 removed lines

@@ -23,13 +23,13 @@ 
 	const TEMPLATE_MARKER = '-eTemplate-';
 
 	/**
-	* List of steps.  Key is the function, value is the translated title.
-	*/
+	 * List of steps.  Key is the function, value is the translated title.
+	 */
 	public $steps;
 
 	/**
-	* List of eTemplates to use for each step.  You can override this with your own etemplates steps.
-	*/
+	 * List of eTemplates to use for each step.  You can override this with your own etemplates steps.
+	 */
 	protected $step_templates = array(
 		'wizard_step30' => 'importexport.wizard_basic_import_csv.sample_file',
 		'wizard_step40' => 'importexport.wizard_basic_import_csv.choosesepncharset',
@@ -39,19 +39,19 @@ 
 		
 
 	/**
-	* Destination fields for the mapping
-	* Key is the field name, value is the human version
-	*/
+	 * Destination fields for the mapping
+	 * Key is the field name, value is the human version
+	 */
 	protected $mapping_fields = array();
 	
 	/**
-	* List of conditions your plugin supports
-	*/
+	 * List of conditions your plugin supports
+	 */
 	protected $conditions = array();
 
 	/**
-	* List of actions your plugin supports
-	*/
+	 * List of actions your plugin supports
+	 */
 	protected $actions = array();
 
 	/**
@@ -68,8 +68,8 @@ 
 	}
 
 	/**
-	* Take a sample CSV file.  It will be processed in later steps
-	*/
+	 * Take a sample CSV file.  It will be processed in later steps
+	 */
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
@@ -263,11 +263,11 @@ 
 	}
 	
 	/**
-	* Process the sample file, get the fields out of it, then allow them to be mapped onto
-	* the fields the destination understands.  Also, set any translations to be done to the field.
-	*
-	* You can use the eTemplate
-	*/
+	 * Process the sample file, get the fields out of it, then allow them to be mapped onto
+	 * the fields the destination understands.  Also, set any translations to be done to the field.
+	 *
+	 * You can use the eTemplate
+	 */
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
@@ -348,8 +348,8 @@ 
 	}
 	
 	/**
-	* Edit conditions
-	*/
+	 * Edit conditions
+	 */
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));

Spacing +69 added lines, -69 removed lines

@@ -75,7 +75,7 @@ 
 	*/
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step30->$content '.print_r($content, true));
 		// return from step30
 		if ($content['step'] == 'wizard_step30')
 		{
@@ -83,17 +83,17 @@ 
 			{
 				case 'next':
 					// Move sample file to temp
-					if($content['file']['tmp_name']) {
+					if ($content['file']['tmp_name']) {
 						Api\Cache::setSession($content['application'], 'csvfile', $content['file']['tmp_name']);
 					}
 					unset($content['file']);
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step30($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step30($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step30
@@ -120,57 +120,57 @@ 
 	 */
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step40->$content '.print_r($content, true));
 		// return from step40
 		if ($content['step'] == 'wizard_step40') {
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
 					// Process sample file for fields
-					if (Api\Cache::getSession($content['application'],'csvfile') &&
-						($handle = fopen(Api\Cache::getSession($content['application'],'csvfile'), "rb")) !== FALSE
+					if (Api\Cache::getSession($content['application'], 'csvfile') &&
+						($handle = fopen(Api\Cache::getSession($content['application'], 'csvfile'), "rb")) !== FALSE
 					) {
 						$data = fgetcsv($handle, 8000, $content['fieldsep']);
 						//error_log(array2string($data));
 						fclose($handle);
 
 						// Remove & forget file
-						unlink(Api\Cache::getSession($content['application'],'csvfile'));
+						unlink(Api\Cache::getSession($content['application'], 'csvfile'));
 						Api\Cache::setSession($content['application'], 'csvfile', '');
-						$content['csv_fields'] = Api\Translation::convert($data,$content['charset']);
+						$content['csv_fields'] = Api\Translation::convert($data, $content['charset']);
 
 						// Reset field mapping for new file
 						$content['field_mapping'] = array();
 
 						// Try to match automatically
 						$english = array();
-						foreach($content['csv_fields'] as $index => $field) {
-							if($content['field_mapping'][$index]) continue;
+						foreach ($content['csv_fields'] as $index => $field) {
+							if ($content['field_mapping'][$index]) continue;
 							$best_match = '';
 							$best_match_value = 0;
-							foreach($this->mapping_fields as $key => $field_name) {
-								if(is_array($field_name)) continue;
-								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0) {
+							foreach ($this->mapping_fields as $key => $field_name) {
+								if (is_array($field_name)) continue;
+								if (strcasecmp($field, $field_name) == 0 || strcasecmp($field, $key) == 0) {
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 								// Check english also
-								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
+								if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
 									$msg_id = Api\Translation::get_message_id($field_name, $content['application']);
 								}
-								if($msg_id) {
+								if ($msg_id) {
 									$english[$field_name] = Api\Translation::read('en', $content['application'], $msg_id);
 								} else {
 									$english[$field_name] = false;
 								}
-								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
+								if ($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 
 								// Check for similar but slightly different
 								$match = 0;
-								if(similar_text(strtolower($field), strtolower($field_name), $match) &&
+								if (similar_text(strtolower($field), strtolower($field_name), $match) &&
 										$match > 85 &&
 										$match > $best_match_value
 								) {
@@ -179,20 +179,20 @@ 
 								}
 
 							}
-							if($best_match) {
+							if ($best_match) {
 								$content['field_mapping'][$index] = $best_match;
 							}
 						}
-					} elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
+					} elseif (!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
 						$content['csv_fields'] = $content['plugin_options']['csv_fields'];
 					}
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step40($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step40
@@ -202,17 +202,17 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
+			if (!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
 				$content['fieldsep'] = $content['plugin_options']['fieldsep'];
 			} elseif (!$content['fieldsep']) {
 				$content['fieldsep'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if (!$content['charset'] && $content['plugin_options']['charset']) {
 				$content['charset'] = $content['plugin_options']['charset'];
 			}
-			if(!array_key_exists('num_header_lines', $content))
+			if (!array_key_exists('num_header_lines', $content))
 			{
-				if(is_array($content['plugin_options']) && array_key_exists('num_header_lines', $content['plugin_options']))
+				if (is_array($content['plugin_options']) && array_key_exists('num_header_lines', $content['plugin_options']))
 				{
 					$content['num_header_lines'] = $content['plugin_options']['num_header_lines'];
 				}
@@ -222,10 +222,10 @@ 
 					$content['num_header_lines'] = 1;
 				}
 			}
-			if(!$content['update_cats'] && $content['plugin_options']['update_cats']) {
+			if (!$content['update_cats'] && $content['plugin_options']['update_cats']) {
 				$content['update_cats'] = $content['plugin_options']['update_cats'];
 			}
-			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
+			if (!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 			else
@@ -234,24 +234,24 @@ 
 				$content['convert'] = 1;
 			}
 
-			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
+			$sel_options['charset'] = Api\Translation::get_installed_charsets() +
 			array(
 				'user'	=> lang('User preference'),
 			);
 
 			// Add in extra allowed charsets
 			$config = Api\Config::read('importexport');
-			$extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
-			if($extra_charsets)
+			$extra_charsets = array_intersect(explode(',', $config['import_charsets']), mb_list_encodings());
+			if ($extra_charsets)
 			{
-				$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
+				$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets, $extra_charsets));
 			}
 			$sel_options['convert'] = array(
 				0       => lang('Database values'),
 				1       => lang('Human friendly values')
 			);
 			$preserv = $content;
-			if($this->mapping_fields['cat_id']) {
+			if ($this->mapping_fields['cat_id']) {
 				$sel_options['update_cats'] = array(
 					'add'	=> lang('Add'),
 					'replace'=> lang('Replace')
@@ -273,18 +273,18 @@ 
 	*/
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step50->$content '.print_r($content, true));
 		// return from step50
 		if ($content['step'] == 'wizard_step50')
 		{
 			unset($content['field_mapping']);
 			unset($content['field_conversion']);
-			foreach($content['mapping'] as $field)
+			foreach ($content['mapping'] as $field)
 			{
 				$index = $field['index'];
-				foreach(array('conversion'=>'field_conversion', 'field' => 'field_mapping') as $id => $dest)
+				foreach (array('conversion'=>'field_conversion', 'field' => 'field_mapping') as $id => $dest)
 				{
-					if(trim($field[$id]) != '' && $field[$id] !== '--NONE--')
+					if (trim($field[$id]) != '' && $field[$id] !== '--NONE--')
 					{
 						$content[$dest][$index] = trim($field[$id]);
 					}
@@ -294,13 +294,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step50($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step50($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step50
@@ -310,7 +310,7 @@ 
 			$content['step'] = 'wizard_step50';
 
 			$content['mapping'] = array(false);
-			if(array_key_exists('field_mapping', $content))
+			if (array_key_exists('field_mapping', $content))
 			{
 				$field = $content['field_mapping'];
 				$conversion = $content['field_conversion'];
@@ -321,7 +321,7 @@ 
 				$conversion = $content['plugin_options']['field_conversion'];
 			}
 			$empties = 1;
-			foreach($content['csv_fields'] as $index => $title)
+			foreach ($content['csv_fields'] as $index => $title)
 			{
 				$content['mapping'][] = array(
 					'index'	=>	$index,
@@ -329,15 +329,15 @@ 
 					'field'	=>	$field[$index],
 					'conversion'	=>	$conversion[$index]
 				);
-				if(strstr($title,lang('Extra %1'))) $empties++;
+				if (strstr($title, lang('Extra %1'))) $empties++;
 			}
-			while($empties <= 3)
+			while ($empties <= 3)
 			{
 				$content['mapping'][] = array(
 					'index' => $index + $empties,
 					'title' => lang('Extra %1', $empties),
-					'field' => $field[$index+$empties],
-					'conversion'	=>	$conversion[$index+$empties]
+					'field' => $field[$index + $empties],
+					'conversion'	=>	$conversion[$index + $empties]
 				);
 				$empties++;
 			}
@@ -355,7 +355,7 @@ 
 	*/
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step55->$content '.print_r($content, true));
 
 		// return from step55
 		if ($content['step'] == 'wizard_step55')
@@ -363,8 +363,8 @@ 
 
 			// Clear conditions that don't do anything
 			array_shift($content['conditions']);
-			foreach($content['conditions'] as $key => &$condition) {
-				if(($condition['true']['action'] == 'none' || !$condition['true']['action'])
+			foreach ($content['conditions'] as $key => &$condition) {
+				if (($condition['true']['action'] == 'none' || !$condition['true']['action'])
 					&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) &&
 					!$condition['string']
 				) {
@@ -373,7 +373,7 @@ 
 				}
 
 				// Check for true without false, or false without true - set to 'none'
-				elseif($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
+				elseif ($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
 					$condition['true']['action'] != '' && $condition['false']['action'] == '' ||
 					!$condition['true'] || !$condition['false']
 				)
@@ -385,9 +385,9 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				case 'add':
@@ -396,7 +396,7 @@ 
 					$content['conditions'][] = array('string' => '');
 					return 'wizard_step55';
 				default :
-					return $this->wizard_step55($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step55($content, $sel_options, $readonlys, $preserv);
 					break;
 			}
 		}
@@ -404,18 +404,18 @@ 
 		$content['text'] = $this->steps['wizard_step55'];
 		$content['step'] = 'wizard_step55';
 
-		if(!$content['conditions'] && $content['plugin_options']['conditions']) {
+		if (!$content['conditions'] && $content['plugin_options']['conditions']) {
 			$content['conditions'] = $content['plugin_options']['conditions'];
 		}
 		$preserv = $content;
 
-		foreach($content['field_mapping'] as $field) {
+		foreach ($content['field_mapping'] as $field) {
 			$sel_options['string'][$field] = $this->mapping_fields[$field];
-			if(!$sel_options['string'][$field])
+			if (!$sel_options['string'][$field])
 			{
-				foreach($this->mapping_fields as $fields)
+				foreach ($this->mapping_fields as $fields)
 				{
-					if(is_array($fields) && $fields[$field])
+					if (is_array($fields) && $fields[$field])
 					{
 						$sel_options['string'][$field] = $fields[$field];
 					}
@@ -450,7 +450,7 @@ 
 	 */
 	public function wizard_step65(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__ . '->$content '.print_r($content,true));
+		if ($this->debug) error_log(__METHOD__.'->$content '.print_r($content, true));
 
 		// return from step65
 		if ($content['step'] == 'wizard_step65')
@@ -458,13 +458,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step65($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step65($content, $sel_options, $readonlys, $preserv);
 					break;
 			}
 		}
@@ -472,18 +472,18 @@ 
 		$content['text'] = $this->steps['wizard_step65'];
 		$content['step'] = 'wizard_step65';
 
-		if(!$content['override_values'] && $content['plugin_options']['override_values']) {
+		if (!$content['override_values'] && $content['plugin_options']['override_values']) {
 			$content['override_values'] = $content['plugin_options']['override_values'];
 		}
 		$preserv = $content;
 
-		foreach($content['field_mapping'] as $field) {
+		foreach ($content['field_mapping'] as $field) {
 			$sel_options['string'][$field] = $this->mapping_fields[$field];
-			if(!$sel_options['string'][$field])
+			if (!$sel_options['string'][$field])
 			{
-				foreach($this->mapping_fields as $fields)
+				foreach ($this->mapping_fields as $fields)
 				{
-					if(is_array($fields) && $fields[$field])
+					if (is_array($fields) && $fields[$field])
 					{
 						$sel_options['string'][$field] = $fields[$field];
 					}

Braces +83 added lines, -33 removed lines

@@ -75,7 +75,10 @@ 
 	*/
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		}
 		// return from step30
 		if ($content['step'] == 'wizard_step30')
 		{
@@ -83,7 +86,8 @@ 
 			{
 				case 'next':
 					// Move sample file to temp
-					if($content['file']['tmp_name']) {
+					if($content['file']['tmp_name'])
+					{
 						Api\Cache::setSession($content['application'], 'csvfile', $content['file']['tmp_name']);
 					}
 					unset($content['file']);
@@ -120,9 +124,13 @@ 
 	 */
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		}
 		// return from step40
-		if ($content['step'] == 'wizard_step40') {
+		if ($content['step'] == 'wizard_step40')
+		{
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
@@ -144,26 +152,40 @@ 
 
 						// Try to match automatically
 						$english = array();
-						foreach($content['csv_fields'] as $index => $field) {
-							if($content['field_mapping'][$index]) continue;
+						foreach($content['csv_fields'] as $index => $field)
+						{
+							if($content['field_mapping'][$index])
+							{
+								continue;
+							}
 							$best_match = '';
 							$best_match_value = 0;
-							foreach($this->mapping_fields as $key => $field_name) {
-								if(is_array($field_name)) continue;
-								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0) {
+							foreach($this->mapping_fields as $key => $field_name)
+							{
+								if(is_array($field_name))
+								{
+									continue;
+								}
+								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0)
+								{
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 								// Check english also
-								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
+								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name]))
+								{
 									$msg_id = Api\Translation::get_message_id($field_name, $content['application']);
 								}
-								if($msg_id) {
+								if($msg_id)
+								{
 									$english[$field_name] = Api\Translation::read('en', $content['application'], $msg_id);
-								} else {
+								}
+								else
+								{
 									$english[$field_name] = false;
 								}
-								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
+								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0)
+								{
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
@@ -179,11 +201,14 @@ 
 								}
 
 							}
-							if($best_match) {
+							if($best_match)
+							{
 								$content['field_mapping'][$index] = $best_match;
 							}
 						}
-					} elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
+					}
+					elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields'])
+					{
 						$content['csv_fields'] = $content['plugin_options']['csv_fields'];
 					}
 					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
@@ -202,12 +227,16 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
+			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep'])
+			{
 				$content['fieldsep'] = $content['plugin_options']['fieldsep'];
-			} elseif (!$content['fieldsep']) {
+			}
+			elseif (!$content['fieldsep'])
+			{
 				$content['fieldsep'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if(!$content['charset'] && $content['plugin_options']['charset'])
+			{
 				$content['charset'] = $content['plugin_options']['charset'];
 			}
 			if(!array_key_exists('num_header_lines', $content))
@@ -222,10 +251,12 @@ 
 					$content['num_header_lines'] = 1;
 				}
 			}
-			if(!$content['update_cats'] && $content['plugin_options']['update_cats']) {
+			if(!$content['update_cats'] && $content['plugin_options']['update_cats'])
+			{
 				$content['update_cats'] = $content['plugin_options']['update_cats'];
 			}
-			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
+			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options']))
+			{
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 			else
@@ -251,12 +282,15 @@ 
 				1       => lang('Human friendly values')
 			);
 			$preserv = $content;
-			if($this->mapping_fields['cat_id']) {
+			if($this->mapping_fields['cat_id'])
+			{
 				$sel_options['update_cats'] = array(
 					'add'	=> lang('Add'),
 					'replace'=> lang('Replace')
 				);
-			} else {
+			}
+			else
+			{
 				$content['no_cats'] = true;
 			}
 			unset ($preserv['button']);
@@ -273,7 +307,10 @@ 
 	*/
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		}
 		// return from step50
 		if ($content['step'] == 'wizard_step50')
 		{
@@ -329,7 +366,10 @@ 
 					'field'	=>	$field[$index],
 					'conversion'	=>	$conversion[$index]
 				);
-				if(strstr($title,lang('Extra %1'))) $empties++;
+				if(strstr($title,lang('Extra %1')))
+				{
+					$empties++;
+				}
 			}
 			while($empties <= 3)
 			{
@@ -355,7 +395,10 @@ 
 	*/
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		}
 
 		// return from step55
 		if ($content['step'] == 'wizard_step55')
@@ -363,7 +406,8 @@ 
 
 			// Clear conditions that don't do anything
 			array_shift($content['conditions']);
-			foreach($content['conditions'] as $key => &$condition) {
+			foreach($content['conditions'] as $key => &$condition)
+			{
 				if(($condition['true']['action'] == 'none' || !$condition['true']['action'])
 					&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) &&
 					!$condition['string']
@@ -376,8 +420,7 @@ 
 				elseif($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
 					$condition['true']['action'] != '' && $condition['false']['action'] == '' ||
 					!$condition['true'] || !$condition['false']
-				)
-				{
+				) {
 					$condition[$condition['true']['action'] == '' ? 'true' : 'false']['action'] = "none";
 				}
 			}
@@ -404,12 +447,14 @@ 
 		$content['text'] = $this->steps['wizard_step55'];
 		$content['step'] = 'wizard_step55';
 
-		if(!$content['conditions'] && $content['plugin_options']['conditions']) {
+		if(!$content['conditions'] && $content['plugin_options']['conditions'])
+		{
 			$content['conditions'] = $content['plugin_options']['conditions'];
 		}
 		$preserv = $content;
 
-		foreach($content['field_mapping'] as $field) {
+		foreach($content['field_mapping'] as $field)
+		{
 			$sel_options['string'][$field] = $this->mapping_fields[$field];
 			if(!$sel_options['string'][$field])
 			{
@@ -450,7 +495,10 @@ 
 	 */
 	public function wizard_step65(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__ . '->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(__METHOD__ . '->$content '.print_r($content,true));
+		}
 
 		// return from step65
 		if ($content['step'] == 'wizard_step65')
@@ -472,12 +520,14 @@ 
 		$content['text'] = $this->steps['wizard_step65'];
 		$content['step'] = 'wizard_step65';
 
-		if(!$content['override_values'] && $content['plugin_options']['override_values']) {
+		if(!$content['override_values'] && $content['plugin_options']['override_values'])
+		{
 			$content['override_values'] = $content['plugin_options']['override_values'];
 		}
 		$preserv = $content;
 
-		foreach($content['field_mapping'] as $field) {
+		foreach($content['field_mapping'] as $field)
+		{
 			$sel_options['string'][$field] = $this->mapping_fields[$field];
 			if(!$sel_options['string'][$field])
 			{

admin/inc/class.uiconfig.inc.php

Spacing +52 added lines, -53 removed lines

@@ -20,7 +20,7 @@ 
 {
 	var $public_functions = array('index' => True);
 
-	function index($params=null)
+	function index($params = null)
 	{
 		// if we have a xet file, run new et2 config
 		if (file_exists(EGW_SERVER_ROOT.'/'.$_GET['appname'].'/templates/default/config.xet'))
@@ -46,7 +46,7 @@ 
 			//_debug_array($params);
 			$_appname = $_GET['appname'];
 		}
-		if ($GLOBALS['egw']->acl->check('site_config_acce',1,'admin'))
+		if ($GLOBALS['egw']->acl->check('site_config_acce', 1, 'admin'))
 		{
 			Egw::redirect_link('/index.php');
 		}
@@ -57,12 +57,12 @@ 
 			Api\Translation::add_app($_appname);
 		}
 
-		if(get_magic_quotes_gpc() && is_array($_POST['newsettings']))
+		if (get_magic_quotes_gpc() && is_array($_POST['newsettings']))
 		{
 			$_POST['newsettings'] = array_stripslashes($_POST['newsettings']);
 		}
 
-		switch($_appname)
+		switch ($_appname)
 		{
 			case 'admin':
 			case 'addressbook':
@@ -89,7 +89,7 @@ 
 		$t = new Framework\Template(Framework\Template::get_dir($appname));
 		$t->set_unknowns('keep');
 		$t->set_file(array('config' => 'config.tpl'));
-		$t->set_block('config','header','header');
+		$t->set_block('config', 'header', 'header');
 
 		// fix header templates missing essential parts like display of validation errors
 		$header = $t->get_var('header');
@@ -107,15 +107,15 @@ 
 		}
 		$t->set_var('header', $header);
 
-		$t->set_block('config','body','body');
-		$t->set_block('config','footer','footer');
+		$t->set_block('config', 'body', 'body');
+		$t->set_block('config', 'footer', 'footer');
 
 		// fix footer submit buttons to just {submit} {cancel}
 		$t->set_var('footer', preg_replace('/<input[^>]+value="{lang_(submit|cancel)}"[^>]*>/', '{$1}', $t->get_var('footer')));
 
 		$c = new Api\Config($config_appname);
 		$c->read_repository();
-		if ($_POST['cancel'] || ($_POST['submit'] || $_POST['save'] || $_POST['apply']) && $GLOBALS['egw']->acl->check('site_config_acce',2,'admin'))
+		if ($_POST['cancel'] || ($_POST['submit'] || $_POST['save'] || $_POST['apply']) && $GLOBALS['egw']->acl->check('site_config_acce', 2, 'admin'))
 		{
 			Egw::redirect_link('/admin/index.php?ajax=true');
 		}
@@ -123,9 +123,9 @@ 
 		if ($_POST['submit'] || $_POST['save'] || $_POST['apply'])
 		{
 			/* Load hook file with functions to validate each Api\Config (one/none/all) */
-			Api\Hooks::single('config_validate',$appname);
+			Api\Hooks::single('config_validate', $appname);
 
-			foreach($_POST['newsettings'] as $key => $config)
+			foreach ($_POST['newsettings'] as $key => $config)
 			{
 				if ($config)
 				{
@@ -133,26 +133,26 @@ 
 					if (in_array($key, (array)$GLOBALS['egw_info']['server']['found_validation_hook'], true) && function_exists($key))
 					{
 						call_user_func($key, $config, $c);
-						if($GLOBALS['config_error'])
+						if ($GLOBALS['config_error'])
 						{
-							$errors .= lang($GLOBALS['config_error']) . "\n";
+							$errors .= lang($GLOBALS['config_error'])."\n";
 							$GLOBALS['config_error'] = False;
 						}
 					}
 				}
 				/* don't erase passwords, since we also don't print them */
-				elseif(strpos($key,'passwd') === false && strpos($key,'password') === false && strpos($key,'root_pw') === false)
+				elseif (strpos($key, 'passwd') === false && strpos($key, 'password') === false && strpos($key, 'root_pw') === false)
 				{
 					unset($c->config_data[$key]);
 				}
 			}
-			if(in_array('final_validation', (array)$GLOBALS['egw_info']['server']['found_validation_hook']) &&
+			if (in_array('final_validation', (array)$GLOBALS['egw_info']['server']['found_validation_hook']) &&
 				function_exists('final_validation'))
 			{
 				final_validation($_POST['newsettings']);
-				if($GLOBALS['config_error'])
+				if ($GLOBALS['config_error'])
 				{
-					$errors .= lang($GLOBALS['config_error']) . "\n";
+					$errors .= lang($GLOBALS['config_error'])."\n";
 					$GLOBALS['config_error'] = False;
 				}
 				unset($GLOBALS['egw_info']['server']['found_validation_hook']);
@@ -160,7 +160,7 @@ 
 
 			$c->save_repository();
 
-			if(!$errors && !$_POST['apply'])
+			if (!$errors && !$_POST['apply'])
 			{
 				Framework::message(lang('Configuration saved.'), 'success');
 				Egw::redirect_link('/index.php', array(
@@ -170,10 +170,10 @@ 
 			}
 		}
 
-		$t->set_var('error','');
-		if($errors)
+		$t->set_var('error', '');
+		if ($errors)
 		{
-			Framework::message(lang('Error') . ': ' . $errors, 'error');
+			Framework::message(lang('Error').': '.$errors, 'error');
 			unset($errors);
 			unset($GLOBALS['config_error']);
 		}
@@ -181,41 +181,41 @@ 
 		{
 			Framework::message(lang('Configuration saved.'), 'success');
 		}
-		$t->set_var('title',lang('Site Configuration'));
-		$t->set_var('action_url',$GLOBALS['egw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname));
-		$t->set_var('th_bg',     $GLOBALS['egw_info']['theme']['th_bg']);
-		$t->set_var('th_text',   $GLOBALS['egw_info']['theme']['th_text']);
-		$t->set_var('row_on',    $GLOBALS['egw_info']['theme']['row_on']);
-		$t->set_var('row_off',   $GLOBALS['egw_info']['theme']['row_off']);
+		$t->set_var('title', lang('Site Configuration'));
+		$t->set_var('action_url', $GLOBALS['egw']->link('/index.php', 'menuaction=admin.uiconfig.index&appname='.$appname));
+		$t->set_var('th_bg', $GLOBALS['egw_info']['theme']['th_bg']);
+		$t->set_var('th_text', $GLOBALS['egw_info']['theme']['th_text']);
+		$t->set_var('row_on', $GLOBALS['egw_info']['theme']['row_on']);
+		$t->set_var('row_off', $GLOBALS['egw_info']['theme']['row_off']);
 		$t->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__CLASS__)));
 
 		$vars = $t->get_undefined('body');
 
-		if (Api\Hooks::single('config',$appname))	// reload the config-values, they might have changed
+		if (Api\Hooks::single('config', $appname))	// reload the config-values, they might have changed
 		{
 			$c->read_repository();
 		}
-		foreach($vars as $value)
+		foreach ($vars as $value)
 		{
-			$valarray = explode('_',$value);
+			$valarray = explode('_', $value);
 			$type = array_shift($valarray);
-			$newval = implode(' ',$valarray);
+			$newval = implode(' ', $valarray);
 
 			switch ($type)
 			{
 				case 'lang':
-					$t->set_var($value,lang($newval));
+					$t->set_var($value, lang($newval));
 					break;
 				case 'value':
-					$newval = str_replace(' ','_',$newval);
+					$newval = str_replace(' ', '_', $newval);
 					/* Don't show passwords in the form */
-					if(strpos($value,'passwd') !== false || strpos($value,'password') !== false || strpos($value,'root_pw') !== false)
+					if (strpos($value, 'passwd') !== false || strpos($value, 'password') !== false || strpos($value, 'root_pw') !== false)
 					{
-						$t->set_var($value,'');
+						$t->set_var($value, '');
 					}
 					else
 					{
-						$t->set_var($value,$c->config_data[$newval]);
+						$t->set_var($value, $c->config_data[$newval]);
 					}
 					break;
 				/*
@@ -233,46 +233,45 @@ 
 				*/
 				case 'selected':
 					$configs = array();
-					$newvals = explode(' ',$newval);
+					$newvals = explode(' ', $newval);
 					$setting = end($newvals);
-					for ($i=0;$i<(count($newvals) - 1); $i++)
+					for ($i = 0; $i < (count($newvals) - 1); $i++)
 					{
 						$configs[] = $newvals[$i];
 					}
-					$config = implode('_',$configs);
+					$config = implode('_', $configs);
 					/* echo $config . '=' . $c->config_data[$config]; */
 					if ($c->config_data[$config] == $setting)
 					{
-						$t->set_var($value,' selected');
+						$t->set_var($value, ' selected');
 					}
 					else
 					{
-						$t->set_var($value,'');
+						$t->set_var($value, '');
 					}
 					break;
 				case 'hook':
-					$newval = str_replace(' ','_',$newval);
-					if(function_exists($newval))
+					$newval = str_replace(' ', '_', $newval);
+					if (function_exists($newval))
 					{
-						$t->set_var($value,$newval($c->config_data));
+						$t->set_var($value, $newval($c->config_data));
 					}
 					else
 					{
-						$t->set_var($value,'');
+						$t->set_var($value, '');
 					}
 					break;
 				case 'call':	// eg. call_class::method or call_app.class.method
-					$newval = str_replace(' ','_',$newval);
-					$t->set_var($value,ExecMethod($newval,$c->config_data));
+					$newval = str_replace(' ', '_', $newval);
+					$t->set_var($value, ExecMethod($newval, $c->config_data));
 					break;
 				default:
-					$t->set_var($value,'');
+					$t->set_var($value, '');
 					break;
 			}
 		}
 		$t->set_var('submit', '<div class="dialogFooterToolbar" style="text-align: left">'.
-			($GLOBALS['egw']->acl->check('site_config_acce',2,'admin') ? '' :
-				Api\Html::submit_button('save', 'Save')."\n".
+			($GLOBALS['egw']->acl->check('site_config_acce', 2, 'admin') ? '' : Api\Html::submit_button('save', 'Save')."\n".
 				Api\Html::submit_button('apply', 'Apply')));
 		$t->set_var('cancel', Api\Html::submit_button('cancel', 'Cancel').'</div>');
 
@@ -282,10 +281,10 @@ 
 		// render the page
 		$GLOBALS['egw']->framework->render(
 			'<div id="admin-config-'.$appname.'" class="admin-config">'.
-			$t->parse('out','header').
-			$t->fp('out','body').
-			$t->fp('out','footer').'</div>',
-			null,true
+			$t->parse('out', 'header').
+			$t->fp('out', 'body').
+			$t->fp('out', 'footer').'</div>',
+			null, true
 		);
 	}
 }

Braces +9 added lines, -2 removed lines

@@ -85,7 +85,11 @@ 
 				$config_appname = $appname;
 				break;
 		}
-		if (ob_get_contents()) ob_end_flush(); // if there is output in buffer, flush it now.
+		if (ob_get_contents())
+		{
+			ob_end_flush();
+		}
+		// if there is output in buffer, flush it now.
 		$t = new Framework\Template(Framework\Template::get_dir($appname));
 		$t->set_unknowns('keep');
 		$t->set_file(array('config' => 'config.tpl'));
@@ -191,10 +195,13 @@ 
 
 		$vars = $t->get_undefined('body');
 
-		if (Api\Hooks::single('config',$appname))	// reload the config-values, they might have changed
+		if (Api\Hooks::single('config',$appname))
+		{
+			// reload the config-values, they might have changed
 		{
 			$c->read_repository();
 		}
+		}
 		foreach($vars as $value)
 		{
 			$valarray = explode('_',$value);

admin/inc/class.admin_import_users_csv.inc.php

Indentation +21 added lines, -21 removed lines

@@ -275,37 +275,37 @@
 	}
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can concatenate them 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 concatenate them 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 +69 added lines, -28 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * class import_csv for admin (users)
  */
-class admin_import_users_csv implements importexport_iface_import_plugin  {
+class admin_import_users_csv implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 		// char
@@ -90,7 +91,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'],
@@ -112,9 +114,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);
 		}
@@ -131,17 +136,27 @@ 
 			'account_status'	=> array('A' => lang('Active'), '' => lang('Disabled'), 'D' => lang('Disabled')),
 		);
 
-		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;
+			}
 
-			if(strtolower($record['account_expires']) == 'never') $record['account_expires'] = -1;
+			if(strtolower($record['account_expires']) == 'never')
+			{
+				$record['account_expires'] = -1;
+			}
 			importexport_import_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ( $_definition->plugin_options['conditions'] )
+			{
+				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				{
+					switch ( $condition['type'] )
+					{
 						// exists
 						case 'exists' :
 							$accounts = array();
@@ -157,16 +172,23 @@ 
 							// Search looks in the given field, but doesn't do an exact match
 							foreach ( (array)$accounts as $key => $account )
 							{
-								if($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
+								if($account[$condition['string']] != $record[$condition['string']])
+								{
+									unset($accounts[$key]);
+								}
 							}
-							if ( is_array( $accounts ) && count( $accounts ) >= 1 ) {
+							if ( is_array( $accounts ) && count( $accounts ) >= 1 )
+							{
 								// apply action to all contacts matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$accounts as $account ) {
+								foreach ( (array)$accounts as $account )
+								{
 									$record['account_id'] = $account['account_id'];
 									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position(), $admin_cmd );
 								}
-							} else {
+							}
+							else
+							{
 								$action = $condition['false'];
 								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position(), $admin_cmd ));
 							}
@@ -176,13 +198,21 @@ 
 						default :
 							die('condition / action not supported!!!');
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
-			} else {
+			}
+			else
+			{
 				// unconditional insert
 				$success = $this->action( 'create', $record, $import_csv->get_current_position(), $admin_cmd );
 			}
-			if($success) $count++;
+			if($success)
+			{
+				$count++;
+			}
 		}
 		return $count;
 	}
@@ -194,8 +224,10 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0, $admin_cmd ) {
-		switch ($_action) {
+	private function action ( $_action, $_data, $record_num = 0, $admin_cmd )
+	{
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'disable':
@@ -209,13 +241,15 @@ 
 				)+(array)$admin_cmd);
 
 
-				if($this->dry_run) {
+				if($this->dry_run)
+				{
 					$this->results[$_action]++;
 					return true;
 				}
 				try {
 					$command->run();
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 					$this->errors[$record_num] = $e->getMessage();
 					return false;
 				}
@@ -232,7 +266,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('User CSV import');
 	}
 
@@ -241,7 +276,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Creates / updates user accounts from CSV file");
 	}
 
@@ -250,7 +286,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -276,7 +313,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -288,7 +326,8 @@ 
 	*       record_# => warning message
 	*       )
 	*/
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -300,7 +339,8 @@ 
 	*       record_# => error message
 	*       )
 	*/
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -312,7 +352,8 @@ 
 	*       action => record count
 	* )
 	*/
-	public function get_results() {
+	public function get_results()
+	{
 		return $this->results;
 	}
 }

Spacing +36 added lines, -36 removed lines

@@ -15,15 +15,15 @@ 
 /**
  * class import_csv for admin (users)
  */
-class admin_import_users_csv implements importexport_iface_import_plugin  {
+class admin_import_users_csv implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 		// string
+		'fieldsep', // char
+		'charset', // string
 		'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(
@@ -40,14 +40,14 @@ 
 	/**
 	 * actions which could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'create', 'delete', 'disable', 'enable' );
+	protected static $actions = array('none', 'update', 'create', 'delete', 'disable', 'enable');
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * @var definition
@@ -90,8 +90,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'],
 		));
@@ -99,11 +99,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'];
@@ -112,9 +112,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);
 		}
@@ -131,22 +131,22 @@ 
 			'account_status'	=> array('A' => lang('Active'), '' => lang('Disabled'), 'D' => lang('Disabled')),
 		);
 
-		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;
 
-			if(strtolower($record['account_expires']) == 'never') $record['account_expires'] = -1;
+			if (strtolower($record['account_expires']) == 'never') $record['account_expires'] = -1;
 			importexport_import_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ($_definition->plugin_options['conditions']) {
+				foreach ($_definition->plugin_options['conditions'] as $condition) {
+					switch ($condition['type']) {
 						// exists
 						case 'exists' :
 							$accounts = array();
 							// Skip the search if the field is empty
-							if($record[$condition['string']] !== '')
+							if ($record[$condition['string']] !== '')
 							{
 								$accounts = $GLOBALS['egw']->accounts->search(array(
 									'type' => 'accounts',
@@ -155,20 +155,20 @@ 
 								));
 							}
 							// Search looks in the given field, but doesn't do an exact match
-							foreach ( (array)$accounts as $key => $account )
+							foreach ((array)$accounts as $key => $account)
 							{
-								if($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
+								if ($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
 							}
-							if ( is_array( $accounts ) && count( $accounts ) >= 1 ) {
+							if (is_array($accounts) && count($accounts) >= 1) {
 								// apply action to all contacts matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$accounts as $account ) {
+								foreach ((array)$accounts as $account) {
 									$record['account_id'] = $account['account_id'];
-									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position(), $admin_cmd );
+									$success = $this->action($action['action'], $record, $import_csv->get_current_position(), $admin_cmd);
 								}
 							} else {
 								$action = $condition['false'];
-								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position(), $admin_cmd ));
+								$success = ($this->action($action['action'], $record, $import_csv->get_current_position(), $admin_cmd));
 							}
 							break;
 
@@ -180,9 +180,9 @@ 
 				}
 			} else {
 				// unconditional insert
-				$success = $this->action( 'create', $record, $import_csv->get_current_position(), $admin_cmd );
+				$success = $this->action('create', $record, $import_csv->get_current_position(), $admin_cmd);
 			}
-			if($success) $count++;
+			if ($success) $count++;
 		}
 		return $count;
 	}
@@ -194,7 +194,7 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0, $admin_cmd ) {
+	private function action($_action, $_data, $record_num = 0, $admin_cmd) {
 		switch ($_action) {
 			case 'none' :
 				return true;
@@ -203,22 +203,22 @@ 
 				$_data['account_expires'] = $_action == 'disable' ? 'already' : '';
 			case 'update' :
 				$old = $GLOBALS['egw']->accounts->read($_data['account_id']);
-				if($old)
+				if ($old)
 				{
 					$old['account_passwd'] = $old['account_pwd']; unset($old['account_pwd']);
-					$old['account_groups'] = implode(',',$GLOBALS['egw']->accounts->memberships($_data['account_id'], true));
+					$old['account_groups'] = implode(',', $GLOBALS['egw']->accounts->memberships($_data['account_id'], true));
 					// Limit history to what actually changed
 					$old = array_intersect_key($old, $_data);
 				}
 			case 'create' :
 				$command = new admin_cmd_edit_user(array(
-					'account' => $_action=='create'?null:(int)$_data['account_id'],
+					'account' => $_action == 'create' ?null:(int)$_data['account_id'],
 					'set' => $_data,
-					'old' => $_action=='create'?null:$old
-				)+(array)$admin_cmd);
+					'old' => $_action == 'create' ?null:$old
+				) + (array)$admin_cmd);
 
 
-				if($this->dry_run) {
+				if ($this->dry_run) {
 					$this->results[$_action]++;
 					return true;
 				}
@@ -275,7 +275,7 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl(importexport_definition &$definition=null)
+	public function get_options_etpl(importexport_definition &$definition = null)
 	{
 		// lets do it!
 	}

admin/inc/class.admin_export_groups_csv.inc.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$query = array(
@@ -40,12 +40,12 @@ 
 		// $_record is an array, that's what search() returns
 		foreach ($selection as $_record) {
 			$record = new admin_egw_group_record($_record);
-			if($options['convert']) {
+			if ($options['convert']) {
 				importexport_export_csv::convert($record, admin_egw_group_record::$types, 'admin', $lookups);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach ($record->get_record_array() as $key => $value) {
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
  			}
 			$export_object->export_record($record);

Indentation +2 added lines, -2 removed lines

@@ -81,8 +81,8 @@
 	}
 
 	public static function get_mimetype() {
-                return 'text/csv';
-        }
+				return 'text/csv';
+		}
 
 	/**
 	 * Return array of settings for export dialog

Braces +25 added lines, -11 removed lines

@@ -21,7 +21,8 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$query = array(
@@ -38,14 +39,22 @@ 
 		);
 
 		// $_record is an array, that's what search() returns
-		foreach ($selection as $_record) {
+		foreach ($selection as $_record)
+		{
 			$record = new admin_egw_group_record($_record);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($record, admin_egw_group_record::$types, 'admin', $lookups);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
  			}
 			$export_object->export_record($record);
@@ -58,7 +67,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Group CSV export');
 	}
 
@@ -67,7 +77,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports groups into a CSV File. ");
 	}
 
@@ -76,11 +87,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
                 return 'text/csv';
         }
 
@@ -106,7 +119,8 @@ 
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'preserv' => array('no_error_for_no_selection'),
 		);