Index: trunk/kernel/include/item.php
===================================================================
diff -u -r341 -r389
--- trunk/kernel/include/item.php	(.../item.php)	(revision 341)
+++ trunk/kernel/include/item.php	(.../item.php)	(revision 389)
@@ -779,14 +779,16 @@
         $db =& $this->adodbConnection;
         $sql = sprintf('SELECT * FROM %s WHERE CategoryId = %s AND ItemResourceId = %s', $SourceTable, $CatId, $this->Get("ResourceId"));
         $rs = $db->Execute($sql);
-        if($rs->RecordCount() == 0 )
-        {
-        	$sql = "INSERT INTO $SourceTable (CategoryId,ItemResourceId, PrimaryCat) VALUES ('$CatId','".$this->Get("ResourceId")."',$Primary)";
-        	if($this->debuglevel)
-        	  echo $sql."<br>\n";
-        	$this->adodbConnection->Execute($sql);
-    	}
-    	
+
+        if (is_object($rs)) {
+	        if($rs->RecordCount() == 0 )
+	        {
+	        	$sql = "INSERT INTO $SourceTable (CategoryId,ItemResourceId, PrimaryCat) VALUES ('$CatId','".$this->Get("ResourceId")."',$Primary)";
+	        	if($this->debuglevel)
+	        	  echo $sql."<br>\n";
+	        	$this->adodbConnection->Execute($sql);
+	    	}    	
+        }
         
         $c = $objCatList->GetCategory($CatId);
       }
Index: trunk/globals.php
===================================================================
diff -u -r385 -r389
--- trunk/globals.php	(.../globals.php)	(revision 385)
+++ trunk/globals.php	(.../globals.php)	(revision 389)
@@ -140,6 +140,30 @@
     return $val;
 }
 
+function IsTablePresent($ado, $tables)
+{
+	$ado = GetADODBConnection();
+	
+    $t = explode(",",$tables);
+    
+    $i = $ado->MetaTables();
+    for($x=0;$x<count($i);$x++)
+        $i[$x] = strtolower($i[$x]);
+
+    $AllFound = TRUE;
+    for($tIndex=0;$tIndex<count($t);$tIndex++)
+    {
+        $table = GetTablePrefix().$t[$tIndex];
+        $table = strtolower($table);
+        if(!in_array($table,$i))
+        {
+            $AllFound = FALSE;
+        }
+                
+    }
+    return $AllFound;
+}
+
 function AddSlash($s)
 {
     if(substr($s,-1) != "/")
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -r243 -r389
--- trunk/admin/install/langpacks/english.lang	(.../english.lang)	(revision 243)
+++ trunk/admin/install/langpacks/english.lang	(.../english.lang)	(revision 389)
@@ -1535,6 +1535,22 @@
 <PHRASE Label="la_Description_in-portal:advanced_view" Type="1">VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gbWFuYWdlIGNhdGVnb3JpZXMgYW5kIGl0ZW1zIGFjcm9zcyBhbGwgY2F0ZWdvcmllcw==</PHRASE>
 <PHRASE Label="lu_pick_links" Type="0">RWRpdG9yJ3MgUGljayBMaW5rcw==</PHRASE>
 <PHRASE Label="lu_pick_news" Type="0">RWRpdG9yJ3MgUGljayBBcnRpY2xlcw==</PHRASE>
+<PHRASE Label="la_tab_EmailLog" Type="1">RW1haWwgTG9n</PHRASE>
+<PHRASE Label="la_prompt_FromUsername" Type="1">RnJvbQ==</PHRASE>
+<PHRASE Label="la_prompt_AddressTo" Type="1">U2VudCBUbw==</PHRASE>
+<PHRASE Label="la_prompt_Event" Type="1">RXZlbnQ=</PHRASE>
+<PHRASE Label="la_prompt_SentOn" Type="1">U2VudCBPbg==</PHRASE>
+<PHRASE Label="la_tab_ServerInfo" Type="1">U2VydmVyIEluZm9ybWF0aW9u</PHRASE>
+<PHRASE Label="la_Description_in-portal:server_info" Type="1">VGhpcyBzZWN0aW9uIGFsbG93cyB0byB2aWV3IFBIUCBjb25maWd1cmF0aW9u</PHRASE>
+<PHRASE Label="la_Description_in-portal:emaillog" Type="1">VGhpcyBzZWN0aW9uIHNob3dzIGFsbCBlLW1haWxzIHNlbnQgYnkgSW4tUG9ydGFs</PHRASE>
+<PHRASE Label="la_Description_in-portal:main_import" Type="1">VGhpcyBzZWN0aW9uIGFsbG93cyB0byBwZXJmb3JtIGRhdGEgaW1wb3J0IGZyb20gb3RoZXIgc3lzdGVtcw==</PHRASE>
+<PHRASE Label="la_prompt_DatabaseSettings" Type="1">RGF0YWJhc2UgU2V0dGluZ3M=</PHRASE>
+<PHRASE Label="la_prompt_SqlType" Type="1">U2VydmVyIFR5cGU=</PHRASE>
+<PHRASE Label="la_prompt_Server" Type="1">U2VydmVyIEhvc3RuYW1l</PHRASE>
+<PHRASE Label="la_prompt_DbName" Type="1">U2VydmVyIERhdGFiYXNl</PHRASE>
+<PHRASE Label="la_prompt_DbUsername" Type="1">RGF0YWJzZSBVc2VyIE5hbWU=</PHRASE>
+<PHRASE Label="la_prompt_DbPass" Type="1">U2VydmVyIFBhc3N3b3Jk</PHRASE>
+<PHRASE Label="la_prompt_Import_Prefix" Type="1">VGFibGUgTmFtZSBQcmVmaXg=</PHRASE>
 </PHRASES><EVENTS><EVENT MessageType="text" Event="USER.ADD" Type="0">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKRGVhciA8aW5wOnRvdXNlciBfRmllbGQ9IkZpcnN0TmFtZSIgLz4gPGlucDp0b3VzZXIgX0ZpZWxkPSJMYXN0TmFtZSIgLz4sDQoNClRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDptX3BhZ2VfdGl0bGUgLz4uIFlvdXIgcmVnaXN0cmF0aW9uIGlzIG5vdyBhY3RpdmUu</EVENT>
 <EVENT MessageType="text" Event="USER.ADD" Type="1">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogTmV3IHVzZXIgaGFzIGJlZW4gYWRkZWQKCkEgbmV3IHVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiBhZGRlZC4=</EVENT>
 <EVENT MessageType="text" Event="USER.APPROVE" Type="0">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiBhcHByb3ZlZAoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iLg==</EVENT>