chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - Format code, fix PHP warning

Browse Source
1.10.x
Julio Montoya 10 years ago
parent 70e4171cdc
commit 4f152ade52
4 changed files with 35 additions and 57 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      main/newscorm/lp_controller.php
  2. 12
      main/newscorm/lp_edit_item.php
  3. 10
      main/newscorm/lp_list_search.php
  4. 56
      main/newscorm/lp_move_item.php

14
main/newscorm/lp_controller.php
Unescape View File

@ -634,16 +634,22 @@ switch ($action) {
if (isset($_FILES['mp3'])) {
$audio = $_FILES['mp3'];
}
$description = isset($_POST['description']) ? $_POST['description'] : '';
$prerequisites = isset($_POST['prerequisites']) ? $_POST['prerequisites'] : '';
$maxTimeAllowed = isset($_POST['maxTimeAllowed']) ? $_POST['maxTimeAllowed'] : '';
$url = isset($_POST['url']) ? $_POST['url'] : '';
$_SESSION['oLP']->edit_item(
$_REQUEST['id'],
$_POST['parent'],
$_POST['previous'],
$post_title,
$_POST['description'],
$_POST['prerequisites'],
$description,
$prerequisites,
$audio,
$_POST['maxTimeAllowed'],
$_POST['url']
$maxTimeAllowed,
$url
);
if (isset($_POST['content_lp'])) {

12
main/newscorm/lp_edit_item.php
Unescape View File

@ -56,8 +56,9 @@ if ((!$is_allowed_to_edit) || ($isStudentView)) {
// From here on, we are admin because of the previous condition, so don't check anymore.
$course_id = api_get_course_int_id();
$sql_query = "SELECT * FROM $tbl_lp WHERE c_id = $course_id AND id = $learnpath_id";
$result = Database::query($sql_query);
$sql = "SELECT * FROM $tbl_lp
WHERE c_id = $course_id AND id = $learnpath_id";
$result = Database::query($sql);
$therow = Database::fetch_array($result);
/*
@ -73,8 +74,8 @@ if (isset($_SESSION['gradebook'])) {
if (!empty($gradebook) && $gradebook == 'view') {
$interbreadcrumb[] = array (
'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
'name' => get_lang('ToolGradebook')
'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
'name' => get_lang('ToolGradebook')
);
}
$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths'));
@ -120,7 +121,8 @@ echo '<div class="col-md-3">';
$path_item = isset($_GET['path_item']) ? $_GET['path_item'] : 0;
$path_item = Database::escape_string($path_item);
$tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
$sql_doc = "SELECT path FROM " . $tbl_doc . " WHERE c_id = $course_id AND id = '". $path_item."' ";
$sql_doc = "SELECT path FROM " . $tbl_doc . "
WHERE c_id = $course_id AND id = '". $path_item."' ";
$res_doc = Database::query($sql_doc);
$path_file = Database::result($res_doc, 0, 0);

10
main/newscorm/lp_list_search.php
Unescape View File

@ -26,9 +26,9 @@ if (isset($_SESSION['gradebook'])){
if (!empty($gradebook) && $gradebook == 'view') {
$interbreadcrumb[]= array (
'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
'name' => get_lang('ToolGradebook')
);
'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
'name' => get_lang('ToolGradebook')
);
}
$interbreadcrumb[] = array('url' => './index.php', 'name' => get_lang(ucfirst(TOOL_SEARCH)));
@ -90,7 +90,7 @@ foreach ($specific_fields as $specific_field) {
// Get right group of terms to show on multiple select.
$fixed_queries = array();
$course_filter = NULL;
$course_filter = null;
if ( ($cid=api_get_course_id()) != -1 ) {
// Results only from actual course.
$course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID . $cid);
@ -99,7 +99,7 @@ if ( ($cid=api_get_course_id()) != -1 ) {
if (count($term_array)) {
$fixed_queries = chamilo_join_queries($term_array, null, $op);
if ($course_filter != NULL) {
if ($course_filter != null) {
$fixed_queries = chamilo_join_queries($fixed_queries, $course_filter, 'and');
}
} else {

56
main/newscorm/lp_move_item.php
Unescape View File

@ -10,20 +10,11 @@
* @author Yannick Warnier <ywarnier@beeznest.org> - cleaning and update for new SCORM tool
* @package chamilo.learnpath
*/
/**
* Code
*/
/* INIT SECTION */
$this_section = SECTION_COURSES;
api_protect_course_script();
/* Libraries */
// The main_api.lib.php, database.lib.php and display.lib.php
// libraries are included by default.
include 'learnpath_functions.inc.php';
//include '../resourcelinker/resourcelinker.inc.php';
include 'resourcelinker.inc.php';
@ -55,61 +46,47 @@ $_SESSION['oLP']->get_js_dropdown_array() .
$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
$tbl_lp = Database::get_course_table(TABLE_LP_MAIN);
$tbl_lp = Database::get_course_table(TABLE_LP_MAIN);
$tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
$tbl_lp_view = Database::get_course_table(TABLE_LP_VIEW);
$isStudentView = (int) $_REQUEST['isStudentView'];
$learnpath_id = (int) $_REQUEST['lp_id'];
$submit = $_POST['submit_button'];
/*
$chapter_id = $_GET['chapter_id'];
$title = $_POST['title'];
$description = $_POST['description'];
$Submititem = $_POST['Submititem'];
$action = $_REQUEST['action'];
$id = (int) $_REQUEST['id'];
$type = $_REQUEST['type'];
$direction = $_REQUEST['direction'];
$moduleid = $_REQUEST['moduleid'];
$prereq = $_REQUEST['prereq'];
$type = $_REQUEST['type'];
*/
$isStudentView = isset($_REQUEST['isStudentView']) ? (int) $_REQUEST['isStudentView'] : '';
$learnpath_id = (int) $_REQUEST['lp_id'];
$submit = isset($_POST['submit_button']) ? $_POST['submit_button'] : '';
/* MAIN CODE */
// Using the resource linker as a tool for adding resources to the learning path.
if ($action == 'add' && $type == 'learnpathitem') {
$htmlHeadXtra[] = "<script language='JavaScript' type='text/javascript'> window.location=\"../resourcelinker/resourcelinker.php?source_id=5&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no\"; </script>";
$htmlHeadXtra[] = "<script type='text/javascript'> window.location=\"../resourcelinker/resourcelinker.php?source_id=5&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no\"; </script>";
}
if ((!$is_allowed_to_edit) || ($isStudentView)) {
error_log('New LP - User not authorized in lp_add_item.php');
header('location:lp_controller.php?action=view&lp_id='.$learnpath_id);
}
// From here on, we are admin because of the previous condition, so don't check anymore.
$course_id = api_get_course_int_id();
$sql_query = "SELECT * FROM $tbl_lp WHERE c_id = $course_id AND id = $learnpath_id";
$sql = "SELECT * FROM $tbl_lp
WHERE c_id = $course_id AND id = $learnpath_id";
$result = Database::query($sql_query);
$result = Database::query($sql);
$therow = Database::fetch_array($result);
//$admin_output = '';
/*
Course admin section
- all the functions not available for students - always available in this case (page only shown to admin)
*/
/* SHOWING THE ADMIN TOOLS */
if (isset($_SESSION['gradebook'])){
if (isset($_SESSION['gradebook'])) {
$gradebook= $_SESSION['gradebook'];
}
if (!empty($gradebook) && $gradebook == 'view') {
$interbreadcrumb[] = array (
'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
'name' => get_lang('ToolGradebook')
);
'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
'name' => get_lang('ToolGradebook')
);
}
$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths'));
@ -121,10 +98,8 @@ $show_learn_path = true;
$lp_theme_css = $_SESSION['oLP']->get_theme();
Display::display_header(get_lang('Move'), 'Path');
//api_display_tool_title($therow['name']);
$suredel = trim(get_lang('AreYouSureToDelete'));
//$suredelstep = trim(get_lang('AreYouSureToDeleteSteps'));
?>
<script type='text/javascript'>
/* <![CDATA[ */
@ -150,12 +125,7 @@ function confirmation(name)
</script>
<?php
//echo $admin_output;
/* DISPLAY SECTION */
echo $_SESSION['oLP']->build_action_menu();
echo '<div class="row">';
echo '<div class="col-md-3">';
echo $_SESSION['oLP']->return_new_tree();
@ -165,7 +135,7 @@ echo '<div class="col-md-9">';
if (isset($is_success) && $is_success === true) {
$msg = '<div class="lp_message" style="margin-bottom:10px;">';
$msg .= 'The item has been moved.';
$msg .= 'The item has been moved.';
$msg .= '</div>';
echo $_SESSION['oLP']->display_item($_GET['id'], $msg);
} else {

Write Preview
Loading…
Cancel
Save