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.

Browse Source
1.9.x
Julio Montoya 11 years ago
parent 60410c7165
commit f13a111e2d
2 changed files with 45 additions and 47 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. 30
      main/newscorm/learnpath.class.php
  2. 62
      main/newscorm/lp_add_item.php

30
main/newscorm/learnpath.class.php
Unescape View File

@ -6153,7 +6153,8 @@ class learnpath
} }
/** /**
* Function that displays a list with al the resources that could be added to the learning path * Function that displays a list with al the resources that
* could be added to the learning path
* @return string * @return string
*/ */
public function display_resources() public function display_resources()
@ -6176,12 +6177,12 @@ class learnpath
$forums = $this->get_forums(null, $course_code); $forums = $this->get_forums(null, $course_code);
$headers = array( $headers = array(
Display::return_icon('folder_document.png', get_lang('Documents'), array(), 64), Display::return_icon('folder_document.png', get_lang('Documents'), array(), ICON_SIZE_BIG),
Display::return_icon('quiz.png', get_lang('Quiz'), array(), 64), Display::return_icon('quiz.png', get_lang('Quiz'), array(), ICON_SIZE_BIG),
Display::return_icon('links.png', get_lang('Links'), array(), 64), Display::return_icon('links.png', get_lang('Links'), array(), ICON_SIZE_BIG),
Display::return_icon('works.png', get_lang('Works'), array(), 64), Display::return_icon('works.png', get_lang('Works'), array(), ICON_SIZE_BIG),
Display::return_icon('forum.png', get_lang('Forums'), array(), 64), Display::return_icon('forum.png', get_lang('Forums'), array(), ICON_SIZE_BIG),
Display::return_icon('add_learnpath_section.png', get_lang('NewChapter'), array(), 64) Display::return_icon('add_learnpath_section.png', get_lang('NewChapter'), array(), ICON_SIZE_BIG)
); );
echo Display::display_normal_message(get_lang('ClickOnTheLearnerViewToSeeYourLearningPath')); echo Display::display_normal_message(get_lang('ClickOnTheLearnerViewToSeeYourLearningPath'));
$chapter = $_SESSION['oLP']->display_item_form('chapter', get_lang('EnterDataNewChapter'), 'add_item'); $chapter = $_SESSION['oLP']->display_item_form('chapter', get_lang('EnterDataNewChapter'), 'add_item');
@ -7540,9 +7541,9 @@ class learnpath
/** /**
* Return HTML form to add/edit a link item * Return HTML form to add/edit a link item
* @param string Action (add/edit) * @param string $action (add/edit)
* @param integer Item ID if exists * @param integer $id Item ID if exists
* @param mixed Extra info * @param mixed $extra_info
* @return string HTML form * @return string HTML form
*/ */
public function display_link_form($action = 'add', $id = 0, $extra_info = '') public function display_link_form($action = 'add', $id = 0, $extra_info = '')
@ -8065,8 +8066,6 @@ class learnpath
WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id . " AND parent_item_id = 0 WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id . " AND parent_item_id = 0
ORDER BY display_order ASC"; ORDER BY display_order ASC";
$res_zero = Database::query($sql_zero); $res_zero = Database::query($sql_zero);
global $charset;
$i = 0; $i = 0;
while ($row_zero = Database :: fetch_array($res_zero)) { while ($row_zero = Database :: fetch_array($res_zero)) {
@ -8449,8 +8448,10 @@ class learnpath
$session_id = api_get_session_id(); $session_id = api_get_session_id();
$condition_session = api_get_session_condition($session_id); $condition_session = api_get_session_condition($session_id);
$sql_link = "SELECT id, title FROM $tbl_link WHERE c_id = ".$course_id." $condition_session ORDER BY title ASC"; $sql = "SELECT id, title FROM $tbl_link
$res_link = Database::query($sql_link); WHERE c_id = ".$course_id." $condition_session
ORDER BY title ASC";
$res_link = Database::query($sql);
$return = '<ul class="lp_resource">'; $return = '<ul class="lp_resource">';
$return .= '<li class="lp_resource_element">'; $return .= '<li class="lp_resource_element">';
@ -8474,6 +8475,7 @@ class learnpath
} }
} }
$return .= '</ul>'; $return .= '</ul>';
return $return; return $return;
} }

62
main/newscorm/lp_add_item.php
Unescape View File

