Index: trunk/admin/install.php
===================================================================
diff -u -N -r773 -r891
--- trunk/admin/install.php	(.../install.php)	(revision 773)
+++ trunk/admin/install.php	(.../install.php)	(revision 891)
@@ -473,10 +473,56 @@
 	    	}    
 	    	
 	    	$dir_name = $pathtoroot.$p."/admin";///install/upgrades/";
-	    	
-	    	$Modules[] = $rs->fields['Name'];
-	    	$Texts[] = $rs->fields['Name']." (".$rs->fields['Version']." ".prompt_language("la_to")." ".GetMaxPortalVersion($dir_name).")";
-	    	
+
+			if($rs->fields['Version']!=$newver=GetMaxPortalVersion($dir_name))
+			{
+
+////////////////////
+
+				$mod_name = strtolower($rs->fields['Name']);
+				$current_version = $rs->fields['Version'];
+		    	if ($mod_name == 'in-portal')$mod_name = '';
+
+		    	$dir_name = $pathtoroot.$mod_name."/admin/install/upgrades/";
+		    	$dir = @dir($dir_name); 
+		    	
+		    	$upgrades_arr = Array();
+		    	
+		    	$new_version = '';
+		    	while ($file = $dir->read()) {
+						if ($file != "." && $file != ".." && !is_dir($dir_name.$file)) { 	        	
+				        	if (strstr($file, 'inportal_check_v')) {
+					        	$upgrades_arr[] = $file;	        		
+				        	}
+						}
+		    	}
+    	
+		    	usort($upgrades_arr, "VersionSort");
+				$result=0;
+				$failCheck=1;
+				$stopCheck=2;
+				$CheckErrors = Array();
+
+		    	foreach($upgrades_arr as $file)
+		    	{
+			      $file_tmp = str_replace("inportal_check_v", "", $file);
+			      $file_tmp = str_replace(".php", "", $file_tmp);	
+				        	
+			   		if (ConvertVersion($file_tmp) > ConvertVersion($current_version)) {
+		    			$filename = $pathtoroot.$mod_name."/admin/install/upgrades/$file";
+				       	if(file_exists($filename))
+					   		{
+								include($filename);
+								if($result&2)break;
+					   		}	        		
+			      	}		
+		    	}
+
+////////////////////
+
+		    	$Modules[] = Array('module'=>$rs->fields['Name'],'curver'=>$rs->fields['Version'],'newver'=>$newver,'error'=>$result!='pass');
+//		    	$Texts[] = $rs->fields['Name']." (".$rs->fields['Version']." ".prompt_language("la_to")." ".GetMaxPortalVersion($dir_name).")";
+			}    	
 	    	/*$dir = @dir($dir_name);    	
 	    	
 	    	while ($file = $dir->read()) {
Index: trunk/admin/install/upgrade_errors.php
===================================================================
diff -u -N
--- trunk/admin/install/upgrade_errors.php	(revision 0)
+++ trunk/admin/install/upgrade_errors.php	(revision 891)
@@ -0,0 +1,209 @@
+<?php 
+
+$pathtoroot = "";
+if(!strlen($pathtoroot))
+{
+  //$path=dirname(realpath(__FILE__));PATH_TRANSLATED
+  $path=dirname(realpath(__FILE__));
+  if(strlen($path))
+  {
+    /* determine the OS type for path parsing */
+    $pos = strpos($path,":");
+    if ($pos === false)
+    {
+      $gOS_TYPE="unix";
+      $pathchar = "/";
+    }
+    else
+    {
+      $gOS_TYPE="win";
+      $pathchar="\\";
+    }
+    $p = $path.$pathchar;
+    /*Start looking for the root flag file */
+    while(!strlen($pathtoroot) && strlen($p))
+    {
+      $sub = substr($p,strlen($pathchar)*-1);
+      if($sub==$pathchar)
+      {
+        $filename = $p."root.flg";
+      }
+      else
+        $filename = $p.$pathchar."root.flg";
+      if(file_exists($filename))
+      {
+        $pathtoroot = $p;
+      }
+      else
+      {
+        $parent = realpath($p.$pathchar."..".$pathchar);
+	if($parent!=$p)
+	{
+	  $p = $parent;
+	}
+	else
+	  $p = "";
+      }
+    }
+    if(!strlen($pathtoroot))
+      $pathtoroot = ".".$pathchar;
+  }
+  else
+  {
+    $pathtoroot = ".".$pathchar;
+  }
+}
+function GetPathChar($path = null)
+{
+ 	if( !isset($path) ) $path = $GLOBALS['pathtoroot'];
+ 	$pos = strpos($path, ':');
+    return ($pos === false) ? "/" : "\\";
+}
+
+$rootURL = 'http://'.dirname($_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']);
+$rootURL = str_replace('/install','',$rootURL);
+
+$tmp = explode('/', $rootURL);
+if( $tmp[ count($tmp) - 1 ] == $admin) unset( $tmp[ count($tmp) - 1 ] );
+$rootURL = implode('/', $tmp).'/';
+unset($tmp);
+$mod_name = '/'.strtolower($_GET['module']);
+if ($mod_name == '/in-portal')$mod_name = '';
+$pathtoroot=str_replace('\\','/',$pathtoroot);
+
+$path_char = GetPathChar();
+
+$sub = substr($pathtoroot,strlen($pathchar)*-1);
+if($sub!=$pathchar)
+{
+  $pathtoroot = $pathtoroot.$pathchar;
+}
+include($pathtoroot."/admin/install/install_lib.php");
+require_once($pathtoroot."/kernel/include/adodb/adodb.inc.php");
+include($_=$pathtoroot."/admin/install/inst_ado.php");
+
+$ini_file = $pathtoroot."config.php";
+if(file_exists($ini_file))
+{
+    $write_access = is_writable($ini_file);
+    $ini_vars = inst_parse_portal_ini($ini_file,TRUE);
+    foreach($ini_vars as $secname => $section)
+    {
+      foreach($section as $key => $value)
+      {
+          $key = "g_".str_replace('-', '', $key);      
+          global $$key;
+          $$key = $value;
+      }
+    }    
+}
+$module_path = $pathtoroot.$mod_name.'/admin/install/';
+$ado =&inst_GetADODBConnection();
+$sql = 'SELECT Version FROM '.$g_TablePrefix.'Modules WHERE Name="'.addslashes($_GET['module']).'" ORDER BY LoadOrder';
+$rs = $ado->Execute($sql);
+
+$mod_ver = 0;
+while ($rs && !$rs->EOF) {
+	$mod_ver = $rs->fields['Version'];
+	$rs->MoveNext();
+}
+
+$p = strtolower($_GET['module']);        
+
+if ($p == 'in-portal')$p = '';
+
+$dir_name = $pathtoroot.$p."/admin";///install/upgrades/";
+
+$newver=GetMaxPortalVersion($dir_name);
+
+if($mod_ver!=$newver)
+{
+   	$dir_name = $pathtoroot.$p."/admin/install/upgrades/";
+	$dir = @dir($dir_name); 
+	
+	$upgrades_arr = Array();
+	
+	$new_version = '';
+	while ($file = $dir->read()) {
+			if ($file != "." && $file != ".." && !is_dir($dir_name.$file)) { 	        	
+	        	if (strstr($file, 'inportal_check_v')) {
+		        	$upgrades_arr[] = $file;	        		
+	        	}
+			}
+	}
+	usort($upgrades_arr, "VersionSort");
+	$result=0;
+	$failCheck=1;
+	$stopCheck=2;
+	$CheckErrors = Array();
+
+	foreach($upgrades_arr as $file)
+	{
+      $file_tmp = str_replace("inportal_check_v", "", $file);
+      $file_tmp = str_replace(".php", "", $file_tmp);	
+	        	
+   		if (ConvertVersion($file_tmp) > ConvertVersion($current_version)) {
+			$filename = $pathtoroot.$mod_name."/admin/install/upgrades/$file";
+	       	if(file_exists($filename))
+		   		{
+					include($filename);
+					if($result&2)break;
+		   		}	        		
+      	}		
+	}
+
+}
+
+function print_pre($s)
+{
+	echo '<pre>'.print_r($s, true).'</pre>';	
+}
+
+?>
+<html>
+	<head>
+		<title>In-Portal - Module Errors</title>
+		<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
+		<meta http-equiv="Pragma" content="no-cache">
+		<link rel="stylesheet" type="text/css" href="<?php echo $rootURL; ?>include/style.css">
+	</head>
+	<body topmargin="0" leftmargin="8" marginheight="8" marginwidth="8" bgcolor="#FFFFFF">
+		<DIV style='position:relative; z-Index: 1; background-color: #ffffff; padding-top:1px;'>
+		<div style='position:absolute; width:100%;top:0px;' align='right'>
+			<img src='<?php echo $rootURL; ?>images/logo_bg.gif'>
+		</div>
+		<img src="<?php echo $rootURL; ?>images/spacer.gif" width="1" height="7"><br>
+		<div style='z-Index:1; position:relative'>
+			<!-- ADMIN TITLE -->
+			<table cellpadding="0" cellspacing="0" border="0" width="100%">
+              <tr><td valign="top" class="admintitle" align="left">
+              <img alt="" width="46" height="46" src="<?php echo $rootURL; ?>install/ic_install.gif" align="absmiddle">&nbsp;Module Errors<br>
+              <img src='<?php echo $rootURL; ?>images/spacer.gif' width=1 height=4><br>
+              </td></tr></table>
+              <!-- SECTION NAVIGATOR -->
+              <table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30"><tr>
+              <TD class="header_left_bg" width="100%">
+              	<span class="tablenav_link">Install</span>
+              </td>
+              <td align="right" class="tablenav" background="<?php echo $rootURL; ?>inst_bg.jpg" width="10">
+              </td>
+             </tr>
+            </table>
+            <!-- END SECTION NAVIGATOR -->
+            <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<tr>
+		<td bgcolor="F6F6F6">
+		<div class="help_box">
+<?php 
+	foreach ($CheckErrors as $error) {
+		echo '<b><font color="#FF0000">'.$error.'</font></b><br />';
+	} 
+?>		
+		</h3>		</div>
+
+				</td>
+
+	</tr>
+</table>
+</body>
+</html>
\ No newline at end of file
Index: trunk/admin/install/upgrades/inportal_check_v1.0.10.php
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/inportal_check_v1.0.10.php	(revision 0)
+++ trunk/admin/install/upgrades/inportal_check_v1.0.10.php	(revision 891)
@@ -0,0 +1,24 @@
+<?php
+// !!! do not use variable $rs as record-set;
+$sql='SELECT ResourceId,COUNT(*) as c FROM '.$g_TablePrefix.'Category GROUP BY 1 HAVING c>1';
+$rs2 = $ado->Execute($sql);
+if ($rs2 && !$rs2->EOF)
+{
+	$result|=$failCheck;
+	$CheckErrors[] = 'You have duplicate ResourceId in table "'.$g_TablePrefix.'Category"';
+}
+$sql='SELECT ResourceId,COUNT(*) as c FROM '.$g_TablePrefix.'PortalGroup GROUP BY 1 HAVING c>1';
+$rs2 = $ado->Execute($sql);
+if ($rs2 && !$rs2->EOF)
+{
+	$result|=$failCheck;
+	$CheckErrors[] = 'You have duplicate ResourceId in table "'.$g_TablePrefix.'PortalGroup"';
+}
+$sql='SELECT ResourceId,COUNT(*) as c FROM '.$g_TablePrefix.'PortalUser GROUP BY 1 HAVING c>1';
+$rs2 = $ado->Execute($sql);
+if ($rs2 && !$rs2->EOF)
+{
+	$result|=$failCheck;
+	$CheckErrors[] = 'You have duplicate ResourceId in table "'.$g_TablePrefix.'PortalUser"';
+}
+?>
\ No newline at end of file
Index: trunk/admin/install/upgrade.php
===================================================================
diff -u -N -r41 -r891
--- trunk/admin/install/upgrade.php	(.../upgrade.php)	(revision 41)
+++ trunk/admin/install/upgrade.php	(.../upgrade.php)	(revision 891)
@@ -17,10 +17,20 @@
     foreach($Modules as $m)
     {        
         echo "<TR class=\"table_color2\"><TD colspan=\"2\" align=\"left\" class=\"txt\">";
-        echo "<INPUT TYPE=\"CHECKBOX\" NAME=\"modules[]\" VALUE=\"$m\" CHECKED=\"checked\">";
-        echo $Texts[$i];
+   		if($m['error'])
+	        echo "<INPUT TYPE=\"CHECKBOX\" NAME=\"modules[]\" VALUE=\"$m\" disabled />";
+    	else
+	        echo "<INPUT TYPE=\"CHECKBOX\" NAME=\"modules[]\" VALUE=\"$m\" CHECKED=\"checked\">";
+        
+		echo $m['module'].' ('.$m['curver'].' '.prompt_language('la_to').' '.$m['newver'].')';
+
+        if ($m['error'])
+        {
+        	$open_url = "install/upgrade_errors.php?module={$m['module']}";
+        	echo " (<span style=\"color: #FF0000; cursor: hand; cursor: pointer;\" onClick=\"CreatePopup('ModuleErrors', '$open_url');\">Pre-requisit test not passed!</span>)";
+        } 
         echo "</TD></TR>\n";
-        $i++;
+//        $i++;
     }
 ?>		            				            				            
 				            <tr class="table_color1">