EGroupware / egroupware

setup/applications.php

Indentation +1 added lines, -1 removed lines

@@ -350,7 +350,7 @@
 			{
 				echo lang('because it depends upon') . ':<br />' . "\n";
 				list($depapp,$depver) = parsedep($setup_info[$resolve]['depends'],False);
-                            $depapp_count = count($depapp);
+							$depapp_count = count($depapp);
 				for ($i=0; $i<$depapp_count; $i++)
 				{
 					echo '<br />' . $depapp[$i] . ': ';

Braces +4 added lines, -1 removed lines

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

Spacing +220 added lines, -220 removed lines

@@ -51,36 +51,36 @@ 
 	Api\Csrf::validate($_POST['csrf_token'], __FILE__);
 }
 
-$setup_tpl->set_block('T_login_stage_header','B_multi_domain','V_multi_domain');
-$setup_tpl->set_block('T_login_stage_header','B_single_domain','V_single_domain');
-$setup_tpl->set_block('T_setup_main','header','header');
-$setup_tpl->set_block('T_setup_main','app_header','app_header');
-$setup_tpl->set_block('T_setup_main','apps','apps');
-$setup_tpl->set_block('T_setup_main','detail','detail');
-$setup_tpl->set_block('T_setup_main','table','table');
-$setup_tpl->set_block('T_setup_main','hook','hook');
-$setup_tpl->set_block('T_setup_main','dep','dep');
-$setup_tpl->set_block('T_setup_main','app_footer','app_footer');
-$setup_tpl->set_block('T_setup_main','submit','submit');
-$setup_tpl->set_block('T_setup_main','footer','footer');
-
-$bgcolor = array('#DDDDDD','#EEEEEE');
-
-function parsedep($depends,$main=True)
+$setup_tpl->set_block('T_login_stage_header', 'B_multi_domain', 'V_multi_domain');
+$setup_tpl->set_block('T_login_stage_header', 'B_single_domain', 'V_single_domain');
+$setup_tpl->set_block('T_setup_main', 'header', 'header');
+$setup_tpl->set_block('T_setup_main', 'app_header', 'app_header');
+$setup_tpl->set_block('T_setup_main', 'apps', 'apps');
+$setup_tpl->set_block('T_setup_main', 'detail', 'detail');
+$setup_tpl->set_block('T_setup_main', 'table', 'table');
+$setup_tpl->set_block('T_setup_main', 'hook', 'hook');
+$setup_tpl->set_block('T_setup_main', 'dep', 'dep');
+$setup_tpl->set_block('T_setup_main', 'app_footer', 'app_footer');
+$setup_tpl->set_block('T_setup_main', 'submit', 'submit');
+$setup_tpl->set_block('T_setup_main', 'footer', 'footer');
+
+$bgcolor = array('#DDDDDD', '#EEEEEE');
+
+function parsedep($depends, $main = True)
 {
 	$depstring = '(';
-	foreach($depends as $b)
+	foreach ($depends as $b)
 	{
-		foreach($b as $c => $d)
+		foreach ($b as $c => $d)
 		{
 			if (is_array($d))
 			{
-				$depstring .= $c . ': ' .implode(',',$d) . '; ';
+				$depstring .= $c.': '.implode(',', $d).'; ';
 				$depver[] = $d;
 			}
 			else
 			{
-				$depstring .= $c . ': ' . $d . '; ';
+				$depstring .= $c.': '.$d.'; ';
 				$depapp[] = $d;
 			}
 		}
@@ -92,7 +92,7 @@ 
 	}
 	else
 	{
-		return array($depapp,$depver);
+		return array($depapp, $depver);
 	}
 }
 
@@ -106,17 +106,17 @@ 
 
 @ksort($setup_info);
 
-if(@$_POST['cancel'])
+if (@$_POST['cancel'])
 {
 	Header("Location: index.php");
 	exit;
 }
 
-if(@$_POST['submit'])
+if (@$_POST['submit'])
 {
-	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
-	$setup_tpl->set_var('description',lang('App install/remove/upgrade') . ':');
-	$setup_tpl->pparse('out','header');
+	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'), False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
+	$setup_tpl->set_var('description', lang('App install/remove/upgrade').':');
+	$setup_tpl->pparse('out', 'header');
 
 	$appname = $_POST['appname'];
 	$remove  = $_POST['remove'];
@@ -125,12 +125,12 @@ 
 
 	$register_hooks = false;
 
-	if(!empty($remove) && is_array($remove))
+	if (!empty($remove) && is_array($remove))
 	{
 		$historylog = new Api\Storage\History();
 		$historylog->db = $GLOBALS['egw_setup']->db;
 
-		foreach($remove as $appname => $key)
+		foreach ($remove as $appname => $key)
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
@@ -138,30 +138,30 @@ 
 
 			if ($setup_info[$appname]['tables'])
 			{
-				$GLOBALS['egw_setup']->process->droptables($terror,$DEBUG);
-				echo '<br />' . $app_title . ' ' . lang('tables dropped') . '.';
+				$GLOBALS['egw_setup']->process->droptables($terror, $DEBUG);
+				echo '<br />'.$app_title.' '.lang('tables dropped').'.';
 			}
 
 			$GLOBALS['egw_setup']->deregister_app($setup_info[$appname]['name']);
-			echo '<br />' . $app_title . ' ' . lang('deregistered') . '.';
+			echo '<br />'.$app_title.' '.lang('deregistered').'.';
 
 			$register_hooks = true;
 
 			$historylog->appname = $appname;
 			if ($historylog->delete(null))
 			{
-				echo '<br />' . $app_title . ' ' . lang('Historylog removed') . '.';
+				echo '<br />'.$app_title.' '.lang('Historylog removed').'.';
 			}
 
 			// delete all application categories and ACL
-			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->cats_table,array('cat_appname' => $appname),__LINE__,__FILE__);
-			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->acl_table,array('acl_appname' => $appname),__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->cats_table, array('cat_appname' => $appname), __LINE__, __FILE__);
+			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->acl_table, array('acl_appname' => $appname), __LINE__, __FILE__);
 		}
 	}
 
