Index: trunk/kernel/include/config.php
===================================================================
diff -u -r13 -r105
--- trunk/kernel/include/config.php	(.../config.php)	(revision 13)
+++ trunk/kernel/include/config.php	(.../config.php)	(revision 105)
@@ -1,5 +1,5 @@
 <?php
-require_once("adodb/adodb.inc.php");
+require_once($pathtoroot."kernel/include/adodb/adodb.inc.php");
 
 class clsConfig
 {
Index: trunk/admin/install.php
===================================================================
diff -u -r103 -r105
--- trunk/admin/install.php	(.../install.php)	(revision 103)
+++ trunk/admin/install.php	(.../install.php)	(revision 105)
@@ -3,7 +3,8 @@
 
 //$new_version = '1.0.2';
 
-define("GET_LICENSE_URL", "http://www.intechnic.com/myaccount/license.php");
+//define("GET_LICENSE_URL", "http://www.intechnic.com/myaccount/license.php");
+define("GET_LICENSE_URL", "http://maris.prod.intechnic.lv/in-business/license.php");
 define('BACKUP_NAME', 'dump(.*).txt'); // how backup dump files are named
 $general_error = '';
 
@@ -70,10 +71,11 @@
   }
 }
 
-if( file_exists($pathtoroot.'debug.php') ) include_once($pathtoroot.'debug.php');
+if( file_exists($pathtoroot.'debug.php') && !defined('DEBUG_MODE') ) include_once($pathtoroot.'debug.php');
 if( defined('DEBUG_MODE') )
 {
 	error_reporting(E_ALL & E_NOTICE);
+	ini_set('display_errors', 1);
 }
 else
 	error_reporting(0);
@@ -95,7 +97,7 @@
 	$state = $_POST["state"];
 }
 
-include("install/install_lib.php");
+include($pathtoroot.$admin."/install/install_lib.php");
 
 $ini_file = $pathtoroot."config.php";
 if(file_exists($ini_file))
@@ -244,7 +246,7 @@
 					<td rowspan="3" width="100000" align="right">&nbsp;</td>
 					<td width="400"><img alt="" src="images/blocks.gif" width="400" height="73"></td>
 				</tr>
-				<tr><td align="right" background="images/version_bg.gif" class="head_version" valign="top"><img alt="" src="images/spacer.gif" width="1" height="14">In-Portal Version 1.0.0: English US</td></tr>
+				<tr><td align="right" background="images/version_bg.gif" class="head_version" valign="top"><img alt="" src="images/spacer.gif" width="1" height="14">In-Portal Version <?php echo GetMaxPortalVersion($pathtoroot.$admin)?>: English US</td></tr>
 				<tr><td><img alt="" src="images/blocks2.gif" width="400" height="2"><br></td></tr>
 				<tr><td bgcolor="black" colspan="4"><img alt="" src="images/spacer.gif" width="1" height="1"><br></td></tr>
 			</table>
@@ -351,7 +353,7 @@
       }
       else
       {
-		$rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['UserName'])."&password=".md5($_POST['UserPass'])."&domain=".$_SERVER['SERVER_NAME'], "r");
+		$rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['UserName'])."&password=".md5($_POST['UserPass'])."&license_code=".base64_encode($g_LicenseCode)."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r");
 		if (!$rfile) {
 			$LoggedIn = false;		
 		}
@@ -495,7 +497,7 @@
     	$rs->MoveNext();    	
     }
     	
-	$include_file = "install/upgrade.php";
+	$include_file = $pathtoroot.$admin."/install/upgrade.php";
 }
 
 if ($state == "upgrade_process") {
@@ -591,7 +593,7 @@
 
 if($state=="db_reconfig")
 {
-  $include_file = "install/db_reconfig.php";	
+  $include_file = $pathtoroot.$admin."/install/db_reconfig.php";	
 }
 
 if($state=="restore_file")
@@ -641,16 +643,16 @@
            }
            else {
            		$state = "warning";
-           		$include_file = "install/warning.php";
+           		$include_file = $pathtoroot.$admin."/install/warning.php";
            }
 		}
 		else {
 			if ($_POST['backupdate'] != '') {
-				$include_file = "install/restore_select.php";
+				$include_file = $pathtoroot.$admin."/install/restore_select.php";
 		  		$restore_error = "$backupfile not found or could not be read";		
 			}
 			else {
-				$include_file = "install/restore_select.php";
+				$include_file = $pathtoroot.$admin."/install/restore_select.php";
 		  		$restore_error = "No backup selected!!!";	
 			}					
 		}
@@ -661,7 +663,7 @@
 if($state=="restore_select")
 {
 	if( isset($_POST['backupdir']) ) $filepath = stripslashes($_POST['backupdir']);
-	$include_file = "install/restore_select.php";	
+	$include_file = $pathtoroot.$admin."/install/restore_select.php";	
 }
 
 if($state=="restore_run")
