EGroupware / egroupware

etemplate/inc/class.xul_io.inc.php

Switch Indentation +93 added lines, -93 removed lines

@@ -214,112 +214,112 @@
 		}
 		switch ($type)
 		{
-		case 'nextmatch':
-			$tpls = $cell['size'] = explode(',', $cell['size']);	// template,hide_header,header_left,header_right
-			unset($tpls[1]);	// hide_header is no template
-			foreach($tpls as $n => $tpl)
-			{
-				if (empty($tpl)) continue;
-				$embeded = new boetemplate($tpl,$this->load_via);
-				if ($embeded_too)
+			case 'nextmatch':
+				$tpls = $cell['size'] = explode(',', $cell['size']);	// template,hide_header,header_left,header_right
+				unset($tpls[1]);	// hide_header is no template
+				foreach($tpls as $n => $tpl)
 				{
-					$this->add_etempl($embeded,$embeded_too);
+					if (empty($tpl)) continue;
+					$embeded = new boetemplate($tpl,$this->load_via);
+					if ($embeded_too)
+					{
+						$this->add_etempl($embeded,$embeded_too);
+					}
+					$cell['size'][$n] = $embeded->name;
+					unset($embeded);
 				}
-				$cell['size'][$n] = $embeded->name;
-				unset($embeded);
-			}
-			$cell['size'] = implode(',', $cell['size']);
-			break;
-		case 'tabbox':
-			$labels = explode('|',$cell['label']);  unset($cell['label']);
-			$helps  = explode('|',$cell['help']);   unset($cell['help']);
-			if (strpos($tab_names=$cell['name'],'=') !== false)
-			{
-				list($cell['name'],$tab_names) = explode('=',$cell['name']);
-			}
-			$names  = explode('|',$tab_names);
-			for ($n = 0; $n < count($labels); ++$n)
-			{
-				$tab = new xmlnode('tab');
-				$tab->set_attribute('id',$names[$n]);
-				$tab->set_attribute('label',$labels[$n]);
-				if ($helps[$n]) $tab->set_attribute('statustext',$helps[$n]);
-				$child->add_node($tab);
+				$cell['size'] = implode(',', $cell['size']);
+				break;
+			case 'tabbox':
+				$labels = explode('|',$cell['label']);  unset($cell['label']);
+				$helps  = explode('|',$cell['help']);   unset($cell['help']);
+				if (strpos($tab_names=$cell['name'],'=') !== false)
+				{
+					list($cell['name'],$tab_names) = explode('=',$cell['name']);
+				}
+				$names  = explode('|',$tab_names);
+				for ($n = 0; $n < count($labels); ++$n)
+				{
+					$tab = new xmlnode('tab');
+					$tab->set_attribute('id',$names[$n]);
+					$tab->set_attribute('label',$labels[$n]);
+					if ($helps[$n]) $tab->set_attribute('statustext',$helps[$n]);
+					$child->add_node($tab);
 
-				$embeded = new boetemplate($names[$n],$this->load_via);
-				if ($embeded_too)
+					$embeded = new boetemplate($names[$n],$this->load_via);
+					if ($embeded_too)
+					{
+						$this->add_etempl($embeded,$embeded_too);
+					}
+					$template = new xmlnode('template');
+					$template->set_attribute('id',$embeded->name);
+					$child2->add_node($template);
+					unset($embeded);
+					unset($template);
+				}
+				break;
+			case 'menulist':	// id,options belongs to the 'menupopup' child
+				if ($cell['span'])
 				{
-					$this->add_etempl($embeded,$embeded_too);
+					list($span, $class) = explode(',', $cell['span']);
+					if (!empty($span)) $this->set_attributes($widget, 'span', $span);
+					if (!empty($class))
+					{
+						$cell['span'] = ','.$class;
+					}
+					else
+					{
+						unset($cell['span']);
+					}
 				}
-				$template = new xmlnode('template');
-				$template->set_attribute('id',$embeded->name);
-				$child2->add_node($template);
-				unset($embeded);
-				unset($template);
-			}
-			break;
-		case 'menulist':	// id,options belongs to the 'menupopup' child
-			if ($cell['span'])
-			{
-				list($span, $class) = explode(',', $cell['span']);
-				if (!empty($span)) $this->set_attributes($widget, 'span', $span);
-				if (!empty($class))
+				// fall-through
+			case 'listbox':
+				if ($cell['type'] != 'select')	// one of the sub-types
 				{
-					$cell['span'] = ','.$class;
+					$attr_widget->set_attribute('type',$cell['type']);
 				}
-				else
+				break;
+			case 'groupbox':
+				if ($cell['label'])
 				{
-					unset($cell['span']);
+					$caption = new xmlnode('caption');
+					$caption->set_attribute('label',$cell['label']);
+					$widget->add_node($caption);
+					unset($cell['label']);
 				}
-			}
-			// fall-through
-		case 'listbox':
-			if ($cell['type'] != 'select')	// one of the sub-types
-			{
-				$attr_widget->set_attribute('type',$cell['type']);
-			}
-			break;
-		case 'groupbox':
-			if ($cell['label'])
-			{
-				$caption = new xmlnode('caption');
-				$caption->set_attribute('label',$cell['label']);
-				$widget->add_node($caption);
-				unset($cell['label']);
-			}
-			// fall-through
-		case 'split':
-		case 'vbox':
-		case 'hbox':
-		case 'box':
-		case 'deck':
-			list($anz,$orient,$options) = explode(',',$cell['size'],3);
-			for ($n = 1; $n <= $anz; ++$n)
-			{
-				$this->add_widget($widget,$cell[$n],$embeded_too);
-				unset($cell[$n]);
-			}
-			// no sure where the data key gets set, but it gives a warning in xml serialization (empty array)
-			unset($cell['data']);
-			if (!empty($orient)) $cell['orient'] = $orient;
-			$cell['size'] = $options;
-			break;
+				// fall-through
+			case 'split':
+			case 'vbox':
+			case 'hbox':
+			case 'box':
+			case 'deck':
+				list($anz,$orient,$options) = explode(',',$cell['size'],3);
+				for ($n = 1; $n <= $anz; ++$n)
+				{
+					$this->add_widget($widget,$cell[$n],$embeded_too);
+					unset($cell[$n]);
+				}
+				// no sure where the data key gets set, but it gives a warning in xml serialization (empty array)
+				unset($cell['data']);
+				if (!empty($orient)) $cell['orient'] = $orient;
+				$cell['size'] = $options;
+				break;
 
-		case 'template':
-			if ($cell['name'][0] != '@' && $embeded_too)
-			{
-				$templ = new boetemplate();
-				if ($templ->read(boetemplate::expand_name($cell['name'],0,0),'default','default',0,'',$this->load_via))
+			case 'template':
+				if ($cell['name'][0] != '@' && $embeded_too)
 				{
-					$this->add_etempl($templ,$embeded_too);
+					$templ = new boetemplate();
+					if ($templ->read(boetemplate::expand_name($cell['name'],0,0),'default','default',0,'',$this->load_via))
+					{
+						$this->add_etempl($templ,$embeded_too);
+					}
+					unset($templ);
 				}
-				unset($templ);
-			}
-			break;
+				break;
 
-		case 'grid':
-			$this->add_grid($parent,$cell,$embeded_too);
-			return;	// grid is already added
+			case 'grid':
+				$this->add_grid($parent,$cell,$embeded_too);
+				return;	// grid is already added
 		}
 		foreach($cell as $attr => $val)
 		{

emailadmin/inc/class.emailadmin_imap.inc.php

Switch Indentation +30 added lines, -30 removed lines

@@ -580,16 +580,16 @@ 
 		$mailbox = '';
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$searchstring = $reference."*";
-				break;
-			case 1:
-				$mailbox = $searchstring = $reference;
-				//$reference = '%';
-				break;
-			case 2:
-				$searchstring = $reference."%";
-				break;
+				case 0:
+					$searchstring = $reference."*";
+					break;
+				case 1:
+					$mailbox = $searchstring = $reference;
+					//$reference = '%';
+					break;
+				case 2:
+					$searchstring = $reference."%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){
@@ -664,16 +664,16 @@ 
 		$mailbox = '';
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$searchstring = $reference."*";
-				break;
-			case 1:
-				$mailbox = $searchstring = $reference;
-				//$reference = '%';
-				break;
-			case 2:
-				$searchstring = $reference."%";
-				break;
+				case 0:
+					$searchstring = $reference."*";
+					break;
+				case 1:
+					$mailbox = $searchstring = $reference;
+					//$reference = '%';
+					break;
+				case 2:
+					$searchstring = $reference."%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){
@@ -730,16 +730,16 @@ 
 
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$mailbox = $reference."*";
-				break;
-			case 1:
-				$mailbox = $reference;
-				$reference = '%';
-				break;
-			case 2:
-				$mailbox = "%";
-				break;
+				case 0:
+					$mailbox = $reference."*";
+					break;
+				case 1:
+					$mailbox = $reference;
+					$reference = '%';
+					break;
+				case 2:
+					$mailbox = "%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){

setup/setup-cli.php

Switch Indentation +81 added lines, -81 removed lines

@@ -66,91 +66,91 @@
 
 switch($action)
 {
-	case '--version':
-	case '--check':
-		setup_cmd::check_installed($arguments[0],0,true);
-		break;
-
-	case '--create-header':
-	case '--edit-header':
-	case '--upgrade-header':
-	case '--update-header':
-		do_header($action == '--create-header',$arguments);
-		break;
-
-	case '--install':
-		do_install($arguments);
-		break;
-
-	case '--config':
-		do_config($arguments);
-		break;
-
-	case '--admin':
-		do_admin($arguments[0]);
-		break;
-
-	case '--update':
-		do_update($arguments[0]);
-		break;
-
-	case '--register-hooks':
-	case '--register-all-hooks':
-		do_hooks($arguments[0]);
-		break;
-
-	case '--backup':
-		do_backup($arguments[0]);
-		break;
-
-	case '--languages':
-		echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
-		break;
-
-	case '--charsets':
-		echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
-		break;
-
-	case '--exit-codes':
-		list_exit_codes();
-		break;
-
-	case '--help':
-	case '--usage':
-		do_usage($arguments[0]);
-		break;
-
-	default:
-		// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
-		if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
-			is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
-		{
-			$args = array();
-			list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
-			foreach($arguments as $arg)
+		case '--version':
+		case '--check':
+			setup_cmd::check_installed($arguments[0],0,true);
+			break;
+
+		case '--create-header':
+		case '--edit-header':
+		case '--upgrade-header':
+		case '--update-header':
+			do_header($action == '--create-header',$arguments);
+			break;
+
+		case '--install':
+			do_install($arguments);
+			break;
+
+		case '--config':
+			do_config($arguments);
+			break;
+
+		case '--admin':
+			do_admin($arguments[0]);
+			break;
+
+		case '--update':
+			do_update($arguments[0]);
+			break;
+
+		case '--register-hooks':
+		case '--register-all-hooks':
+			do_hooks($arguments[0]);
+			break;
+
+		case '--backup':
+			do_backup($arguments[0]);
+			break;
+
+		case '--languages':
+			echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
+			break;
+
+		case '--charsets':
+			echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
+			break;
+
+		case '--exit-codes':
+			list_exit_codes();
+			break;
+
+		case '--help':
+		case '--usage':
+			do_usage($arguments[0]);
+			break;
+
+		default:
+			// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
+			if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
+				is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
 			{
-				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
-				{
-					throw new egw_exception_wrong_userinput(lang("Invalid argument '%1' !!!",$arg),90);
-				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				$args = array();
+				list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
+				foreach($arguments as $arg)
 				{
-					list($name,$sub) = explode('[',substr($name,0,-1),2);
-					$args[$name][$sub] = $value;
-				}
-				else
-				{
-					$args[$name] = $value;
+					list($name,$value) = explode('=',$arg,2);
+					if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+					{
+						throw new egw_exception_wrong_userinput(lang("Invalid argument '%1' !!!",$arg),90);
+					}
+					if (substr($name,-1) == ']')	// allow 1-dim. arrays
+					{
+						list($name,$sub) = explode('[',substr($name,0,-1),2);
+						$args[$name][$sub] = $value;
+					}
+					else
+					{
+						$args[$name] = $value;
+					}
 				}
+				$cmd = new $class($args);
+				$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
+				if (is_array($msg)) $msg = print_r($msg,true);
+				echo "$msg\n";
+				break;
 			}
-			$cmd = new $class($args);
-			$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
-			if (is_array($msg)) $msg = print_r($msg,true);
-			echo "$msg\n";
-			break;
-		}
-		throw new egw_exception_wrong_userinput(lang("Unknown option '%1' !!!",$action),90);
+			throw new egw_exception_wrong_userinput(lang("Unknown option '%1' !!!",$action),90);
 }
 exit(0);
 

setup/index.php

Switch Indentation +92 added lines, -92 removed lines

@@ -180,17 +180,17 @@ 
 
 switch($GLOBALS['egw_info']['setup']['stage']['db'])
 {
-	case 1:
-		$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
-		$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
-		$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
-		$setup_tpl->set_var('create_database',lang('Create database'));
-		$setup_tpl->set_var('instr','');
-		$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
-		switch ($info['db_type'])
-		{
+		case 1:
+			$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
+			$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
+			$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
+			$setup_tpl->set_var('create_database',lang('Create database'));
+			$setup_tpl->set_var('instr','');
+			$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
+			switch ($info['db_type'])
+			{
 			case 'mysql':
 			case 'mysqli':
 			case 'mysqlt':
@@ -223,76 +223,76 @@ 
 				//break;
 			default:
 				$setup_tpl->parse('V_db_stage_1','B_db_stage_1a');
-		}
+			}
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_1');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 2:
-		$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 3:
-		$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
-		$setup_tpl->set_var('install',lang('Install'));
-		$setup_tpl->set_var('proceed',lang('We can proceed'));
-		$setup_tpl->set_var('coreapps',lang('all applications'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
-		$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
-			'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
-		$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
-		$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
-			lang('Convert backup to charset selected above').'</label>');
-		$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 4:
-		$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',$setup_info['phpgwapi']['currentver']));
-		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['phpgwapi']['version']));
-		$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
-		$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('upgrade',lang('Upgrade'));
-		$setup_tpl->set_var('goto',lang('Go to'));
-		$setup_tpl->set_var('configuration',lang('configuration'));
-		$setup_tpl->set_var('admin_account',lang('Create admin account'));
-		$setup_tpl->set_var('applications',lang('Manage Applications'));
-		$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
-		$setup_tpl->set_var('language_management',lang('Manage Languages'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+		case 2:
+			$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 3:
+			$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
+			$setup_tpl->set_var('install',lang('Install'));
+			$setup_tpl->set_var('proceed',lang('We can proceed'));
+			$setup_tpl->set_var('coreapps',lang('all applications'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
+			$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
+				'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
+			$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
+			$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
+				lang('Convert backup to charset selected above').'</label>');
+			$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 4:
+			$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
+			$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',$setup_info['phpgwapi']['currentver']));
+			$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['phpgwapi']['version']));
+			$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
+			$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('upgrade',lang('Upgrade'));
+			$setup_tpl->set_var('goto',lang('Go to'));
+			$setup_tpl->set_var('configuration',lang('configuration'));
+			$setup_tpl->set_var('admin_account',lang('Create admin account'));
+			$setup_tpl->set_var('applications',lang('Manage Applications'));
+			$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
+			$setup_tpl->set_var('language_management',lang('Manage Languages'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
 
-		$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 5:
-		$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
-		$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
-		$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('cancel',lang('cancel'));
-		$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 6:
-		$setup_tpl->set_var('status',lang('Status'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
-		$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
-		$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
+			$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 5:
+			$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
+			$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
+			$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('cancel',lang('cancel'));
+			$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 6:
+			$setup_tpl->set_var('status',lang('Status'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
+			$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
+			$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
 
-		try {	// catch DB errors to report them
-			switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
-			{
+			try {	// catch DB errors to report them
+				switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
+				{
 				case 'dbcreate':
 					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8',	// create all new db's with utf8
 						!preg_match('/^[0-9.a-z_]+$/i', $_POST['db_grant_host']) ? 'localhost' : $_POST['db_grant_host']);
@@ -371,7 +371,7 @@ 
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
-			}
+				}
 		}
 		catch (egw_exception_db $e)
 		{
@@ -383,21 +383,21 @@ 
 		$db_filled_block = $db_filled_block . $setup_tpl->get_var('V_db_stage_6_post');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 10:
-		$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
-		$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	default:
-		$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
-		$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
+		case 10:
+			$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
+			$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		default:
+			$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
+			$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
 }
 
 // Config Section

phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php

Switch Indentation +24 added lines, -24 removed lines

@@ -310,30 +310,30 @@
 		}
 
 		switch (strtoupper($t)) {
-		case 'VARCHAR':
-		case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-				if ($len <= $this->blobSize) return 'C';
-		case 'LONG':
-		case 'LONG VARCHAR':
-		case 'CLOB':
-		return 'X';
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-				return 'B';
-
-		case 'DATE': return 'D';
-
-		//case 'T': return 'T';
-
-		case 'BIT': return 'L';
-		case 'INT':
-		case 'SMALLINT':
-		case 'INTEGER': return 'I';
-		default: return 'N';
+			case 'VARCHAR':
+			case 'VARCHAR2':
+			case 'CHAR':
+			case 'VARBINARY':
+			case 'BINARY':
+					if ($len <= $this->blobSize) return 'C';
+			case 'LONG':
+			case 'LONG VARCHAR':
+			case 'CLOB':
+			return 'X';
+			case 'LONG RAW':
+			case 'LONG VARBINARY':
+			case 'BLOB':
+					return 'B';
+
+			case 'DATE': return 'D';
+
+			//case 'T': return 'T';
+
+			case 'BIT': return 'L';
+			case 'INT':
+			case 'SMALLINT':
+			case 'INTEGER': return 'I';
+			default: return 'N';
 		}
 	}
 }