Index: trunk/admin/install.php
===================================================================
diff -u -r1176 -r1193
--- trunk/admin/install.php	(.../install.php)	(revision 1176)
+++ trunk/admin/install.php	(.../install.php)	(revision 1193)
@@ -332,7 +332,7 @@
 	$lic = base64_decode($g_License);
     if(strlen($lic))
     {
-            _inst_ParseLicense($lic);
+            a83570933e44bc66b31dd7127cf3f23a($lic);
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
     }
 
@@ -834,7 +834,11 @@
 					$tmp_data = explode('Code==:', $rcontents);
 				
 	            	$data = base64_decode(str_replace("In-Portal License File - do not edit!\n", "", $tmp_data[0]));				
+<<<<<<< install.php
+					a83570933e44bc66b31dd7127cf3f23a($data);
+=======
 					_inst_ParseLicense($data);
+>>>>>>> 1.71
 		            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
 		            if($ValidLicense)
 		            {
@@ -886,7 +890,11 @@
 				$tmp_data = explode('Code==:', $rcontents);
 							
 	            $data = base64_decode(str_replace("In-Portal License File - do not edit!\n", "", $tmp_data[0]));				
+<<<<<<< install.php
+	            a83570933e44bc66b31dd7127cf3f23a($data);
+=======
 	            _inst_ParseLicense($data);
+>>>>>>> 1.71
 	            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
 	            if($ValidLicense)
 	            {
@@ -936,11 +944,15 @@
                 fclose($fp);
             }      
             
-            $tmp_data = inst_LoadLicense(FALSE,$pathtoroot."themes/tmp.lic");            
+            $tmp_data = ae666b1b8279502f4c4b570f133d513e(FALSE,$pathtoroot."themes/tmp.lic");            
             $data = $tmp_data[0];
             
             @unlink($pathtoroot."themes/tmp.lic");
+<<<<<<< install.php
+            a83570933e44bc66b31dd7127cf3f23a($data);
+=======
             _inst_ParseLicense($data);
+>>>>>>> 1.71
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
             if($ValidLicense)
             {
@@ -961,7 +973,11 @@
         if(strlen($g_License))
         {
             $lic = base64_decode($g_License);
+<<<<<<< install.php
+            a83570933e44bc66b31dd7127cf3f23a($lic);
+=======
             _inst_ParseLicense($lic);
+>>>>>>> 1.71
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
             if($ValidLicense)
             {            
@@ -1061,7 +1077,11 @@
     $lic = base64_decode($g_License);
     if(strlen($lic))
     {
+<<<<<<< install.php
+            a83570933e44bc66b31dd7127cf3f23a($lic);
+=======
             _inst_ParseLicense($lic);
+>>>>>>> 1.71
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
     }
 
@@ -1095,7 +1115,11 @@
         $lic = base64_decode($g_License);
         if(strlen($lic))
         {
+<<<<<<< install.php
+           a83570933e44bc66b31dd7127cf3f23a($lic);
+=======
            _inst_ParseLicense($lic);
+>>>>>>> 1.71
            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
         }
     }
@@ -1104,7 +1128,7 @@
     {
         $domain = $_SERVER['HTTP_HOST'];
         
-        if (strstr($domain, $i_Keys[0]['domain']) || inst_IsLocalSite($domain)) {
+        if (strstr($domain, $i_Keys[0]['domain']) || de3ec1b7a142cccd0d51f03d24280744($domain)) {
         	set_ini_value("Intechnic","Domain",$domain);
         	save_values();
         	$state="runsql";
@@ -1118,7 +1142,7 @@
     {
         $domain = str_replace(" ", "", $_POST["other"]);
         if ($domain != '') {
-        	if (strstr($domain, $i_Keys[0]['domain']) || inst_IsLocalSite($domain)) {
+        	if (strstr($domain, $i_Keys[0]['domain']) || de3ec1b7a142cccd0d51f03d24280744($domain)) {
         		set_ini_value("Intechnic","Domain",$domain);
         		save_values();
         		$state="runsql";
@@ -1142,7 +1166,11 @@
         $lic = base64_decode($g_License);
         if(strlen($lic))
         {
+<<<<<<< install.php
+           a83570933e44bc66b31dd7127cf3f23a($lic);
+=======
            _inst_ParseLicense($lic);
+>>>>>>> 1.71
            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
         }
     }
@@ -1598,7 +1626,11 @@
     $ado->Execute($sql);
     $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '".$_SERVER['DOCUMENT_ROOT'].$sitepath."admin/backupdata' WHERE VariableName='Backup_Path'";
     $ado->Execute($sql);
+<<<<<<< install.php
+    $Modules = a48d819089308a9aeb447e7248b2587f();
+=======
     $Modules = _inst_GetModuleList();
+>>>>>>> 1.71
     
     if (count($Modules) > 0) {    
     	$include_file = $pathtoroot.$admin."/install/modselect.php";
Index: trunk/admin/modules/addmodule.php
===================================================================
diff -u -r791 -r1193
--- trunk/admin/modules/addmodule.php	(.../addmodule.php)	(revision 791)
+++ trunk/admin/modules/addmodule.php	(.../addmodule.php)	(revision 1193)
@@ -169,7 +169,7 @@
     $mod_tmp_name = substr($mod_tmp_name, 0, strlen($mod_tmp_name) - 1);
     
 
-    if (inst_ModuleLicensed($mod_tmp_name)) {
+    if (ed592fe427e1ce60e32ffcb0c82d8557($mod_tmp_name)) {
 		if (file_exists($pathtoroot.strtolower($mod_tmp_name)."/admin/install/prerequisit.php")) {
 			include_once($pathtoroot.strtolower($mod_tmp_name)."/admin/install/prerequisit.php");
 		}