@@ -671,7 +673,7 @@
   if(!strlen($backupfile))
     $backupfile = SuperStrip($_GET['File'], true);
       	
-  $include_file = "install/restore_run.php";	
+  $include_file = $pathtoroot.$admin."/install/restore_run.php";	
 }
 
 if($state=="db_config_save")
@@ -704,19 +706,19 @@
   	if ($install_type == '') {
   		$install_type = 1;
   	}
-	$include_file = "install/dbinfo.php";
+	$include_file = $pathtoroot.$admin."/install/dbinfo.php";
 }
 
 if ($state == "download_license") {
 	$ValidLicense = FALSE;
 	if ($_POST['login'] != '' && $_POST['password'] != '') {
 		// Here we determine weather login is ok & check available licenses
 		
-		$rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['login'])."&password=".md5($_POST['password'])."&domain=".$_SERVER['SERVER_NAME'], "r");
+		$rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['login'])."&password=".md5($_POST['password'])."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r");
 		if (!$rfile) {
 			$get_license_error = "Unable to connect to the Intechnic server! Please try again later!";
 			$state = "get_license";
-			$include_file = "install/get_license.php";			
+			$include_file = $pathtoroot.$admin."/install/get_license.php";			
 		}
 		else {
 			$rcontents = '';
@@ -729,22 +731,25 @@
 			if (substr($rcontents, 0, 5) == 'Error') {
 				$get_license_error = substr($rcontents, 6);
 				$state = "get_license";
-				$include_file = "install/get_license.php";					
+				$include_file = $pathtoroot.$admin."/install/get_license.php";					
 			}
 			else {
 				if (substr($rcontents, 0, 3) == "SEL") {
 					$state = "download_license";
 					$license_select = substr($rcontents, 4);
-					$include_file = "install/download_license.php";
+					$include_file = $pathtoroot.$admin."/install/download_license.php";
 				}
 				else {
 					// Here we get one license
-		            $data = base64_decode(str_replace("In-Portal License File - do not edit!\n", "", $rcontents));
+					$tmp_data = explode('Code==:', $rcontents);
+				
+	            	$data = base64_decode(str_replace("In-Portal License File - do not edit!\n", "", $tmp_data[0]));				
 					inst_ParseLicense($data);
 		            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
 		            if($ValidLicense)
 		            {
 		                set_ini_value("Intechnic","License",base64_encode($data));
+	                	set_ini_value("Intechnic","LicenseCode",$tmp_data[1]);		                
 		                save_values();
 		                $state="domain_select";
 		                $got_license = 1;
@@ -764,15 +769,15 @@
 	else if ($_POST['licenses'] == '') {
 		$state = "get_license";
 		$get_license_error = "Username and / or password not specified!!!";
-		$include_file = "install/get_license.php";
+		$include_file = $pathtoroot.$admin."/install/get_license.php";
 	}
 	else {
 		// Here we download license
-		$rfile = @fopen(GET_LICENSE_URL."?license_id=".md5($_POST['licenses'])."&dlog=".md5($_POST['dlog'])."&dpass=".md5($_POST['dpass'])."&domain=".$_POST['domain'], "r");
+		$rfile = @fopen(GET_LICENSE_URL."?license_id=".md5($_POST['licenses'])."&dlog=".md5($_POST['dlog'])."&dpass=".md5($_POST['dpass'])."&domain=".base64_encode($_POST['domain']), "r");
 		if (!$rfile) {
 			$get_license_error = "Unable to connect to the Intechnic server! Please try again later!";
 			$state = "get_license";
-			$include_file = "install/get_license.php";			
+			$include_file = $pathtoroot.$admin."/install/get_license.php";			
 		}
 		else {
 			$rcontents = '';
@@ -785,15 +790,18 @@
 			if (substr($rcontents, 0, 5) == 'Error') {
 				$download_license_error = substr($rcontents, 6);
 				$state = "download_license";
-				$include_file = "install/download_license.php";					
+				$include_file = $pathtoroot.$admin."/install/download_license.php";					
 			}
 			else {
-	            $data = base64_decode(str_replace("In-Portal License File - do not edit!\n", "", $rcontents));				
+				$tmp_data = explode('Code==:', $rcontents);
+				
+	            $data = base64_decode(str_replace("In-Portal License File - do not edit!\n", "", $tmp_data[0]));				
 	            inst_ParseLicense($data);
 	            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
 	            if($ValidLicense)
 	            {
 	                set_ini_value("Intechnic","License",base64_encode($data));
+	                set_ini_value("Intechnic","LicenseCode",$tmp_data[1]);
 	                save_values();
 	                $state="domain_select";
 	            }
@@ -815,7 +823,7 @@
     switch($_POST["lic_opt"])
     {
     case 1: /* download from intechnic */
-        $include_file = "install/get_license.php";
+        $include_file = $pathtoroot.$admin."/install/get_license.php";
         $state = "get_license";
     	//if(!$ValidLicense)
         //{
@@ -833,13 +841,17 @@
                 $lic = fread($fp,filesize($pathtoroot."themes/tmp.lic"));
                 fclose($fp);
             }      
-            $data = inst_LoadLicense(FALSE,$pathtoroot."themes/tmp.lic");
+            
+            $tmp_data = inst_LoadLicense(FALSE,$pathtoroot."themes/tmp.lic");            
+            $data = $tmp_data[0];
+            
             @unlink($pathtoroot."themes/tmp.lic");
             inst_ParseLicense($data);
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
             if($ValidLicense)
             {
                 set_ini_value("Intechnic","License",base64_encode($data));
+                set_ini_value("Intechnic","LicenseCode",$tmp_data[1]);
                 save_values();
                 $state="domain_select";
             }
@@ -887,7 +899,7 @@
 
 if($state=="license")
 {
-    $include_file = "install/sel_license.php";    
+    $include_file = $pathtoroot.$admin."/install/sel_license.php";    
 
 }
 
@@ -943,7 +955,7 @@
     	$install_type = 2;
     }    
     
-	$include_file = "install/reinstall.php";
+	$include_file = $pathtoroot.$admin."/install/reinstall.php";
 }
 
 if($state=="login")
@@ -975,7 +987,7 @@
 
 if($state=="getuser")
 {
-        $include_file = "install/login.php";
+        $include_file = $pathtoroot.$admin."/install/login.php";
 }
 
 if($state=="set_domain")
@@ -989,20 +1001,34 @@
            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
         }
     }
+    
     if($_POST["domain"]==1)
     {
         $domain = $_SERVER['HTTP_HOST'];
-        set_ini_value("Intechnic","Domain",$domain);
-        save_values();
-        $state="runsql";
+        
+        if (strstr($domain, $i_Keys[0]['domain'])) {
+        	set_ini_value("Intechnic","Domain",$domain);
+        	save_values();
+        	$state="runsql";
+        }
+        else {
+        	$DomainError = 'Domain name selected does not match domain name in the license!';
+        	$state = "domain_select";
+        }        	
     }
     else
     {
         $domain = str_replace(" ", "", $_POST["other"]);
         if ($domain != '') {
-        	set_ini_value("Intechnic","Domain",$domain);
-        	save_values();
-        	$state="runsql";
+        	if (strstr($domain, $i_Keys[0]['domain'])) {
+        		set_ini_value("Intechnic","Domain",$domain);
+        		save_values();
+        		$state="runsql";
+        	}
+	        else {
+	        	$DomainError = 'Domain name entered does not match domain name in the license!';
+	        	$state = "domain_select";
+	        }         	
         }
         else {
         	$DomainError = 'Please enter valid domain!';
@@ -1023,7 +1049,7 @@
         }
     }
   
-    $include_file = "install/domain.php";
+    $include_file = $pathtoroot.$admin."/install/domain.php";
 }
 
 
@@ -1097,13 +1123,13 @@
        	$state="RootPass";
   }
   else {
-  	  $include_file = "install/install_finish.php";
+  	  $include_file = $pathtoroot.$admin."/install/install_finish.php";
       $state="finish";
   }
 }
 
 if ($state == "finish") {
-	$include_file = "install/install_finish.php";
+	$include_file = $pathtoroot.$admin."/install/install_finish.php";
 }
 
 if($state=="RootSetPass")
