Index: trunk/admin/install.php
===================================================================
diff -u -r744 -r773
--- trunk/admin/install.php	(.../install.php)	(revision 744)
+++ trunk/admin/install.php	(.../install.php)	(revision 773)
@@ -170,6 +170,8 @@
 	return stripslashes($str);
 }
 
+$skip_step = false;
+
 require_once($pathtoroot.$admin."/install/inst_ado.php");
 $helpURL = $rootURL.$admin.'/help/install_help.php?destform=popup&help_usage=install';
 ?>
@@ -1503,12 +1505,6 @@
     $state="lang_select";
 }
 
-if($state=="lang_select")
-{
-	$Packs = GetLanguageList();
-	$include_file = $pathtoroot.$admin."/install/lang_select.php";
-}
-
 if($state=="modselect")
 {
  /* /admin/install.php */
@@ -1534,9 +1530,22 @@
     $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '".$_SERVER['DOCUMENT_ROOT'].$sitepath."admin/backupdata' WHERE VariableName='Backup_Path'";
     $ado->Execute($sql);
     $Modules = inst_GetModuleList();
-    $include_file = $pathtoroot.$admin."/install/modselect.php";
+    
+    if (count($Modules) > 0) {    
+    	$include_file = $pathtoroot.$admin."/install/modselect.php";
+    }
+    else {
+    	$state = "lang_select";
+    	$skip_step = true;
+    }
 }
 
+if($state=="lang_select")
+{
+	$Packs = GetLanguageList();
+	$include_file = $pathtoroot.$admin."/install/lang_select.php";
+}
+
 if(substr($state,0,10)=="postconfig")
 {
     $p = explode("_",$state);
@@ -1810,7 +1819,12 @@
 if ($state == "warning") {
 	$tmp_step--;
 	$next_step = $tmp_step + 1;
-}	
+}
+
+if ($skip_step) {
+	$tmp_step++;
+	$next_step = $tmp_step + 1;
+}
 ?>
 	
 	<tr height="100%">
Index: trunk/admin/install/install_lib.php
===================================================================
diff -u -r542 -r773
--- trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 542)
+++ trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 773)
@@ -457,8 +457,10 @@
     //$lic = LoadLicense();
     $lic = base64_decode($g_License);
     inst_ParseLicense($lic);
-//    echo "Checking $g_Domain..<br>\n";
-//    echo "<PRE>";print_r($i_Keys); echo "</PRE><br>";
+    
+    //echo "Checking $g_Domain..<br>\n";
+    //echo "<PRE>";print_r($i_Keys); echo "</PRE><br>";
+    
     $modules = array();
     if(!inst_IsLocalSite($g_Domain))
     {    
@@ -471,14 +473,14 @@
             }
         }    
         if(in_array($name,$modules))
-	{
-//	  echo "Module $name is licensed<br>\n";
+		{
+		  	//echo "Module $name is licensed<br>\n";
             return TRUE;
-	}
-	else
- 	{
-	 // echo "Module $name is not licensed<br>\n";
-	  return FALSE;
+		}
+		else
+ 		{
+	 		//echo "Module $name is not licensed<br>\n";
+	  		return FALSE;
         }
     }
     else
@@ -557,9 +559,9 @@
 					$inst_file = $ModuleAdminDir.'install.php';
 					if( file_exists($inst_file) && file_exists($ModuleAdminDir.'install/inportal_schema.sql') )
 					{
-						//if(inst_ModuleLicensed($file))
+						if(inst_ModuleLicensed($file)) {
 							$new[$file] = $inst_file;
-						
+						}						
 					}
 				}
 			}
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -r738 -r773
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 738)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 773)
@@ -1724,7 +1724,7 @@
         global $objConfig;
           
         $update =& $GLOBALS[$this->PageEnvar]; // env_var_update
-                
+
         // insteresting stuff :)
         if(!$this->PerPageVar) $this->PerPageVar = "Perpage_Links";
 
