Index: branches/RC/core/install/remove_schema.sql
===================================================================
diff -u -N
--- branches/RC/core/install/remove_schema.sql	(revision 0)
+++ branches/RC/core/install/remove_schema.sql	(revision 10924)
@@ -0,0 +1,40 @@
+DROP TABLE PermissionConfig;
+DROP TABLE Permissions;
+DROP TABLE CustomField;
+DROP TABLE ConfigurationAdmin;
+DROP TABLE ConfigurationValues;
+DROP TABLE EmailMessage;
+DROP TABLE EmailQueue;
+DROP TABLE EmailSubscribers;
+DROP TABLE Events;
+DROP TABLE IdGenerator;
+DROP TABLE Language;
+DROP TABLE Modules;
+DROP TABLE PersistantSessionData;
+DROP TABLE Phrase;
+DROP TABLE PhraseCache;
+DROP TABLE PortalGroup;
+DROP TABLE PortalUser;
+DROP TABLE PortalUserCustomData;
+DROP TABLE SessionData;
+DROP TABLE Theme;
+DROP TABLE ThemeFiles;
+DROP TABLE UserGroup;
+DROP TABLE UserSession;
+DROP TABLE EmailLog;
+DROP TABLE Cache;
+DROP TABLE StdDestinations;
+DROP TABLE Category;
+DROP TABLE CategoryCustomData;
+DROP TABLE CategoryItems;
+DROP TABLE PermCache;
+DROP TABLE Stylesheets;
+DROP TABLE PopupSizes;
+DROP TABLE Counters;
+DROP TABLE Skins;
+DROP TABLE ChangeLogs;
+DROP TABLE SessionLogs;
+DROP TABLE StatisticsCapture;
+DROP TABLE SlowSqlCapture;
+DROP TABLE Agents;
+DROP TABLE SpellingDictionary;
\ No newline at end of file
Index: branches/RC/core/install/steps_db.xml
===================================================================
diff -u -N -r10832 -r10924
--- branches/RC/core/install/steps_db.xml	(.../steps_db.xml)	(revision 10832)
+++ branches/RC/core/install/steps_db.xml	(.../steps_db.xml)	(revision 10924)
@@ -1,4 +1,7 @@
 <steps>