@@ -1131,7 +1157,7 @@
 
 if($state=="RootPass")
 {
-    $include_file = "install/rootpass.php";
+    $include_file = $pathtoroot.$admin."/install/rootpass.php";
 }
 
 if($state=="lang_install_init")
@@ -1300,7 +1326,7 @@
 		if($force_finish == true) $next_step = 3;
 		$NextUrl = $_SERVER['PHP_SELF']."?Offset=$Offset&Status=$Status&state=lang_install&next_step=$next_step&install_type=$install_type";
 		if($force_finish == true) $NextUrl .= '&ff=1';
-		$include_file = "install/lang_run.php";
+		$include_file = $pathtoroot.$admin."/install/lang_run.php";
   }
   else 
   {
@@ -1321,7 +1347,7 @@
     	if($force_finish == true) $next_step = 3;
   	  	$NextUrl = $_SERVER['PHP_SELF']."?Offset=$Offset&Status=$Status&State=lang_install&next_step=$next_step&install_type=$install_type";
   	  	if($force_finish == true) $NextUrl .= '&ff=1';
-  	  	$include_file = "install/lang_run.php";
+  	  	$include_file = $pathtoroot.$admin."/install/lang_run.php";
   	  }
   	  else
   	  {
@@ -1333,7 +1359,7 @@
   		{
   	    	$_POST['next_step'] = 4;
   	    	$state = 'finish';
-			$include_file = "install/install_finish.php";
+			$include_file = $pathtoroot.$admin."/install/install_finish.php";
   		}
   	  }
   }
