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 241a4490d9
commit a7861d33ea
5 changed files with 28 additions and 29 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. 1
      main/course_home/activity.php
  2. 26
      main/course_home/course_home.php
  3. 20
      main/inc/introductionSection.inc.php
  4. 8
      main/inc/lib/display.lib.php
  5. 2
      main/inc/lib/sessionmanager.lib.php

1
main/course_home/activity.php
Unescape View File

@ -65,7 +65,6 @@ if ($enabled == 'true') {
// COURSE ADMIN ONLY VIEW
// Start of tools for CourseAdmins (teachers/tutors)
if ($session_id == 0 && api_is_course_admin() && api_is_allowed_to_edit(null, true)) {
$content .= '<div class="courseadminview" style="border:0px; margin-top: 0px;padding:0px;">
<div class="normal-message" id="id_normal_message" style="display:none">';

26
main/course_home/course_home.php
Unescape View File

@ -28,13 +28,10 @@
* @package chamilo.course_home
*/
/* INIT SECTION */
use \ChamiloSession as Session;
// Name of the language file that needs to be included.
$language_file = array('course_home','courses');
$language_file = array('course_home', 'courses');
$use_anonymous = true;
// Inlcuding the global initialization file.
@ -48,9 +45,7 @@ require_once dirname(__FILE__).'/../inc/global.inc.php';
//unset($_SESSION['lpobject']);
$htmlHeadXtra[] ='<script>
/* option show/hide thematic-block */
$(document).ready(function(){
$("#thematic-show").click(function(){
$(".btn-hide-thematic").hide();
@ -64,7 +59,6 @@ $(document).ready(function(){
});
});
$(document).ready(function() {
$(".make_visible_and_invisible").attr("href", "javascript:void(0);");
$(".make_visible_and_invisible > img").click(function () {
@ -119,7 +113,6 @@ $(document).ready(function() {
});
});
</script>';
// The section for the tabs
@ -140,11 +133,11 @@ define('TOOL_DRH', 'tool_drh');
define('TOOL_STUDENT_VIEW', 'toolstudentview');
define('TOOL_ADMIN_VISIBLE', 'tooladminvisible');
$user_id = api_get_user_id();
$course_code = api_get_course_id();
$user_id = api_get_user_id();
$course_code = api_get_course_id();
$show_message = '';
//Deleting group session
// Deleting group session
Session::erase('toolgroup');
Session::erase('_gid');
@ -255,12 +248,15 @@ $content = Display::return_introduction_section(TOOL_COURSE_HOMEPAGE, array(
the setting homepage_view is adjustable through
the platform administration section */
//require_once api_get_path(LIBRARY_PATH).'course_home.lib.php';
if ($show_autolunch_lp_warning) {
$show_message .= Display::return_message(get_lang('TheLPAutoLaunchSettingIsONStudentsWillBeRedirectToAnSpecificLP'),'warning');
$show_message .= Display::return_message(
get_lang('TheLPAutoLaunchSettingIsONStudentsWillBeRedirectToAnSpecificLP'),
'warning'
);
}
if (api_get_setting('homepage_view') == 'activity' || api_get_setting('homepage_view') == 'activity_big') {
if (api_get_setting('homepage_view') == 'activity' ||
api_get_setting('homepage_view') == 'activity_big'
) {
require 'activity.php';
} elseif (api_get_setting('homepage_view') == '2column') {
require '2column.php';

20
main/inc/introductionSection.inc.php
Unescape View File

@ -1,5 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* The INTRODUCTION MICRO MODULE is used to insert and edit
* an introduction section on a Chamilo module or on the course homepage.
@ -117,7 +118,6 @@ if ($intro_editAllowed) {
}
}
/* INTRODUCTION MICRO MODULE - DISPLAY SECTION */
/* Retrieves the module introduction text, if exist */
@ -126,6 +126,7 @@ if ($intro_editAllowed) {
$intro_content = null;
$sql = "SELECT intro_text FROM $TBL_INTRODUCTION
WHERE c_id = $course_id AND id='".Database::escape_string($moduleId)."' AND session_id = 0";
$intro_dbQuery = Database::query($sql);
if (Database::num_rows($intro_dbQuery) > 0) {
$intro_dbResult = Database::fetch_array($intro_dbQuery);
@ -243,7 +244,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
<div class="row-fluid score-thematic">
<div class="span8">';
$thematic_description_html .=
'<div class="span6 name-student">
'<div class="span6 name-student">
<h2>' . $userInfo['firstName'] . '</h2>
<h3>' . $userInfo['lastName'] . '</h3>
</div>
@ -256,7 +257,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
</div>
</div>';
$thematic_description_html .=
'<div class="span4">
'<div class="span4">
<a id="thematic-show" class="btn btn-small btn-primary accordion-toggle btn-hide-thematic" href="#pross" data-toggle="collapse" data-parent="#progress-bar-course">
' . get_lang('SeeDetail') . '
</a>
@ -268,7 +269,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
</div>
</div>';
$thematic_description_html .=
'<div class="accordion-body collapse in" id="pross" style="height: auto !important;">
'<div class="accordion-body collapse in" id="pross" style="height: auto !important;">
<div class="accordion-inner">
<div class="row-fluid">
<div class="span4">
@ -291,10 +292,10 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
</div>
</div>';
$thematic_description_html .=
'<div class="span8">
'<div class="span8">
<div class="row-fluid">';
$thematic_description_html .=
'<div class="span6 items-progress'.$class1.'">
'<div class="span6 items-progress'.$class1.'">
<div class="topics">' . $subTitle1 . '</div>
<p class="title_topics">' . $thematic_info['title'] . '</p>
<p class="date">' . $thematic_advance_info['start_date'] . '</p>
@ -308,7 +309,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
$thematic_advance_info2['start_date'] = api_format_date($thematic_advance_info2['start_date'], DATE_TIME_FORMAT_LONG);
$thematic_description_html .=
'<div class="span6 items-progress">
'<div class="span6 items-progress">
<div class="topics">'.$subTitle2.'</div>
<p class="title_topics">'.$thematic_info['title'].'</p>
<p class="date">'.$thematic_advance_info2['start_date'].'</p>
@ -317,7 +318,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
</div>';
}
$thematic_description_html.=
'</div>
'</div>
</div>
</div>
</div>
@ -337,9 +338,6 @@ $introduction_section .= '</div>';
$introduction_section .= '<div class="home-course-intro span12"><div class="page-course">';
if ($intro_dispDefault) {
$intro_content = $intro_content;
if (!empty($intro_content)) {
$introduction_section.='<div class="page-course-intro">';
$introduction_section .= $intro_content;

8
main/inc/lib/display.lib.php
Unescape View File

@ -142,7 +142,13 @@ class Display
echo self::return_introduction_section($tool, $editor_config);
}
public static function return_introduction_section($tool, $editor_config = null) {
/**
* @param string $tool
* @param array $editor_config
* @return null
*/
public static function return_introduction_section($tool, $editor_config = null)
{
$is_allowed_to_edit = api_is_allowed_to_edit();
$moduleId = $tool;
if (api_get_setting('enable_tool_introduction') == 'true' || $tool == TOOL_COURSE_HOMEPAGE) {

2
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -2741,9 +2741,9 @@ class SessionManager
}
}
}
// Inserting new sessions list.
if (!empty($sessions_list) && is_array($sessions_list)) {
foreach ($sessions_list as $session_id) {
$session_id = intval($session_id);
$sql = "INSERT IGNORE INTO $tbl_session_rel_user (id_session, id_user, relation_type)

Write Preview
Loading…
Cancel
Save