+	<step name="clean_db" title="Clean database">
+		<![CDATA[missing step description]]>
+	</step>
 	<step name="db_config" title="Database Configuration">
 		<![CDATA[Host name (<i>normally "localhost"</i>), Database user name, and database Password.
 		These fields are required to connect to the database.</p><p>If you would like In-Portal
Index: branches/RC/admin/install.php
===================================================================
diff -u -N -r10832 -r10924
--- branches/RC/admin/install.php	(.../install.php)	(revision 10832)
+++ branches/RC/admin/install.php	(.../install.php)	(revision 10924)
@@ -1334,18 +1334,8 @@
 		// KERNEL 4 INIT: END
 
 		$lang_xml =& $application->recallObject('LangXML');
+		/* @var $lang_xml LangXML_Parser */
 
-		if (defined('DBG_FAST_INSTALL') && DBG_FAST_INSTALL) {
-			$lang_xml->tables['phrases'] = TABLE_PREFIX.'Phrase';
-			$lang_xml->tables['emailmessages'] = TABLE_PREFIX.'EmailMessage';
-		}
-		else {
-			$lang_xml->renameTable('phrases', TABLE_PREFIX.'ImportPhrases');
-			$lang_xml->renameTable('emailmessages', TABLE_PREFIX.'ImportEvents');
-		}
-
-		$lang_xml->lang_object->TableName = $application->getUnitOption('lang','TableName');
-
 		$languages = $application->GetVar('lang');
 		if($languages)
 		{
@@ -1360,17 +1350,11 @@
 				foreach($modules as $module_name => $module_folder)
 				{
 					$lang_path = MODULES_PATH.'/'.$module_folder.'admin/install/langpacks';
-					$lang_xml->Parse($lang_path.'/'.$lang_file, '|0|1|2|', '');
-					if($force_finish) $lang_xml->lang_object->Update();
+					$lang_xml->Parse($lang_path.'/'.$lang_file, '|0|1|2|', '', $force_finish ? LANG_SKIP_EXISTING : LANG_OVERWRITE_EXISTING);
 				}
 			}
 
-			if (defined('DBG_FAST_INSTALL') && DBG_FAST_INSTALL) {
-				$state = 'lang_default';
-			}
-			else {
-				$state = 'lang_install';
-			}
+			$state = 'lang_default'; // lang_install
 		}
 		else
 		{
@@ -1399,7 +1383,7 @@
 
 	if($Status == 0)
 	{
-		$Offset = $objLanguages->ReadImportTable($PhraseTable, 1,"0,1,2", $force_finish ? false : true, 200,$Offset);
+		$Offset = $objLanguages->ReadImportTable($PhraseTable, 1, "0,1,2", $force_finish ? false : true, 200, $Offset);
 		if($Offset >= $Total)
 		{
 			$Offset=0;
Index: branches/RC/kernel/include/config.php
===================================================================
diff -u -N -r8929 -r10924
--- branches/RC/kernel/include/config.php	(.../config.php)	(revision 8929)
+++ branches/RC/kernel/include/config.php	(.../config.php)	(revision 10924)
@@ -26,7 +26,7 @@
 	function Load()
 	{
       if(is_object($this->adodbConnection))
-      {      
+      {
           LogEntry("Config Load Start\n");
           $sql = "select VariableName, VariableValue from ".GetTablePrefix()."ConfigurationValues";
     	  $rs = $this->adodbConnection->Execute($sql);
@@ -46,7 +46,7 @@
               $rs->MoveNext();
             $count++;
     	  }
-          LogEntry("Config Load End - $count Variables\n");         
+          LogEntry("Config Load End - $count Variables\n");
       }
       unset($this->m_DirtyFields);
       $this->m_IsDirty=false;
@@ -74,7 +74,7 @@
 	function Set($property, $value,$type=0,$force=FALSE)
 	{
 	  if(is_array($this->config) && strlen($property)>0)
-	  {	
+	  {
 	    if(array_key_exists($property,$this->config))
 	    {
 	      $current = $this->config[$property];
@@ -89,7 +89,7 @@
 	  $this->m_IsDirty = ($this->m_IsDirty or $changed or $force);
 	  if($changed || $force)
 	  {
-            $this->m_DirtyFields[$property] = $value;                      
+            $this->m_DirtyFields[$property] = $value;
 	  }
 	  $this->m_VarType[$property] = $type;
 	}
@@ -105,8 +105,8 @@
 //                $sql = sprintf("UPDATE ".GetTablePrefix()."ConfigurationValues SET VariableValue=%s WHERE VariableName=%s",                             $this->adodbConnection->qstr($value), $this->adodbConnection->qstr($field));
                 $sql = 'UPDATE '.GetTablePrefix().'ConfigurationValues SET VariableValue="'.addslashes($value).'" WHERE VariableName="'.addslashes($field).'"';
                 // echo $sql."<br>\n";
-              
-                $rs = $this->adodbConnection->execute($sql);                        
+
+                $rs = $this->adodbConnection->execute($sql);
 	      }
         }
   	  }
@@ -123,12 +123,12 @@
     function GetDirtySessionValues($VarType)
     {
         $result = array();
-        
+
         if(is_array($this->m_DirtyFields))
-        {        
+        {
           foreach($this->m_DirtyFields as $property=>$values)
           {
-           if($this->m_VarType[$property]==$VarType)	                        
+           if($this->m_VarType[$property]==$VarType)
                 $result[$property] = $values;
           }
         }
@@ -147,35 +147,35 @@
 				$result[$config_var] = $var_value;
 		}
 		return $result;
-	}    
+	}
 }/* clsConfig */
 
 /*
 To create the configuration forms in the admin section, populate the table ConfigurationAdmin and
 ConfigurationValues.
-    
-    The tables are fairly straight-forward.  The fields of concern in the ConfigurationValues table is 
-ModuleOwner and Section.  ModuleOwner should either be the module name or In-Portal for kernel related stuff.  
+
+    The tables are fairly straight-forward.  The fields of concern in the ConfigurationValues table is
+ModuleOwner and Section.  ModuleOwner should either be the module name or In-Portal for kernel related stuff.
 (Items which should appear under 'System Configuration').
-    
-    The Section field determines the NavMenu section the value is associated with. For example, 
+
+    The Section field determines the NavMenu section the value is associated with. For example,
 in-portal:configure_general refers to items listed under System Configuration->General.
 
-    In the ConfigurationAdmin table, ensure the VariableName field is the same as the one in ConfigurationValues 
+    In the ConfigurationAdmin table, ensure the VariableName field is the same as the one in ConfigurationValues
 (this is the field that creates the natural join.)  The prompt field is the text displayed to the left of the form element
 in the table.  This should contain LANGUAGE ELEMENT IDENTIFIERS that are plugged into the Language function.
 
-    The element_type field describes the type of form element is associated with this item.  Possible values are: 
+    The element_type field describes the type of form element is associated with this item.  Possible values are:
         - text : textbox
         - checkbox : a simple checkbox
         - select : creates a dropdown box. In this case, the ValueList field should be populated with a comma-separated list
                    in name=value,name=value format   (each element is translated to:
                     <option VALUE="[value]">[name]</option>
-                  
+
                     To add dynamic data to this list, enclose an SQL statement with <SQL></SQL> tags for example:
                     <SQL>SELECT FieldLabel as OptionName, FieldName as OptionValue FROM <prefix>CustomField WHERE <prefix>.CustomFieldType=3></SQL>
-                    
-                    note the specific field labels OptionName and OptionValue.  They are required by the parser. 
+
+                    note the specific field labels OptionName and OptionValue.  They are required by the parser.
                     use the <prefix> tag to insert the system's table prefix into the sql statement as appropriate
 
 */
@@ -185,27 +185,27 @@
   var $heading;
   var $prompt;
   var $ElementType;
-  var $ValueList; /* comma-separated list in name=value pair format*/  
+  var $ValueList; /* comma-separated list in name=value pair format*/
   var $ValidationRules;
   var $default_value;
   var $adodbConnection;
   var $NextItem=NULL;
   var $Section;
-  
+
   var $DisplayOrder = null;
-  
+
   var $TabIndex = 0;
-  
+
   /**
    * Application instance
    *
    * @var kApplication
    */
   var $Application = null;
-  
+
   function clsConfigAdminItem($config_name=NULL)
-  {   
-	$this->Application =& kApplication::Instance();      
+  {
+	$this->Application =& kApplication::Instance();
       $this->adodbConnection = &GetADODBConnection();
   	if ($config_name) {
           $this->LoadSetting($config_name);
@@ -223,7 +223,7 @@
           $this->prompt = $rs->fields["prompt"];
           $this->ElementType = $rs->fields["element_type"];
           $this->ValidationRules=$rs->fields["validation"];
-          $this->default_value = $rs->fields["VariableValue"];  
+          $this->default_value = $rs->fields["VariableValue"];
           $this->ValueList=$rs->fields["ValueList"];
           $this->Section = $rs->fields["Section"];
           $this->DisplayOrder = $rs->fields['DisplayOrder'];
@@ -234,14 +234,14 @@
   {
   		$cf_helper =& $this->Application->recallObject('InpCustomFieldsHelper');
 	  	/* @var $cf_helper InpCustomFieldsHelper */
-	  	
-	  	return $cf_helper->GetValuesHash($string);
+
+	  	return $cf_helper->GetValuesHash($string, ',');
   }
 
 	function ItemFormElement($StartFrom=1)
   	{
-    	global $objConfig;    
-    
+    	global $objConfig;
+
     	if(!$this->TabIndex) $this->TabIndex = $StartFrom;
 
     	$o = '';
@@ -251,32 +251,32 @@
     	}
     	$this->default_value = inp_htmlize($this->default_value);
     	$validation_rule = $this->ValidationRules ? ' ValidationType="'.$this->ValidationRules.'" ' : '';
-    	
+
     	switch($this->ElementType)
     	{
       		case 'text':
         		$o .= '<input type="text" tabindex="'.($this->TabIndex++).'" name="'.$this->name.'" ';
         		$o .= 'value="'.$this->default_value.'"'.$validation_rule.'>';
       			break;
-      			
+
       		case 'checkbox':
         		$o .= '<input type="checkbox" name="'.$this->name.'" tabindex="'.($this->TabIndex++).'"'.$validation_rule;
         		$o .= $this->default_value ? ' checked>' : '>';
       			break;
-      			
+
     		case 'password':
     			/* To exclude config form from populating with Root (md5) password */
     			if( $this->Section == 'in-portal:configure_users' ) $this->default_value = '';
-    		
+
 		        $o .= '<input type="password" tabindex="'.($this->TabIndex++).'" name="'.$this->name.'" ';
 		        $o .= 'value="'.$this->default_value.'">';
     			break;
-    			
+
     		case 'textarea':
         		$o .= '<textarea tabindex="'.($this->TabIndex++).'" '.$this->ValueList.' name="'.$this->name.'"'.$validation_rule.'>'.$this->default_value.'</textarea>';
     			break;
-    			
-    		case 'label':         
+
+    		case 'label':
 				if ($this->default_value) {
 					$tag_params = clsHtmlTag::ParseAttributes($this->ValueList);
 					if (isset($tag_params['cut_first'])) {
@@ -293,7 +293,7 @@
 					}
 				}
 				break;
-      		
+
 			case 'radio':
             	$radioname = $this->name;
             	$this->TabIndex++;
@@ -305,22 +305,22 @@
             	}
             	$this->TabIndex++;
       			break;
-      			
+
       		case 'select':
         		$o .= '<select name="'.$this->name.'" tabindex="'.($this->TabIndex++).'"'.$validation_rule.'>';
         		$values = $this->GetValues($this->ValueList);
-        				
+
         		foreach ($values as $option_id => $option_name) {
         			$selected = $this->default_value == $option_id ? ' selected' : '';
     				$o .= '<option value="'.$option_id.'" '.$selected.'>'.$option_name.'</option>';
         		}
         		$o .= '</select>';
         		break;
-        	
+
         	case 'multiselect':
         		$o .= '<select id="'.$this->name.'_select" tabindex="'.($this->TabIndex++).'" onchange="update_multiple_options(\''.$this->name.'\');" multiple>';
         		$values = $this->GetValues($this->ValueList);
-        		
+
         		$selected_values = explode('|', substr($this->default_value, 1, -1) );
         		foreach ($values as $option_id => $option_name) {
         			$selected = in_array($option_id, $selected_values) ? ' selected' : '';
@@ -339,7 +339,7 @@
   }
 }
 
-class clsConfigAdmin 
+class clsConfigAdmin
 {
   var $module;
   var $section;
@@ -359,32 +359,32 @@
       unset($this->Items);
       $this->Items = array();
   }
-  
+
   function NumItems()
   {
         if(is_array($this->Items))
         {
             return count($this->Items);
         }
         else
-            return 0;  	
+            return 0;
   }
 
   function LoadItems($CheckNextItems=TRUE, $inst=FALSE)
   {
       $this->Clear();
       if(!$inst)
-      {      
-        $sql = "SELECT * FROM ".GetTablePrefix()."ConfigurationAdmin INNER JOIN ".GetTablePrefix()."ConfigurationValues Using(VariableName) 
+      {
+        $sql = "SELECT * FROM ".GetTablePrefix()."ConfigurationAdmin INNER JOIN ".GetTablePrefix()."ConfigurationValues Using(VariableName)
                 WHERE ModuleOwner='".$this->module."' AND Section='".$this->section."' ORDER BY DisplayOrder ASC";
       }
       else
       {
 
-          $sql = "SELECT * FROM ".GetTablePrefix()."ConfigurationAdmin INNER JOIN ".GetTablePrefix()."ConfigurationValues Using(VariableName) 
+          $sql = "SELECT * FROM ".GetTablePrefix()."ConfigurationAdmin INNER JOIN ".GetTablePrefix()."ConfigurationValues Using(VariableName)
                   WHERE ModuleOwner='".$this->module."' AND Section='".$this->section."' AND Install=1 ORDER BY DisplayOrder ASC";
       }
-	  if( $GLOBALS['debuglevel'] ) echo $sql."<br>\n"; 
+	  if( $GLOBALS['debuglevel'] ) echo $sql."<br>\n";
       $adodbConnection = &GetADODBConnection();
       $rs = $adodbConnection->Execute($sql);
       $i = null;
@@ -393,8 +393,8 @@
       {
           $data = $rs->fields;
           if(is_object($i) && $CheckNextItems)
-          {          
-            $last = $i->prompt;            
+          {
+            $last = $i->prompt;
             unset($i);
           }
           $i = new clsConfigAdminItem(NULL);
@@ -407,15 +407,15 @@
           $i->ValidationRules = isset($data['validaton']) ? $data['validaton'] : '';
           $i->Section = $data["Section"];
           $i->DisplayOrder = $data['DisplayOrder'];
-          
+
           if(strlen($last)>0)
-          {          
+          {
             if($i->prompt==$last)
-            {           
+            {
               $this->Items[count($this->Items)-1]->NextItem=$i;
             }
             else
-            { 
+            {
               $i->NextItem=NULL;
               array_push($this->Items,$i);
             }
@@ -427,25 +427,25 @@
           }
           //unset($i);
           $rs->MoveNext();
-      }      
+      }
   }
 
   function SaveItems($POSTVARS, $force=FALSE)
   {
       global $objConfig;
-      
+
       foreach($this->Items as $i)
-      {               	  
+      {
           if($i->ElementType != "label")
 		  {
 			  if($i->ElementType != "checkbox")
-			  {        			  	
+			  {
 				$objConfig->Set($i->name,stripslashes($POSTVARS[$i->name]));
 			  }
 			  else
-			  {          
+			  {
 				if($POSTVARS[$i->name]=="on")
-				{            
+				{
 					$value=1;
 				}
 				else
Index: branches/RC/core/install/step_templates/install_setup.tpl
===================================================================
diff -u -N -r10832 -r10924
--- branches/RC/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 10832)
+++ branches/RC/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 10924)
@@ -32,12 +32,12 @@
 	$option_tpl = ob_get_clean();
 
 	$options = 	Array (
-						'upgrade'		=>	'Upgrade In-Portal',
-						1				=>	'Clean out the In-Portal database and reinstall',
-						2				=>	'Install to a new database',
-						'update_license'=>	'Update License Information',
-						'db_reconfig'	=>	'Change Database Configuration',
-						'fix_paths'		=>	'Fix Paths',
+						'upgrade'			=>	'Upgrade In-Portal',
+						'clean_reinstall'	=>	'Clean out the In-Portal database and reinstall',
+						2					=>	'Install to a new database',
+						'update_license'	=>	'Update License Information',
+						'db_reconfig'		=>	'Change Database Configuration',
+						'fix_paths'			=>	'Fix Paths',
 				);
 
 	$upgradable_modules = $this->GetUpgradableModules();
Index: branches/RC/core/install.php
===================================================================
diff -u -N -r10886 -r10924
--- branches/RC/core/install.php	(.../install.php)	(revision 10886)
+++ branches/RC/core/install.php	(.../install.php)	(revision 10924)
@@ -57,6 +57,7 @@
 		 */
 		var $steps = Array (
 			'fresh_install'		=>	Array ('check_paths', 'db_config', 'select_license', 'download_license', 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'finish'),
+			'clean_reinstall'	=>	Array ('check_paths', 'clean_db', 'db_config', 'select_license', 'download_license', 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'finish'),
 			'already_installed'	=>	Array ('check_paths', 'install_setup'),
 
 			'upgrade'			=>	Array ('check_paths', 'install_setup', 'upgrade_modules', 'finish'),
@@ -77,7 +78,7 @@
 		 *
 		 * @var Array
 		 */
-		var $skipApplicationSteps = Array ('check_paths', 'db_config', 'db_reconfig' /*, 'install_setup'*/); // remove install_setup when application will work separately from install
+		var $skipApplicationSteps = Array ('check_paths', 'clean_db', 'db_config', 'db_reconfig' /*, 'install_setup'*/); // remove install_setup when application will work separately from install
 
 		/**
 		 * Folders that should be writeable to continue installation. $1 - main writeable folder from config.php ("/system" by default)
@@ -242,6 +243,22 @@
 					}
 					break;
 
+				case 'clean_db':
+					// don't use Application, because all tables will be erased and it will crash
+					$sql = 'SELECT Path
+							FROM ' . TABLE_PREFIX . 'Modules';
+					$modules = $this->Conn->GetCol($sql);
+
+					foreach ($modules as $module_folder) {
+						$remove_file = '/' . $module_folder . 'install/remove_schema.sql';
+						if (file_exists(FULL_PATH . $remove_file)) {
+							$this->toolkit->RunSQL($remove_file);
+						}
+					}
+
+					$this->currentStep = $this->GetNextStep();
+					break;
+
 				case 'db_config':
 				case 'db_reconfig':
 					$fields = Array (
Index: branches/RC/core/install/step_templates/choose_modules.tpl
===================================================================
diff -u -N -r10836 -r10924
--- branches/RC/core/install/step_templates/choose_modules.tpl	(.../choose_modules.tpl)	(revision 10836)
+++ branches/RC/core/install/step_templates/choose_modules.tpl	(.../choose_modules.tpl)	(revision 10924)
@@ -39,7 +39,8 @@
 
 		if (!in_array(strtolower($license_module), $licensed_modules)) {
 			// when module isn't licensed user can't install it
-			array_unshift($prerequisites_errors, 'Module not licensed');
+			continue; // option #1: don't show non-licensed modules
+			array_unshift($prerequisites_errors, 'Module not licensed'); // option #2: show warning under module name
 		}
 
 		if ($prerequisites_errors) {
Index: branches/RC/kernel/install/remove_schema.sql
===================================================================
diff -u -N
--- branches/RC/kernel/install/remove_schema.sql	(revision 0)
+++ branches/RC/kernel/install/remove_schema.sql	(revision 10924)
@@ -0,0 +1,23 @@
+DROP TABLE BanRules;
+DROP TABLE CountCache;
+DROP TABLE Favorites;
+DROP TABLE Images;
+DROP TABLE ItemRating;
+DROP TABLE ItemReview;
+DROP TABLE ItemTypes;
+DROP TABLE ItemFiles;
+DROP TABLE Relationship;
+DROP TABLE SearchConfig;
+DROP TABLE SearchLog;
+DROP TABLE IgnoreKeywords;
+DROP TABLE SpamControl;
+DROP TABLE StatItem;
+DROP TABLE SuggestMail;
+DROP TABLE SysCache;
+DROP TABLE TagLibrary;
+DROP TABLE TagAttributes;
+DROP TABLE ImportScripts;
+DROP TABLE StylesheetSelectors;
+DROP TABLE Visits;
+DROP TABLE ImportCache;
+DROP TABLE RelatedSearches;
\ No newline at end of file