@@ -1367,7 +1393,7 @@
 	{
 		$Packs[$l->Get("LanguageId")] = $l->Get("PackName");
 	}
-	$include_file = "install/lang_default.php";	
+	$include_file = $pathtoroot.$admin."/install/lang_default.php";	
 }
 
 
@@ -1454,7 +1480,7 @@
 if($state=="lang_select")
 {
 	$Packs = GetLanguageList();
-	$include_file = "install/lang_select.php";
+	$include_file = $pathtoroot.$admin."/install/lang_select.php";
 }
 
 if($state=="modselect")
@@ -1482,7 +1508,7 @@
     $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 = "install/modselect.php";
+    $include_file = $pathtoroot.$admin."/install/modselect.php";
 }
 
 if(substr($state,0,10)=="postconfig")
@@ -1501,11 +1527,11 @@
 		} 
 
 		$modules_str = substr($modules_str, 0, strlen($modules_str) - 1);  
-		$rfile = @fopen(GET_LICENSE_URL."?url=".base64_encode($_SERVER['SERVER_NAME'].$_POST['Site_Path'])."&modules=".base64_encode($modules_str)."&domain=".md5($_SERVER['SERVER_NAME']), "r");
+		$rfile = @fopen(GET_LICENSE_URL."?url=".base64_encode($_SERVER['SERVER_NAME'].$_POST['Site_Path'])."&modules=".base64_encode($modules_str)."&license_code=".base64_encode($g_LicenseCode)."&domain=".md5($_SERVER['SERVER_NAME']), "r");
 		if (!$rfile) {
 			//$get_license_error = "Unable to connect to the Intechnic server! Please try again later!";
 			//$state = "postconfig_1";
-			//$include_file = "install/postconfig.php";			
+			//$include_file = $pathtoroot.$admin."/install/postconfig.php";			
 		}
 		else {	
 			$rcontents = '';
@@ -1539,7 +1565,7 @@
         	
     if($step <= count($configs)+1)
     {
-         $include_file = "install/postconfig.php";
+         $include_file = $pathtoroot.$admin."/install/postconfig.php";
     }
     else
         $state = "theme_sel";       
@@ -1548,7 +1574,7 @@
 if($state=="theme_sel")
 {
     $objThemes->CreateMissingThemes();
-    $include_file = "install/theme_select.php";
+    $include_file = $pathtoroot.$admin."/install/theme_select.php";
 }
 
 if($state=="theme_set")
@@ -1570,7 +1596,7 @@
     $t->Set("PrimaryTheme",1);
     $t->Update();
     $t->VerifyTemplates();
-	$include_file = "install/install_finish.php";    
+	$include_file = $pathtoroot.$admin."/install/install_finish.php";    
     $state="finish";
 }
 
Index: trunk/admin/config/edit_label.php
===================================================================
diff -u -r38 -r105
--- trunk/admin/config/edit_label.php	(.../edit_label.php)	(revision 38)
+++ trunk/admin/config/edit_label.php	(.../edit_label.php)	(revision 105)
@@ -97,28 +97,26 @@
 }
 
 $section = "in-portal:phrase_editor";
-$ids = GetVar('PhraseId');
+$ids = $_GET["PhraseId"];
 
-if( strlen($ids) )
+if(strlen($ids))
 {
-  // useless code: begin
   $ids = str_replace("[","",$ids);
   $ids = str_replace("]","",$ids);
   $ids = str_replace("\"","",$ids);
   $ids = str_replace("\\","",$ids);
-  // useless code: end
   $PhraseIds = explode(",",$ids);
 }
 else
 {
   $LangId = $_GET["LanguageId"];	
 }
 
