Index: branches/RC/admin/tag_listing.php
===================================================================
diff -u -r8929 -r9389
--- branches/RC/admin/tag_listing.php	(.../tag_listing.php)	(revision 8929)
+++ branches/RC/admin/tag_listing.php	(.../tag_listing.php)	(revision 9389)
@@ -11,28 +11,28 @@
 include_once($pathtoroot."kernel/include/tag-class.php");
 
 $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:tag_library";
 //Set Environment Variable
 $envar = "env=" . BuildEnv();
 
 $sec = $objSections->GetSection($section);
 $objCatToolBar = new clsToolBar();
-$objCatToolBar->Add("img_save", 
+$objCatToolBar->Add("img_save",
 					"la_Save",
 					"#",
 					"swap('img_save','toolbar/tool_select_f2.gif');",
 					"swap('img_save', 'toolbar/tool_select.gif');",
 					"javascript:history.back();",
 					"tool_select.gif");
-$objCatToolBar->Add("img_cancel", 
+$objCatToolBar->Add("img_cancel",
 					"la_Cancel",
 					"#",
-					"swap('img_cancel','toolbar/tool_cancel_f2.gif');", 
+					"swap('img_cancel','toolbar/tool_cancel_f2.gif');",
 					"swap('img_cancel', 'toolbar/tool_cancel.gif');",
 					"javascript:history.back();",
 					"tool_cancel.gif");
@@ -72,44 +72,44 @@
   	{
   		$i->LoadAttribs(); //echo " ".$i->attribs->NumItems()." Attributes<br>\n";
   		if( $i->Get("name") )
-  		{  
-      		?> 
+  		{
+      		?>
       		<tr class="header">
 				<td class="b-element" colspan="2">
 					<?php echo ($i->Get("scope") != "global") ? $i->Get("scope").'.'.$i->Get("name") : $i->Get("name"); ?>
       			</td>
       		</tr>
-      		<tr class="tag-listing-row">	
+      		<tr class="tag-listing-row">
       			<td colspan="2" class="i-element"><?php echo $i->Get("description"); ?></td>
       		</tr>
           		<tr class="tag-listing-row">
           			<td class="b-element" width="90%">Attributes:</td>
           			<td class="b-element" width="10%">Source example:</td>
           		</tr>
-          		
+
           		<tr>
           			<td>
 						<?php if( $i->attribs->NumItems() > 0 ) { // has attributes ?>
 						<!-- attributes listing: begin -->
   			        	<table border="0" width="100%" class="tag-listing">
   			        	<?php
   			        	foreach($i->attribs->Items as $a)
-  			        	{              
+  			        	{
   			        	?>
   			        		<tr class="tag-listing-row">
   			        			<td valign="top"><?php echo $a->Get("Name").'['.$a->Get("AttrType").']'; ?></td>
   			        			<td><?php echo $a->Get("Description"); ?></td>
   			        		</tr>
   			        	<?php
   			        	}
-  			        	?> 
+  			        	?>
   			        	</table>
   			        	<!-- attributes listing: end -->
   			        	<?php } else{ ?>&nbsp; <?php } ?>
   			        </td>
   			       	<td>
   			       		<!-- example -->
-  			       		<?php 
+  			       		<?php
   			       			$example = $i->Get('example');
   			       			echo $example ? $example : '&nbsp;';
   			       		?>
@@ -119,6 +119,6 @@
   		}
   	}
 }
-?> 
-</table> 
+?>
+</table>
 <?php int_footer(); ?>
\ No newline at end of file
Index: branches/RC/admin/listview/listview.php
===================================================================
diff -u -r8929 -r9389
--- branches/RC/admin/listview/listview.php	(.../listview.php)	(revision 8929)
+++ branches/RC/admin/listview/listview.php	(.../listview.php)	(revision 9389)
@@ -1,15 +1,15 @@
 <?php
 
-require_once FULL_PATH.'/admin/listview/columnheader.php';
-require_once FULL_PATH.'/admin/listview/viewmenu.php';
+require_once FULL_PATH.ADMIN_DIRECTORY.'/listview/columnheader.php';
+require_once FULL_PATH.ADMIN_DIRECTORY.'/listview/viewmenu.php';
 
-class clsListView 
+class clsListView
 {
     var $Formatters = Array(); // formatters to apply while printing list
     var $ColumnHeaders;
     var $ToolBar;
     var $ListItems;
-    var $PageLinkTemplate;    
+    var $PageLinkTemplate;
     var $PerPageVar;
     var $CurrentPageVar;
     var $CurrentPage;
@@ -35,12 +35,12 @@
 	var $ViewMenu;
 
 	var $JSCheckboxName;
-	
+
     function clsListView($ToolBar=NULL,$ListItems=NULL)
     {
         $this->SetToolBar($ToolBar);
         $this->SetListItems($ListItems);
-        $this->ColumnHeaders = new clsColumnHeaderList();       
+        $this->ColumnHeaders = new clsColumnHeaderList();
         $this->CurrentPage=1;
 	    $this->CheckboxName = "itemlist[]";
         $this->SelectorType="checkbox";
@@ -50,10 +50,10 @@
         $this->extra_env="";
         $this->PriorityField="Priority";
         $this->TotalItemCount = 0;
-        
+
         if (!is_null($ToolBar))
         	$this->JSCheckboxName = $ToolBar->Get("CheckClass");
-        $this->SetFormatters(); // for setting custom formatters       
+        $this->SetFormatters(); // for setting custom formatters
     }
 
     function SetToolbar($ToolBar)
@@ -62,22 +62,22 @@
       if(is_object($this->ToolBar))
           $this->CheckArray=$this->ToolBar->Get("CheckClass");
     }
-    
+
     function GetPage()
     {
     	// get current page
     	$this->RefreshPageVar();
     	return $this->CurrentPage;
    	}
-	
+
 	function GetLimitSQL()
 	{
 		return GetLimitSQL($this->GetPage(), $this->GetPerPage() );
 	}
-	
+
 	function SetListItems(&$ListItems)
 	{
-		$this->ListItems =& $ListItems;	
+		$this->ListItems =& $ListItems;
 	}
 
     function SetIDfield($field)
@@ -98,14 +98,14 @@
 	function ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSort,$FilterVar,$FilterValue,$FilterMax)
 	{
 		global $objConfig;
-		
+
 		//$FilterVal = $this->CurrentFilter;
 		//$fMax = $this->Filtermax;
 		//$sOrder = $this->CurrentSortOrder;
 		//$sOrderVar = $this->OrderVar;
 		//$sField = $this->CurrentSortField;
-		//$sDefault = $this->DefaultSortField;		
-		
+		//$sDefault = $this->DefaultSortField;
+
 		$this->ViewMenu = new clsViewMenu();
 		$this->ViewMenu->PerPageVar = $this->PerPageVar;
 		$this->ViewMenu->PerPageValue = (int)$objConfig->Get($this->PerPageVar);
@@ -115,38 +115,38 @@
 		$this->ViewMenu->CurrentSortOrder = $objConfig->get($SortOrderVar);
 		$this->ViewMenu->SortVar = $SortFieldVar;
 		$this->ViewMenu->OrderVar = $SortOrderVar;
-		$this->ViewMenu->CurrentFilter= $FilterValue;		
+		$this->ViewMenu->CurrentFilter= $FilterValue;
 		$this->ViewMenu->FilterVar = $FilterVar;
 		$this->ViewMenu->FilterMax = $FilterMax;
 		foreach($this->ColumnHeaders->Columns as $col)
         {
-        	$this->ViewMenu->AddSortField($col->field,$col->label,$DefaultSort==$col->field);	
+        	$this->ViewMenu->AddSortField($col->field,$col->label,$DefaultSort==$col->field);
         }
 	}
-    
+
 	function AddViewMenuFilter($Label,$Bit)
 	{
 	  if(is_object($this->ViewMenu))
-	  	$this->ViewMenu->AddFilterField($Label,$Bit);	
+	  	$this->ViewMenu->AddFilterField($Label,$Bit);
 	}
-	
+
 	function GetViewMenu($imagesURL)
-	{	
-		if(is_object($this->ViewMenu))  
+	{
+		if(is_object($this->ViewMenu))
 		{
 	  		$this->ViewMenu->CheckboxName = $this->JSCheckboxName;
-			return $this->ViewMenu->GetViewMenuJS($imagesURL);	
+			return $this->ViewMenu->GetViewMenuJS($imagesURL);
 		}
 		else
 		  return "";
 	}
-	
+
 	function SetFormatters()
 	{
-		// for setting custom formatters	
+		// for setting custom formatters
 		// abstract
 	}
-	
+
 	function SetFormatter($field, $type, $params)
   	{
   		// by Alex
@@ -156,24 +156,24 @@
   		{
   			case FT_OPTION:
   				$this->Formatters[$field]['options'] = $params;
-  				break;	
+  				break;
   		}
   	}
-  
+
     function PrintItem($index)
     {
         if( !isset($this->ListItems->Items[$index]) ) return '';
         $li = $this->ListItems->Items[$index];
-        
+
         $o = "";
-        $first=1; 
+        $first=1;
 
         if(is_object($li))
-        {        
+        {
           // ==== new by Alex: begin ====
           $li->Formatters =& $this->Formatters;
           // ==== new by Alex: end ====
-          
+
           $id_field = $this->IdField;
           $row_id = $li->Get($id_field);
           if(is_numeric($li->Get($this->PriorityField)))
@@ -185,31 +185,31 @@
           $o = "<TR ".int_table_color_ret()." ID=\"$row_id\">\n";
           foreach($this->ColumnHeaders->Columns as $col)
           {
-            $width="";    
+            $width="";
             $ColId = $row_id."_col_".$col->field;
             if($first==1)
-            {                                          
+            {
               if(strlen($col->width))
               {
                   $width =  $col->width;
               }
               $o .= "<TD $width valign=\"top\" class=\"text\">";
               if($this->checkboxes)
-              { 
+              {
                 $onclick = "onclick=\"if (this.checked) {".$this->CheckArray.".addCheck('$row_id');} else {".$this->CheckArray.".removeCheck('$row_id');}\"";
                 $onclicksrc = "onclicksrc=\"if (this.checked) {".$this->CheckArray.".addCheck('$row_id');} else {".$this->CheckArray.".removeCheck('$row_id');}\"";
                 $o .= "<input rowId='".$row_id."' checkArrayName='".$this->CheckArray."' isSelector=\"true\" type=\"".$this->SelectorType."\" name=\"".$this->CheckboxName."\" value=\"$row_id\" $onclick $onclicksrc>";
               }
               if(isset($this->RowIcons[$index]))
-              {                  
+              {
                  $url = $this->RowIcons[$index];
                  if(strlen($url))
                    $o .= "<img src=\"".$url."\"> ";
               }
               $first=0;
             }
             else
-            {       
+            {
               if(strlen($col->width))
               {
                 $o .= "<TD ".$col->width.">";
@@ -218,7 +218,7 @@
                 $o .= "<TD>";
             }
             if($Priority!=0)
-            {            
+            {
                 $o .= "<span class=\"priority\"><sup>$Priority</sup></span>";
                 $Priority=0;
             }
@@ -252,7 +252,7 @@
 
         return $ret;
     }
-    
+
     function GetPerPage()
     {
     	global $objConfig;
@@ -266,13 +266,13 @@
         }
     	return $PerPage;
     }
-    
+
     function GetAdminPageLinkList($url)
     {
         global $objConfig;
-               
+
         $PerPage = $this->GetPerPage();
-        
+
         if($this->TotalItemCount>0)
         {
             $NumPages = ceil($this->TotalItemCount / $PerPage);
@@ -293,25 +293,25 @@
             $StartPage=1;
         $EndPage = $StartPage+9;
         if($EndPage>$NumPages)
-        {        
+        {
             $EndPage = $NumPages;
             $StartPage = $EndPage-10;
             if($StartPage<1)
                 $StartPage=1;
         }
-        
+
         $o .= "<b class=\"text\">".admin_language("la_Page")."</b> ";
         if($StartPage>1)
         {
-          $target =  $this->CurrentPage-10; 
+          $target =  $this->CurrentPage-10;
           $prev_url = str_replace("{TargetPage}",$target,$url);
           $o .= "<A HREF=\"$prev_url\" class=\"NAV_URL\"><<</A>";
         }
-        
+
         for($p=$StartPage;$p<=$EndPage;$p++)
         {
         	if($p!=$this->CurrentPage)
-            {                
+            {
                 $href = str_replace("{TargetPage}",$p,$url);
                 $o .= " <A HREF=\"$href\" class=\"NAV_URL\">$p</A> ";
             }
@@ -326,7 +326,7 @@
           $next_url = str_replace("{TargetPage}",$target,$url);
           $o .= "<A HREF=\"$next_url\" class=\"NAV_URL\"> &gt;&gt;</A>";
         }
-        return $o;        
+        return $o;
     }
 
     function SliceItems()
@@ -338,40 +338,40 @@
            $PerPage=20;
         $NumPages = ceil($this->ListItems->NumItems() / $PerPage);
         if($NumPages>1)
-        {        
+        {
           $Start = ($this->CurrentPage-1)*$PerPage;
           $this->ListItems->Items = array_slice($this->ListItems->Items,$Start,$PerPage);
         }
     }
-	
+
 	function RefreshPageVar()
 	{
 	  global $objSession;
 	  if( (int)GetVar('lpn') > 0)
-      {          
+      {
           $this->CurrentPage = $_GET["lpn"];
           $objSession->SetVariable($this->CurrentPageVar,$this->CurrentPage);
       }
       else
           $this->CurrentPage = $objSession->GetVariable($this->CurrentPageVar);
-      
+
       $this->ListItems->Page = $this->CurrentPage;
 	}
-	
+
     function PrintPageLinks($add_search = '')
     {
       global $imagesURL, $objSession, $lvErrorString;
-      
+
       if(strlen($this->PageLinks)>0)
       {
           return $this->PageLinks;
       }
       $this->RefreshPageVar();
-     
+
       if($this->CurrentPage<1)
           $this->CurrentPage = 1;
       if(!strlen($this->PageURL))
-      {     
+      {
           $this->PageURL = $_SERVER["PHP_SELF"]."?env=".BuildEnv();
           if(strlen($this->extra_env))
           {
@@ -380,19 +380,19 @@
           elseif (GetVar('en') !== false) {
           	$this->PageURL .= '&en='.(int)GetVar('en');
           }
-          
+
           $this->PageURL .= "&lpn={TargetPage}";
       }
       $cols = $this->ColumnHeaders->Count();
       $o = "<TABLE cellSpacing=0 cellPadding=2 width=\"100%\" class=\"pagenav\"><tbody><TR >\n";
-      
+
       if(strlen($lvErrorString))
       {
          $o .= "<TD STYLE=\"border-bottom: 1px solid #000000;\" colspan=2><span class=\"validation_error\">$lvErrorString</SPAN></TD></TR><TR>";
-         
+
       }
       if($this->SearchBar==FALSE)
-      {      
+      {
         $o .= '<TD colspan="2">';
         $o .= $this->GetAdminPageLinkList($this->PageURL);
         $o .= "</TD>\n";
@@ -401,23 +401,23 @@
       {
       	  $val = inp_htmlize(str_replace(","," ", $this->SearchKeywords),1);
           $o .= "<TD>";
-          $o .= $this->GetAdminPageLinkList($this->PageURL)."</TD>";          
+          $o .= $this->GetAdminPageLinkList($this->PageURL)."</TD>";
           $o .= "<TD align=\"right\" valign=\"top\">$add_search".admin_language("la_prompt_Search");
           $o .= "    <INPUT TYPE=\"TEXT\" ID=\"ListSearchWord\" NAME=\"ListSearchWord\" VALUE=\"$val\">";
           $o .= "    <IMG align=\"middle\" height=24 width=24 name=\"imgSearch\" ID=\"imgSearch\" src=\"$imagesURL/itemicons/icon16_search.gif\" ";
-          $o .= "         onMouseOut=\"swap('imgSearch', '$imagesURL/itemicons/icon16_search.gif');\" "; 
+          $o .= "         onMouseOut=\"swap('imgSearch', '$imagesURL/itemicons/icon16_search.gif');\" ";
           $o .= "         onMouseOver=\"swap('imgSearch','$imagesURL/itemicons/icon16_search_f2.gif');\" ";
-          $o .= "         onClick=\"Submit_ListSearch('".$this->SearchAction."');\">"; 
+          $o .= "         onClick=\"Submit_ListSearch('".$this->SearchAction."');\">";
           $o .= "     <IMG align=\"middle\" height=24 width=24 name=\"imgResetSearch\" ID=\"imgResetSearch\" src=\"$imagesURL/itemicons/icon16_search_reset.gif\" ";
-          $o .= "         onMouseOut=\"swap('imgResetSearch', '$imagesURL/itemicons/icon16_search_reset.gif');\" "; 
+          $o .= "         onMouseOut=\"swap('imgResetSearch', '$imagesURL/itemicons/icon16_search_reset.gif');\" ";
           $o .= "         onMouseOver=\"swap('imgResetSearch','$imagesURL/itemicons/icon16_search_reset_f2.gif');\" ";
-          $o .= "         onClick=\"Submit_ListSearch('".$this->SearchAction."_reset');\">";           
+          $o .= "         onClick=\"Submit_ListSearch('".$this->SearchAction."_reset');\">";
           if(strlen($this->SearchDropdownId)>0)
           {
           	$o .= "     <IMG height=16 width=16 name=\"imgSearchDropDown\" src=\"$imagesURL/itemicons/icon16_search_dropdown.gif\" ";
-          	$o .= "         onMouseOut=\"swap('imgResetDropDown', '$imagesURL/itemicons/icon16_search_dropdown.gif');\" "; 
+          	$o .= "         onMouseOut=\"swap('imgResetDropDown', '$imagesURL/itemicons/icon16_search_dropdown.gif');\" ";
           	$o .= "         onMouseOver=\"swap('imgResetDropDown','$imagesURL/itemicons/icon16_search_dropdown.gif');\" ";
-          	$o .= "         onClick=\"ListSearch_PopUp('".$this->SearchDropdownId."');\">";           	
+          	$o .= "         onClick=\"ListSearch_PopUp('".$this->SearchDropdownId."');\">";
           }
           $o .= "</TD>";
       }
@@ -429,7 +429,7 @@
     {
 		$o = '';
       if($this->checkboxes)
-      {       
+      {
         $o = "<script language=\"javascript\">\n";
         $o .="<!--\n";
 
@@ -452,7 +452,7 @@
             $this->CurrentPage=1;
 
         $o = "\n";
-		
+
         if(is_object($this->ToolBar))
         {
             if($this->PrintToolBar)
@@ -466,11 +466,11 @@
           $o .= $this->ColumnHeaders->PrintColumns();
         }
         if($this->ListItems->NumItems()>0)
-        {                  
+        {
           $o .= $this->PrintItems();
-         
+
         }
-        	
+
         $o .= "$footer</TABLE>";
         if($this->ListItems->NumItems()>0)
           $o .= $this->PrintJavaScriptInit();
Index: branches/RC/admin/editor/editor_new.php
===================================================================
diff -u -r8929 -r9389
--- branches/RC/admin/editor/editor_new.php	(.../editor_new.php)	(revision 8929)
+++ branches/RC/admin/editor/editor_new.php	(.../editor_new.php)	(revision 9389)
@@ -5,15 +5,15 @@
 ##                   In-portal                     			##
 ##             Intechnic Corporation               			##
 ##          All Rights Reserved, 1998-2002            		##
-##                                           				## 
-## No portion of this code may be copied, reproduced or  	## 
+##                                           				##
+## No portion of this code may be copied, reproduced or  	##
 ##    otherwise redistributed without proper written     	##
 ##   consent of Intechnic Corporation.  Violation will      ##
 ##    result in revocation of the license and support    	##
 ##  privileges along maximum prosecution allowed by law. 	##
 ##############################################################
 
-define('IS_POPUP', 1); 
+define('IS_POPUP', 1);
 
 // new startup: begin
 define('REL_PATH', 'admin/editor');
@@ -22,8 +22,8 @@
 require_once FULL_PATH.'/kernel/startup.php';
 // new startup: end
 
-require_once ($pathtoroot.$admin."/include/elements.php"); 
-require_once ($pathtoroot."kernel/admin/include/navmenu.php"); 
+require_once ($pathtoroot.$admin."/include/elements.php");
+require_once ($pathtoroot."kernel/admin/include/navmenu.php");
 require_once($pathtoroot.$admin."/toolbar.php");
 require_once($pathtoroot.$admin."/editor/cmseditor/fckeditor.php");
 
@@ -51,7 +51,7 @@
    $objListToolBar->Set("section",$section);
    $objListToolBar->Set("load_menu_func","");
    $objListToolBar->Set("CheckClass","");
-  
+
    $listImages = array();
                     //$img, $alt, $link, $onMouseOver, $onMouseOut, $onClick
 
@@ -71,9 +71,9 @@
    echo $objListToolBar->Build();
 ?>
   <form name="frm" action="javascript:update_opener();">
-<?php  
+<?php
 	$oFCKeditor = new FCKeditor('Content');
-	
+
 	$oFCKeditor->BasePath	= 'cmseditor/' ;
 	$oFCKeditor->Width		= '100%' ;
 	$oFCKeditor->Height		= '500' ;
@@ -82,12 +82,12 @@
 	$oFCKeditor->Config = Array(
 		//'UserFilesPath' => $pathtoroot.'kernel/user_files',
 		'ProjectPath' => $objConfig->Get("Site_Path"),
-		'CustomConfigurationsPath' => $rootURL.'admin/editor/inp_fckconfig.js',
+		'CustomConfigurationsPath' => $rootURL.$admin.'/editor/inp_fckconfig.js',
 		'EditorAreaCSS' => GetThemeCSS(),
 		//'StylesXmlPath' => '../../inp_styles.xml',
 		//'Debug' => 1,
 	);
-	
+
 	function GetThemeCSS()
 	{
 		$query = 'SELECT LastCompiled, '.GetTablePrefix().'Stylesheets.Name as StyleName FROM '.GetTablePrefix().'Theme
@@ -96,31 +96,31 @@
 							WHERE	ThemeId = 4';
 
 		$conn =& GetADODBConnection();
-		
+
 		$res = $conn->GetRow($query);
-					
+
 		$last_compiled = $res['LastCompiled'];
-			
+
 		$style_name = strtolower( $res['StyleName'] );
-		
+
 		global $pathtoroot,$rootURL;
-		
+
 		$css_path = $pathtoroot.'kernel/stylesheets';
-		
+
 		$css_url = $rootURL.'kernel/stylesheets';
-		
+
 		if( file_exists($css_path.'/'.$style_name.'-'.$last_compiled.'.css') )
 		{
 			$ret = $css_url.'/'.$style_name.'-'.$last_compiled.'.css';
 		}
 		return $ret;
 	}
-	
-  echo $oFCKeditor->CreateHtml() ;            
-?>	
-	</FORM>  
+
+  echo $oFCKeditor->CreateHtml() ;
+?>
+	</FORM>
       </td></tr></table>
-      
+
     </form>
 
    </body>
@@ -143,36 +143,36 @@
            //f = document.getElementById('editform');
            d = document.getElementById('Content');
            d.value = current;
-        } 
-        else 
+        }
+        else
         	window.close()
      }
-     else 
+     else
      	window.close()
     }
-         
+
     function update_opener()
-    {       
-       d = document.getElementById('Content');      
+    {
+       d = document.getElementById('Content');
        if (d.form)
          if (d.form.onsubmit)
             d.form.onsubmit()
 
        if (!window.opener) return;
        if (!window.opener.closed)
-       
+
 //       if (typeof (bf.$TargetField.value) != 'undefined') {
 //         current = bf.$TargetField;
 //       }
 //       else {
 				current = window.opener.document.getElementById('$TargetField');
 //       }
-       
+
        current.value = d.value;
-       //alert('Setting bf.$TargetField.value to'+d.value); 	
+       //alert('Setting bf.$TargetField.value to'+d.value);
        window.close();
     }
-         
+
 END;
 ?>
 //   setTimeout('update_content();',100);
Index: branches/RC/kernel/include/modules.php
===================================================================
diff -u -r8929 -r9389
--- branches/RC/kernel/include/modules.php	(.../modules.php)	(revision 8929)
+++ branches/RC/kernel/include/modules.php	(.../modules.php)	(revision 9389)
@@ -983,11 +983,11 @@
 
  	$application =& kApplication::Instance();	// just to sure, that object is here in all actions
  	if($FrontEnd == 0 || !is_numeric($FrontEnd) || $FrontEnd == 2) {
-	  $rootURL = 'http://'.ThisDomain().$objConfig->Get('Site_Path');
+	  /*$rootURL = 'http://'.ThisDomain().$objConfig->Get('Site_Path');
 	  $admin = $objConfig->Get("AdminDirectory");
 	  if( !strlen($admin) ) $admin = "admin";
 	  $adminURL = $rootURL.$admin;
-      $imagesURL = $adminURL."/images";
+      $imagesURL = $adminURL."/images";*/
 
       if( $key != 'bbcat' && _ModuleLicensed($modules_loaded[$key]) )
       {
Index: branches/RC/admin/install_over_kx.php
===================================================================
diff -u -r8929 -r9389
--- branches/RC/admin/install_over_kx.php	(.../install_over_kx.php)	(revision 8929)
+++ branches/RC/admin/install_over_kx.php	(.../install_over_kx.php)	(revision 9389)
@@ -1,30 +1,31 @@
 <?php
+//	die('aa');
 	// new startup: begin
 	define('REL_PATH', 'admin');
 	$relation_level = count( explode('/', REL_PATH) );
 	define('FULL_PATH', realpath(dirname(__FILE__) . str_repeat('/..', $relation_level) ) );
-	
+
 	if (!defined('IS_INSTALL')) define('IS_INSTALL', 1);
 	require_once FULL_PATH.'/kernel/startup.php';
 	// new startup: end
 
 	$application =& kApplication::Instance();
 	$application->Init();
 
-	require_once FULL_PATH.'/admin/install/install_lib.php';
+	require_once FULL_PATH.ADMIN_DIRECTORY.'/install/install_lib.php';
 
 	echo '<strong>In-Portal Installation</strong><br />';
-	
+
 	echo '1. Importing Database<br />';
-  	RunSchemaFile($application->Conn, FULL_PATH.'/admin/install/inportal_schema.sql', 'dbconnection');
-  	RunSQLFile($application->Conn, FULL_PATH.'/admin/install/inportal_data.sql', 'dbconnection');
-  	
+  	RunSchemaFile($application->Conn, FULL_PATH.ADMIN_DIRECTORY.'/install/inportal_schema.sql', 'dbconnection');
+  	RunSQLFile($application->Conn, FULL_PATH.ADMIN_DIRECTORY.'/install/inportal_data.sql', 'dbconnection');
+
 	echo '2. Writing config.php<br />';
   	if (!(isset($ini_file) && $ini_file)) {
 		$ini_file = FULL_PATH.'/config.php';
 		$ini_vars = inst_parse_portal_ini($ini_file, true);
 	}
-		
+
   	$sql = 'SELECT Version FROM '.TABLE_PREFIX.'Modules WHERE Name = '.$application->Conn->qstr('In-Portal');
 	$mod_version = $application->Conn->GetOne($sql);
 
@@ -34,17 +35,17 @@
   	echo '3. Removing Config Cache<br />';
   	$sql = 'DELETE FROM '.TABLE_PREFIX.'Cache WHERE (VarName = "config_files") OR (VarName LIKE "%_parsed")';
 	$application->Conn->Query($sql);
-	
+
 	echo '4. Importing Language Pack<br />';
 	$lang_xml =& $application->recallObjectP('LangXML', null, Array(), false); // false - don't use temp tables
 	/* @var $lang_xml LangXML_Parser */
-	
-	$lang_xml->Parse(FULL_PATH.'/admin/install/langpacks/english.lang', '|0|1|2|', '');
-	
+
+	$lang_xml->Parse(FULL_PATH.ADMIN_DIRECTORY.'/install/langpacks/english.lang', '|0|1|2|', '');
+
 	echo '5. Verifying License Status<br />';
 	$modules_helper =& $application->recallObject('ModulesHelper');
 	/* @var $modules_helper kModulesHelper */
-	
+
 	$modules = $modules_helper->checkLogin();
 	if (in_array('In-Portal', $modules)) {
 		// in-portal is licensed
@@ -53,6 +54,6 @@
 	else {
 		echo '<a href="install.php?install_type=5&state=license&next_step=2">Please Update Your License</a><br />';
 	}
-	
+
 	echo '<strong>Done</strong><br />';
 ?>
\ No newline at end of file
Index: branches/RC/core/kernel/utility/debugger/debugger.js
===================================================================
diff -u -r9359 -r9389
--- branches/RC/core/kernel/utility/debugger/debugger.js	(.../debugger.js)	(revision 9359)
+++ branches/RC/core/kernel/utility/debugger/debugger.js	(.../debugger.js)	(revision 9389)
@@ -381,9 +381,9 @@
 	var the_debugger = this;
 	this.AddEvent(drag_object, 'mousedown', function(ev){
 		ev = ev || window.event;
-		the_debugger.InitialPos = findPos(drag_object);
+		the_debugger.InitialPos = dbg_findPos(drag_object);
 		var coords = the_debugger.mouseCoords(ev);
-		var pos = findPos(drag_object);
+		var pos = dbg_findPos(drag_object);
 		the_debugger.MouseOffset = [coords.x - pos[0], coords.y - pos[1]];
 		the_debugger.DragObject = drag_object;
 		the_debugger.LastDragObject = drag_object;
@@ -412,6 +412,19 @@
 		if(tmp){
 			endCallback(tmp);
 		}
-		var pos = findPos(drag_object);
+		var pos = dbg_findPos(drag_object);
 	});
+}
+
+function dbg_findPos(obj) {
+	var curleft = curtop = 0;
+	if (obj.offsetParent) {
+		curleft = obj.offsetLeft
+		curtop = obj.offsetTop
+		while (obj = obj.offsetParent) {
+			curleft += obj.offsetLeft
+			curtop += obj.offsetTop
+		}
+	}
+	return [curleft,curtop];
 }
\ No newline at end of file
Index: branches/RC/admin/index4_direct.php
===================================================================
diff -u -r8929 -r9389
--- branches/RC/admin/index4_direct.php	(.../index4_direct.php)	(revision 8929)
+++ branches/RC/admin/index4_direct.php	(.../index4_direct.php)	(revision 9389)
@@ -5,8 +5,8 @@
 ##					      In-portal							##
 ##					Intechnic Corporation					##
 ##			   All Rights Reserved, 1998-2002				##
-##															##	
-##	No portion of this code may be copied, reproduced or	##	
+##															##
+##	No portion of this code may be copied, reproduced or	##
 ##	   otherwise redistributed without proper written		##
 ##	  consent of Intechnic Corporation.  Violation will		##
 ##	   result in revocation of the license and support		##
@@ -19,25 +19,25 @@
 	define('FULL_PATH', realpath(dirname(__FILE__) . str_repeat('/..', $relation_level) ) );
 	require_once FULL_PATH.'/kernel/startup.php';
 	// new startup: end
-	
+
 	$prefix = $application->GetVar('prefix');
 	$application->SetVar($prefix.'_mode', 't');
-	
+
 	$id_field = $application->getUnitOption($prefix, 'IDField');
 	$temp_handler =& $application->recallObject($prefix.'_TempHandler', 'kTempTablesHandler');
 	$table_name = $temp_handler->GetTempName( $application->getUnitOption($prefix, 'TableName'), 'prefix:'.$prefix );
-	
+
 	$db =& $application->GetADODBConnection();
 	$item_id = $db->GetOne('SELECT '.$id_field.' FROM '.$table_name, (int)$application->GetVar('en'));
-	$application->SetVar($prefix.'_id', $item_id);		
-	
+	$application->SetVar($prefix.'_id', $item_id);
+
 	$object =& $application->recallObject($prefix, null, Array('skip_autoload' => true));
 	$object->Load($item_id);
-	
+
 	$template = $application->GetVar('t');
-	include_once FULL_PATH.'/admin/'.$template.'.php';
-	
+	include_once FULL_PATH.ADMIN_DIRECTORY.'/'.$template.'.php';
+
 	$application->Run();
-	
+
 	int_footer();
 ?>
\ No newline at end of file
Index: branches/RC/core/kernel/startup.php
===================================================================
diff -u -r8929 -r9389
--- branches/RC/core/kernel/startup.php	(.../startup.php)	(revision 8929)
+++ branches/RC/core/kernel/startup.php	(.../startup.php)	(revision 9389)
@@ -17,9 +17,23 @@
 
 	define('INPORTAL_ENV', 1);
 
+	$vars = parse_portal_ini(FULL_PATH.'/config.php');
+
+	$admin_directory = isset($vars['AdminDirectory']) ? $vars['AdminDirectory'] : '/admin';
+	define('ADMIN_DIRECTORY', $admin_directory);
+
 	# New path detection method: begin
-	safeDefine('REL_PATH', '/admin');
-	$ps = rtrim(preg_replace("/".preg_quote(rtrim(REL_PATH, '/'), '/')."$/", '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
+	if (defined('REL_PATH')) {
+		// location of index.php relatively to site base folder
+		$relative_path = preg_replace('/^[\/]{0,1}admin(.*)/', $admin_directory.'\\1', REL_PATH);
+	}
+	else {
+		// default index.php relative location is administrative console folder
+		define('REL_PATH', $admin_directory);
+		$relative_path = REL_PATH;
+	}
+
+	$ps = rtrim(preg_replace('/'.preg_quote(rtrim($relative_path, '/'), '/').'$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
 	safeDefine('BASE_PATH', $ps); // in case in-portal has defined it before
 	# New path detection method: end
 
@@ -29,8 +43,6 @@
 	$https_mark = getArrayValue($_SERVER, 'HTTPS');
 	safeDefine('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
 
-	$vars = parse_portal_ini(FULL_PATH.'/config.php');
-
 	safeDefine('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
 	safeDefine('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');
 
Index: branches/RC/kernel/startup.php
===================================================================
diff -u -r8929 -r9389
--- branches/RC/kernel/startup.php	(.../startup.php)	(revision 8929)
+++ branches/RC/kernel/startup.php	(.../startup.php)	(revision 9389)
@@ -24,7 +24,7 @@
 	$g_TablePrefix = TABLE_PREFIX;
 	$pathtoroot = preg_replace('/(.*)\/$/', '\\1', FULL_PATH).'/';
 
-	$admin		=	'admin';
+	$admin		=	defined('ADMIN_DIRECTORY') ? trim(ADMIN_DIRECTORY, '/') : 'admin';
 	$rootURL	=	PROTOCOL.SERVER_NAME.(defined('PORT')?':'.PORT : '').rtrim(BASE_PATH, '/').'/';
 	$localURL	=	$rootURL.'kernel/';
 	$adminURL	=	$rootURL.$admin;
Index: branches/RC/core/kernel/application.php
===================================================================
diff -u -r9277 -r9389
--- branches/RC/core/kernel/application.php	(.../application.php)	(revision 9277)
+++ branches/RC/core/kernel/application.php	(.../application.php)	(revision 9389)
@@ -1133,7 +1133,7 @@
 
 		if( substr($t, -4) == '.tpl' ) $t = substr($t, 0, strlen($t) - 4 );
 
-		if ( $this->IsAdmin() && $prefix == '') $prefix = '/admin';
+		if ( $this->IsAdmin() && $prefix == '') $prefix = ADMIN_DIRECTORY;
 		if ( $this->IsAdmin() && $prefix == '_FRONT_END_') $prefix = '';
 
 		$index_file = $this->getIndexFile($prefix, $index_file, $params);
@@ -1700,8 +1700,6 @@
 		$this->Session->LoadPersistentVars();
 	}
 
-
-
 	function LoadCache() {
 		$cache_key = $this->GetVar('t').$this->GetVar('m_theme').$this->GetVar('m_lang').$this->IsAdmin();
 		$query = sprintf("SELECT PhraseList, ConfigVariables FROM %s WHERE Template = %s",