Index: trunk/admin/editor/cmseditor/editor/_source/internals/fcktools.js
===================================================================
diff -u -r1415 -r1974
--- trunk/admin/editor/cmseditor/editor/_source/internals/fcktools.js	(.../fcktools.js)	(revision 1415)
+++ trunk/admin/editor/cmseditor/editor/_source/internals/fcktools.js	(.../fcktools.js)	(revision 1974)
@@ -137,11 +137,13 @@
 
 FCKTools.HTMLEncode = function( text )
 {
-	text = text.replace( /&/g, "&" ) ;
+	//text = text.replace( /&/g, "&" ) ;
 	text = text.replace( /"/g, """ ) ;
 	text = text.replace( /</g, "&lt;" ) ;
 	text = text.replace( />/g, "&gt;" ) ;
 	text = text.replace( /'/g, "&#39;" ) ;
+	//text = text.replace( /&amp;lt;/g, "&lt;" ) ;
+	//text = text.replace( /&amp;qt;/g, "&qt;" ) ;
 
 	return text ;
 }
Index: trunk/admin/editor/cmseditor/fckeditor.js
===================================================================
diff -u -r1666 -r1974
--- trunk/admin/editor/cmseditor/fckeditor.js	(.../fckeditor.js)	(revision 1666)
+++ trunk/admin/editor/cmseditor/fckeditor.js	(.../fckeditor.js)	(revision 1974)
@@ -161,11 +161,13 @@
 	if ( typeof( text ) != "string" )
 		text = text.toString() ;
 
-	text = text.replace(/&/g, "&amp;") ;
+	//text = text.replace(/&/g, "&amp;") ;
 	text = text.replace(/"/g, "&quot;") ;
 	text = text.replace(/</g, "&lt;") ;
 	text = text.replace(/>/g, "&gt;") ;
 	text = text.replace(/'/g, "&#39;") ;
+	//text = text.replace( /&amp;lt;/g, "&lt;" ) ;
+	//text = text.replace( /&amp;qt;/g, "&qt;" ) ;
 
 	return text ;
 }
\ No newline at end of file
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php
===================================================================
diff -u -r1595 -r1974
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 1595)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 1974)
@@ -168,7 +168,7 @@
 			if ($level > 0)
 				$prefix=$prefix.'- ';
 
-			$res .= '<CmsPage path="'.$page_path.'" title="'.$prefix.htmlspecialchars($rs->fields['page_title'],ENT_QUOTES).'" serverpath="'.BASE_PATH.'/index.php?t=" />';
+			$res .= '<CmsPage path="'.$page_path.'" title="'.$prefix.htmlspecialchars($rs->fields['page_title'],ENT_QUOTES).'" st_id="'.$rs->fields['st_id'].'" serverpath="'.BASE_PATH.'/index.php?t=" />';
 			$res .= ReadCmsTree($rs->fields['st_id'], $level+1);
 			
 			$rs->MoveNext();
Index: trunk/admin/editor/cmseditor/editor/dialog/fck_link.html
===================================================================
diff -u -r1415 -r1974
--- trunk/admin/editor/cmseditor/editor/dialog/fck_link.html	(.../fck_link.html)	(revision 1415)
+++ trunk/admin/editor/cmseditor/editor/dialog/fck_link.html	(.../fck_link.html)	(revision 1974)
@@ -96,7 +96,7 @@
 					<tr>
 						<td>
 							<span fckLang="DlgLnkInternalName">Internal Page Name:</span><br />
-							<select id="cmbImternalPagName" onchange="ChangeInternalUrl(this.value);">
+							<select id="cmbImternalPagName" onchange="ChangeInternalUrl(this.value,this);">
 							</select><br />
 						</td>
 					</tr>
Index: trunk/admin/editor/cmseditor/editor/dialog/fck_link/fck_link.js
===================================================================
diff -u -r1483 -r1974
--- trunk/admin/editor/cmseditor/editor/dialog/fck_link/fck_link.js	(.../fck_link.js)	(revision 1483)
+++ trunk/admin/editor/cmseditor/editor/dialog/fck_link/fck_link.js	(.../fck_link.js)	(revision 1974)
@@ -24,6 +24,8 @@
 var ServerPath = '';
 var from = '';
 var anchor_ = '';
+var	links_path = new Array()
+
 //#### Dialog Tabs
 
 // Set the dialog tabs.
