From bbd1d454763114524ed2ecaadd84d76dd4a349c8 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 26 Nov 2013 15:48:51 +0100 Subject: [PATCH] Minor - cleaning code --- main/inc/lib/document.lib.php | 2 +- main/inc/lib/main_api.lib.php | 30 ++++++++++++++----- .../inc/lib/wami-recorder/record_document.php | 1 - main/newscorm/lp_add_audio.php | 20 ++++++------- 4 files changed, 33 insertions(+), 20 deletions(-) diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php index 8935955d27..8451e317b5 100644 --- a/main/inc/lib/document.lib.php +++ b/main/inc/lib/document.lib.php @@ -916,7 +916,7 @@ class DocumentManager //first, delete the actual document... $document_id = self :: get_document_id($_course, $path); - $document_exists_in_disk = file_exists($base_work_dir . $path); + $document_exists_in_disk = file_exists($base_work_dir.$path); $new_path = $path . '_DELETED_' . $document_id; $current_session_id = api_get_session_id(); diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php index 549ae0edc1..aa185e37b1 100644 --- a/main/inc/lib/main_api.lib.php +++ b/main/inc/lib/main_api.lib.php @@ -3051,8 +3051,11 @@ function api_get_datetime($time = null) { * @param int The session ID (optional) * @return int -1 on error, 0 if invisible, 1 if visible */ -function api_get_item_visibility($_course, $tool, $id, $session=0) { - if (!is_array($_course) || count($_course) == 0 || empty($tool) || empty($id)) { return -1; } +function api_get_item_visibility($_course, $tool, $id, $session=0) +{ + if (!is_array($_course) || count($_course) == 0 || empty($tool) || empty($id)) { + return -1; + } $tool = Database::escape_string($tool); $id = Database::escape_string($id); $session = (int) $session; @@ -3089,7 +3092,18 @@ function api_get_item_visibility($_course, $tool, $id, $session=0) { * @version January 2005 * @desc update the item_properties table (if entry not exists, insert) of the course */ -function api_item_property_update($_course, $tool, $item_id, $lastedit_type, $user_id, $to_group_id = 0, $to_user_id = null, $start_visible = 0, $end_visible = 0, $session_id = 0) { +function api_item_property_update( + $_course, + $tool, + $item_id, + $lastedit_type, + $user_id, + $to_group_id = 0, + $to_user_id = null, + $start_visible = 0, + $end_visible = 0, + $session_id = 0 +) { // Definition of variables. $tool = Database::escape_string($tool); @@ -3257,14 +3271,14 @@ function api_item_property_update($_course, $tool, $item_id, $lastedit_type, $us * @param string tool name, linked to 'rubrique' of the course tool_list (Warning: language sensitive !!) * @param int id of the item itself, linked to key of every tool ('id', ...), "*" = all items of the tool */ -function api_get_item_property_by_tool($tool, $course_code, $session_id = null) { +function api_get_item_property_by_tool($tool, $course_code, $session_id = null) +{ $course_info = api_get_course_info($course_code); $tool = Database::escape_string($tool); // Definition of tables. $item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY); - $session_condition = ''; $session_id = intval($session_id); $session_condition = ' AND id_session = '.$session_id; $course_id = $course_info['real_id']; @@ -6526,7 +6540,8 @@ function api_get_bytes_memory_limit($mem){ * @return $user_info (array): user_id, lastname, firstname, username, email, ... * @author Yannick Warnier */ -function api_get_user_info_from_official_code($official_code = '') { +function api_get_user_info_from_official_code($official_code = '') +{ if (empty($official_code)) { return false; } $sql = "SELECT * FROM ".Database :: get_main_table(TABLE_MAIN_USER)." WHERE official_code ='".Database::escape_string($official_code)."'"; $result = Database::query($sql); @@ -6644,7 +6659,8 @@ function api_get_user_blocked_by_captcha($username) * @return string * @author hubert borderiou */ -function api_get_short_text_from_html($in_html, $in_number_char) { +function api_get_short_text_from_html($in_html, $in_number_char) +{ $out_res = api_remove_tags_with_space($in_html, false); $postfix = "..."; if (strlen($out_res) > $in_number_char) { diff --git a/main/inc/lib/wami-recorder/record_document.php b/main/inc/lib/wami-recorder/record_document.php index 05efff625a..424b3d8292 100644 --- a/main/inc/lib/wami-recorder/record_document.php +++ b/main/inc/lib/wami-recorder/record_document.php @@ -39,7 +39,6 @@ if (empty($content)) { exit; } -//security extension $ext = explode('.', $waminame); $ext = strtolower($ext[sizeof($ext) - 1]); diff --git a/main/newscorm/lp_add_audio.php b/main/newscorm/lp_add_audio.php index c9f2cf06ad..a049047fc1 100644 --- a/main/newscorm/lp_add_audio.php +++ b/main/newscorm/lp_add_audio.php @@ -16,7 +16,6 @@ api_protect_course_script(); require_once 'learnpath_functions.inc.php'; require_once 'resourcelinker.inc.php'; - $is_allowed_to_edit = api_is_allowed_to_edit(null, true); $isStudentView = (int) $_REQUEST['isStudentView']; @@ -81,12 +80,8 @@ if (empty($lp_item_id)) { $lp_item = new learnpathItem($lp_item_id); $tpl = new Template($tool_name); $form = new FormValidator('add_audio', 'post', api_get_self().'?action=add_audio&id='.$lp_item_id, null, array('enctype' => 'multipart/form-data')); - - - $suredel = trim(get_lang('AreYouSureToDelete')); - $file = null; $lpPathInfo = $_SESSION['oLP']->generate_lp_folder(api_get_course_info()); @@ -106,7 +101,6 @@ $page .= ''; $page .= '
'; - $form->addElement('header', get_lang('RecordYourVoice')); $tpl->assign('lp_item_id', $lp_item_id); @@ -131,18 +125,22 @@ if (!empty($file)) { $form->addElement('button', 'submit', get_lang('Edit')); $course_info = api_get_course_info(); -$document_tree = DocumentManager::get_document_preview($course_info, null, null, 0, false, '/audio', 'lp_controller.php?action=add_audio&id='.$lp_item_id); +$document_tree = DocumentManager::get_document_preview( + $course_info, + null, + null, + 0, + false, + '/audio', + 'lp_controller.php?action=add_audio&id='.$lp_item_id +); $page .= $form->return_form(); - $page .= ''.get_lang('SelectAnAudioFileFromDocuments').''; $page .= $document_tree; - $page .= '
'; - $page .= ''; - $tpl->assign('content', $page); $content = $tpl->fetch('default/learnpath/lp_upload_audio.tpl'); $tpl->display_one_col_template();