فهرست منبع

[svn r14625] fix a bug when trying to insert a media on homepage

Eric Marguin 17 سال پیش
والد
کامیت
181a03f1cf

+ 11 - 1
main/admin/configure_homepage.php

@@ -1,4 +1,4 @@
-<?php // $Id: configure_homepage.php 14000 2007-12-17 17:18:26Z elixir_inter $
+<?php // $Id: configure_homepage.php 14625 2008-03-17 15:48:21Z elixir_inter $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -835,6 +835,16 @@ switch($action){
 			$result_sql=api_sql_query($sql);
 			$isocode_language=mysql_result($result_sql,0,0);
 			$oFCKeditor->Config['DefaultLanguage'] = $isocode_language;
+			$upload_path = api_get_path(REL_PATH)."main/upload/";
+			
+			//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 video
+			$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" ;
+			
 			echo $oFCKeditor->CreateHtml();
 		}
 		?>

+ 3 - 1
main/inc/lib/fckeditor/editor/plugins/MP3/fck_mp3.php

@@ -37,7 +37,9 @@ include('../../../../../../inc/global.inc.php');
 		  <?php
 
 		  $sType = "MP3";
-		  include(api_get_path(INCLUDE_PATH).'course_document.inc.php');
+		  if(isset($_course["sysCode"])){
+		 	 include(api_get_path(INCLUDE_PATH).'course_document.inc.php');
+		  }
 		  
 		  ?>
 		</div>

+ 3 - 1
main/inc/lib/fckeditor/editor/plugins/Video/fck_video.php

@@ -37,7 +37,9 @@ include('../../../../../../inc/global.inc.php');
 		  <?php 
 		  
 		  $sType = "Video";
-		  include(api_get_path(INCLUDE_PATH).'course_document.inc.php');
+		  if(isset($_course["sysCode"])){
+		  	include(api_get_path(INCLUDE_PATH).'course_document.inc.php');
+		  }
 		  
 		  ?>
 		</div>

+ 1 - 1
user_portal.php

@@ -317,7 +317,7 @@ function get_personal_session_course_list($user_id)
 									LEFT JOIN `".$tbl_user_course_category."`.`user_course_category`
 									ON course_rel_user.user_course_cat = user_course_category.id
 									WHERE  course_rel_user.user_id = '".$user_id."'
-									ORDER BY user_course_category.sort, course_rel_user.sort ASC,i";
+									ORDER BY user_course_category.sort, course_rel_user.sort ASC,user_course_category.title, i";
 	
 	$course_list_sql_result = api_sql_query($personal_course_list_sql, __FILE__, __LINE__);