Removing calls of fileDisplay.lib.php

skala
Julio Montoya 12 years ago
parent efc4ecaadf
commit 5b0e21a136
  1. 1
      main/course_info/infocours.php
  2. 5
      main/document/document.php
  3. 2
      main/document/document_lite.php
  4. 2
      main/document/document_quota.php
  5. 6
      main/dropbox/dropbox_init.inc.php
  6. 29
      main/inc/ajax/document.ajax.php
  7. 2
      main/inc/course_document.inc.php
  8. 5
      main/inc/lib/document.lib.php
  9. 2
      main/inc/lib/message.lib.php
  10. 405
      main/inc/lib/nanogong.lib.php
  11. 5
      main/inc/lib/search/tool_processors/document_processor.class.php
  12. 4
      main/newscorm/back_compat.inc.php
  13. 8
      main/resourcelinker/resourcelinker.inc.php
  14. 37
      main/social/message_for_group_form.inc.php
  15. 1
      main/work/work.lib.php
  16. 4
      main/work/work.php
  17. 1
      tests/test_manager.inc.php

@ -26,7 +26,6 @@ $nameTools = get_lang('ModifInfo');
/* Libraries */
require_once api_get_path(LIBRARY_PATH).'pdf.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
api_protect_course_script(true);
api_block_anonymous_users();

@ -39,11 +39,6 @@ $this_section = SECTION_COURSES;
require_once 'document.inc.php';
$lib_path = api_get_path(LIBRARY_PATH);
/* Libraries */
require_once $lib_path . 'fileUpload.lib.php';
require_once $lib_path . 'fileDisplay.lib.php';
require_once $lib_path . 'fileManage.lib.php';
api_protect_course_script(true);
//erase temp nanogons' audio, image edit

@ -22,8 +22,6 @@ $lib_path = api_get_path(LIBRARY_PATH);
/* Libraries */
require_once $lib_path.'document.lib.php';
require_once $lib_path.'fileUpload.lib.php';
require_once $lib_path.'fileDisplay.lib.php';
api_protect_course_script(true);

@ -12,8 +12,6 @@ $language_file = array('document');
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
if (!api_is_allowed_to_edit(null, true)) {
api_not_allowed(true);
}

@ -48,23 +48,17 @@ require_once 'dropbox_config.inc.php';
// the dropbox file that contains additional functions
require_once 'dropbox_functions.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
// protecting the script
api_protect_course_script();
/* Libraries */
// including the library for the sortable table
//require_once api_get_path(LIBRARY_PATH).'tablesort.lib.php';moved to autoload
// including the library for the dropbox
require_once 'dropbox_class.inc.php';
// including some libraries that are also used in the documents tool
require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php'; // we use a function build_document_icon_tag
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php'; // the function FileManager::choose_image is used
require_once api_get_path(LIBRARY_PATH).'document.lib.php';

