[svn r17646] FS#2970 - FCKEditor: Revision of inserting Flash objects for the simple and the advanced file managers. Checked for course documents and portal's homepage.

main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.html

@@ -29,7 +29,8 @@
 		<link href="../../dialog/common/fck_dialog_common.css" rel="stylesheet" type="text/css" />
 		<script type="text/javascript">
 		<!--
-		document.writeln(FCK.TempBaseTag);
+		//document.writeln(FCK.TempBaseTag);
+		document.writeln(FCKConfig.BaseHref);
 		-->
 		</script>
 	</head>

main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.js

@@ -71,23 +71,10 @@ function LoadSelection()
 {
 	oMedia = new Media() ;
 	oMedia.setObjectElement( getSelectedMovie() ) ;
-/*	
-	alert (
-		"id: " + oMedia.id +
-		"\nUrl: " + oMedia.url + 
-		"\nWidth: " + oMedia.width +
-		"\nHeight: " + oMedia.height +
-		"\nQuality: " + oMedia.quality +
-		"\nScale: " + oMedia.scale +
-		"\nVSpace: " + oMedia.vspace +
-		"\nHSpace: " + oMedia.hspace +
-		"\nAlign: " + oMedia.align +
-		"\nBgcolor: " + oMedia.bgcolor +
-		"\nLoop: " + oMedia.loop +
-		"\nPlay: " + oMedia.play
-	);
-*/
-	GetE( 'txtURL' ).value    	= oMedia.url ;
+
+	//GetE( 'txtURL' ).value    	= oMedia.url ;
+	GetE( 'txtURL' ).value    	=  FCK.RemoveBasePath( oMedia.url ) ;
+
 	GetE( 'txtVSpace' ).value		= oMedia.vspace ;
 	GetE( 'txtHSpace' ).value		= oMedia.hspace ;
 	GetE( 'selAlign' ).value		= oMedia.align ;
@@ -114,8 +101,7 @@ function Ok()
 
 	//var e = ( oMedia || FCK.EditorDocument.createElement( 'OBJECT' ) ) ;
 	var e = ( oMedia || new Media() ) ;
-	e.url = setFlashUrl(  GetE( 'txtURL' ).value ) ;
-	//e.url = oEditor.FCKConfig.CreateDocumentDir + GetE( 'txtURL' ).value;	
+	e.url = FCK.AddBasePath( GetE( 'txtURL' ).value ) ;
 	
 	updateMovie(e) ;	
 
@@ -123,22 +109,6 @@ function Ok()
 	return true ;
 }
 
-function setFlashUrl( url )
-{
-	return_url = '' ;
-
-	if ( oEditor.FCKConfig.CreateDocumentDir == '/' )
-	{
-		return_url = url; // // FCKConfig.CreateDocumentDir variable is defined in create_document.php	
-	}
-	else
-	{
-		return_url = oEditor.FCKConfig.CreateDocumentDir  + url ;
-	}
-
-	return return_url;	
-}
-
 /**
  * Obtiene los datos del form y actualiza el objeto..
  * Obtains data from the form and updates the object ...

main/inc/lib/fckeditor/editor/plugins/fckEmbedMovies/fck_embedmovies.js

@@ -120,6 +120,9 @@ function SetUrl( url )
 
 function CreateEmbeddedMovie(e, url)
 {
+	// Added by Ivan Tcholakov
+	url = FCK.AddBasePath( url ) ;
+
 	var sType, pluginspace, codebase, classid;
 	var sExt = url.match(/\.(mpg|mpeg|mp4|avi|wmv|mov|asf)$/i);