Index: branches/RC/admin/modules/upgrade_lic.php
===================================================================
diff -u -r8929 -r9398
--- branches/RC/admin/modules/upgrade_lic.php	(.../upgrade_lic.php)	(revision 8929)
+++ branches/RC/admin/modules/upgrade_lic.php	(.../upgrade_lic.php)	(revision 9398)
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 // new startup: begin
 define('REL_PATH', 'admin/modules');
@@ -8,10 +8,10 @@
 // new startup: end
 
 $pathtolocal = $pathtoroot."kernel/";
-require_once ($pathtoroot."admin/include/elements.php");
+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");
+require_once($pathtoroot.$admin."/toolbar.php");
 //Set Section
 $section = "in-portal:addmodule";
 //Set Environment Variable
@@ -29,65 +29,65 @@
 
 }
 $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;
+    $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; ?>">	
+<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> 
+ <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(); ?>> 
+   <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 > 
+       <TD >
  	  	<INPUT type="password" name="UserPass" class="text" size="50" value=''>
   	  </TD>
    </TR>