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
pull/2487/head
jmontoyaa 9 years ago
parent 789c13a1e0
commit ce4ea38613
3 changed files with 22 additions and 37 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. 4
      main/course_info/delete_course.php
  2. 15
      main/course_info/infocours.php
  3. 40
      main/inc/lib/link.lib.php

4
main/course_info/delete_course.php
Unescape View File

@ -1,6 +1,8 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/** /**
* This script is about deleting a course. * This script is about deleting a course.
* It displays a message box ('are you sure you wish to delete this course') * It displays a message box ('are you sure you wish to delete this course')
@ -9,8 +11,6 @@
* @package chamilo.course_info * @package chamilo.course_info
*/ */
use \ChamiloSession as Session;
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
$this_section = SECTION_COURSES; $this_section = SECTION_COURSES;
$current_course_tool = TOOL_COURSE_MAINTENANCE; $current_course_tool = TOOL_COURSE_MAINTENANCE;

15
main/course_info/infocours.php
Unescape View File

@ -60,16 +60,16 @@ $tbl_admin = Database:: get_main_table(TABLE_MAIN_ADMIN);
$tbl_course_user = Database:: get_main_table(TABLE_MAIN_COURSE_USER); $tbl_course_user = Database:: get_main_table(TABLE_MAIN_COURSE_USER);
$tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE); $tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE);
$s_select_course_tutor_name = "SELECT tutor_name FROM $tbl_course WHERE id = $courseId"; $sql = "SELECT tutor_name FROM $tbl_course WHERE id = $courseId";
$q_tutor = Database::query($s_select_course_tutor_name); $q_tutor = Database::query($sql);
$s_tutor = Database::result($q_tutor, 0, 'tutor_name'); $s_tutor = Database::result($q_tutor, 0, 'tutor_name');
$target_name = api_sort_by_first_name() ? 'firstname' : 'lastname'; $target_name = api_sort_by_first_name() ? 'firstname' : 'lastname';
$s_sql_course_titular = "SELECT DISTINCT username, lastname, firstname $sql = "SELECT DISTINCT username, lastname, firstname
FROM $tbl_user as user, $tbl_course_user as course_rel_user FROM $tbl_user as user, $tbl_course_user as course_rel_user
WHERE (course_rel_user.status='1') AND user.user_id=course_rel_user.user_id AND c_id ='".$courseId."' WHERE (course_rel_user.status='1') AND user.user_id=course_rel_user.user_id AND c_id ='".$courseId."'
ORDER BY ".$target_name." ASC"; ORDER BY ".$target_name." ASC";
$q_result_titulars = Database::query($s_sql_course_titular); $q_result_titulars = Database::query($sql);
if (Database::num_rows($q_result_titulars) == 0) { if (Database::num_rows($q_result_titulars) == 0) {
$sql = "SELECT username, lastname, firstname FROM $tbl_user as user, $tbl_admin as admin $sql = "SELECT username, lastname, firstname FROM $tbl_user as user, $tbl_admin as admin
@ -808,7 +808,6 @@ if ($form->validate() && is_settings_editable()) {
} }
/* Header */ /* Header */
Display :: display_header($nameTools, MODULE_HELP_NAME); Display :: display_header($nameTools, MODULE_HELP_NAME);
if ($show_delete_watermark_text_message) { if ($show_delete_watermark_text_message) {
Display :: display_normal_message(get_lang('FileDeleted')); Display :: display_normal_message(get_lang('FileDeleted'));

40
main/inc/lib/link.lib.php
Unescape View File

@ -234,9 +234,9 @@ class Link extends Model
// Add all terms to db. // Add all terms to db.
$all_specific_terms = ''; $all_specific_terms = '';
foreach ($specific_fields as $specific_field) { foreach ($specific_fields as $specific_field) {
if (isset ($_REQUEST[$specific_field['code']])) { if (isset($_REQUEST[$specific_field['code']])) {
$sterms = trim($_REQUEST[$specific_field['code']]); $sterms = trim($_REQUEST[$specific_field['code']]);
if (!empty ($sterms)) { if (!empty($sterms)) {
$all_specific_terms .= ' ' . $sterms; $all_specific_terms .= ' ' . $sterms;
$sterms = explode(',', $sterms); $sterms = explode(',', $sterms);
foreach ($sterms as $sterm) { foreach ($sterms as $sterm) {
@ -295,7 +295,7 @@ class Link extends Model
} }
$di = new ChamiloIndexer(); $di = new ChamiloIndexer();
isset ($_POST['language']) ? $lang = Database:: escape_string( isset($_POST['language']) ? $lang = Database:: escape_string(
$_POST['language'] $_POST['language']
) : $lang = 'english'; ) : $lang = 'english';
$di->connectDb(null, null, $lang); $di->connectDb(null, null, $lang);
@ -331,7 +331,6 @@ class Link extends Model
$description = trim($_POST['description']); $description = trim($_POST['description']);
if (empty($category_title)) { if (empty($category_title)) {
$msgErr = get_lang('GiveCategoryName');
Display:: display_error_message(get_lang('GiveCategoryName')); Display:: display_error_message(get_lang('GiveCategoryName'));
$ok = false; $ok = false;
} else { } else {
@ -388,7 +387,6 @@ class Link extends Model
$id = intval($id); $id = intval($id);
if (empty($id)) { if (empty($id)) {
return false; return false;
} }
@ -450,7 +448,7 @@ class Link extends Model
public static function delete_link_from_search_engine($course_id, $link_id) public static function delete_link_from_search_engine($course_id, $link_id)
{ {
// Remove from search engine if enabled. // Remove from search engine if enabled.
if (api_get_setting('search_enabled') == 'true') { if (api_get_setting('search_enabled') === 'true') {
$tbl_se_ref = Database:: get_main_table( $tbl_se_ref = Database:: get_main_table(
TABLE_MAIN_SEARCH_ENGINE_REF TABLE_MAIN_SEARCH_ENGINE_REF
); );
@ -459,9 +457,7 @@ class Link extends Model
$res = Database:: query($sql); $res = Database:: query($sql);
if (Database:: num_rows($res) > 0) { if (Database:: num_rows($res) > 0) {
$row = Database:: fetch_array($res); $row = Database:: fetch_array($res);
require_once api_get_path( require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
LIBRARY_PATH
) . 'search/ChamiloIndexer.class.php';
$di = new ChamiloIndexer(); $di = new ChamiloIndexer();
$di->remove_document((int)$row['search_did']); $di->remove_document((int)$row['search_did']);
} }
@ -588,15 +584,9 @@ class Link extends Model
$res = Database:: query($sql); $res = Database:: query($sql);
if (Database:: num_rows($res) > 0) { if (Database:: num_rows($res) > 0) {
require_once api_get_path( require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
LIBRARY_PATH require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
).'search/ChamiloIndexer.class.php'; require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
require_once api_get_path(
LIBRARY_PATH
).'search/IndexableChunk.class.php';
require_once api_get_path(
LIBRARY_PATH
).'specific_fields_manager.lib.php';
$se_ref = Database:: fetch_array($res); $se_ref = Database:: fetch_array($res);
$specific_fields = get_specific_field_list(); $specific_fields = get_specific_field_list();
@ -610,11 +600,11 @@ class Link extends Model
TOOL_LINK, TOOL_LINK,
$id $id
); );
if (isset ($_REQUEST[$specific_field['code']])) { if (isset($_REQUEST[$specific_field['code']])) {
$sterms = trim( $sterms = trim(
$_REQUEST[$specific_field['code']] $_REQUEST[$specific_field['code']]
); );
if (!empty ($sterms)) { if (!empty($sterms)) {
$all_specific_terms .= ' ' . $sterms; $all_specific_terms .= ' ' . $sterms;
$sterms = explode(',', $sterms); $sterms = explode(',', $sterms);
foreach ($sterms as $sterm) { foreach ($sterms as $sterm) {
@ -652,7 +642,7 @@ class Link extends Model
$ic_slide->addValue('content', $link_description); $ic_slide->addValue('content', $link_description);
// Add category name if set. // Add category name if set.
if (isset ($categoryId) && $categoryId > 0) { if (isset($categoryId) && $categoryId > 0) {
$table_link_category = Database:: get_course_table( $table_link_category = Database:: get_course_table(
TABLE_LINK_CATEGORY TABLE_LINK_CATEGORY
); );
@ -864,7 +854,7 @@ class Link extends Model
$sql = "SELECT *, link.id FROM $tbl_link link $sql = "SELECT *, link.id FROM $tbl_link link
INNER JOIN $TABLE_ITEM_PROPERTY itemproperties INNER JOIN $TABLE_ITEM_PROPERTY itemproperties
ON (link.id=itemproperties.ref AND link.c_id = itemproperties.c_id ) ON (link.id=itemproperties.ref AND link.c_id = itemproperties.c_id)
WHERE WHERE
itemproperties.tool='" . TOOL_LINK . "' AND itemproperties.tool='" . TOOL_LINK . "' AND
link.category_id='" . $catid . "' AND link.category_id='" . $catid . "' AND
@ -1260,10 +1250,7 @@ class Link extends Model
WHERE c_id = $course_id AND " . $urleq . ' AND ' . $cateq WHERE c_id = $course_id AND " . $urleq . ' AND ' . $cateq
); );
if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array( if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array($result))) {
$result
))
) {
$sql = "UPDATE $tbl_link SET $sql = "UPDATE $tbl_link SET
title = '" . Database:: escape_string($title) . "', title = '" . Database:: escape_string($title) . "',
description = '" . Database:: escape_string($description) . "' description = '" . Database:: escape_string($description) . "'
@ -1573,7 +1560,6 @@ class Link extends Model
} }
$header .= Security::remove_XSS($myrow['category_title']).'</a>'; $header .= Security::remove_XSS($myrow['category_title']).'</a>';
$header .= '<div class="pull-right">'; $header .= '<div class="pull-right">';
if (api_is_allowed_to_edit(null, true)) { if (api_is_allowed_to_edit(null, true)) {
if ($session_id == $myrow['session_id']) { if ($session_id == $myrow['session_id']) {

Write Preview
Loading…
Cancel
Save