Index: trunk/admin/install.php
===================================================================
diff -u -r547 -r553
--- trunk/admin/install.php	(.../install.php)	(revision 547)
+++ trunk/admin/install.php	(.../install.php)	(revision 553)
@@ -1,7 +1,8 @@
 <?php
 error_reporting(0);
 
-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 = '';
 
@@ -385,6 +386,17 @@
 	              $ado =& inst_GetADODBConnection();
 	              $filename = $pathtoroot.$admin."/install/inportal_remove.sql";  
 	              RunSchemaFile($ado,$filename);
+	              
+	              // removing other tables
+	              $tables = $ado->MetaTables();
+	              
+	              foreach($tables as $tab_name) {
+	              	if (strstr($tab_name, $g_TablePrefix."ses_")) {
+	              		$sql = "DROP TABLE IF EXISTS $tab_name";
+	              		$ado->Execute($sql);
+	              	}
+	              }
+	              
 	              /* run install again */
 	              $state="license";
 	          break;
Index: trunk/admin/modules/upgrade_lic.php
===================================================================
diff -u
--- trunk/admin/modules/upgrade_lic.php	(revision 0)
+++ trunk/admin/modules/upgrade_lic.php	(revision 553)
@@ -0,0 +1,165 @@
+<?php 
+
+  
+if(!strlen($pathtoroot))
+{
+  $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;
+  }
+}
+
+$sub = substr($pathtoroot,strlen($pathchar)*-1);
+if($sub!=$pathchar)
+{
+  $pathtoroot = $pathtoroot.$pathchar;
+}
+//echo $pathtoroot;
+//echo $pathtoroot;
+require_once($pathtoroot."kernel/startup.php");
+$rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
+$admin = $objConfig->Get("AdminDirectory");
+if(!strlen($admin))
+    $admin = "admin";    
+$adminURL = $rootURL.$admin;
+$localURL=$rootURL."kernel/";
+$imagesURL = $rootURL."admin/images";
+//admin only util
+$pathtolocal = $pathtoroot."kernel/";
+require_once ($pathtoroot."admin/include/elements.php");
+require_once ($pathtoroot."kernel/admin/include/navmenu.php");
+require_once ($pathtolocal."admin/include/navmenu.php");
+require_once($pathtoroot."admin/toolbar.php");
+//Set Section
+$section = "in-portal:addmodule";
+//Set Environment Variable
+$envar = "env=" . BuildEnv();
+global $tables;
+unset($tables);
+
+
+if($_POST["Action"]=="update")
+{
+    $newpath= $_POST["backup_path"];
+    $newpath = str_replace('\\\\','\\',$newpath);
+    $objConfig->Set("Backup_Path",$newpath);
+    $objConfig->Save();
+
+}
+$filepath=$objConfig->Get("Backup_Path");
+         
+$limit = 100;
+$success =0;
+
+$objSession->SetVariable("restore_filepath",$filepath);
+$objSession->SetVariable("restore_success",0);
+$objSession->SetVariable("restore_todo","");
+      
+$sec = $objSections->GetSection($section);
+$objCatToolBar = new clsToolBar();
+
+$ro_perm = $objSession->HasSystemPermission("SYSTEM_ACCESS.READONLY");
+
+if (true)
+{
+	
+  $MouseOver="";
+  $MouseOut="";
+  $onClick="";
+  $link="#";
+  $objCatToolBar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Step"),"#","","","","tool_prev_f3.gif");
+ 
+  if(true)
+  {
+    $MouseOver="swap('moveright','toolbar/tool_next_f2.gif');";
+    $MouseOut="swap('moveright', 'toolbar/tool_next.gif');";
+
+
+    $var="?env=".BuildEnv()."&en=$en_next";
+    $link2=$rootURL."admin/install.php".$var;
+    $onClick="document.location= '$link2';";
+    $onClick="document.restore1.submit();";
+
+
+    $link="#";
+    $objCatToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Step"),$link,$MouseOver,$MouseOut,$onClick,"tool_next.gif");
+  }
+  
+  $title = admin_language("la_tab_upgrade_license");
+  
+  int_header($objCatToolBar,NULL,$title);
+}
+
+$SubmitUrl = $adminURL."/install.php";
+//$SubmitUrl = $adminURL."/install.php";
+?>
+         
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<form name="restore1" TARGET="<?php echo $ro_perm ? 'main' : '_top'; ?>" METHOD="POST" action="<?php echo $SubmitUrl; ?>">	
+<?php int_subsection_title(prompt_language("la_Prompt_Warning"));  ?>
+ <TR <?php echo int_table_color(); ?>> 
+       <TD COLSPAN="2"><span class=\"text\"><?php echo prompt_language("la_Text_Update_Licence"); ?>  
+            </span> 
+       </TD>
+    </TR>
+
+   <TR <?php echo int_table_color(); ?>> 
+      <td width=\"60%\" valign=\"top\"><span class=\"text\"><?php echo prompt_language("la_prompt_Root_Password"); ?></span></td>
+       <TD > 
+ 	  	<INPUT type="password" name="UserPass" class="text" size="50" value=''>
+  	  </TD>
+   </TR>
+   <input type=hidden name="state" value="reinstall_process">
+   <input type=hidden name="install_type" value="8">
+   <input type=hidden name="next_step" value="2">
+   <input type=hidden name="UserName" value="root">
+   <input type=hidden name="inp_opt" value="3">
+</FORM>
+</TABLE>
+<?php
+int_footer();
+?>
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -r534 -r553
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 534)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 553)
@@ -482,8 +482,8 @@
     {
     	$html = $text;
       $search = "<inp:".$this->TagPrefix;
-      $next_tag = strpos($html,"<inp:");
-      //$next_tag = strpos($html,$search);
+      //$next_tag = strpos($html,"<inp:");
+      $next_tag = strpos($html,$search);
       
 
       while($next_tag)
Index: trunk/kernel/include/portaluser.php
===================================================================
diff -u -r525 -r553
--- trunk/kernel/include/portaluser.php	(.../portaluser.php)	(revision 525)
+++ trunk/kernel/include/portaluser.php	(.../portaluser.php)	(revision 553)
@@ -312,7 +312,7 @@
     { 
         global $objConfig, $objUsers, $objCatList,$objSession, $var_list_update, $var_list, $m_var_list_update;
         //echo "<PRE>"; print_r($element); echo "</pre>";
-        
+        //echo "Tag Prefix: ".$this->TagPrefix." Element: ".$element->name."<br>";
         if (strtolower($element->name) == 'touser') {
         	$this->TagPrefix = "touser";
         }
@@ -597,12 +597,16 @@
                 if(!strlen($ret))
                     $ret = $this->GetCustomFieldValue($field,$default);
             break;
+            default:
+            	$ret = "Undefined:".$element->name;
+            	break;            
             }
         }
         else
         {
             $ret = $this->parsetag($element->name);        
         }