@ -11,9 +11,6 @@
* @author Julio Montoya - Improving the list of templates * @author Julio Montoya - Improving the list of templates
* @package chamilo.learnpath * @package chamilo.learnpath
*/ */
/**
* INIT SECTION
*/
$this_section = SECTION_COURSES; $this_section = SECTION_COURSES;
@ -21,6 +18,8 @@ api_protect_course_script();
include 'learnpath_functions.inc.php'; include 'learnpath_functions.inc.php';
include 'resourcelinker.inc.php'; include 'resourcelinker.inc.php';
/** @var learnpath $learnPath */
$learnPath = $_SESSION['oLP'];
$language_file = 'learnpath'; $language_file = 'learnpath';
@ -94,7 +93,7 @@ function InnerDialogLoaded() {
return B.ClickFrame(); return B.ClickFrame();
};'."\n". };'."\n".
$_SESSION['oLP']->get_js_dropdown_array() . $learnPath->get_js_dropdown_array() .
'function load_cbo(id){' ."\n" . 'function load_cbo(id){' ."\n" .
'if (!id) {return false;}'. 'if (!id) {return false;}'.
@ -129,9 +128,6 @@ $(function() {
/* Constants and variables */ /* Constants and variables */
//Already set in lp_controller.php
//$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
$isStudentView = isset($_REQUEST['isStudentView']) ? $_REQUEST['isStudentView'] : null; $isStudentView = isset($_REQUEST['isStudentView']) ? $_REQUEST['isStudentView'] : null;
$learnpath_id = isset($_REQUEST['lp_id']) ? intval($_REQUEST['lp_id']) : null; $learnpath_id = isset($_REQUEST['lp_id']) ? intval($_REQUEST['lp_id']) : null;
$submit = isset($_POST['submit_button']) ? $_POST['submit_button'] : null; $submit = isset($_POST['submit_button']) ? $_POST['submit_button'] : null;
@ -141,7 +137,7 @@ $action = isset($_GET['action']) ? $_GET['action'] : null;
// Using the resource linker as a tool for adding resources to the learning path. // Using the resource linker as a tool for adding resources to the learning path.
if ($action == 'add' && $type == 'learnpathitem') { 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)) { if ((!$is_allowed_to_edit) || ($isStudentView)) {
error_log('New LP - User not authorized in lp_add_item.php'); error_log('New LP - User not authorized in lp_add_item.php');
@ -162,15 +158,15 @@ if (!empty($gradebook) && $gradebook == 'view') {
} }
$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths')); $interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths'));
$interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", 'name' => $_SESSION['oLP']->get_name()); $interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", 'name' => $learnPath->get_name());
switch ($type) { switch ($type) {
case 'chapter': case 'chapter':
$interbreadcrumb[]= array ('url' => 'lp_controller.php?action=add_item&type=step&lp_id='.$_SESSION['oLP']->get_id(), 'name' => get_lang('NewStep')); $interbreadcrumb[]= array ('url' => 'lp_controller.php?action=add_item&type=step&lp_id='.$learnPath->get_id(), 'name' => get_lang('NewStep'));
$interbreadcrumb[]= array ('url' => '#', 'name' => get_lang('NewChapter')); $interbreadcrumb[]= array ('url' => '#', 'name' => get_lang('NewChapter'));
break; break;
case 'document': case 'document':
$interbreadcrumb[]= array ('url' => 'lp_controller.php?action=add_item&type=step&lp_id='.$_SESSION['oLP']->get_id(), 'name' => get_lang('NewStep')); $interbreadcrumb[]= array ('url' => 'lp_controller.php?action=add_item&type=step&lp_id='.$learnPath->get_id(), 'name' => get_lang('NewStep'));
break; break;
default: default:
$interbreadcrumb[]= array ('url' => '#', 'name' => get_lang('NewStep')); $interbreadcrumb[]= array ('url' => '#', 'name' => get_lang('NewStep'));
@ -183,7 +179,7 @@ if ($action == 'add_item' && $type == 'document' ) {
// Theme calls. // Theme calls.
$show_learn_path = true; $show_learn_path = true;
$lp_theme_css = $_SESSION['oLP']->get_theme(); $lp_theme_css = $learnPath->get_theme();
Display::display_header(null, 'Path'); Display::display_header(null, 'Path');
@ -241,12 +237,12 @@ $(document).ready(function() {
/* DISPLAY SECTION */ /* DISPLAY SECTION */
echo $_SESSION['oLP']->build_action_menu(); echo $learnPath->build_action_menu();
echo '<div class="row-fluid" style="overflow:hidden">'; echo '<div class="row-fluid" style="overflow:hidden">';
echo '<div id="lp_sidebar" class="span4">'; echo '<div id="lp_sidebar" class="span4">';
echo $_SESSION['oLP']->return_new_tree(null, true); echo $learnPath->return_new_tree(null, true);
$message = isset($_REQUEST['message']) ? $_REQUEST['message'] : null; $message = isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
@ -274,74 +270,74 @@ if (isset($new_item_id) && is_numeric($new_item_id)) {
switch ($type) { switch ($type) {
case 'chapter': case 'chapter':
echo $_SESSION['oLP']->display_manipulate($new_item_id, $_POST['type']); echo $learnPath->display_manipulate($new_item_id, $_POST['type']);
Display::display_confirmation_message(get_lang('NewChapterCreated')); Display::display_confirmation_message(get_lang('NewChapterCreated'));
break; break;
case TOOL_LINK: case TOOL_LINK:
echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); echo $learnPath->display_manipulate($new_item_id, $type);
Display::display_confirmation_message(get_lang('NewLinksCreated')); Display::display_confirmation_message(get_lang('NewLinksCreated'));
break; break;
case TOOL_STUDENTPUBLICATION: case TOOL_STUDENTPUBLICATION:
echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); echo $learnPath->display_manipulate($new_item_id, $type);
Display::display_confirmation_message(get_lang('NewStudentPublicationCreated')); Display::display_confirmation_message(get_lang('NewStudentPublicationCreated'));
break; break;
case 'module': case 'module':
echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); echo $learnPath->display_manipulate($new_item_id, $type);
Display::display_confirmation_message(get_lang('NewModuleCreated')); Display::display_confirmation_message(get_lang('NewModuleCreated'));
break; break;
case TOOL_QUIZ: case TOOL_QUIZ:
echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); echo $learnPath->display_manipulate($new_item_id, $type);
Display::display_confirmation_message(get_lang('NewExerciseCreated')); Display::display_confirmation_message(get_lang('NewExerciseCreated'));
break; break;
case TOOL_DOCUMENT: case TOOL_DOCUMENT:
Display::display_confirmation_message(get_lang('NewDocumentCreated')); Display::display_confirmation_message(get_lang('NewDocumentCreated'));
echo $_SESSION['oLP']->display_item($new_item_id); echo $learnPath->display_item($new_item_id);
break; break;
case TOOL_FORUM: case TOOL_FORUM:
echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); echo $learnPath->display_manipulate($new_item_id, $type);
Display::display_confirmation_message(get_lang('NewForumCreated')); Display::display_confirmation_message(get_lang('NewForumCreated'));
break; break;
case 'thread': case 'thread':
echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); echo $learnPath->display_manipulate($new_item_id, $type);
Display::display_confirmation_message(get_lang('NewThreadCreated')); Display::display_confirmation_message(get_lang('NewThreadCreated'));
break; break;
} }
} else { } else {
switch ($type) { switch ($type) {
case 'chapter': case 'chapter':
echo $_SESSION['oLP']->display_item_form($type, get_lang('EnterDataNewChapter')); echo $learnPath->display_item_form($type, get_lang('EnterDataNewChapter'));
break; break;
case 'module': case 'module':
echo $_SESSION['oLP']->display_item_form($type, get_lang('EnterDataNewModule')); echo $learnPath->display_item_form($type, get_lang('EnterDataNewModule'));
break; break;
case 'document': case 'document':
if (isset($_GET['file']) && is_numeric($_GET['file'])) { if (isset($_GET['file']) && is_numeric($_GET['file'])) {
echo $_SESSION['oLP']->display_document_form('add', 0, $_GET['file']); echo $learnPath->display_document_form('add', 0, $_GET['file']);
} else { } else {
echo $_SESSION['oLP']->display_document_form('add', 0); echo $learnPath->display_document_form('add', 0);
} }
break; break;
case 'hotpotatoes': case 'hotpotatoes':
echo $_SESSION['oLP']->display_hotpotatoes_form('add', 0, $_GET['file']); echo $learnPath->display_hotpotatoes_form('add', 0, $_GET['file']);
break; break;
case 'quiz': case 'quiz':
echo Display::display_warning_message(get_lang('ExerciseCantBeEditedAfterAddingToTheLP')); echo Display::display_warning_message(get_lang('ExerciseCantBeEditedAfterAddingToTheLP'));
echo $_SESSION['oLP']->display_quiz_form('add', 0, $_GET['file']); echo $learnPath->display_quiz_form('add', 0, $_GET['file']);
break; break;
case 'forum': case 'forum':
echo $_SESSION['oLP']->display_forum_form('add', 0, $_GET['forum_id']); echo $learnPath->display_forum_form('add', 0, $_GET['forum_id']);
break; break;
case 'thread': case 'thread':
echo $_SESSION['oLP']->display_thread_form('add', 0, $_GET['thread_id']); echo $learnPath->display_thread_form('add', 0, $_GET['thread_id']);
break; break;
case 'link': case 'link':
echo $_SESSION['oLP']->display_link_form('add', 0, $_GET['file']); echo $learnPath->display_link_form('add', 0, $_GET['file']);
break; break;
case 'student_publication': case 'student_publication':
echo $_SESSION['oLP']->display_student_publication_form('add', 0, $_GET['file']); echo $learnPath->display_student_publication_form('add', 0, $_GET['file']);
break; break;
case 'step': case 'step':
$_SESSION['oLP']->display_resources(); $learnPath->display_resources();
break; break;
} }
} }

Write Preview
Loading…
Cancel
Save