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, comments

Browse Source
pull/2624/head
Julio Montoya 7 years ago
parent 80bc4f9ada
commit 39744c61dd
6 changed files with 21 additions and 33 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. 5
      main/admin/settings.lib.php
  2. 4
      main/gradebook/lib/be/category.class.php
  3. 1
      main/inc/lib/myspace.lib.php
  4. 3
      main/install/index.php
  5. 4
      main/install/install.lib.php
  6. 37
      main/wiki/wiki.inc.php

5
main/admin/settings.lib.php
Unescape View File

@ -1491,9 +1491,10 @@ function generateSettingsForm($settings, $settings_by_access_list)
['maxlength' => '5', 'aria-label' => get_lang($row['title'])] ['maxlength' => '5', 'aria-label' => get_lang($row['title'])]
); );
$form->applyFilter($row['variable'], 'html_filter'); $form->applyFilter($row['variable'], 'html_filter');
$default_values[$row['variable']] = $row['selected_value'];
// For platform character set selection: Conversion of the textfield to a select box with valid values. // For platform character set selection:
// Conversion of the textfield to a select box with valid values.
$default_values[$row['variable']] = $row['selected_value'];
} elseif ($row['variable'] == 'platform_charset') { } elseif ($row['variable'] == 'platform_charset') {
continue; continue;
} else { } else {

4
main/gradebook/lib/be/category.class.php
Unescape View File

@ -1727,13 +1727,13 @@ class Category implements GradebookItem
if (api_is_allowed_to_edit() && !api_is_platform_admin()) { if (api_is_allowed_to_edit() && !api_is_platform_admin()) {
// root // root
if ($this->id == 0) { if ($this->id == 0) {
// inside a course
return $this->get_root_categories_for_teacher( return $this->get_root_categories_for_teacher(
api_get_user_id(), api_get_user_id(),
$course_code, $course_code,
$session_id, $session_id,
false false
); );
// inside a course
} elseif (!empty($this->course_code)) { } elseif (!empty($this->course_code)) {
return self::load( return self::load(
null, null,
@ -1745,6 +1745,7 @@ class Category implements GradebookItem
$order $order
); );
} elseif (!empty($course_code)) { } elseif (!empty($course_code)) {
// course independent
return self::load( return self::load(
null, null,
null, null,
@ -1754,7 +1755,6 @@ class Category implements GradebookItem
$session_id, $session_id,
$order $order
); );
// course independent
} else { } else {
return self::load( return self::load(
null, null,

1
main/inc/lib/myspace.lib.php
Unescape View File

@ -2383,7 +2383,6 @@ class MySpace
$sql_select = "SELECT user_id FROM $table_user WHERE username ='$user_name' "; $sql_select = "SELECT user_id FROM $table_user WHERE username ='$user_name' ";
$rs = Database::query($sql_select); $rs = Database::query($sql_select);
$user['create'] = Database::result($rs, 0, 0); $user['create'] = Database::result($rs, 0, 0);
// This should be the ID because the user exists.
} else { } else {
$user['create'] = $is_session_avail; $user['create'] = $is_session_avail;
} }

3
main/install/index.php
Unescape View File

@ -39,9 +39,6 @@ require_once '../inc/lib/api.lib.php';
require_once '../inc/lib/text.lib.php'; require_once '../inc/lib/text.lib.php';
api_check_php_version('../inc/'); api_check_php_version('../inc/');
/* INITIALIZATION SECTION */
ob_implicit_flush(true); ob_implicit_flush(true);
session_start(); session_start();
require_once api_get_path(LIBRARY_PATH).'database.constants.inc.php'; require_once api_get_path(LIBRARY_PATH).'database.constants.inc.php';

4
main/install/install.lib.php
Unescape View File

@ -2088,8 +2088,8 @@ function checkCourseScriptCreation(
} }
} }
fclose($fp); fclose($fp);
//Check allow_url_fopen
} elseif (ini_get('allow_url_fopen')) { } elseif (ini_get('allow_url_fopen')) {
// Check allow_url_fopen
if ($fp = @fopen($url, 'r')) { if ($fp = @fopen($url, 'r')) {
while ($result = fgets($fp, 1024)) { while ($result = fgets($fp, 1024)) {
if (!empty($result) && $result == '123') { if (!empty($result) && $result == '123') {
@ -2098,8 +2098,8 @@ function checkCourseScriptCreation(
} }
fclose($fp); fclose($fp);
} }
// Check if has support for cURL
} elseif (function_exists('curl_init')) { } elseif (function_exists('curl_init')) {
// Check if has support for cURL
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch, CURLOPT_HEADER, 0); curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_URL, $url);

37
main/wiki/wiki.inc.php
Unescape View File

@ -2759,15 +2759,12 @@ class Wiki
} }
} else { } else {
if ($search_content == '1') { if ($search_content == '1') {
// warning don't use group by reflink because don't return the last version
$sql = "SELECT * FROM ".$tbl_wiki." s1 $sql = "SELECT * FROM ".$tbl_wiki." s1
WHERE WHERE
s1.c_id = $course_id AND s1.c_id = $course_id AND
title LIKE '%".Database::escape_string( title LIKE '%".Database::escape_string($search_term)."%' OR
$search_term content LIKE '%".Database::escape_string($search_term)."%' AND
)."%' OR
content LIKE '%".Database::escape_string(
$search_term
)."%' AND
id=( id=(
SELECT MAX(s2.id) SELECT MAX(s2.id)
FROM ".$tbl_wiki." s2 FROM ".$tbl_wiki." s2
@ -2775,8 +2772,8 @@ class Wiki
s2.c_id = $course_id AND s2.c_id = $course_id AND
s1.reflink = s2.reflink AND s1.reflink = s2.reflink AND
".$groupfilter.$condition_session.")"; ".$groupfilter.$condition_session.")";
// warning don't use group by reflink because don't return the last version
} else { } else {
// warning don't use group by reflink because don't return the last version
$sql = "SELECT * FROM ".$tbl_wiki." s1 $sql = "SELECT * FROM ".$tbl_wiki." s1
WHERE WHERE
s1.c_id = $course_id AND s1.c_id = $course_id AND
@ -2790,12 +2787,12 @@ class Wiki
s2.c_id = $course_id AND s2.c_id = $course_id AND
s1.reflink = s2.reflink AND s1.reflink = s2.reflink AND
".$groupfilter.$condition_session.")"; ".$groupfilter.$condition_session.")";
// warning don't use group by reflink because don't return the last version
} }
} }
} else { } else {
if ($all_vers == '1') { if ($all_vers == '1') {
if ($search_content == '1') { if ($search_content == '1') {
//search all pages and all versions
$sql = "SELECT * FROM ".$tbl_wiki." $sql = "SELECT * FROM ".$tbl_wiki."
WHERE WHERE
c_id = $course_id AND c_id = $course_id AND
@ -2837,21 +2834,18 @@ class Wiki
WHERE s2.c_id = $course_id AND WHERE s2.c_id = $course_id AND
s1.reflink = s2.reflink AND s1.reflink = s2.reflink AND
".$groupfilter.$condition_session.")"; ".$groupfilter.$condition_session.")";
// warning don't use group by reflink because don't return the last version
} else { } else {
// warning don't use group by reflink because don't return the last version
$sql = "SELECT * FROM ".$tbl_wiki." s1 $sql = "SELECT * FROM ".$tbl_wiki." s1
WHERE WHERE
s1.c_id = $course_id AND s1.c_id = $course_id AND
visibility=1 AND visibility=1 AND
title LIKE '%".Database::escape_string( title LIKE '%".Database::escape_string($search_term)."%' AND
$search_term
)."%' AND
id = ( id = (
SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 SELECT MAX(s2.id) FROM ".$tbl_wiki." s2
WHERE s2.c_id = $course_id AND WHERE s2.c_id = $course_id AND
s1.reflink = s2.reflink AND s1.reflink = s2.reflink AND
".$groupfilter.$condition_session.")"; ".$groupfilter.$condition_session.")";
// warning don't use group by reflink because don't return the last version
} }
} }
} }
@ -2864,7 +2858,6 @@ class Wiki
while ($obj = Database::fetch_object($result)) { while ($obj = Database::fetch_object($result)) {
//get author //get author
$userinfo = api_get_user_info($obj->user_id); $userinfo = api_get_user_info($obj->user_id);
//get time //get time
$year = substr($obj->dtime, 0, 4); $year = substr($obj->dtime, 0, 4);
$month = substr($obj->dtime, 5, 2); $month = substr($obj->dtime, 5, 2);
@ -4480,8 +4473,9 @@ class Wiki
} }
echo '</div>'; echo '</div>';
if (api_is_allowed_to_edit(false, true) || api_is_platform_admin( if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
)) { //only by professors if page is hidden // only by professors if page is hidden
// warning don't use group by reflink because does not return the last version
$sql = 'SELECT * $sql = 'SELECT *
FROM '.$tbl_wiki.' s1 FROM '.$tbl_wiki.' s1
WHERE s1.c_id = '.$course_id.' AND id=( WHERE s1.c_id = '.$course_id.' AND id=(
@ -4491,8 +4485,8 @@ class Wiki
s1.reflink = s2.reflink AND s1.reflink = s2.reflink AND
'.$groupfilter.' AND '.$groupfilter.' AND
session_id='.$session_id.')'; session_id='.$session_id.')';
// warning don't use group by reflink because does not return the last version
} else { } else {
// warning don't use group by reflink because does not return the last version
$sql = 'SELECT * FROM '.$tbl_wiki.' s1 $sql = 'SELECT * FROM '.$tbl_wiki.' s1
WHERE visibility=1 AND s1.c_id = '.$course_id.' AND id=( WHERE visibility=1 AND s1.c_id = '.$course_id.' AND id=(
SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2
@ -4501,7 +4495,6 @@ class Wiki
s1.reflink = s2.reflink AND s1.reflink = s2.reflink AND
'.$groupfilter.' AND '.$groupfilter.' AND
session_id='.$session_id.')'; session_id='.$session_id.')';
// warning don't use group by reflink because does not return the last version
} }
$allpages = Database::query($sql); $allpages = Database::query($sql);
@ -4920,9 +4913,8 @@ class Wiki
$page = str_replace(' ', '_', get_lang('DefaultTitle')); $page = str_replace(' ', '_', get_lang('DefaultTitle'));
} }
//table if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
if (api_is_allowed_to_edit(false, true) || api_is_platform_admin( // only by professors if page is hidden
)) {
//only by professors if page is hidden //only by professors if page is hidden
$sql = "SELECT * FROM ".$tbl_wiki." s1 $sql = "SELECT * FROM ".$tbl_wiki." s1
WHERE s1.c_id = $course_id AND linksto LIKE '%".Database::escape_string( WHERE s1.c_id = $course_id AND linksto LIKE '%".Database::escape_string(
@ -4930,15 +4922,14 @@ class Wiki
)."%' AND id=( )."%' AND id=(
SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 SELECT MAX(s2.id) FROM ".$tbl_wiki." s2
WHERE s2.c_id = $course_id AND s1.reflink = s2.reflink AND ".$groupfilter.$condition_session.")"; WHERE s2.c_id = $course_id AND s1.reflink = s2.reflink AND ".$groupfilter.$condition_session.")";
//add blank space after like '%" " %' to identify each word
} else { } else {
//add blank space after like '%" " %' to identify each word
$sql = "SELECT * FROM ".$tbl_wiki." s1 $sql = "SELECT * FROM ".$tbl_wiki." s1
WHERE s1.c_id = $course_id AND visibility=1 AND linksto LIKE '%".Database::escape_string( WHERE s1.c_id = $course_id AND visibility=1 AND linksto LIKE '%".Database::escape_string(
$page $page
)."%' AND id=( )."%' AND id=(
SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 SELECT MAX(s2.id) FROM ".$tbl_wiki." s2
WHERE s2.c_id = $course_id AND s1.reflink = s2.reflink AND ".$groupfilter.$condition_session.")"; WHERE s2.c_id = $course_id AND s1.reflink = s2.reflink AND ".$groupfilter.$condition_session.")";
//add blank space after like '%" " %' to identify each word
} }
$allpages = Database::query($sql); $allpages = Database::query($sql);

Write Preview
Loading…
Cancel
Save