Index: trunk/admin/modules/addmodule.php
===================================================================
diff -u -r553 -r773
--- trunk/admin/modules/addmodule.php	(.../addmodule.php)	(revision 553)
+++ trunk/admin/modules/addmodule.php	(.../addmodule.php)	(revision 773)
@@ -156,6 +156,7 @@
     unset($data);
     $data = array();
     $status= admin_language("la_text_ready_to_install");
+    $pre_error = admin_language("la_text_prerequisit_not_passed");
     
     $mod_tmp_name_arr = explode('-', $mod);
     
@@ -167,7 +168,17 @@
     $mod_tmp_name = substr($mod_tmp_name, 0, strlen($mod_tmp_name) - 1);
     
     if (_ModuleLicensed($mod_tmp_name)) {
-    	$data["Url"] = "<A HREF=\"".$rootURL.$mod."/admin/install.php?env=".BuildEnv()."&redirect=1\">$status</A>";
+		if (file_exists($pathtoroot.strtolower($mod_tmp_name)."/admin/install/prerequisit.php")) {
+			include_once($pathtoroot.strtolower($mod_tmp_name)."/admin/install/prerequisit.php");
+		}
+		    	
+    	if ($result) {
+    		$data["Url"] = "<A HREF=\"".$rootURL.$mod."/admin/install.php?env=".BuildEnv()."&redirect=1\">$status</A>";
+    	}
+    	else {
+    		$show_errors = true;
+    		$data["Url"] = '<a href="javascript:javascript:CreatePopup(\'ModuleErrors\', \''.$rootURL.'admin/install/prerequisit_errors.php?module='.strtolower($mod_tmp_name).'\');"><font color="#FF0000">'.$pre_error.'</font></a>';
+    	}
     }
     else {
     	$data["Url"] = '<a href="'.$rootURL.'admin/modules/upgrade_lic.php?env='.BuildEnv().'"><font color="#FF0000">'.admin_language("la_module_not_licensed").'</font></a>';
Index: trunk/kernel/include/searchitems.php
===================================================================
diff -u -r676 -r773
--- trunk/kernel/include/searchitems.php	(.../searchitems.php)	(revision 676)
+++ trunk/kernel/include/searchitems.php	(.../searchitems.php)	(revision 773)
@@ -516,7 +516,7 @@
           }
         }
         $SelectSQL .= "GROUP BY $idField ";
-        //echo $SelectSQL."<br><br>\n";
+        echo $SelectSQL."<br><br>\n";
         if($InitTable)
         {   
            $this->adodbConnection->Execute("DROP TABLE IF EXISTS ".$this->ResultTable);
Index: trunk/admin/install/modselect.php
===================================================================
diff -u -r315 -r773
--- trunk/admin/install/modselect.php	(.../modselect.php)	(revision 315)
+++ trunk/admin/install/modselect.php	(.../modselect.php)	(revision 773)
@@ -14,10 +14,28 @@
 
 <?php
     foreach($Modules as $m)
-    {        
+    {  
+		$result = true;
+		if (file_exists($pathtoroot."$m/admin/install/prerequisit.php")) {
+			include_once($pathtoroot."$m/admin/install/prerequisit.php");
+		}
+    	    
         echo "<TR class=\"table_color2\"><TD colspan=\"2\" align=\"left\" class=\"txt\">";
-        echo "<INPUT TYPE=\"CHECKBOX\" NAME=\"domain[]\" VALUE=\"$m\" CHECKED=\"checked\">";
+        
+        if ($result) {
+        	echo "<INPUT TYPE=\"CHECKBOX\" NAME=\"domain[]\" VALUE=\"$m\" CHECKED=\"checked\">";
+        }
+        else {
+        	echo "<INPUT TYPE=\"CHECKBOX\" NAME=\"domain[]\" VALUE=\"$m\" disabled>";
+        }
+        
         echo $m;
+        
+        if (!$result) {
+        	$open_url = $rootURL.$admin."/install/prerequisit_errors.php?module=$m";
+        	echo " (<a href=\"javascript:CreatePopup('ModuleErrors', '$open_url');\"><font color=\"#FF0000\">Pre-requisit test not passed!</font></a>)";
+        }
+        
         echo "</TD></TR>\n";
     }
 ?>