Browse Source

[svn r18086] ajaxfilemanager can now operate on the agenda

Juan Carlos Raña 16 years ago
parent
commit
f88b820213
2 changed files with 21 additions and 60 deletions
  1. 20 59
      main/calendar/agenda.inc.php
  2. 1 1
      main/inc/lib/fckeditor/myconfig_afm.js

+ 20 - 59
main/calendar/agenda.inc.php

@@ -1,4 +1,4 @@
-<?php //$Id: agenda.inc.php 18047 2009-01-28 17:07:28Z cvargas1 $
+<?php //$Id: agenda.inc.php 18086 2009-01-29 22:03:00Z herodoto $
 
 /*
 ==============================================================================
@@ -2798,7 +2798,17 @@ function show_add_form($id = '')
 			$oFCKeditor->Height		= '175';
 			$oFCKeditor->Width		= '100%';
 			$oFCKeditor->Value		= $content;
-			$oFCKeditor->Config['CustomConfigurationsPath'] = api_get_path(REL_PATH)."main/inc/lib/fckeditor/myconfig.js";
+			if (api_get_setting('advanced_filemanager'))
+			{
+				$oFCKeditor->Config['CustomConfigurationsPath'] = api_get_path(REL_PATH)."main/inc/lib/fckeditor/myconfig_afm.js";
+			}
+			else
+			{
+				$oFCKeditor->Config['CustomConfigurationsPath'] = api_get_path(REL_PATH)."main/inc/lib/fckeditor/myconfig.js";
+			}
+		
+
+
 			$oFCKeditor->ToolbarSet = 'Agenda';
 
 			$TBL_LANGUAGES = Database::get_main_table(TABLE_MAIN_LANGUAGE);
@@ -2809,74 +2819,25 @@ function show_add_form($id = '')
 
 			//FCKeditor Configuration for documents
 
-			if (api_get_setting('advanced_filemanager') == 'true')
+			if (api_get_setting('advanced_filemanager'))
 			{
-				// TODO: Settings for ajaxfilemanager to be implemented.
-
-				//$oFCKeditor->Config['AdvancedFileManager'] = true;
-
-				// For images
-
-				// For flash
-
-				// For MP3
-
-				// For Videos
-
-				// Links
-
-				// For Videos (flv)
-
-				//------------------------------------------------------------------------
-				
-				// At the moment here the simple manager does the work.
-
-				$oFCKeditor->Config['AdvancedFileManager'] = false;
-
-				if (isset($_SESSION['_course']) && $_SESSION['_course']['path']!='')
-				{
-					$upload_path = api_get_path(REL_COURSE_PATH).$_SESSION['_course']['path'].'/document/';
-				}
-				else
-				{
-					$upload_path = api_get_path(REL_PATH).'main/default_course_document/';
-				}
-
-				// if we don't find the CreateDocumentWebDir set we change it with th absolute path http://www.dok..
-
-				if ($oFCKeditor->Config['CreateDocumentWebDir']=='')
-				{
-					$oFCKeditor->Config['CreateDocumentWebDir']=api_get_path('WEB_COURSE_PATH').api_get_course_path().'/document/';
-					$oFCKeditor->Config['CreateDocumentDir'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/document/';
-				};
-
 				// For images
-				$oFCKeditor->Config['ImageBrowserURL'] = $oFCKeditor->BasePath . "editor/filemanager/browser/default/browser.html?Type=Images&Connector=connectors/php/connector.php&ServerPath=$upload_path";
-				$oFCKeditor->Config['ImageUploadURL'] = $oFCKeditor->BasePath . "editor/filemanager/upload/php/upload.php?Type=Images&ServerPath=$upload_path" ;
+				$oFCKeditor->Config['ImageBrowserURL'] = $oFCKeditor->BasePath . "editor/plugins/ajaxfilemanager/ajaxfilemanager.php";
 
 				// For flash
-				$oFCKeditor->Config['FlashBrowserURL'] = $oFCKeditor->BasePath . "editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/php/connector.php&ServerPath=$upload_path";
-				$oFCKeditor->Config['FlashUploadURL'] = $oFCKeditor->BasePath . "editor/filemanager/upload/php/upload.php?Type=Flash&ServerPath=$upload_path" ;
+				$oFCKeditor->Config['FlashBrowserURL'] = $oFCKeditor->BasePath . "editor/plugins/ajaxfilemanager/ajaxfilemanager.php";
 
 				// For MP3
-				$oFCKeditor->Config['MP3BrowserURL'] = $oFCKeditor->BasePath . "editor/filemanager/browser/default/browser.html?Type=MP3&Connector=connectors/php/connector.php&ServerPath=$upload_path";
-				$oFCKeditor->Config['MP3UploadURL'] = $oFCKeditor->BasePath . "editor/filemanager/upload/php/upload.php?Type=MP3&ServerPath=$upload_path" ;
-
-				// For Videos
-				$oFCKeditor->Config['VideoBrowserURL'] = $oFCKeditor->BasePath . "editor/filemanager/browser/default/browser.html?Type=Video&Connector=connectors/php/connector.php&ServerPath=$upload_path";
-				$oFCKeditor->Config['VideoUploadURL'] = $oFCKeditor->BasePath . "editor/filemanager/upload/php/upload.php?Type=Video&ServerPath=$upload_path" ;
+				$oFCKeditor->Config['MP3BrowserURL'] = $oFCKeditor->BasePath . "editor/plugins/ajaxfilemanager/ajaxfilemanager.php";
 
-				// Links
-				$oFCKeditor->Config['LinkBrowserURL'] = $oFCKeditor->BasePath . "editor/filemanager/browser/default/browser.html?Type=Images&Connector=connectors/php/connector.php&ServerPath=$upload_path";
+				// For video
+				$oFCKeditor->Config['VideoBrowserURL'] = $oFCKeditor->BasePath . "editor/plugins/ajaxfilemanager/ajaxfilemanager.php";
 
-				// For Videos (flv)
-				$oFCKeditor->Config['MediaBrowserURL'] = $oFCKeditor->BasePath . "editor/filemanager/browser/default/browser.html?Type=Video/flv&Connector=connectors/php/connector.php&ServerPath=$upload_path";
-				$oFCKeditor->Config['MediaUploadURL'] = $oFCKeditor->BasePath . "editor/filemanager/upload/php/upload.php?Type=Video/flv&ServerPath=$upload_path" ;
+				// For flv Player (Videos)
+				$oFCKeditor->Config['VideoBrowserURL'] = $oFCKeditor->BasePath . "editor/plugins/ajaxfilemanager/ajaxfilemanager.php";
 			}
 			else
 			{
-				$oFCKeditor->Config['AdvancedFileManager'] = false;
-
 				if (isset($_SESSION['_course']) && $_SESSION['_course']['path']!='')
 				{
 					$upload_path = api_get_path(REL_COURSE_PATH).$_SESSION['_course']['path'].'/document/';

+ 1 - 1
main/inc/lib/fckeditor/myconfig_afm.js

@@ -110,7 +110,7 @@ FCKConfig.Plugins.Add("Attachment", "en", sOtherPluginPath ) ;*/
 
 // added by Julio Montoya
 FCKConfig.Plugins.Add("MP3", "en", sOtherPluginPath ) ;
-FCKConfig.Plugins.Add('ImageManager','en') ;
+//FCKConfig.Plugins.Add('ImageManager','en') ;//deactivated when run with advanced filemanager and whitout formvalidator
 FCKConfig.Plugins.Add('flvPlayer','en') ;
 //FCKConfig.Plugins.Add("Flash", "en");
 FCKConfig.Plugins.Add('fckEmbedMovies');