@@ -293,7 +295,6 @@
 		GetE('txtUrl').value = sHRef ;
 	}
 	
-	
 	if ( !oPopupMatch )
 	{
 		// Get the target.
@@ -370,27 +371,78 @@
 	for ( var i = 0 ; i < oNodes.length ; i++ )
 	{
 		var sCmsPage = oNodes[i].attributes.getNamedItem('path').value ;
+		var sCmsId = oNodes[i].attributes.getNamedItem('st_id').value ;
 		var sTitle = oNodes[i].attributes.getNamedItem('title').value ;
 		ServerPath = oNodes[i].attributes.getNamedItem('serverpath').value;
-		GetE('cmbImternalPagName').options[i] = new Option(sTitle, sCmsPage);
+		if (LinkTypeID()) {
+			links_path[i] = sCmsPage;
+			GetE('cmbImternalPagName').options[i] = new Option(sTitle,  SetIDtag(sCmsId));
+		}
+		else
+				GetE('cmbImternalPagName').options[i] = new Option(sTitle, sCmsPage); 
+	
 		if (GetE('txtUrl')) {
 			tmpUrl = GetE('txtUrl').value;
 			if (tmpUrl.length == 0 && i == 0) {
 				window.frames["frmInternal"].document.location.href = ServerPath + sCmsPage+GetAdmin();
 			}
 			//alert(tmpUrl+' === '+sCmsPage);
-			if (tmpUrl.match(sCmsPage+'$')) {
-				GetE('cmbImternalPagName').options[i].selected=1;
-				window.frames["frmInternal"].document.location.href = tmpUrl+GetAdmin();
+			if (LinkTypeID())
+			{
+				if (tmpUrl == SetIDtag(sCmsId) || tmpUrl == SetIDtagAMP(sCmsId) || tmpUrl == SetIDtagNoLtQt(sCmsId)) {
+					GetE('cmbImternalPagName').options[i].selected=1;
+					//alert(ServerPath+sCmsPage+GetAdmin());
+					window.frames["frmInternal"].document.location.href = ServerPath+sCmsPage+GetAdmin();
+				}
+			} else {
+				if (tmpUrl.match(sCmsPage+'$')) {
+					GetE('cmbImternalPagName').options[i].selected=1;
+					//alert(tmpUrl+GetAdmin());
+					window.frames["frmInternal"].document.location.href = tmpUrl+GetAdmin();
+				}
 			}
 		} 
 	}
 }
 
-function ChangeInternalUrl(url)
+function LinkTypeID()
 {
-	window.frames["frmInternal"].document.location.href = ServerPath + url+GetAdmin();
-	//window.frames["frmInternal"].document.location.onload = LoadAnchorNamesAndIds();
+		if (typeof(oEditor.FCKConfig.LocalLinkType) != 'undefined') 
+		{
+			if (oEditor.FCKConfig.LocalLinkType == 'ID') 
+				return true;
+		}		
+		return false;
+}
+
+function SetIDtagNoLtQt(id)
+{
+	return "<%cms:GetBlockData id='"+id+"' field='href'%>";
+}
+
+function SetIDtag(id)
+{
+	return "&lt;%cms:GetBlockData id='"+id+"' field='href'%&gt;";
+}
+function SetIDtagAMP(id)
+{
+	return "&amp;lt;%cms:GetBlockData id='"+id+"' field='href'%&amp;gt;";
+
+}
+
+function ChangeInternalUrl(url,obj)
+{
+	if(LinkTypeID()) {
+		for (var i=0; i < obj.options.length; i++) {
+			if (obj.options[i].value == url) {
+				url=links_path[i];
+				window.frames["frmInternal"].document.location.href = ServerPath + url + GetAdmin();
+				return;
+			}	 
+		}
+	} else
+		window.frames["frmInternal"].document.location.href = ServerPath + url+GetAdmin();
+		//window.frames["frmInternal"].document.location.onload = LoadAnchorNamesAndIds();
 	//LoadAnchorNamesAndIds();
 }
 
@@ -476,8 +528,12 @@
 	{
 		
 		case 'internal' :
-			sUri = ServerPath+GetE('cmbImternalPagName').value;	
+			if (LinkTypeID())
+				sUri = GetE('cmbImternalPagName').value
+			else
+				sUri = ServerPath+GetE('cmbImternalPagName').value;	
 			//sUri = GetE('cmbLinkProtocol').value + sUri ;
+			//alert(sUri);
 			var cmbAnchorName = GetE('cmbAnchorName').value
 			if (cmbAnchorName.length > 0)
 				sUri = sUri+'#'+cmbAnchorName 
@@ -548,7 +604,7 @@
 		window.location.href='dialog/fck_image.html?create';
 		return ;
 	}
-
+	
 	if ( oLink )	
 		oLink.href = sUri ;
 	else	
Index: trunk/admin/editor/cmseditor/editor/fckeditor.html
===================================================================
diff -u -r1696 -r1974
--- trunk/admin/editor/cmseditor/editor/fckeditor.html	(.../fckeditor.html)	(revision 1696)
+++ trunk/admin/editor/cmseditor/editor/fckeditor.html	(.../fckeditor.html)	(revision 1974)
@@ -1,28 +1,47 @@
-<!--
+<!--
  * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2004 Frederico Caldeira Knabben
  * 
  * Licensed under the terms of the GNU Lesser General Public License:
  * 		http://www.opensource.org/licenses/lgpl-license.php
  * 
  * For further information visit:
  * 		http://www.fckeditor.net/
  * 
- * File Name: fckeditor.html
+ * File Name: fckeditor.original.html
  * 	Main page that holds the editor.
  * 
+ * Version:  2.0 RC3
+ * Modified: 2005-03-02 10:54:21
+ * 
  * File Authors:
  * 		Frederico Caldeira Knabben (fredck@fckeditor.net)
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 	<head>
 		<title>FCKeditor</title>
+		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5"> <!-- @Packager.RemoveLine -->
 		<meta name="robots" content="noindex, nofollow" />
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<script type="text/javascript" src="lang/fcklanguagemanager.js"></script>
+		<!-- @Packager.RemoveLine
 		<meta http-equiv="Cache-Control" content="public">
+		@Packager.RemoveLine -->
+		<!-- @Packager.Remove.Start -->
+		<script type="text/javascript" src="_source/internals/fckcoreextensions.js"></script>
+		<script type="text/javascript" src="_source/globals/fck_constants.js"></script>
+		<script type="text/javascript" src="_source/internals/fckbrowserinfo.js"></script>
+		<script type="text/javascript" src="_source/internals/fckscriptloader.js"></script>
+		<script type="text/javascript" src="_source/internals/fckurlparams.js"></script>
+		<script type="text/javascript" src="_source/internals/fck.js"></script>
+		<script type="text/javascript" src="_source/internals/fckconfig.js"></script>
+		<script type="text/javascript" src="_source/globals/fckeditorapi.js"></script>
+		<script type="text/javascript" src="_source/internals/fck_onload.js"></script>
+		<!-- @Packager.Remove.End -->
+		<!-- @Packager.RemoveLine
 		<script type="text/javascript" src="js/fck_startup.js"></script>
+		@Packager.RemoveLine -->
 	</head>
 	<body>
 		<table height="100%" width="100%" cellpadding="0" cellspacing="0" border="0" style="TABLE-LAYOUT: fixed">
@@ -43,17 +62,12 @@
 			</tr>
 			<tr id="eWysiwyg">
 				<td id="eWysiwygCell" height="100%" valign="top">
-					<iframe id="eEditorArea"  class='defaulttext' name="eEditorArea" height="100%" width="100%" frameborder="no" src="fckblank.html"></iframe>
+					<iframe id="eEditorArea" name="eEditorArea" height="100%" width="100%" frameborder="no" src="fckeditorarea.html"></iframe>
 				</td>
 			</tr>
 			<tr id="eSource" style="DISPLAY: none">
 				<td class="Source" height="100%" valign="top">
-					<span style="font-size: 8pt; font-family: arial,verdana,sans-serif; color: #AA0000;">
-					<span style="color: #FF0000;">You are in HTML mode. Use the [Source] button to switch back to WYSIWYG mode.</span><br>
-					Please note that incorrect or invalid HTML may break the web site's layout or produce undesirable results.
-					This mode should be utilized only by expert users. Intechnic Corporation assumes no responsibility for problems caused by incorrect modifications of the HTML code.
-					</span><hr>					
-					<textarea id="eSourceField" dir="ltr" style="WIDTH: 100%; HEIGHT: 82%"></textarea>
+					<textarea id="eSourceField" dir="ltr" style="WIDTH: 100%; HEIGHT: 100%"></textarea>
 				</td>
 			</tr>
 		</table>