@ -1,21 +1,21 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Responses to AJAX calls for the document upload
* Responses to AJAX calls for the document upload
*/
require_once '../global.inc.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
$action = $_REQUEST['a'];
switch($action) {
switch($action) {
case 'upload_file':
api_protect_course_script(true);
api_protect_course_script(true);
//User access same as upload.php
$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
// This needs cleaning!
if (api_get_group_id()) {
if ($is_allowed_to_edit || GroupManager::is_user_in_group(api_get_user_id(), api_get_group_id())) { // Only courseadmin or group members allowed
if (api_get_group_id()) {
if ($is_allowed_to_edit || GroupManager::is_user_in_group(api_get_user_id(), api_get_group_id())) { // Only courseadmin or group members allowed
} else {
exit;
}
@ -23,28 +23,27 @@ switch($action) {
} else { // No course admin and no group member...
exit;
}
if (!empty($_FILES)) {
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
$file = $_FILES['file'];
$result = DocumentManager::upload_document($_FILES, $_POST['curdirpath'], $file['name'], null, 0, 'overwrite', false, false);
$file = $_FILES['file'];
$result = DocumentManager::upload_document($_FILES, $_POST['curdirpath'], $file['name'], null, 0, 'overwrite', false, false);
$json = array();
$json['name'] = Display::url(api_htmlentities($file['name']), api_htmlentities($result['url']), array('target'=>'_blank'));
$json['type'] = api_htmlentities($file['type']);
$json['size'] = format_file_size($file['size']);
$json['size'] = format_file_size($file['size']);
if (!empty($result) && is_array($result)) {
$json['result'] = Display::return_icon('accept.png', get_lang('Uploaded'));
$json['result'] = Display::return_icon('accept.png', get_lang('Uploaded'));
} else {
$json['result'] = Display::return_icon('exclamation.png', get_lang('Error'));
}
echo json_encode($json);
echo json_encode($json);
}
break;
case 'document_preview':
$course_info = api_get_course_info_by_id($_REQUEST['course_id']);
$course_info = api_get_course_info_by_id($_REQUEST['course_id']);
if (!empty($course_info) && is_array($course_info)) {
echo DocumentManager::get_document_preview($course_info, false, '_blank', $_REQUEST['session_id']);
}
break;
break;
}
exit;

@ -10,9 +10,7 @@ require 'global.inc.php';
require_once api_get_path(LIBRARY_PATH).'fckeditor/repository.php';
require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
//if(!$is_in_admin){
if (!api_is_platform_admin()){

@ -2821,8 +2821,7 @@ class DocumentManager {
* @return string The HTML list
*/
public static function write_resources_tree($course_info, $session_id, $resources_sorted, $num = 0, $lp_id = false, $target = '', $add_move_button = false, $overwrite_url = null) {
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
$img_path = api_get_path(WEB_IMG_PATH);
$img_sys_path = api_get_path(SYS_CODE_PATH).'img/';
$web_code_path = api_get_path(WEB_CODE_PATH);
@ -3230,6 +3229,6 @@ class DocumentManager {
return $system_folders;
}
}
//end class DocumentManager

@ -9,8 +9,6 @@
/**
* Code
*/
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
/**
* Class

@ -1,133 +1,133 @@
<?php
<?php
/* For licensing terms, see /license.txt */
/**
*
*
* Files are saved in the path:
*
*
* courses/XXX/exercises/(session_id)/(exercise_id)/(question_id)/(user_id)/
*
* The file name is composed with
*
* The file name is composed with
*
* (course_id)/(session_id)/(user_id)/(exercise_id)/(question_id)/(exe_id).wav|mp3|ogg
*
*
*/
class Nanogong {
var $filename;
var $store_filename;
var $store_path;
var $params;
var $can_edit = false;
/* Files allowed to upload */
var $available_extensions = array('mp3', 'wav', 'ogg');
public function __construct($params = array()) {
$this->set_parameters($params);
}
function create_user_folder() {
//COURSE123/exercises/session_id/exercise_id/question_id/user_id
if (empty($this->store_path)) {
return false;
}
//@todo use an array to create folders
$folders_to_create = array();
//Trying to create the courses/COURSE123/exercises/ dir just in case
if (!is_dir($this->store_path)) {
mkdir($this->store_path);
}
}
if (!is_dir($this->store_path.$this->session_id)) {
mkdir($this->store_path.$this->session_id);
}
if (!empty($this->exercise_id) && !is_dir($this->store_path.$this->session_id.'/'.$this->exercise_id)) {
mkdir($this->store_path.$this->session_id.'/'.$this->exercise_id);
}
if (!empty($this->question_id) && !is_dir($this->store_path.$this->session_id.'/'.$this->exercise_id.'/'.$this->question_id)) {
mkdir($this->store_path.$this->session_id.'/'.$this->exercise_id.'/'.$this->question_id);
}
if (!empty($this->user_id) && !is_dir($this->store_path.$this->session_id.'/'.$this->exercise_id.'/'.$this->question_id.'/'.$this->user_id)) {
mkdir($this->store_path.$this->session_id.'/'.$this->exercise_id.'/'.$this->question_id.'/'.$this->user_id);
}
}
/**
* Setting parameters: course id, session id, etc
* @param array
* @param array
*/
function set_parameters($params = array()) {
//Setting course id
if (isset($params['course_id'])) {
$this->course_id = intval($params['course_id']);
} else {
$this->course_id = $params['course_id'] = api_get_course_int_id();
}
//Setting course info
if (isset($this->course_id)) {
$this->course_info = api_get_course_info_by_id($this->course_id);
}
//Setting session id
if (isset($params['session_id'])) {
$this->session_id = intval($params['session_id']);
} else {
$this->session_id = $params['session_id'] = api_get_session_id();
}
//Setting user ids
if (isset($params['user_id'])) {
$this->user_id = intval($params['user_id']);
} else {
$this->user_id = $params['user_id'] = api_get_user_id();
}
//Setting user ids
if (isset($params['exercise_id'])) {
$this->exercise_id = intval($params['exercise_id']);
} else {
$this->exercise_id = 0;
}
//Setting user ids
if (isset($params['question_id'])) {
$this->question_id = intval($params['question_id']);
} else {
$this->question_id = 0;
}
$this->can_edit = false;
if (api_is_allowed_to_edit()) {
$this->can_edit = true;
$this->can_edit = true;
} else {
if ($this->user_id == api_get_user_id()) {
$this->can_edit = true;
}
}
//Settings the params array
$this->params = $params;
$this->store_path = api_get_path(SYS_COURSE_PATH).$this->course_info['path'].'/exercises/';
$this->create_user_folder();
$this->create_user_folder();
$this->store_path = $this->store_path.implode('/', array($this->session_id, $this->exercise_id, $this->question_id, $this->user_id)).'/';
$this->filename = $this->generate_filename();
$this->store_filename = $this->store_path.$this->filename;
}
/**
* Generates the filename with the next format:
* (course_id)/(session_id)/(user_id)/(exercise_id)/(question_id)/(exe_id)
@ -138,160 +138,157 @@ class Nanogong {
if (!empty($this->params)) {
//filename
//course_id/session_id/user_id/exercise_id/question_id/exe_id
$filename_array = array($this->params['course_id'], $this->params['session_id'], $this->params['user_id'], $this->params['exercise_id'], $this->params['question_id'], $this->params['exe_id']);
$filename_array = array($this->params['course_id'], $this->params['session_id'], $this->params['user_id'], $this->params['exercise_id'], $this->params['question_id'], $this->params['exe_id']);
return implode('-', $filename_array);
} else {
return api_get_unique_id();
}
}
/**
* Delete audio file
* @return number
*/
function delete_files() {
$delete_found = 0;
if ($this->can_edit) {
$file = $this->load_filename_if_exists();
$path_info = pathinfo($file);
if ($this->can_edit) {
$file = $this->load_filename_if_exists();
$path_info = pathinfo($file);
foreach($this->available_extensions as $extension) {
$file_to_delete = $path_info['dirname'].'/'.$path_info['filename'].'.'.$extension;
if (is_file($file_to_delete)) {
unlink($file_to_delete);
$delete_found = 1;
}
}
}
}
return $delete_found;
}
/**
*
*
* Tricky stuff to deal with the feedback = 0 in exercises (all question per page)
* @param unknown_type $exe_id
*/
function replace_with_real_exe($exe_id) {
$filename = null;
//@ugly fix
foreach($this->available_extensions as $extension) {
foreach($this->available_extensions as $extension) {
$items = explode('-', $this->filename);
$items[5] = 'temp_exe';
$filename = implode('-', $items);
if (is_file($this->store_path.$filename.'.'.$extension)) {
$old_name = $this->store_path.$filename.'.'.$extension;
$filename = implode('-', $items);
if (is_file($this->store_path.$filename.'.'.$extension)) {
$old_name = $this->store_path.$filename.'.'.$extension;
$items = explode('-', $this->filename);
$items[5] = $exe_id;
$filename = $filename = implode('-', $items);
$new_name = $this->store_path.$filename.'.'.$extension;
//var_dump($old_name, $new_name);
rename($old_name, $new_name);
rename($old_name, $new_name);
break;
}
}
}
}
function load_filename_if_exists($load_from_database = false) {
$filename = null;
//@ugly fix
foreach($this->available_extensions as $extension) {
if (is_file($this->store_path.$this->filename.'.'.$extension)) {
foreach($this->available_extensions as $extension) {
if (is_file($this->store_path.$this->filename.'.'.$extension)) {
$filename = $this->filename.'.'.$extension;
break;
break;
}
}
//temp_exe
}
//temp_exe
if ($load_from_database) {
//Load the real filename just if exists
if (isset($this->params['exe_id']) && isset($this->params['user_id']) && isset($this->params['question_id']) && isset($this->params['session_id']) && isset($this->params['course_id'])) {
$attempt_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
$sql = "SELECT filename FROM $attempt_table
WHERE exe_id = ".$this->params['exe_id']." AND
user_id = ".$this->params['user_id']." AND
user_id = ".$this->params['user_id']." AND
question_id = ".$this->params['question_id']." AND
session_id = ".$this->params['session_id']." AND
session_id = ".$this->params['session_id']." AND
course_code = '".$this->course_info['code']."' LIMIT 1";
$result = Database::query($sql);
$result = Database::fetch_row($result,'ASSOC');
if (isset($result) && isset($result[0]) && !empty($result[0])) {
$filename = $result[0];
$filename = $result[0];
}
}
}
if (is_file($this->store_path.$filename)) {
return $this->store_path.$filename;
}
return null;
}
/**
*
*
* Get the URL of the file
* path courses/XXX/exercises/(session_id)/(exercise_id)/(question_id)/(user_id)/
*
*
* @return string
*/
function get_public_url($force_download = 0) {
$params = $this->get_params(true);
$url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=get_file&download='.$force_download.'&'.$params;
$url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=get_file&download='.$force_download.'&'.$params;
$params = $this->get_params();
$filename = basename($this->load_filename_if_exists());
$filename = basename($this->load_filename_if_exists());
$url = api_get_path(WEB_COURSE_PATH).$this->course_info['path'].'/exercises/'.
$params['session_id'].'/'.$params['exercise_id'].'/'.$params['question_id'].'/'.$params['user_id'].'/'.$filename;
$params['session_id'].'/'.$params['exercise_id'].'/'.$params['question_id'].'/'.$params['user_id'].'/'.$filename;
return $url;
}
/**
* Uploads the nanogong wav file
*/
* Uploads the nanogong wav file
*/
public function upload_file($is_nano = false) {
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
if (!empty($_FILES)) {
$upload_ok = process_uploaded_file($_FILES['file'], false);
if (!empty($_FILES)) {
$upload_ok = process_uploaded_file($_FILES['file'], false);
if (!is_uploaded_file($_FILES['file']['tmp_name'])) {
return 0;
}
if ($upload_ok) {
// Check if there is enough space to save the file
if (!DocumentManager::enough_space($_FILES['file']['size'], DocumentManager::get_course_quota())) {
return 0;
}
return 0;
}
//first we delete everything before uploading the file
$this->delete_files();
//Reload the filename variable
$file_name = add_ext_on_mime($_FILES['file']['name'], $_FILES['file']['type']);
$file_name = add_ext_on_mime($_FILES['file']['name'], $_FILES['file']['type']);
$file_name = strtolower($file_name);
$file_info = pathinfo($file_name);
$file_info = pathinfo($file_name);
if ($is_nano == true) {
$file_info['extension'] = 'wav';
$file_info['extension'] = 'wav';
}
$file_name = $this->filename.'.'.$file_info['extension'];
if (in_array($file_info['extension'], $this->available_extensions)) {
if (in_array($file_info['extension'], $this->available_extensions)) {
if (move_uploaded_file($_FILES['file']['tmp_name'], $this->store_path.$file_name)) {
$this->store_filename = $this->store_path.$file_name;
$this->store_filename = $this->store_path.$file_name;
//error_log('saved');
return 1;
}
}
}
}
}
return 0;
}
/**
* Show the audio file + a button to download
*
@ -299,26 +296,26 @@ class Nanogong {
public function show_audio_file($show_delete_button = false) {
$html = '';
$file_path = $this->load_filename_if_exists();
if (!empty($file_path)) {
$url = $this->get_public_url(true);
$actions = Display::url(Display::return_icon('save.png', get_lang('Download'), array(), ICON_SIZE_SMALL), $url, array('target'=>'_blank'));
$download_button = Display::url(get_lang('Download'), $url, array('class' =>'btn'));
if ($show_delete_button) {
if ($show_delete_button) {
$actions .= ' '.Display::url(Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL), "#", array('onclick'=>'delete_file();'));
}
$basename = basename($file_path);
$path_info = pathinfo($basename);
if ($path_info['extension'] == 'wav') {
$html .= '<script>
$(document).ready( function() {
var java_enabled = navigator.javaEnabled();
if (java_enabled) {
if (java_enabled) {
$("#nanogong_warning").hide();
$("#nanogong_player_id").show();
} else {
@ -327,12 +324,12 @@ class Nanogong {
}
});
</script>';
$html .= '<div id="nanogong_player_id" class="nanogong_player_container">';
$html .= '<div class="action_player">'.$actions.'</div>';
$html .= '<div class="nanogong_player">';
$html .= '<div class="action_player">'.$actions.'</div>';
$html .= '<div class="nanogong_player">';
$html .= '<applet id="nanogong_player" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="40" ALIGN="middle">';
$html .= '<param name="ShowRecordButton" value="false" />'; // default true
$html .= '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
//echo '<param name="ShowSpeedButton" value="false" />'; // default true
@ -343,47 +340,47 @@ class Nanogong {
//echo '<param name="EndTime" value="65" />';
$html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
//$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
//echo '<param name="SamplingRate" value="32000" />';
//echo '<param name="MaxDuration" value="60" />';
$html .= '<param name="SoundFileURL" value="'.$url.'" />';//load a file |(default "")
$html .= '</applet>';
$html .= '</applet>';
$html .= '</div>';
$html .= '</div>';
$html .= '<div id="nanogong_warning">'.Display::return_message(get_lang('BrowserDoesNotSupportNanogongPlayer'),'warning').$download_button.'</div>';
$html .= '<div id="nanogong_warning">'.Display::return_message(get_lang('BrowserDoesNotSupportNanogongPlayer'),'warning').$download_button.'</div>';
} elseif(in_array($path_info['extension'],array('mp3', 'ogg','wav'))) {
$js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
$html .= '<link rel="stylesheet" href="'.$js_path.'jquery-jplayer/skins/blue/jplayer.blue.monday.css" type="text/css">';
//$html .= '<link rel="stylesheet" href="' . $js_path . 'jquery-jplayer/skins/chamilo/jplayer.blue.monday.css" type="text/css">';
$html .= '<script type="text/javascript" src="'.$js_path.'jquery-jplayer/jquery.jplayer.min.js"></script>';
$html .= '<div class="nanogong_player"></div>';
$html .= '<br /><div class="action_player">'.$actions.'</div><br /><br /><br />';
$params = array('url' => $url,
'extension' =>$path_info['extension'],
'count'=> 1
'count'=> 1
);
$jquery = DocumentManager::generate_jplayer_jquery($params);
$html .= '<script>
$(document).ready( function() {
//Experimental changes to preview mp3, ogg files
'.$jquery.'
$(document).ready( function() {
//Experimental changes to preview mp3, ogg files
'.$jquery.'
});
</script>';
</script>';
$html .= DocumentManager::generate_media_preview(1, 'advanced');
}
}
return $html;
}
/*
var filename = document.getElementById("audio_title").value+".wav";
var filename = filename.replace(/\s/g, "_");//replace spaces by _
@ -393,7 +390,7 @@ class Nanogong {
var course_code="'.urlencode($course_code).'";
var urlnanogong="'.$url.'?filename="+filename+"&filepath="+filepath+"&dir="+dir+"&course_code="+course_code;
*/
/**
* Returns the nanogong javascript code
* @return string
@ -402,13 +399,13 @@ class Nanogong {
$params = $this->get_params(true);
$url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=save_file&'.$params.'&is_nano=1';
$url_load_file = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=show_audio&'.$params;
$url_delete = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=delete&'.$params;
$js = '<script language="javascript">
//lang vars
var lang_no_applet = "'.get_lang('NanogongNoApplet').'";
var lang_record_before_save = "'.get_lang('NanogongRecordBeforeSave').'";
var lang_give_a_title = "'.get_lang('NanogongGiveTitle').'";
@ -417,102 +414,102 @@ class Nanogong {
var lang_deleted = "'.get_lang('Deleted').'";
var is_nano = 0;
function check_gong() {
//var record = document.getElementById("nanogong");
var recorder;
var recorder;
var java_enabled = navigator.javaEnabled()
return java_enabled;
}
return java_enabled;
}
function show_simple_upload_form() {
$("#no_nanogong_div").show();
//$("#nanogong_div").hide();
$("#preview").hide();
}
$(document).ready( function() {
$(document).ready( function() {
$("#no_nanogong_div").hide();
$("#nanogong_div").hide();
var check_js = check_gong();
if (check_js == true) {
$("#nanogong_div").show();
$("#no_nanogong_div").hide();
is_nano = 1;
$(".nanogong_player").show();
$(".nanogong_player").show();
} else {
$("#no_nanogong_div").show();
$("#nanogong_div").hide();
$(".nanogong_player").hide();
}
//show always the mp3/ogg upload form (for dev purposes)
//$("#no_nanogong_div").show();
//$("#nanogong_div").hide();
//$("#nanogong_div").hide();
});
function delete_file() {
$.ajax({
url: "'.$url_delete.'",
success:function(data) {
$("#status_warning").hide();
$("#status_ok").hide();
$("#messages").html(data);
$("#messages").show();
$("#preview").hide();
$("#preview").hide();
}
});
}
function upload_file() {
$("#form_nanogong_simple").submit();
}
}
function send_voice() {
$("#status_warning").hide();
$("#status_ok").hide();
$("#messages").hide();
var check_js = check_gong();
var check_js = check_gong();
var recorder = document.getElementById("nanogong");
if (!recorder || !check_js) {
//alert(lang_no_applet)
$("#status_warning").html(lang_no_applet);
$("#status_warning").show();
//Show form
$("#no_nanogong_div").show();
$("#nanogong_div").hide();
$("#no_nanogong_div").show();
$("#nanogong_div").hide();
return false;
}
var duration = parseInt(recorder.sendGongRequest("GetMediaDuration", "audio")) || 0;
if (duration <= 0) {
$("#status_warning").html(lang_record_before_save);
$("#status_warning").show();
return false;
}
return false;
}
var applet = document.getElementById("nanogong");
var ret = applet.sendGongRequest("PostToForm", "'.$url.'", "file", "", "temp"); // PostToForm, postURL, inputname, cookie, filename
if (ret == 1) {
if (ret == 1) {
$("#status_ok").html(lang_submitted);
$("#status_ok").show();
$("#status_ok").show();
$.ajax({
url:"'.$url_load_file.'&is_nano="+is_nano,
success: function(data){
success: function(data){
$("#preview").html(data);
$("#preview").show();
}
});
$("#preview").show();
}
});
} else {
//alert(lang_submitted+"\n"+ret);
$("#status_warning").html(lang_failed_to_submit);
@ -523,30 +520,30 @@ class Nanogong {
</script>';
return $js;
}
/**
* Returns the HTML form to upload a nano file or upload a file
* Returns the HTML form to upload a nano file or upload a file
*/
function return_form($message = null) {
$params = $this->get_params(true);
$url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=save_file&'.$params;
//check browser support and load form
$array_browser = api_browser_support('check_browser');
$preview_file = $this->show_audio_file(true, true);
$preview_file = $this->show_audio_file(true, true);
$preview_file = Display::div($preview_file, array('id' => 'preview', 'style' => 'text-align:center; padding-left: 25px;'));
$html .= '<center>';
//Use normal upload file
$html .= Display::return_icon('microphone.png', get_lang('PressRecordButton'),'', ICON_SIZE_BIG);
$html .='<br />';
$html .= '<div id="nanogong_div">';
$html .= '<applet id="nanogong" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="40" align="middle">';
//echo '<param name="ShowRecordButton" value="false" />'; // default true
// echo '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
@ -558,69 +555,69 @@ class Nanogong {
//echo '<param name="EndTime" value="65" />';
$html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
//$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
//echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
//echo '<param name="MaxDuration" value="60" />';
//echo '<param name="SoundFileURL" value="http://somewhere.com/mysoundfile.wav" />';//load a file |(default "")
$html .= '</applet>';
$html .= '<br /><br /><br />';
$html .= '<br /><br /><br />';
$html .= '<form name="form_nanogong_advanced">';
$html .= '<input type="hidden" name="is_nano" value="1">';
$html .= '<a href="#" class="btn" onclick="send_voice()" />'.get_lang('SendRecord').'</a>';
$html .= '</form></div>';
$html .= '</form></div>';
$html .= Display::url(get_lang('ProblemsRecordingUploadYourOwnAudioFile'), 'javascript:void(0)', array('onclick' => 'show_simple_upload_form();'));
$html .= '<br /><br /><div id="no_nanogong_div">';
//$html .= Display::return_message(get_lang('BrowserNotSupportNanogongSend'), 'warning');
//$html .= Display::return_message(get_lang('BrowserNotSupportNanogongSend'), 'warning');
$html .= '<form id="form_nanogong_simple" class="form-search" action="'.$url.'" name="form_nanogong" method="POST" enctype="multipart/form-data">';
$html .= '<input type="file" name="file">';
$html .= '<a href="#" class="btn" onclick="upload_file()" />'.get_lang('UploadFile').'</a>';
$html .= '</form>';
$html .= '</div>';
$html .= '</form>';
$html .= '</div>';
$html .= '</center>';
$html .= '<div style="display:none" id="status_ok" class="confirmation-message"></div><div style="display:none" id="status_warning" class="warning-message"></div>';
$html .= '<div id="messages">'.$message.'</div>';
$html .= $preview_file;
return $html;
}
function get_params($return_as_query = false) {
if (empty($this->params)) {
return false;
}
}
if ($return_as_query) {
return http_build_query($this->params);
}
return $this->params;
return $this->params;
}
function get_param_value($attribute) {
if (isset($this->params[$attribute])) {
return $this->params[$attribute];
}
}
/**
* Show a button to load the form
* @return string
*/
function show_button() {
$params_string = $this->get_params(true);
$html .= '<br />'.Display::url(get_lang('RecordAnswer'),api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=show_form&'.$params_string.'&TB_iframe=true&height=400&width=500',
function show_button() {
$params_string = $this->get_params(true);
$html .= '<br />'.Display::url(get_lang('RecordAnswer'),api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=show_form&'.$params_string.'&TB_iframe=true&height=400&width=500',
array('class'=>'btn thickbox'));
$html .= '<br /><br />'.Display::return_message(get_lang('UseTheMessageBelowToAddSomeComments'));
$html .= '<br /><br />'.Display::return_message(get_lang('UseTheMessageBelowToAddSomeComments'));
return $html;
}
}
}
}

@ -77,12 +77,12 @@ class document_processor extends search_processor {
$doc_id = Database::escape_string($doc_id);
$sql = "SELECT * FROM $doc_table
WHERE $doc_table.id = $doc_id AND c_id = $course_id
WHERE $doc_table.id = $doc_id AND c_id = $course_id
LIMIT 1";
$dk_result = Database::query($sql);
$sql = "SELECT insert_user_id FROM $item_property_table
WHERE ref = $doc_id AND tool = '" . TOOL_DOCUMENT . "' AND c_id = $course_id
WHERE ref = $doc_id AND tool = '" . TOOL_DOCUMENT . "' AND c_id = $course_id
LIMIT 1";
$name = '';
if ($row = Database::fetch_array($dk_result)) {
@ -90,7 +90,6 @@ class document_processor extends search_processor {
$url = api_get_path(WEB_PATH) . 'courses/%s/document%s';
$url = sprintf($url, $course_path, $row['path']);
// Get the image path
include_once api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php';
$icon = FileManager::choose_image(basename($row['path']));
$thumbnail = api_get_path(WEB_CODE_PATH) . 'img/' . $icon;
$image = $thumbnail;

@ -10,6 +10,4 @@
/**
* Code
*/
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; // replace_dangerous_char()
require_once '../inc/global.inc.php';

@ -17,12 +17,6 @@ use \ChamiloSession as Session;
* INIT SECTION
*/
// name of the language file that needs to be included
//$language_file = "resourcelinker";// TODO: Repeated deleting and moving the rest of this lang file to trad4all
//include(api_get_path(SYS_CODE_PATH).'lang/english/resourcelinker.inc.php'); // TODO: Repeated deleting and moving the rest of this lang file to trad4all
//include(api_get_path(SYS_CODE_PATH).'lang/'.$_course['language'].'/resourcelinker.inc.php'); // TODO: Repeated deleting and moving the rest of this lang file to trad4all
include_once(api_get_path(LIBRARY_PATH).'fileDisplay.lib.php');
include(api_get_path(SYS_CODE_PATH).'exercice/hotpotatoes.lib.php');
/**
@ -246,7 +240,7 @@ function display_addedresource_link($type, $id, $style='')
{
$styling = ' class="'.$style.'"';
}
$course_id = api_get_course_int_id();
switch ($type)

@ -17,7 +17,6 @@ if (api_get_setting('allow_social_tool') !='true') {
}
require_once api_get_path(LIBRARY_PATH).'fckeditor/fckeditor.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
$tok = Security::get_token();
@ -43,24 +42,24 @@ $to_group = '';
$subject = '';
$message = '';
if (!empty($group_id) && $allowed_action) {
$group_info = GroupPortalManager::get_group_data($group_id);
$group_info = GroupPortalManager::get_group_data($group_id);
$is_member = GroupPortalManager::is_group_member($group_id);
if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED && !$is_member) {
api_not_allowed(true);
api_not_allowed(true);
}
$to_group = $group_info['name'];
if (!empty($message_id)) {
$message_info = MessageManager::get_message_by_id($message_id);
if ($allowed_action == 'reply_message_group') {
$message_info = MessageManager::get_message_by_id($message_id);
if ($allowed_action == 'reply_message_group') {
$subject = get_lang('Reply').': '.api_xml_http_response_encode($message_info['title']);
//$message = api_xml_http_response_encode($message_info['content']);
} else {
$subject = api_xml_http_response_encode($message_info['title']);
$message = api_xml_http_response_encode($message_info['content']);
}
}
}
}
}
$page_item = !empty($_GET['topics_page_nr'])?intval($_GET['topics_page_nr']):1;
@ -84,27 +83,27 @@ $page_topic = !empty($_GET['topics_page_nr'])?intval($_GET['topics_page_nr']):1
if (api_get_setting('allow_message_tool')=='true') {
//normal message
$user_info = api_get_user_info($userfriend_id);
//echo api_xml_http_response_encode(get_lang('To')).":&nbsp;&nbsp;".api_xml_http_response_encode($to_group);
//echo api_xml_http_response_encode(get_lang('To')).":&nbsp;&nbsp;".api_xml_http_response_encode($to_group);
$height = 180;
if ($allowed_action == 'add_message_group') {
$height = 140;
echo '<span style="color:red">*</span> '.api_xml_http_response_encode(get_lang('Title')).' :<br />';
echo '<input id="txt_subject_id" name="title" type="text" style="width:450px;" value="'.$subject.'"><br /><br />';
echo '<input id="txt_subject_id" name="title" type="text" style="width:450px;" value="'.$subject.'"><br /><br />';
}
//echo api_xml_http_response_encode(get_lang('Description')).' :<br />';
//echo api_xml_http_response_encode(get_lang('Description')).' :<br />';
$oFCKeditor = new FCKeditor('content') ;
$oFCKeditor->ToolbarSet = 'messages';
$oFCKeditor->Width = '95%';
$oFCKeditor->Height = $height;
$oFCKeditor->Value = $message;
$return = $oFCKeditor->CreateHtml();
$return = $oFCKeditor->CreateHtml();
echo $return;
if ($allowed_action == 'add_message_group') {
echo '<div><span style="color:red"> * </span>'.get_lang('FieldRequired').'</div>';
echo '<div><span style="color:red"> * </span>'.get_lang('FieldRequired').'</div>';
}
?>
?>
<br /><br />
<?php echo api_xml_http_response_encode(get_lang('AttachmentFiles')); ?> :<br />
<span id="filepaths"><div id="filepath_1"><input type="file" name="attach_1" size="20" /></div></span>
@ -112,15 +111,15 @@ $page_topic = !empty($_GET['topics_page_nr'])?intval($_GET['topics_page_nr']):1
<a href="javascript://" onclick="return add_image_form()">
<?php echo get_lang('AddOneMoreFile') ?></a>
</div>
(<?php echo api_xml_http_response_encode(sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize')))) ?>)
(<?php echo api_xml_http_response_encode(sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize')))) ?>)
<br />
<br />
<?php if ($allowed_action == 'add_message_group') { ?>
<button class="btn save" onclick="if(validate_text_empty(this.form.title.value,'<?php echo get_lang('YouShouldWriteASubject')?>')){return false;}" type="submit" value="<?php echo api_xml_http_response_encode(get_lang('SendMessage')); ?>"><?php echo api_xml_http_response_encode(get_lang('SendMessage')) ?></button>
<?php } else { ?>
<button class="btn save" type="submit" value="<?php echo api_xml_http_response_encode(get_lang('SendMessage')); ?>"><?php echo api_xml_http_response_encode(get_lang('SendMessage')) ?></button>
<?php } ?>
<?php } ?>
<?php } ?>
</dl>
</td>

@ -14,7 +14,6 @@
* Initialization
*/
require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
/**

@ -55,10 +55,6 @@ api_protect_course_script(true);
// Including necessary files
require_once 'work.lib.php';
include_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
$course_id = api_get_course_int_id();
$course_info = api_get_course_info();
$user_id = api_get_user_id();

@ -68,7 +68,6 @@ require_once $maindir.'course_info/download.lib.php';
/**Files inside '/../main/lib/' */
require_once $libdir.'urlmanager.lib.php';
require_once $libdir.'fileDisplay.lib.php';
require_once $libdir.'groupmanager.lib.php';
require_once $libdir.'usermanager.lib.php';
require_once $libdir.'social.lib.php';

Loading…
Cancel
Save