-$EditDirect = GetVar('direct');
+$EditDirect = (int)$_GET["direct"];
 
 if($EditDirect)
 {
-  $NewLabel = GetVar('label');
+  $NewLabel = $_GET["label"];
   if(!$LangId)
   {
     $LangId = $objSession->Get("Language");	
@@ -127,24 +125,24 @@
 
 unset($objEditItems);
 
-if ( isset($PhraseIds) && count($PhraseIds) > 1) {
+if (count($PhraseIds) > 1) {
 	$print_list = true;
 }
 else {
 	$ado = GetADODBConnection();
 	$sql = "SELECT PhraseId FROM ".$objSession->GetEditTable("Phrase");
 	
-	if ( isset($LangId) && $LangId > 0 ) {
+	if ($LangId) {
 		$sql .= " WHERE LanguageId = $LangId";
 	}
 	
 	$rs = $ado->Execute($sql);
 	
-	if ( GetVar('en') === false ) {
+	if (!$_GET['en']) {
 		$selected_id = $PhraseIds[0];
 	}
 	else {
-		$selected_id = GetVar('PhraseId');
+		$selected_id = $_GET['PhraseId'];
 	}
 	
 	$PhraseIdList = '';
@@ -170,7 +168,9 @@
 $objListToolBar->Set("CheckClass","ThemeChecks");
   
 $objListToolBar->Add("select", "la_ToolTip_Select","#","swap('select','toolbar/tool_select_f2.gif');",
-                    "swap('select', 'toolbar/tool_select.gif');", "LangSubmit();", "tool_select.gif");
+                    "swap('select', 'toolbar/tool_select.gif');",
+                     "LangSubmit();",
+                     "tool_select.gif");
 
 $objListToolBar->Add("cancel", "la_ToolTip_Stop","#","swap('cancel','toolbar/tool_stop_f2.gif');",
                     "swap('cancel', 'toolbar/tool_stop.gif');","window.close();","tool_stop.gif");
@@ -209,15 +209,17 @@
 <form name="frmPhrase" ID="frmPhrase" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar;?>" method=POST>
 <TABLE cellSpacing="0" cellPadding="2" width="100%" class="tableborder">
 <?php
-if( !isset($objPhraseList) ) $objPhraseList = new clsPhraseList();
-
-if(!$EditDirect) $objPhraseList->SourceTable = $objSession->GetEditTable("Phrase");
+if(!is_object($objPhraseList))
+{
+  $objPhraseList = new clsPhraseList();
+}
+if(!$EditDirect)
+  $objPhraseList->SourceTable = $objSession->GetEditTable("Phrase");
   
 $count_ids = 1;
 
 if ($print_list) {
 	$count_ids = count($PhraseIds);
-	$selected_id = $PhraseIds[0];
 }
 else {
 	foreach($PhraseIdArr as $key => $value) {
@@ -227,22 +229,23 @@
 	}
 }
 
-for($x = 0; $x < $count_ids; $x++)
+for($x=0;$x<$count_ids;$x++)
 {
   $p = $objPhraseList->GetItem($PhraseIds[$x]);
   
-  if( !isset($LangId) ) $LangId = $p->Get("LanguageId");
-  if(is_object($p) && isset($selected_id) )
+  //echo "<pre>"; print_r($p); echo "</pre>";
+  
+  if(!$LangId)
+    $LangId = $p->Get("LanguageId");
+  if(is_object($p) && ($selected_id != '' || $count_ids > 1))
   {
   	echo int_subsection_title_ret(admin_language("la_tab_General").": ".GetPrimaryTranslation($p->Get("Phrase")));
-  	if($p->Get('PhraseId') > 0)
-  	{
-  		echo "<TR ".int_table_color_ret()." >\n";
-  		echo "  <TD>".admin_language("la_prompt_PhraseId")."</TD>\n";
-    	echo "  <TD>".$p->Get("PhraseId")."</TD>\n";
-  		echo "  <TD></TD>\n";
-		echo "</TR>\n";
-	}
+  	echo "<TR ".int_table_color_ret()." >\n";
+  	echo "  <TD>".admin_language("la_prompt_PhraseId")."</TD>\n";
+    echo "  <TD>".$p->Get("PhraseId")."</TD>\n";
+  	echo "  <TD></TD>\n";
+	echo "</TR>\n";
+
 	echo "<TR ".int_table_color_ret()." >\n";
   	echo "  <TD>".admin_language("la_prompt_Label")."</TD>\n";
 	echo "  <TD><input size=60 type=text  tabindex=\"1\" ValidationType=\"exists\" NAME=\"name[".$p->Get("PhraseId")."]\" VALUE=\"".$p->Get("Phrase")."\"></TD>\n";
@@ -278,10 +281,14 @@
 	unset($p);                                                   
   }
 }
-$PriTrans = isset($NewLabel) ? GetPrimaryTranslation($NewLabel) : '';
 ?>
-
-<?php if (GetVar('PhraseId') === false) { ?> 
+<?php
+  if(strlen($NewLabel)>0)
+  {
+  	"::".$PriTrans = GetPrimaryTranslation($NewLabel);
+  }
+?> 
+<?php if ($_GET['PhraseId'] == '') { ?> 
 <?php int_subsection_title(admin_language("la_tab_General").":: New Phrase ".$PriTrans); ?> 
 
 <TR <?php int_table_color(); ?> >
@@ -308,10 +315,10 @@
     </TD>
 </tr> 
 <tr>        
-	<td colspan="3" align="center"><font color="#FF0000"><?php if(isset($add_error)) echo $add_error; ?></font></td>
+	<td colspan="3" align="center"><font color="#FF0000"><?php echo $add_error; ?></font></td>
 </tr>
 <INPUT type=hidden name="Action1" VALUE="new">
-<?php } ?>
+<?php } ?>                                   
 <INPUT TYPE=HIDDEN NAME="LanguageId" VALUE="<?php echo $LangId; ?>">
 <INPUT type=hidden name="Action" VALUE="m_phrase_edit">
 <input type=hidden name="direct" VALUE="<?php echo $EditDirect; ?>">
Index: trunk/kernel/include/item.php
===================================================================
diff -u -r13 -r105
--- trunk/kernel/include/item.php	(.../item.php)	(revision 13)
+++ trunk/kernel/include/item.php	(.../item.php)	(revision 105)
@@ -1,6 +1,6 @@
 <?php
-require_once("itemreview.php");
-require_once("itemrating.php");
+require_once($pathtoroot."kernel/include/itemreview.php");
+require_once($pathtoroot."kernel/include/itemrating.php");
 
 class clsItem extends clsParsedItem
 {
Index: trunk/admin/install/install_lib.php
===================================================================
diff -u -r89 -r105
--- trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 89)
+++ trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 105)
@@ -13,6 +13,27 @@
        return true;
 } 
 
+function GetMaxPortalVersion($admindirname)
+{
+	$dir = @dir($admindirname.'/install/upgrades');
+	
+	$version = '';
+	while ($file = $dir->read()) {
+        if ($file != "." && $file != ".." && !is_dir($dir_name.$file))
+        { 
+        	$file = str_replace("inportal_upgrade_v", "", $file);
+        	$file = str_replace(".sql", "", $file);
+        	
+        	if ($file != '') {	
+        		if (str_replace('.', '', $file) > str_replace('.', '', $version)) {
+        			$version = $file;
+        		}
+        	}
+        }
+	}
+	
+	return $version;
+}
 
 function TableExists($ado, $tables)
 {
@@ -286,6 +307,8 @@
 {
     global $path,$admin;
     
+    $data = Array();
+    
     if(!strlen($file))
     {    
       $f = $path.$admin."/include/inportal.dat";
@@ -295,7 +318,8 @@
     if(file_exists($f))
     {
         $contents = file($f);
-        $data = base64_decode($contents[1]);
+        $data[0] = base64_decode($contents[1]);
+        $data[1] = $contents[2];
     }
     else
         if($LoadRemote)
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -r99 -r105
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 99)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 105)
@@ -948,13 +948,16 @@
     }
 
     function GetPage($Page, $ItemsPerPage)
-    {	                
+    {
         $result = array_slice($this->Items, ($Page * $ItemsPerPage) - $ItemsPerPage, $ItemsPerPage);
         return $result;
     }
 
     function GetNumPages($ItemsPerPage)
-    {        
+    { 
+    	if ($_GET['reset'] == 1) {
+    		$this->Page = 1;
+    	}    	
         return GetPageCount($ItemsPerPage,$this->QueryItemCount);
     }
 
Index: trunk/admin/include/sections.php
===================================================================
diff -u -r63 -r105
--- trunk/admin/include/sections.php	(.../sections.php)	(revision 63)
+++ trunk/admin/include/sections.php	(.../sections.php)	(revision 105)
@@ -360,7 +360,7 @@
         {
             if($sec->Get("key")=="in-portal:root")
             {
-                $caption=$objConfig->Get("Site_Name");
+                $caption=stripslashes($objConfig->Get("Site_Name"));
             }
             else
             {            
Index: trunk/kernel/parser.php
===================================================================
diff -u -r80 -r105
--- trunk/kernel/parser.php	(.../parser.php)	(revision 80)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 105)
@@ -365,6 +365,7 @@
   @description: creates an INPUT tag for a form field. All extra attributes are passed to the INPUT tag
   @attrib: _Form:: Form name for the field
   @attrib: _Field:: Field Name
+  @attrib: _ForgetValue:bool: if true, forget value
   @attrib: _Required:bool: If set, In-Portal requires this field have a value when submitting
   @example: <inp:m_form_input type="text" class="input" style="width:600px;" _field="topic_subject" _Form="edit_topic" _Required="1" />
 */
@@ -375,13 +376,16 @@
     $html_attribs = ExtraAttributes($attribs);
     $form = $attribs["_form"];
     $field = strtolower($attribs["_field"]);
-    if(isset($_POST[$field]))
+    if(isset($_POST[$field]) && $attribs['_forgetvalue'] != 1)
     {
       $value = $_POST[$field];
     }
-    else
-        $value = $FormValues[$form][$field];
-    // echo $form.".".$field."=".$value."<br>\n";
+    else {
+    	if ($attribs['_forgetvalue'] != 1) {
+        	$value = $FormValues[$form][$field];
+    	}
+    }
+     //echo $form.".".$field."=".$value." = ".$attribs['_forgetvalue']."<br>\n";
     if($form=="m_register" && ($field=="password" || $field=="passwordverify") && $objConfig->Get("User_Password_Auto"))
     {
       $ret = "";
@@ -1241,6 +1245,7 @@
       		}
     	}
     }
+    $ret = stripslashes($ret);
 	return $ret;
 }
 
Index: trunk/admin/index.php
===================================================================
diff -u -r13 -r105
--- trunk/admin/index.php	(.../index.php)	(revision 13)
+++ trunk/admin/index.php	(.../index.php)	(revision 105)
@@ -78,8 +78,9 @@
 {
   $pathtoroot = $pathtoroot.$pathchar;
 }
+
 //echo "<PRE>"; print_r($_POST); echo "</PRE>";
-require_once("../kernel/startup.php");
+require_once($pathtoroot."/kernel/startup.php");
 
 $rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
 $admin = substr($path,strlen($pathtoroot));
@@ -100,13 +101,13 @@
       setcookie("sid"," ",time()-3600);
     $objSession->Logout();
     
-	require_once("login.php");
+	require_once($pathtoroot.$admin."/login.php");
 }
 
 $envar = "env=" . BuildEnv();
 
-require_once ("include/elements.php"); 
-require_once ("../kernel/admin/include/navmenu.php"); 
+require_once ($pathtoroot.$admin."/include/elements.php"); 
+require_once ($pathtoroot."kernel/admin/include/navmenu.php"); 
 
 $pathtolocal = $pathtoroot;
 
Index: trunk/kernel/startup.php
===================================================================
diff -u -r41 -r105
--- trunk/kernel/startup.php	(.../startup.php)	(revision 41)
+++ trunk/kernel/startup.php	(.../startup.php)	(revision 105)
@@ -2,10 +2,11 @@
 /*
     startup.php: this is the primary startup sequence for in-portal services    
 */
-if( file_exists($pathtoroot.'debug.php') ) include_once($pathtoroot.'debug.php');
+if( file_exists($pathtoroot.'debug.php') && !defined('DEBUG_MODE') ) include_once($pathtoroot.'debug.php');
 if( defined('DEBUG_MODE') )
 {
 	error_reporting(E_ALL & E_NOTICE);
+	ini_set('display_errors', 1);	
 }
 else
 	error_reporting(0);
@@ -21,15 +22,15 @@
 LogEntry("Initalizing System..\n");
 
 /* for 64 bit timestamps */
-require_once("include/adodb/adodb-time.inc.php");
-require_once("include/dates.php");
+require_once($pathtoroot."kernel/include/adodb/adodb-time.inc.php");
+require_once($pathtoroot."kernel/include/dates.php");
 
 /* create the global error object */
-require_once("include/error.php");
+require_once($pathtoroot."kernel/include/error.php");
 $Errors = new clsErrorManager();
 
-require_once("include/itemdb.php");
-require_once("include/config.php");
+require_once($pathtoroot."kernel/include/itemdb.php");
+require_once($pathtoroot."kernel/include/config.php");
 /* create the global configuration object */
 LogEntry("Creating Config Object..\n");
 $objConfig = new clsConfig();
@@ -38,50 +39,50 @@
 if( defined('ADODB_EXTENSION') && constant('ADODB_EXTENSION') > 0 )
 	LogEntry("ADO Extension: ".ADODB_EXTENSION."\n");	
 
-require_once("include/parseditem.php");
-require_once("include/item.php");
-require_once("include/syscache.php");
-require_once("include/modlist.php");
-require_once("include/searchconfig.php");
-require_once("include/banrules.php");
+require_once($pathtoroot."kernel/include/parseditem.php");
+require_once($pathtoroot."kernel/include/item.php");
+require_once($pathtoroot."kernel/include/syscache.php");
+require_once($pathtoroot."kernel/include/modlist.php");
+require_once($pathtoroot."kernel/include/searchconfig.php");
+require_once($pathtoroot."kernel/include/banrules.php");
 
 $objModules = new clsModList();
 $objSystemCache = new clsSysCacheList();
 $objSystemCache->PurgeExpired();
 $objBanList = new clsBanRuleList();
 
-require_once("include/image.php");
+require_once($pathtoroot."kernel/include/image.php");
 
-require_once("include/itemtypes.php");
+require_once($pathtoroot."kernel/include/itemtypes.php");
 $objItemTypes = new clsItemTypeList();
 
-require_once("include/theme.php");
+require_once($pathtoroot."kernel/include/theme.php");
 $objThemes = new clsThemeList();
 
-require_once("include/language.php");
+require_once($pathtoroot."kernel/include/language.php");
 $objLanguages = new clsLanguageList();
 $objImageList = new clsImageList();
 
 /* Load session and user class definitions */
 //require_once("include/customfield.php");
 //require_once("include/custommetadata.php");
-require_once("include/usersession.php");
-require_once("include/favorites.php");
-require_once("include/portaluser.php");
-require_once("include/portalgroup.php");
+require_once($pathtoroot."kernel/include/usersession.php");
+require_once($pathtoroot."kernel/include/favorites.php");
+require_once($pathtoroot."kernel/include/portaluser.php");
+require_once($pathtoroot."kernel/include/portalgroup.php");
 
 /* create the user management class */
 $objFavorites = new clsFavoriteList();
 $objUsers = new clsUserManager();
 $objGroups = new clsGroupList();
 
-require_once("include/cachecount.php");
-require_once("include/customfield.php");
-require_once("include/custommetadata.php");
-require_once("include/permissions.php");
-require_once("include/relationship.php");
-require_once("include/category.php");
-require_once("include/statitem.php");
+require_once($pathtoroot."kernel/include/cachecount.php");
+require_once($pathtoroot."kernel/include/customfield.php");
+require_once($pathtoroot."kernel/include/custommetadata.php");
+require_once($pathtoroot."kernel/include/permissions.php");
+require_once($pathtoroot."kernel/include/relationship.php");
+require_once($pathtoroot."kernel/include/category.php");
+require_once($pathtoroot."kernel/include/statitem.php");
 /* category base class, used by all the modules at some point */
 $objPermissions = new clsPermList();
 $objPermCache = new clsPermCacheList();
@@ -91,19 +92,19 @@
 $objCustomDataList = new clsCustomDataList();
 $objCountCache = new clsCacheCountList();
  
-require_once("include/smtp.php");
-require_once("include/emailmessage.php");
-require_once("include/events.php");
+require_once($pathtoroot."kernel/include/smtp.php");
+require_once($pathtoroot."kernel/include/emailmessage.php");
+require_once($pathtoroot."kernel/include/events.php");
 LogEntry("Creating Mail Queue..\n");
 $objMessageList = new clsEmailMessageList();
 $objEmailQueue = new clsEmailQueue();
 LogEntry("Done creating Mail Queue Objects\n");
 
-require_once("include/searchitems.php");
-require_once("include/advsearch.php");
+require_once($pathtoroot."kernel/include/searchitems.php");
+require_once($pathtoroot."kernel/include/advsearch.php");
 
-require_once("include/parse.php");
-require_once("include/socket.php");
+require_once($pathtoroot."kernel/include/parse.php");
+require_once($pathtoroot."kernel/include/socket.php");
   
 /* responsible for including module code as required 
    This script also creates an instance of the user session onject and
Index: trunk/themes/default/misc/right_searchbox.tpl
===================================================================
diff -u -r13 -r105
--- trunk/themes/default/misc/right_searchbox.tpl	(.../right_searchbox.tpl)	(revision 13)
+++ trunk/themes/default/misc/right_searchbox.tpl	(.../right_searchbox.tpl)	(revision 105)
@@ -11,7 +11,7 @@
 					<td valign="top">
 						<table width="100%" border="0" cellspacing="0" cellpadding="0">
 							<tr>
-								<td><inp:m_form_input type="text" class="input" style="width:135px;" _field="keywords" _Form="m_simplesearch" _Required="1" /><br /></td>
+								<td><inp:m_form_input type="text" class="input" style="width:135px;" _field="keywords" _Form="m_simplesearch" _Required="1" _ForgetValue="1" /><br /></td>
 							</tr>
 							<tr>
 								<td class="option-txt">
Index: trunk/kernel/include/modules.php
===================================================================
diff -u -r89 -r105
--- trunk/kernel/include/modules.php	(.../modules.php)	(revision 89)
+++ trunk/kernel/include/modules.php	(.../modules.php)	(revision 105)
@@ -492,7 +492,7 @@
     {    
     	$domain = _StripDomainHost($domain);
     	//echo "New domain: $domain<br>";
-    	//echo "<pre>"; print_r($i_Keys); echo "</pre>";
+//    	echo "<pre>"; print_r($i_Keys); echo "</pre>";
         for($x=0;$x<count($i_Keys);$x++)
         {
             $key = $i_Keys[$x];
Index: trunk/themes/default/categories/catlist_element.tpl
===================================================================
diff -u -r13 -r105
--- trunk/themes/default/categories/catlist_element.tpl	(.../catlist_element.tpl)	(revision 13)
+++ trunk/themes/default/categories/catlist_element.tpl	(.../catlist_element.tpl)	(revision 105)
@@ -4,7 +4,7 @@
    	<td valign="top">
    		<a href="<inp:cat _field="link" />"><img src="img/ic_category.gif" border=0 width="17" height="17" alt="" /></a><br /></td>
 		<td><img src="img/s.gif" width="5" height="1" alt="" /><br /></td>
-		<td class="item"><A href="<inp:cat _field="link" />"><inp:cat _Field="Name" /></a> <span class="comments">(<inp:m_language _Phrase="lu_subcats" /> <inp:cat _Field="subcatcount" _GroupOnly="1" />)</span>
+		<td class="item"><A href="<inp:cat _field="link" />&reset=1"><inp:cat _Field="Name" /></a> <span class="comments">(<inp:m_language _Phrase="lu_subcats" /> <inp:cat _Field="subcatcount" _GroupOnly="1" />)</span>
     	<inp:cat _field="new"><img src="img/ic_new.gif" width="11" height="11" alt="<inp:m_language _Phrase="lu_new" />" /></inp>
       <inp:cat _field="pick"><img src="img/ic_pick.gif" width="11" height="11" alt="<inp:m_language _Phrase="lu_editors_pick" />" /></inp>
     </td>