From 39744c61dda8eebed5fbeeeba1ee9e152b607d0d Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 8 Aug 2018 08:34:27 +0200 Subject: [PATCH] Minor - format code, comments --- main/admin/settings.lib.php | 5 ++-- main/gradebook/lib/be/category.class.php | 4 +-- main/inc/lib/myspace.lib.php | 1 - main/install/index.php | 3 -- main/install/install.lib.php | 4 +-- main/wiki/wiki.inc.php | 37 +++++++++--------------- 6 files changed, 21 insertions(+), 33 deletions(-) diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php index 733523811d..eaac34e33e 100755 --- a/main/admin/settings.lib.php +++ b/main/admin/settings.lib.php @@ -1491,9 +1491,10 @@ function generateSettingsForm($settings, $settings_by_access_list) ['maxlength' => '5', 'aria-label' => get_lang($row['title'])] ); $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') { continue; } else { diff --git a/main/gradebook/lib/be/category.class.php b/main/gradebook/lib/be/category.class.php index 4748cc8006..3743f4a726 100755 --- a/main/gradebook/lib/be/category.class.php +++ b/main/gradebook/lib/be/category.class.php @@ -1727,13 +1727,13 @@ class Category implements GradebookItem if (api_is_allowed_to_edit() && !api_is_platform_admin()) { // root if ($this->id == 0) { + // inside a course return $this->get_root_categories_for_teacher( api_get_user_id(), $course_code, $session_id, false ); - // inside a course } elseif (!empty($this->course_code)) { return self::load( null, @@ -1745,6 +1745,7 @@ class Category implements GradebookItem $order ); } elseif (!empty($course_code)) { + // course independent return self::load( null, null, @@ -1754,7 +1755,6 @@ class Category implements GradebookItem $session_id, $order ); - // course independent } else { return self::load( null, diff --git a/main/inc/lib/myspace.lib.php b/main/inc/lib/myspace.lib.php index d11c1fadc7..cd844d74c5 100644 --- a/main/inc/lib/myspace.lib.php +++ b/main/inc/lib/myspace.lib.php @@ -2383,7 +2383,6 @@ class MySpace $sql_select = "SELECT user_id FROM $table_user WHERE username ='$user_name' "; $rs = Database::query($sql_select); $user['create'] = Database::result($rs, 0, 0); - // This should be the ID because the user exists. } else { $user['create'] = $is_session_avail; } diff --git a/main/install/index.php b/main/install/index.php index f36145ce65..44ada79fbf 100755 --- a/main/install/index.php +++ b/main/install/index.php @@ -39,9 +39,6 @@ require_once '../inc/lib/api.lib.php'; require_once '../inc/lib/text.lib.php'; api_check_php_version('../inc/'); - -/* INITIALIZATION SECTION */ - ob_implicit_flush(true); session_start(); require_once api_get_path(LIBRARY_PATH).'database.constants.inc.php'; diff --git a/main/install/install.lib.php b/main/install/install.lib.php index 2fa15a186c..a7729a40a0 100755 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -2088,8 +2088,8 @@ function checkCourseScriptCreation( } } fclose($fp); - //Check allow_url_fopen } elseif (ini_get('allow_url_fopen')) { + // Check allow_url_fopen if ($fp = @fopen($url, 'r')) { while ($result = fgets($fp, 1024)) { if (!empty($result) && $result == '123') { @@ -2098,8 +2098,8 @@ function checkCourseScriptCreation( } fclose($fp); } - // Check if has support for cURL } elseif (function_exists('curl_init')) { + // Check if has support for cURL $ch = curl_init(); curl_setopt($ch, CURLOPT_HEADER, 0); curl_setopt($ch, CURLOPT_URL, $url); diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php index 08470dc8b9..00688bf37d 100755 --- a/main/wiki/wiki.inc.php +++ b/main/wiki/wiki.inc.php @@ -2759,15 +2759,12 @@ class Wiki } } else { if ($search_content == '1') { + // warning don't use group by reflink because don't return the last version $sql = "SELECT * FROM ".$tbl_wiki." s1 WHERE s1.c_id = $course_id AND - title LIKE '%".Database::escape_string( - $search_term - )."%' OR - content LIKE '%".Database::escape_string( - $search_term - )."%' AND + title LIKE '%".Database::escape_string($search_term)."%' OR + content LIKE '%".Database::escape_string($search_term)."%' AND id=( SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 @@ -2775,8 +2772,8 @@ class Wiki s2.c_id = $course_id AND s1.reflink = s2.reflink AND ".$groupfilter.$condition_session.")"; - // warning don't use group by reflink because don't return the last version } else { + // warning don't use group by reflink because don't return the last version $sql = "SELECT * FROM ".$tbl_wiki." s1 WHERE s1.c_id = $course_id AND @@ -2790,12 +2787,12 @@ class Wiki s2.c_id = $course_id AND s1.reflink = s2.reflink AND ".$groupfilter.$condition_session.")"; - // warning don't use group by reflink because don't return the last version } } } else { if ($all_vers == '1') { if ($search_content == '1') { + //search all pages and all versions $sql = "SELECT * FROM ".$tbl_wiki." WHERE c_id = $course_id AND @@ -2837,21 +2834,18 @@ class Wiki WHERE s2.c_id = $course_id AND s1.reflink = s2.reflink AND ".$groupfilter.$condition_session.")"; - // warning don't use group by reflink because don't return the last version } else { + // warning don't use group by reflink because don't return the last version $sql = "SELECT * FROM ".$tbl_wiki." s1 WHERE s1.c_id = $course_id AND visibility=1 AND - title LIKE '%".Database::escape_string( - $search_term - )."%' AND + title LIKE '%".Database::escape_string($search_term)."%' AND id = ( SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 WHERE s2.c_id = $course_id AND s1.reflink = s2.reflink AND ".$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)) { //get author $userinfo = api_get_user_info($obj->user_id); - //get time $year = substr($obj->dtime, 0, 4); $month = substr($obj->dtime, 5, 2); @@ -4480,8 +4473,9 @@ class Wiki } echo ''; - if (api_is_allowed_to_edit(false, true) || api_is_platform_admin( - )) { //only by professors if page is hidden + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { + // only by professors if page is hidden + // warning don't use group by reflink because does not return the last version $sql = 'SELECT * FROM '.$tbl_wiki.' s1 WHERE s1.c_id = '.$course_id.' AND id=( @@ -4491,8 +4485,8 @@ class Wiki s1.reflink = s2.reflink AND '.$groupfilter.' AND session_id='.$session_id.')'; - // warning don't use group by reflink because does not return the last version } else { + // warning don't use group by reflink because does not return the last version $sql = 'SELECT * FROM '.$tbl_wiki.' s1 WHERE visibility=1 AND s1.c_id = '.$course_id.' AND id=( SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 @@ -4501,7 +4495,6 @@ class Wiki s1.reflink = s2.reflink AND '.$groupfilter.' AND session_id='.$session_id.')'; - // warning don't use group by reflink because does not return the last version } $allpages = Database::query($sql); @@ -4920,9 +4913,8 @@ class Wiki $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 $sql = "SELECT * FROM ".$tbl_wiki." s1 WHERE s1.c_id = $course_id AND linksto LIKE '%".Database::escape_string( @@ -4930,15 +4922,14 @@ class Wiki )."%' AND id=( SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 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 { + //add blank space after like '%" " %' to identify each word $sql = "SELECT * FROM ".$tbl_wiki." s1 WHERE s1.c_id = $course_id AND visibility=1 AND linksto LIKE '%".Database::escape_string( $page )."%' AND id=( SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 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);