-	if(!empty($install) && is_array($install))
+	if (!empty($install) && is_array($install))
 	{
-		foreach($install as $appname => $key)
+		foreach ($install as $appname => $key)
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
@@ -171,13 +171,13 @@ 
 			{
 				$terror_c = $GLOBALS['egw_setup']->process->current($terror, $DEBUG);
 				$terror = $GLOBALS['egw_setup']->process->default_records($terror_c, $DEBUG);
-				echo '<br />' . $app_title . ' '
-					. lang('tables installed, unless there are errors printed above') . '.';
+				echo '<br />'.$app_title.' '
+					. lang('tables installed, unless there are errors printed above').'.';
 			}
 			else
 			{
 				// check default_records for apps without tables, they might need some initial work too
-				$terror = $GLOBALS['egw_setup']->process->default_records($terror,$DEBUG);
+				$terror = $GLOBALS['egw_setup']->process->default_records($terror, $DEBUG);
 				if ($GLOBALS['egw_setup']->app_registered($setup_info[$appname]['name']))
 				{
 					$GLOBALS['egw_setup']->update_app($setup_info[$appname]['name']);
@@ -186,7 +186,7 @@ 
 				{
 					$GLOBALS['egw_setup']->register_app($setup_info[$appname]['name']);
 				}
-				echo '<br />' . $app_title . ' ' . lang('registered') . '.';
+				echo '<br />'.$app_title.' '.lang('registered').'.';
 
 				if ($setup_info[$appname]['hooks'])
 				{
@@ -196,23 +196,23 @@ 
 		}
 	}
 
-	if(!empty($upgrade) && is_array($upgrade))
+	if (!empty($upgrade) && is_array($upgrade))
 	{
-		foreach($upgrade as $appname => $key)
+		foreach ($upgrade as $appname => $key)
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
 			$terror[$appname] = $setup_info[$appname];
 
-			$GLOBALS['egw_setup']->process->upgrade($terror,$DEBUG);
+			$GLOBALS['egw_setup']->process->upgrade($terror, $DEBUG);
 			if ($setup_info[$appname]['tables'])
 			{
-				echo '<br />' . $app_title . ' ' . lang('tables upgraded') . '.';
+				echo '<br />'.$app_title.' '.lang('tables upgraded').'.';
 				// The process_upgrade() function also handles registration
 			}
 			else
 			{
-				echo '<br />' . $app_title . ' ' . lang('upgraded') . '.';
+				echo '<br />'.$app_title.' '.lang('upgraded').'.';
 			}
 			$register_hooks = true;
 		}
@@ -221,61 +221,61 @@ 
 	if ($register_hooks)
 	{
 		Api\Hooks::read(true);
-		echo '<br />' . $app_title . ' ' . lang('hooks registered') . '.';
+		echo '<br />'.$app_title.' '.lang('hooks registered').'.';
 	}
 
 	//$setup_tpl->set_var('goback',
-	echo '<br /><a href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>';
+	echo '<br /><a href="applications.php?debug='.$DEBUG.'">'.lang('Go back').'</a>';
 	//$setup_tpl->pparse('out','submit');
-	$setup_tpl->pparse('out','footer');
+	$setup_tpl->pparse('out', 'footer');
 	exit;
 }
 else
 {
-	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'), False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 }
 
-if(@$_GET['hooks'])
+if (@$_GET['hooks'])
 {
 	Api\Cache::flush(Api\Cache::INSTANCE);
 
-	echo lang('Cached cleared') . '<br />';
+	echo lang('Cached cleared').'<br />';
 }
 $detail = $_GET['detail'];
 $resolve = $_GET['resolve'];
-if(@$detail)
+if (@$detail)
 {
 	@ksort($setup_info[$detail]);
-	$setup_tpl->set_var('description',lang('App details') . ':');
-	$setup_tpl->pparse('out','header');
+	$setup_tpl->set_var('description', lang('App details').':');
+	$setup_tpl->pparse('out', 'header');
 
-	$setup_tpl->set_var('name','application');
+	$setup_tpl->set_var('name', 'application');
 	$setup_tpl->set_var('details', lang($setup_info[$detail]['title']));
-	$setup_tpl->pparse('out','detail');
+	$setup_tpl->pparse('out', 'detail');
 
-	foreach($setup_info[$detail] as $key => $val)
+	foreach ($setup_info[$detail] as $key => $val)
 	{
-		switch($key)
+		switch ($key)
 		{
 			case 'title':
 				continue 2;
 			case 'tables':
 				$tblcnt = count($setup_info[$detail][$key]);
-				if(is_array($val))
+				if (is_array($val))
 				{
-					$key = '<a href="sqltoarray.php?appname=' . $detail . '&submit=True&apps=True">' . $key . '(' . $tblcnt . ')</a>' . "\n";
-					$val = implode(',' . "\n",$val);
+					$key = '<a href="sqltoarray.php?appname='.$detail.'&submit=True&apps=True">'.$key.'('.$tblcnt.')</a>'."\n";
+					$val = implode(','."\n", $val);
 				}
 				break;
 			case 'hooks':
-				foreach($val as &$hooks)
+				foreach ($val as &$hooks)
 				{
 					$hooks = (array)$hooks;
 				}
 				$val = str_replace('EGroupware\\', '', implode(', ', call_user_func_array('array_merge', $val)));
 				break;
 			case 'depends':
-				foreach($val as &$dep)
+				foreach ($val as &$dep)
 				{
 					$dep = $dep['appname'].': '.implode(', ', $dep['versions']);
 				}
@@ -288,174 +288,174 @@ 
 				if (is_array($val)) $val = implode(', ', $val);
 				break;
 		}
-		$setup_tpl->set_var('bg_color', $bgcolor[++$i & 1]);
-		$setup_tpl->set_var('name',$key);
-		$setup_tpl->set_var('details',$val);
-		$setup_tpl->pparse('out','detail');
+		$setup_tpl->set_var('bg_color', $bgcolor[++$i&1]);
+		$setup_tpl->set_var('name', $key);
+		$setup_tpl->set_var('details', $val);
+		$setup_tpl->pparse('out', 'detail');
 	}
 
-	echo '<br /><a href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>';
-	$setup_tpl->pparse('out','footer');
+	echo '<br /><a href="applications.php?debug='.$DEBUG.'">'.lang('Go back').'</a>';
+	$setup_tpl->pparse('out', 'footer');
 	exit;
 }
 elseif (@$resolve)
 {
 	$version  = $_GET['version'];
 	$notables = $_GET['notables'];
-	$setup_tpl->set_var('description',lang('Problem resolution'). ':');
-	$setup_tpl->pparse('out','header');
+	$setup_tpl->set_var('description', lang('Problem resolution').':');
+	$setup_tpl->pparse('out', 'header');
 	$app_title = $setup_info[$resolve]['title'] ? $setup_info[$resolve]['title'] : $setup_info[$resolve]['name'];
 
-	if($_GET['post'])
+	if ($_GET['post'])
 	{
-		echo '"' . $app_title . '" ' . lang('may be broken') . ' ';
+		echo '"'.$app_title.'" '.lang('may be broken').' ';
 		echo lang('because an application it depends upon was upgraded');
 		echo '<br />';
-		echo lang('to a version it does not know about') . '.';
+		echo lang('to a version it does not know about').'.';
 		echo '<br />';
-		echo lang('However, the application may still work') . '.';
+		echo lang('However, the application may still work').'.';
 	}
-	elseif($_GET['badinstall'])
+	elseif ($_GET['badinstall'])
 	{
-		echo '"' . $app_title . '" ' . lang('is broken') . ' ';
-		echo lang('because of a failed upgrade or install') . '.';
+		echo '"'.$app_title.'" '.lang('is broken').' ';
+		echo lang('because of a failed upgrade or install').'.';
 		echo '<br />';
-		echo lang('Some or all of its tables are missing') . '.';
+		echo lang('Some or all of its tables are missing').'.';
 		echo '<br />';
-		echo lang('You should either uninstall and then reinstall it, or attempt manual repairs') . '.';
+		echo lang('You should either uninstall and then reinstall it, or attempt manual repairs').'.';
 	}
-	elseif($_GET['deleted'])
+	elseif ($_GET['deleted'])
 	{
-		echo '"' . $app_title . '" ' . lang('is broken') . ' ';
-		echo lang('because its sources are missing') . '!';
+		echo '"'.$app_title.'" '.lang('is broken').' ';
+		echo lang('because its sources are missing').'!';
 		echo '<br />';
-		echo lang('However the tables are still in the database') . '.';
+		echo lang('However the tables are still in the database').'.';
 		echo '<br />';
-		echo lang('You should either install the sources or uninstall it, to get rid of the tables') . '.';
+		echo lang('You should either install the sources or uninstall it, to get rid of the tables').'.';
 	}
 	elseif (!$version)
 	{
-		if($setup_info[$resolve]['enabled'])
+		if ($setup_info[$resolve]['enabled'])
 		{
-			echo '"' . $app_title . '" ' . lang('is broken') . ' ';
+			echo '"'.$app_title.'" '.lang('is broken').' ';
 		}
 		else
 		{
-			echo '"' . $app_title . '" ' . lang('is disabled') . ' ';
+			echo '"'.$app_title.'" '.lang('is disabled').' ';
 		}
 
 		if (!$notables)
 		{
-			if($setup_info[$resolve]['status'] == 'D')
+			if ($setup_info[$resolve]['status'] == 'D')
 			{
-				echo lang('because it depends upon') . ':<br />' . "\n";
-				list($depapp,$depver) = parsedep($setup_info[$resolve]['depends'],False);
+				echo lang('because it depends upon').':<br />'."\n";
+				list($depapp, $depver) = parsedep($setup_info[$resolve]['depends'], False);
                             $depapp_count = count($depapp);
-				for ($i=0; $i<$depapp_count; $i++)
+				for ($i = 0; $i < $depapp_count; $i++)
 				{
-					echo '<br />' . $depapp[$i] . ': ';
+					echo '<br />'.$depapp[$i].': ';
 					$list = '';
-					foreach($depver[$i] as $x => $y)
+					foreach ($depver[$i] as $x => $y)
 					{
-						$list .= $y . ', ';
+						$list .= $y.', ';
 					}
-					echo substr($list,0,-2)."\n";
+					echo substr($list, 0, -2)."\n";
 				}
-				echo '<br /><br />' . lang('The table definition was correct, and the tables were installed') . '.';
+				echo '<br /><br />'.lang('The table definition was correct, and the tables were installed').'.';
 			}
 			else
 			{
-				echo lang('because it was manually disabled') . '.';
+				echo lang('because it was manually disabled').'.';
 			}
 		}
-		elseif($setup_info[$resolve]['enable'] == 2)
+		elseif ($setup_info[$resolve]['enable'] == 2)
 		{
-			echo lang('because it is not a user application, or access is controlled via acl') . '.';
+			echo lang('because it is not a user application, or access is controlled via acl').'.';
 		}
-		elseif($setup_info[$resolve]['enable'] == 0)
+		elseif ($setup_info[$resolve]['enable'] == 0)
 		{
-			echo lang('because the enable flag for this app is set to 0, or is undefined') . '.';
+			echo lang('because the enable flag for this app is set to 0, or is undefined').'.';
 		}
 		else
 		{
-			echo lang('because it requires manual table installation, <br />or the table definition was incorrect') . ".\n"
-				. lang("Please check for sql scripts within the application's directory") . '.';
+			echo lang('because it requires manual table installation, <br />or the table definition was incorrect').".\n"
+				. lang("Please check for sql scripts within the application's directory").'.';
 		}
-		echo '<br />' . lang('However, the application is otherwise installed') . '.';
+		echo '<br />'.lang('However, the application is otherwise installed').'.';
 	}
 	else
 	{
-		echo $app_title . ' ' . lang('has a version mismatch') . ' ';
-		echo lang('because of a failed upgrade, or the database is newer than the installed version of this app') . '.';
+		echo $app_title.' '.lang('has a version mismatch').' ';
+		echo lang('because of a failed upgrade, or the database is newer than the installed version of this app').'.';
 		echo '<br />';
-		echo lang('If the application has no defined tables, selecting upgrade should remedy the problem') . '.';
-		echo '<br />' . lang('However, the application is otherwise installed') . '.';
+		echo lang('If the application has no defined tables, selecting upgrade should remedy the problem').'.';
+		echo '<br />'.lang('However, the application is otherwise installed').'.';
 	}
 
-	echo '<br /><a href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>';
-	$setup_tpl->pparse('out','footer');
+	echo '<br /><a href="applications.php?debug='.$DEBUG.'">'.lang('Go back').'</a>';
+	$setup_tpl->pparse('out', 'footer');
 	exit;
 }
 else
 {
-	$setup_tpl->set_var('description',lang('Select the desired action(s) from the available choices'));
-	$setup_tpl->set_var('action_url','applications.php');
-	$setup_tpl->pparse('out','header');
-
-	$setup_tpl->set_var('appdata',lang('Application Data'));
-	$setup_tpl->set_var('actions',lang('Actions'));
-	$setup_tpl->set_var('app_info',lang('Application Name and Status Information'));
-	$setup_tpl->set_var('app_title',lang('Application Title'));
-	$setup_tpl->set_var('app_currentver',lang('Current Version'));
-	$setup_tpl->set_var('app_version',lang('Available Version'));
-	$setup_tpl->set_var('app_install',lang('Install'));
-	$setup_tpl->set_var('app_remove',lang('Remove'));
-	$setup_tpl->set_var('app_upgrade',lang('Upgrade'));
-	$setup_tpl->set_var('app_resolve',lang('Resolve'));
-	$setup_tpl->set_var('check','check.png');
-	$setup_tpl->set_var('install_all',lang('Install All'));
-	$setup_tpl->set_var('upgrade_all',lang('Upgrade All'));
-	$setup_tpl->set_var('remove_all',lang('Remove All'));
-	$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-	$setup_tpl->set_var('debug','<input type="checkbox" name="debug" value="True"' .($DEBUG ? ' checked="checked"' : '') . ' />');
-	$setup_tpl->set_var('bg_color',$bgcolor[0]);
-
-	$setup_tpl->pparse('out','app_header');
+	$setup_tpl->set_var('description', lang('Select the desired action(s) from the available choices'));
+	$setup_tpl->set_var('action_url', 'applications.php');
+	$setup_tpl->pparse('out', 'header');
+
+	$setup_tpl->set_var('appdata', lang('Application Data'));
+	$setup_tpl->set_var('actions', lang('Actions'));
+	$setup_tpl->set_var('app_info', lang('Application Name and Status Information'));
+	$setup_tpl->set_var('app_title', lang('Application Title'));
+	$setup_tpl->set_var('app_currentver', lang('Current Version'));
+	$setup_tpl->set_var('app_version', lang('Available Version'));
+	$setup_tpl->set_var('app_install', lang('Install'));
+	$setup_tpl->set_var('app_remove', lang('Remove'));
+	$setup_tpl->set_var('app_upgrade', lang('Upgrade'));
+	$setup_tpl->set_var('app_resolve', lang('Resolve'));
+	$setup_tpl->set_var('check', 'check.png');
+	$setup_tpl->set_var('install_all', lang('Install All'));
+	$setup_tpl->set_var('upgrade_all', lang('Upgrade All'));
+	$setup_tpl->set_var('remove_all', lang('Remove All'));
+	$setup_tpl->set_var('lang_debug', lang('enable for extra debug-messages'));
+	$setup_tpl->set_var('debug', '<input type="checkbox" name="debug" value="True"'.($DEBUG ? ' checked="checked"' : '').' />');
+	$setup_tpl->set_var('bg_color', $bgcolor[0]);
+
+	$setup_tpl->pparse('out', 'app_header');
 
 	$i = 0;
-	foreach($setup_info as $key => $value)
+	foreach ($setup_info as $key => $value)
 	{
-		if(@$value['name'])
+		if (@$value['name'])
 		{
 			$i = ($i ? 0 : 1);
-			$setup_tpl->set_var('apptitle',$value['title']?$value['title']:lang($value['name']));
-			$setup_tpl->set_var('currentver',@$value['currentver']);
-			$setup_tpl->set_var('version',$value['version']);
-			$setup_tpl->set_var('bg_color',$bgcolor[$i]);
+			$setup_tpl->set_var('apptitle', $value['title'] ? $value['title'] : lang($value['name']));
+			$setup_tpl->set_var('currentver', @$value['currentver']);
+			$setup_tpl->set_var('version', $value['version']);
+			$setup_tpl->set_var('bg_color', $bgcolor[$i]);
 
-			switch($value['status'])
+			switch ($value['status'])
 			{
 				case 'C':
-					$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-					$setup_tpl->set_var('upgrade','&nbsp;');
+					$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+					$setup_tpl->set_var('upgrade', '&nbsp;');
 					if (!$GLOBALS['egw_setup']->detection->check_app_tables($value['name']))
 					{
 						// App installed and enabled, but some tables are missing
-						$setup_tpl->set_var('instimg','table.png');
-						$setup_tpl->set_var('bg_color','FFCCAA');
-						$setup_tpl->set_var('instalt',lang('Not Completed'));
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
-						$status = lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
+						$setup_tpl->set_var('instimg', 'table.png');
+						$setup_tpl->set_var('bg_color', 'FFCCAA');
+						$setup_tpl->set_var('instalt', lang('Not Completed'));
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&badinstall=True">'.lang('Potential Problem').'</a>');
+						$status = lang('Requires reinstall or manual repair').' - '.$value['status'];
 					}
 					else
 					{
-						$setup_tpl->set_var('instimg','completed.png');
-						$setup_tpl->set_var('instalt',lang('Completed'));
-						$setup_tpl->set_var('install','&nbsp;');
-						if($value['enabled'])
+						$setup_tpl->set_var('instimg', 'completed.png');
+						$setup_tpl->set_var('instalt', lang('Completed'));
+						$setup_tpl->set_var('install', '&nbsp;');
+						if ($value['enabled'])
 						{
-							$setup_tpl->set_var('resolution','');
-							$status = lang('OK') . ' - ' . $value['status'];
+							$setup_tpl->set_var('resolution', '');
+							$status = lang('OK').' - '.$value['status'];
 						}
 						else
 						{
@@ -463,123 +463,123 @@ 
 							{
 								$notables = '&notables=True';
 							}
-							$setup_tpl->set_var('bg_color','CCCCFF');
+							$setup_tpl->set_var('bg_color', 'CCCCFF');
 							$setup_tpl->set_var('resolution',
-								'<a href="applications.php?resolve=' . $value['name'] .  $notables . '">' . lang('Possible Reasons') . '</a>'
+								'<a href="applications.php?resolve='.$value['name'].$notables.'">'.lang('Possible Reasons').'</a>'
 							);
-							$status = lang('Disabled') . ' - ' . $value['status'];
+							$status = lang('Disabled').' - '.$value['status'];
 						}
 					}
 					break;
 				case 'U':
-					$setup_tpl->set_var('instimg','incomplete.png');
-					$setup_tpl->set_var('instalt',lang('Not Completed'));
+					$setup_tpl->set_var('instimg', 'incomplete.png');
+					$setup_tpl->set_var('instalt', lang('Not Completed'));
 					if (!@$value['currentver'])
 					{
-						if ($value['tables'] && $GLOBALS['egw_setup']->detection->check_app_tables($value['name'],True))
+						if ($value['tables'] && $GLOBALS['egw_setup']->detection->check_app_tables($value['name'], True))
 						{
 							// Some tables missing
-							$setup_tpl->set_var('remove',$key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-							$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
-							$status = lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
+							$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+							$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&badinstall=True">'.lang('Potential Problem').'</a>');
+							$status = lang('Requires reinstall or manual repair').' - '.$value['status'];
 						}
 						else
 						{
-							$setup_tpl->set_var('remove','&nbsp;');
-							$setup_tpl->set_var('resolution','');
-							$status = lang('Requires upgrade') . ' - ' . $value['status'];
+							$setup_tpl->set_var('remove', '&nbsp;');
+							$setup_tpl->set_var('resolution', '');
+							$status = lang('Requires upgrade').' - '.$value['status'];
 						}
 						// show not installed apps without icon
-						$setup_tpl->set_var('instimg','spacer.png');
-						$setup_tpl->set_var('instalt','');
-						$setup_tpl->set_var('bg_color','CCFFCC');
-						$setup_tpl->set_var('install','<input type="checkbox" name="install[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('upgrade','&nbsp;');
-						$status = lang('Please install') . ' - ' . $value['status'];
+						$setup_tpl->set_var('instimg', 'spacer.png');
+						$setup_tpl->set_var('instalt', '');
+						$setup_tpl->set_var('bg_color', 'CCFFCC');
+						$setup_tpl->set_var('install', '<input type="checkbox" name="install['.$value['name'].']" />');
+						$setup_tpl->set_var('upgrade', '&nbsp;');
+						$status = lang('Please install').' - '.$value['status'];
 					}
 					else
 					{
-						$setup_tpl->set_var('bg_color','CCCCFF');
-						$setup_tpl->set_var('install','&nbsp;');
+						$setup_tpl->set_var('bg_color', 'CCCCFF');
+						$setup_tpl->set_var('install', '&nbsp;');
 						// TODO display some info about breakage if you mess with this app
-						$setup_tpl->set_var('upgrade','<input type="checkbox" name="upgrade[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('remove',$key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('resolution','');
-						$status = lang('Requires upgrade') . ' - ' . $value['status'];
+						$setup_tpl->set_var('upgrade', '<input type="checkbox" name="upgrade['.$value['name'].']" />');
+						$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+						$setup_tpl->set_var('resolution', '');
+						$status = lang('Requires upgrade').' - '.$value['status'];
 					}
 					break;
 				case 'V':
-					$setup_tpl->set_var('instimg','incomplete.png');
-					$setup_tpl->set_var('instalt',lang('Not Completed'));
-					$setup_tpl->set_var('install','&nbsp;');
-					$setup_tpl->set_var('remove',$key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
+					$setup_tpl->set_var('instimg', 'incomplete.png');
+					$setup_tpl->set_var('instalt', lang('Not Completed'));
+					$setup_tpl->set_var('install', '&nbsp;');
+					$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
 					if ($value['version'] == 'deleted')
 					{
-						$setup_tpl->set_var('bg_color','CCAAAA');
-						$setup_tpl->set_var('upgrade','&nbsp;');
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&deleted=True">' . lang('Possible Solutions') . '</a>');
-						$status = lang('Sources deleted/missing') . ' - ' . $value['status'];
+						$setup_tpl->set_var('bg_color', 'CCAAAA');
+						$setup_tpl->set_var('upgrade', '&nbsp;');
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&deleted=True">'.lang('Possible Solutions').'</a>');
+						$status = lang('Sources deleted/missing').' - '.$value['status'];
 					}
 					else
 					{
-						$setup_tpl->set_var('upgrade','<input type="checkbox" name="upgrade[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&version=True">' . lang('Possible Solutions') . '</a>');
-						$status = lang('Version Mismatch') . ' - ' . $value['status'];
+						$setup_tpl->set_var('upgrade', '<input type="checkbox" name="upgrade['.$value['name'].']" />');
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&version=True">'.lang('Possible Solutions').'</a>');
+						$status = lang('Version Mismatch').' - '.$value['status'];
 					}
 					break;
 				case 'D':
-					$setup_tpl->set_var('bg_color','FFCCCC');
+					$setup_tpl->set_var('bg_color', 'FFCCCC');
 					$depstring = parsedep($value['depends']);
 					$depstring .= ')';
-					$setup_tpl->set_var('instimg','dep.png');
-					$setup_tpl->set_var('instalt',lang('Dependency Failure'));
-					$setup_tpl->set_var('install','&nbsp;');
+					$setup_tpl->set_var('instimg', 'dep.png');
+					$setup_tpl->set_var('instalt', lang('Dependency Failure'));
+					$setup_tpl->set_var('install', '&nbsp;');
 					if ($values['currentver'])
 					{
-						$setup_tpl->set_var('remove',$key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '">' . lang('Possible Solutions') . '</a>');
+						$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'">'.lang('Possible Solutions').'</a>');
 					}
 					else
 					{
-						$setup_tpl->set_var('remove','&nbsp;');
-						$setup_tpl->set_var('resolution','&nbsp;');
+						$setup_tpl->set_var('remove', '&nbsp;');
+						$setup_tpl->set_var('resolution', '&nbsp;');
 					}
-					$setup_tpl->set_var('upgrade','&nbsp;');
-					$status = lang('Dependency Failure') . ':' . $depstring . $value['status'];
+					$setup_tpl->set_var('upgrade', '&nbsp;');
+					$status = lang('Dependency Failure').':'.$depstring.$value['status'];
 					break;
 				case 'P':
-					$setup_tpl->set_var('bg_color','FFCCFF');
+					$setup_tpl->set_var('bg_color', 'FFCCFF');
 					$depstring = parsedep($value['depends']);
 					$depstring .= ')';
-					$setup_tpl->set_var('instimg','dep.png');
-					$setup_tpl->set_var('instalt',lang('Post-install Dependency Failure'));
-					$setup_tpl->set_var('install','&nbsp;');
-					$setup_tpl->set_var('remove','&nbsp;');
-					$setup_tpl->set_var('upgrade','&nbsp;');
-					$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&post=True">' . lang('Possible Solutions') . '</a>');
-					$status = lang('Post-install Dependency Failure') . ':' . $depstring . $value['status'];
+					$setup_tpl->set_var('instimg', 'dep.png');
+					$setup_tpl->set_var('instalt', lang('Post-install Dependency Failure'));
+					$setup_tpl->set_var('install', '&nbsp;');
+					$setup_tpl->set_var('remove', '&nbsp;');
+					$setup_tpl->set_var('upgrade', '&nbsp;');
+					$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&post=True">'.lang('Possible Solutions').'</a>');
+					$status = lang('Post-install Dependency Failure').':'.$depstring.$value['status'];
 					break;
 				default:
-					$setup_tpl->set_var('instimg','incomplete.png');
-					$setup_tpl->set_var('instalt',lang('Not Completed'));
-					$setup_tpl->set_var('install','&nbsp;');
-					$setup_tpl->set_var('remove','&nbsp;');
-					$setup_tpl->set_var('upgrade','&nbsp;');
-					$setup_tpl->set_var('resolution','');
+					$setup_tpl->set_var('instimg', 'incomplete.png');
+					$setup_tpl->set_var('instalt', lang('Not Completed'));
+					$setup_tpl->set_var('install', '&nbsp;');
+					$setup_tpl->set_var('remove', '&nbsp;');
+					$setup_tpl->set_var('upgrade', '&nbsp;');
+					$setup_tpl->set_var('resolution', '');
 					$status = '';
 					break;
 			}
 			//$setup_tpl->set_var('appname',$value['name'] . '-' . $status . ',' . $value['filename']);
-			$setup_tpl->set_var('appinfo',$value['name'] . '-' . $status);
-			$setup_tpl->set_var('appname',$value['name']);
+			$setup_tpl->set_var('appinfo', $value['name'].'-'.$status);
+			$setup_tpl->set_var('appname', $value['name']);
 
-			$setup_tpl->pparse('out','apps',True);
+			$setup_tpl->pparse('out', 'apps', True);
 		}
 	}
 
-	$setup_tpl->set_var('submit',lang('Save'));
-	$setup_tpl->set_var('cancel',lang('Cancel'));
-	$setup_tpl->pparse('out','app_footer');
-	$setup_tpl->pparse('out','footer');
+	$setup_tpl->set_var('submit', lang('Save'));
+	$setup_tpl->set_var('cancel', lang('Cancel'));
+	$setup_tpl->pparse('out', 'app_footer');
+	$setup_tpl->pparse('out', 'footer');
 	$GLOBALS['egw_setup']->html->show_footer();
 }

setup/doc/chown.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
  * @version $Id$
  */
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
 {
@@ -39,7 +39,7 @@ 
 }
 $ids = explode(',', $_SERVER['argv'][0]);
 $change = array();
-while($ids)
+while ($ids)
 {
 	$from = (int)array_shift($ids);
 	$to = (int)array_shift($ids);
@@ -66,24 +66,24 @@ 
 
 chown_grp($path, null, $recursive);
 
-function chown_grp($path, array $stat=null, $recursive=false)
+function chown_grp($path, array $stat = null, $recursive = false)
 {
 	global $change;
 
 	if (is_null($stat) && !($stat = stat($path))) return false;
 
-	if (isset($change[$stat['uid']]) && !chown($path, $uid=$change[$stat['uid']]))
+	if (isset($change[$stat['uid']]) && !chown($path, $uid = $change[$stat['uid']]))
 	{
 		echo "Faild to set new owner #$uid for $path\n";
 	}
-	if (isset($change[-$stat['gid']]) && !chgrp($path, $gid=-$change[-$stat['gid']]))
+	if (isset($change[-$stat['gid']]) && !chgrp($path, $gid = -$change[-$stat['gid']]))
 	{
 		echo "Faild to set new group #$gid for $path\n";
 	}
 
 	if ($recursive && is_dir($path))
 	{
-		foreach(new DirectoryIterator($path) as $child)
+		foreach (new DirectoryIterator($path) as $child)
 		{
 			if (!$child->isDot())
 				chown_grp($child->getPathname(), array(

Braces +11 added lines, -3 removed lines

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

importexport/setup/setup.inc.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
 	'name'  => 'eGroupware core team',
 	'email' => 'egroupware-developers@lists.sf.net'
 );
-$setup_info['importexport']['autoinstall'] = true;	// install automatically on update
+$setup_info['importexport']['autoinstall'] = true; // install automatically on update
 
-$setup_info['importexport']['license']  = 'GPL';
+$setup_info['importexport']['license'] = 'GPL';
 $setup_info['importexport']['description'] =
 '';
 $setup_info['importexport']['note'] =

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

@@ -37,7 +37,7 @@
 /* Dependencies for this app to work */
 $setup_info['importexport']['depends'][] = array(
 	 'appname' => 'api',
-	 'versions' => Array('16.1')
+	 'versions' => array('16.1')
 );
 
 // installation checks for importexport

importexport/setup/tables_current.inc.php

Spacing +8 added lines, -8 removed lines

@@ -12,15 +12,15 @@
 $phpgw_baseline = array(
 	'egw_importexport_definitions' => array(
 		'fd' => array(
-			'definition_id' => array('type' => 'auto','nullable' => False),
-			'name' => array('type' => 'varchar','precision' => '255'),
-			'application' => array('type' => 'varchar','precision' => '50'),
-			'plugin' => array('type' => 'varchar','precision' => '100'),
-			'type' => array('type' => 'varchar','precision' => '20'),
-			'allowed_users' => array('type' => 'varchar','meta' => 'account-commasep','precision' => '255'),
+			'definition_id' => array('type' => 'auto', 'nullable' => False),
+			'name' => array('type' => 'varchar', 'precision' => '255'),
+			'application' => array('type' => 'varchar', 'precision' => '50'),
+			'plugin' => array('type' => 'varchar', 'precision' => '100'),
+			'type' => array('type' => 'varchar', 'precision' => '20'),
+			'allowed_users' => array('type' => 'varchar', 'meta' => 'account-commasep', 'precision' => '255'),
 			'plugin_options' => array('type' => 'longtext'),
-			'owner' => array('type' => 'int','meta' => 'account','precision' => '4'),
-			'description' => array('type' => 'varchar','precision' => '255'),
+			'owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '4'),
+			'description' => array('type' => 'varchar', 'precision' => '255'),
 			'modified' => array('type' => 'timestamp'),
 			'filter' => array('type' => 'longtext')
 		),

importexport/setup/tables_update.inc.php

Spacing +15 added lines, -15 removed lines

@@ -13,7 +13,7 @@ 
 
 function importexport_upgrade0_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','description',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'description', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
@@ -44,11 +44,11 @@ 
 
 function importexport_upgrade1_8()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_importexport_definitions','definition_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_importexport_definitions', 'definition_id', array(
 		'type' => 'auto',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','modified',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'modified', array(
 		'type' => 'timestamp'
 	));
 
@@ -63,7 +63,7 @@ 
 
 function importexport_upgrade1_9_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','filter',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'filter', array(
 		'type' => 'longtext'
 	));
 
@@ -74,7 +74,7 @@ 
 	// import i/e defintions
 	if (extension_loaded('dom'))
 	{
-		require_once(EGW_INCLUDE_ROOT. '/importexport/inc/class.importexport_definitions_bo.inc.php');
+		require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.importexport_definitions_bo.inc.php');
 
 		// This sets up $GLOBALS['egw']->accounts and $GLOBALS['egw']->db
 		$GLOBALS['egw_setup']->setup_account_object();
@@ -82,18 +82,18 @@ 
 		// step through every source code intstalled app
 		$egwdir = dir(EGW_INCLUDE_ROOT);
 		while (false !== ($appdir = $egwdir->read())) {
-			$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-			if ( !is_dir( $defdir ) ) continue;
+			$defdir = EGW_INCLUDE_ROOT."/$appdir/setup/";
+			if (!is_dir($defdir)) continue;
 
 			// step through each file in defdir of app
 			$d = dir($defdir);
 			while (false !== ($entry = $d->read())) {
 				try
 				{
-					$file = $defdir. '/'. $entry;
-					list( $filename, $extension) = explode('.',$entry);
-					if ( $extension != 'xml' ) continue;
-					importexport_definitions_bo::import( $file );
+					$file = $defdir.'/'.$entry;
+					list($filename, $extension) = explode('.', $entry);
+					if ($extension != 'xml') continue;
+					importexport_definitions_bo::import($file);
 				}
 				catch (Exception $e)
 				{
@@ -104,10 +104,10 @@ 
 		}
 	}
 	// give Default and Admins group rights for ImportExport
-	foreach(array('Default' => 'Default','Admins' => 'Admin') as $account_lid => $name)
+	foreach (array('Default' => 'Default', 'Admins' => 'Admin') as $account_lid => $name)
 	{
-		$account_id = $GLOBALS['egw_setup']->add_account($account_lid,$name,'Group',False,False);
-		$GLOBALS['egw_setup']->add_acl('importexport','run',$account_id);
+		$account_id = $GLOBALS['egw_setup']->add_account($account_lid, $name, 'Group', False, False);
+		$GLOBALS['egw_setup']->add_acl('importexport', 'run', $account_id);
 	}
 
 	return $GLOBALS['setup_info']['importexport']['currentver'] = '1.9.004';
@@ -115,7 +115,7 @@ 
 
 function importexport_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','filter',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'filter', array(
 		'type' => 'longtext'
 	));
 

Braces +12 added lines, -4 removed lines

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

importexport/setup/default_records.inc.php

Spacing +11 added lines, -11 removed lines

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

Braces +12 added lines, -4 removed lines

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

importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php

Spacing +28 added lines, -28 removed lines

@@ -14,7 +14,7 @@ 
 
 if (!defined('IMPORTEXPORT_APP'))
 {
-	define('IMPORTEXPORT_APP','importexport');
+	define('IMPORTEXPORT_APP', 'importexport');
 }
 
 class importexport_admin_prefs_sidebox_hooks
@@ -35,40 +35,40 @@ 
 				array(
 					'text' => 'Import',
 					'link' => "javascript:egw_openWindowCentered2('".
-						Egw::link('/index.php','menuaction=importexport.importexport_import_ui.import_dialog',false).
+						Egw::link('/index.php', 'menuaction=importexport.importexport_import_ui.import_dialog', false).
 						"','_blank',850,440,'yes')",
 					'icon' => 'import'
 				),
 			);
 			$export_limit = Api\Storage\Merge::getExportLimit($appname);
 			//error_log(__METHOD__.__LINE__.' app:'.$appname.' limit:'.$export_limit);
-			if(Api\Storage\Merge::is_export_limit_excepted() || $export_limit !== 'no')
+			if (Api\Storage\Merge::is_export_limit_excepted() || $export_limit !== 'no')
 			{
 				$file[] = array(
 					'text' => 'Export',
 					'link' => "javascript:egw_openWindowCentered2('".
-						Egw::link('/index.php','menuaction=importexport.importexport_export_ui.export_dialog',false).
+						Egw::link('/index.php', 'menuaction=importexport.importexport_export_ui.export_dialog', false).
 						"','_blank',850,440,'yes')",
 					'icon' => 'export'
 				);
 			}
 			$config = Api\Config::read($appname);
-			if($config['users_create_definitions'])
+			if ($config['users_create_definitions'])
 			{
-				$file['Define imports|exports']	= Egw::link('/index.php',array(
+				$file['Define imports|exports'] = Egw::link('/index.php', array(
 						'menuaction' => 'importexport.importexport_definitions_ui.index',
 						'ajax' => 'true'
-				),$GLOBALS['egw_info']['user']['apps']['admin'] ? 'admin' : 'preferences');
+				), $GLOBALS['egw_info']['user']['apps']['admin'] ? 'admin' : 'preferences');
 			}
-			display_sidebox($appname,lang($appname),$file);
+			display_sidebox($appname, lang($appname), $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
-				'Site Configuration' => Egw::link('/index.php','menuaction=importexport.importexport_definitions_ui.site_config'),
-				'Import definitions' => Egw::link('/index.php','menuaction=importexport.importexport_definitions_ui.import_definition'),
-				'Define imports|exports'  => Egw::link('/index.php',array(
+				'Site Configuration' => Egw::link('/index.php', 'menuaction=importexport.importexport_definitions_ui.site_config'),
+				'Import definitions' => Egw::link('/index.php', 'menuaction=importexport.importexport_definitions_ui.import_definition'),
+				'Define imports|exports'  => Egw::link('/index.php', array(
 					'menuaction' => 'importexport.importexport_definitions_ui.index',
 					'ajax' => 'true'
 				)),
@@ -78,11 +78,11 @@ 
 			);
 			if ($location == 'admin')
 			{
-				display_section($appname,$file);
+				display_section($appname, $file);
 			}
 			else
 			{
-				display_sidebox($appname,lang('Admin'),$file);
+				display_sidebox($appname, lang('Admin'), $file);
 			}
 		}
 	}
@@ -91,13 +91,13 @@ 
 	 * Called from framework so Import / Export can add links into other apps' sidebox.
 	 */
 	public static function other_apps() {
-		if(!$GLOBALS['egw_info']['user']['apps']['importexport']) return array();
-		if($GLOBALS['egw_info']['flags']['no_importexport'] === true) return array();
+		if (!$GLOBALS['egw_info']['user']['apps']['importexport']) return array();
+		if ($GLOBALS['egw_info']['flags']['no_importexport'] === true) return array();
 
 		$appname = $GLOBALS['egw_info']['flags']['currentapp'];
 		$cache = Api\Cache::getCache(Api\Cache::SESSION, 'importexport', 'sidebox_links');
 
-		if(!$cache[$appname] && $GLOBALS['egw_info']['user']['apps']['importexport']) {
+		if (!$cache[$appname] && $GLOBALS['egw_info']['user']['apps']['importexport']) {
 			$cache[$appname]['import'] = importexport_helper_functions::has_definitions($appname, 'import');
 			$cache[$appname]['export'] = importexport_helper_functions::has_definitions($appname, 'export');
 			Api\Cache::setCache(Api\Cache::SESSION, 'importexport', 'sidebox_links', $cache);
@@ -106,51 +106,51 @@ 
 		// Add in import / export, if available
 		$file = array();
 		$plugins = importexport_helper_functions::get_plugins($appname);
-		if($cache[$appname]['import'])
+		if ($cache[$appname]['import'])
 		{
 			$file['Import CSV'] = array('link' => "javascript:egw_openWindowCentered2('".
-				Egw::link('/index.php',array(
+				Egw::link('/index.php', array(
 					'menuaction' => 'importexport.importexport_import_ui.import_dialog',
 					'appname'=>$appname
-				),false)."','_blank',850,440,'yes')",
+				), false)."','_blank',850,440,'yes')",
 				'icon' => 'import',
 				'app' => 'importexport',
 				'text' => in_array($appname, array('sitemgr')) || count($plugins[$appname]['import']) > 1 ? 'Import' : 'Import CSV'
 			);
-			if($GLOBALS['egw_info']['flags']['disable_importexport']['import']) {
+			if ($GLOBALS['egw_info']['flags']['disable_importexport']['import']) {
 				$file['Import CSV']['link'] = '';
 			}
 		}
 		$export_limit = Api\Storage\Merge::getExportLimit($appname);
 		//error_log(__METHOD__.__LINE__.' app:'.$appname.' limit:'.$export_limit);
-		if ((Api\Storage\Merge::is_export_limit_excepted() || Api\Storage\Merge::hasExportLimit($export_limit,'ISALLOWED')) && $cache[$appname]['export'])
+		if ((Api\Storage\Merge::is_export_limit_excepted() || Api\Storage\Merge::hasExportLimit($export_limit, 'ISALLOWED')) && $cache[$appname]['export'])
 		{
 			$file['Export CSV'] = array('link' => "javascript:egw_openWindowCentered2('".
-				Egw::link('/index.php',array(
+				Egw::link('/index.php', array(
 					'menuaction' => 'importexport.importexport_export_ui.export_dialog',
 					'appname'=>$appname
-				),false)."','_blank',850,440,'yes')",
+				), false)."','_blank',850,440,'yes')",
 				'icon' => 'export',
 				'app' => 'importexport',
 				'text' => in_array($appname, array('sitemgr')) || count($plugins[$appname]['export']) > 1 ? 'Export' : 'Export CSV'
 			);
-			if($GLOBALS['egw_info']['flags']['disable_importexport']['export']) {
+			if ($GLOBALS['egw_info']['flags']['disable_importexport']['export']) {
 				$file['Export CSV']['link'] = '';
 			}
 		}
 		
 		$config = Api\Config::read('importexport');
-		if($appname != 'admin' && ($config['users_create_definitions'] || $GLOBALS['egw_info']['user']['apps']['admin']) &&
+		if ($appname != 'admin' && ($config['users_create_definitions'] || $GLOBALS['egw_info']['user']['apps']['admin']) &&
 			count(importexport_helper_functions::get_plugins($appname)) > 0
 		)
 		{
-			$file['Define imports|exports']	= Egw::link('/index.php',array(
+			$file['Define imports|exports'] = Egw::link('/index.php', array(
 				'menuaction' => 'importexport.importexport_definitions_ui.index',
 				'application' => $appname,
 				'ajax' => 'true'
-			),$GLOBALS['egw_info']['user']['apps']['admin'] ? 'admin' : 'preferences');
+			), $GLOBALS['egw_info']['user']['apps']['admin'] ? 'admin' : 'preferences');
 		}
-		if($file) display_sidebox($appname,lang('importexport'),$file);
+		if ($file) display_sidebox($appname, lang('importexport'), $file);
 	}
 	
 	/**

Braces +21 added lines, -9 removed lines

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

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

@@ -65,7 +65,7 @@
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			$file = Array(
+			$file = array(
 				'Site Configuration' => Egw::link('/index.php','menuaction=importexport.importexport_definitions_ui.site_config'),
 				'Import definitions' => Egw::link('/index.php','menuaction=importexport.importexport_definitions_ui.import_definition'),
 				'Define imports|exports'  => Egw::link('/index.php',array(

importexport/inc/class.importexport_arrayxml.inc.php

Spacing +23 added lines, -23 removed lines

@@ -30,39 +30,39 @@ 
 	 * @param DOMElement $_node

 	 * @return string XML string

 	 */

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

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

 		$returnXML = false;

-		if ( $_node === null ) {

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

+		if ($_node === null) {

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

 			$_node->formatOutput = true;

 			$returnXML = true;

 		}

 		

-		$datatype = gettype( $_data );

-		switch ( $datatype ) {

+		$datatype = gettype($_data);

+		switch ($datatype) {

 			case 'array' :

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

-				$_node->appendChild( $subnode );

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

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

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

+				$_node->appendChild($subnode);

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

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

 					

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

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

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

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

 				}

 				break;

 

 			default : 

-				switch ( $datatype ) {

+				switch ($datatype) {

 					case 'boolean' :

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

 						break;

 					default:

 						$data = &$_data;

 				}

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

-				$_node->appendChild( $subnode );

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

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

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

+				$_node->appendChild($subnode);

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

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

 				break;

 		}

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

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

 	 * @return array

 	 */

-	public static function xml2array( $_xml ) {

-		if ( $_xml instanceof DOMElement ) {

+	public static function xml2array($_xml) {

+		if ($_xml instanceof DOMElement) {

 			$n = &$_xml;

 		} else {

 			$n = new DOMDocument;

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

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

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

 		}

 		$xml_array = array();

 		

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

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

 			

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

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

 				

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

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

 

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

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

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

 				$xml_array[$name] = self::xml2array($nc);

 			} else {

-				switch ( $type ) {

+				switch ($type) {

 					case 'boolean' :

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

 						break;

Braces +36 added lines, -15 removed lines

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

  * @static only namespace here

  */ 

-class importexport_arrayxml {

+class importexport_arrayxml
+{
 	

 	/**

 	 * converts a php array to an xml string

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

 	 * @return string XML string

 	 */

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

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

-		if ( $_node === null ) {

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

 			$_node->formatOutput = true;

 			$returnXML = true;

 		}

 		

 		$datatype = gettype( $_data );

-		switch ( $datatype ) {

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

 				$subnode = new DOMElement( 'entry' );

 				$_node->appendChild( $subnode );

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

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

 					

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

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

 				}

 				break;

 

 			default : 

-				switch ( $datatype ) {

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

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

 						break;

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

 	 * @return array

 	 */

-	public static function xml2array( $_xml ) {

-		if ( $_xml instanceof DOMElement ) {

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

-		} else {

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

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

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

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

 		$xml_array = array();

 		

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

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

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

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

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

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

 

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

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

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

-			} else {

-				switch ( $type ) {

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

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

 						break;

importexport/inc/class.importexport_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();

Spacing +98 added lines, -98 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;
 				}
@@ -285,27 +285,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(
@@ -313,16 +313,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;
@@ -336,7 +336,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');
@@ -350,7 +350,7 @@ 
 		$rm = file_exists($path);
 		$f = @fopen($path, 'a');
 
-		if ($f===false)
+		if ($f === false)
 		{
 			return false;
 		}
@@ -376,10 +376,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');
@@ -400,25 +400,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;
@@ -427,30 +427,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);
 				}
@@ -466,27 +466,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);
 					}
@@ -494,14 +494,14 @@ 
 				// 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();
 			}
 			$definition->plugin_options = array_merge($definition->plugin_options, $selection);
 		}
 
-		foreach($targets as $target)
+		foreach ($targets as $target)
 		{
 			// Update lock timeout
 			$data['lock'] = time() + 3600;
@@ -510,16 +510,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)
@@ -529,20 +529,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";
@@ -550,22 +550,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());
@@ -574,23 +574,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;
@@ -601,9 +601,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();
@@ -620,7 +620,7 @@ 
 		$jobs = $async->read($id);
 		$job = $jobs[$id];
 
-		if(is_array($job))
+		if (is_array($job))
 		{
 			$async->cancel_timer($id);
 			$result = $async->set_timer(
@@ -630,37 +630,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";
 			}

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