+        
         return $ret;
     }
 
Index: trunk/admin/category/addcategory_custom.php
===================================================================
diff -u -r374 -r553
--- trunk/admin/category/addcategory_custom.php	(.../addcategory_custom.php)	(revision 374)
+++ trunk/admin/category/addcategory_custom.php	(.../addcategory_custom.php)	(revision 553)
@@ -189,12 +189,14 @@
       {
         $val_field = "<input type=\"text\" tabindex=\"".($i+1)."\" VALUE=\"".$f->Get("Value")."\" name=\"$fieldname\">";
         $field->Set("Value", $val_field);
+        $field->Set("FieldLabel", admin_language($field->Get('Prompt')));
         $field->Set("DataId",$f->Get("CustomDataId"));
       }
       else
       {      
         $val_field = "<input type=text tabindex=\"".($i+1)."\" VALUE=\"\" name=\"$fieldname\">";
         $field->Set("Value", $val_field);
+        $field->Set("FieldLabel", admin_language($field->Get('Prompt')));        
         $field->Set("DataId",0);
       }
   }
Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r537 -r553
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 537)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 553)
@@ -205,7 +205,7 @@
     function SendToUser($UserId)
     {
         global $objUsers, $objEmailQueue, $objConfig;
-
+		
         $conn = &GetADODBConnection();
         //echo "Handling Event ".$this->Get("Event")." for user $UserId <br>\n";
         $this->recipient = new clsPortalUser($UserId); // $objUsers->GetItem($UserId);
@@ -217,10 +217,10 @@
           $To = trim($this->recipient->Get("FirstName")." ".$this->recipient->Get("LastName"));
 
           $this->ReadTemplate();
-          
+
           $subject = $this->ParseSection($this->subject, $this->recipient);
           $body = $this->ParseSection($this->body);
-
+          
           if(!is_object($this->fromuser))
           {
               $this->fromuser = $objUsers->GetItem($this->Get("FromUserId"));
@@ -307,9 +307,10 @@
     function ParseTemplateText($text)
     {
       $html = $text;
-      $search = "<inp:".$this->TagPrefix;
-      $next_tag = strpos($html,"<inp:");
-      //$next_tag = strpos($html,$search);
+      $search = "<inp:";
+      //$search = "<inp:".$this->TagPrefix;
+      //$next_tag = strpos($html,"<inp:");
+      $next_tag = strpos($html,$search);
       
       while($next_tag)
       { 
Index: trunk/admin/modules/addmodule.php
===================================================================
diff -u -r374 -r553
--- trunk/admin/modules/addmodule.php	(.../addmodule.php)	(revision 374)
+++ trunk/admin/modules/addmodule.php	(.../addmodule.php)	(revision 553)
@@ -155,9 +155,25 @@
 
     unset($data);
     $data = array();
-    $status= admin_language("la_text_ready_to_install");       
-    $data["Url"] = "<A HREF=\"".$rootURL.$mod."/admin/install.php?env=".BuildEnv()."&redirect=1\">$status</A>";
-    $data["Name"] = $mod;
+    $status= admin_language("la_text_ready_to_install");
+    
+    $mod_tmp_name_arr = explode('-', $mod);
+    
+    $mod_tmp_name = '';
+    foreach ($mod_tmp_name_arr as $names) {
+    	$mod_tmp_name .= ucfirst($names)."-";
+    }
+    
+    $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>";
+    }
+    else {
+    	$data["Url"] = '<a href="'.$rootURL.'admin/modules/upgrade_lic.php?env='.BuildEnv().'"><font color="#FF0000">'.admin_language("la_module_not_licensed").'</font></a>';
+    }
+    
+    $data["Name"] = $mod_tmp_name;
     $objModList->AddItemFromArray($data);        
 }
 
Index: trunk/kernel/include/modules.php
===================================================================
diff -u -r540 -r553
--- trunk/kernel/include/modules.php	(.../modules.php)	(revision 540)
+++ trunk/kernel/include/modules.php	(.../modules.php)	(revision 553)
@@ -546,7 +546,8 @@
                 //echo "ok<br>";
             	$modules = explode(",",$key["mod"]);            	
             }
-        }            
+        }  
+        //print_pre($modules);          
         if(in_array($name,$modules)) {
         	//echo "ok<br>";
             return TRUE;