Minor - format code

main/course_info/delete_course.php

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

main/course_info/infocours.php

@@ -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 = Database:: get_main_table(TABLE_MAIN_COURSE);
 
-$s_select_course_tutor_name = "SELECT tutor_name FROM $tbl_course WHERE id = $courseId";
-$q_tutor = Database::query($s_select_course_tutor_name);
+$sql = "SELECT tutor_name FROM $tbl_course WHERE id = $courseId";
+$q_tutor = Database::query($sql);
 $s_tutor = Database::result($q_tutor, 0, 'tutor_name');
 
 $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
         WHERE (course_rel_user.status='1') AND user.user_id=course_rel_user.user_id AND c_id ='".$courseId."'
         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) {
     $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 */
-
 Display :: display_header($nameTools, MODULE_HELP_NAME);
 if ($show_delete_watermark_text_message) {
     Display :: display_normal_message(get_lang('FileDeleted'));

main/inc/lib/link.lib.php

@@ -331,7 +331,6 @@ class Link extends Model
             $description = trim($_POST['description']);
 
             if (empty($category_title)) {
-                $msgErr = get_lang('GiveCategoryName');
                 Display:: display_error_message(get_lang('GiveCategoryName'));
                 $ok = false;
             } else {
@@ -388,7 +387,6 @@ class Link extends Model
         $id = intval($id);
 
         if (empty($id)) {
-
             return false;
         }
 
@@ -450,7 +448,7 @@ class Link extends Model
     public static function delete_link_from_search_engine($course_id, $link_id)
     {
         // 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(
                 TABLE_MAIN_SEARCH_ENGINE_REF
             );
@@ -459,9 +457,7 @@ class Link extends Model
             $res = Database:: query($sql);
             if (Database:: num_rows($res) > 0) {
                 $row = Database:: fetch_array($res);
-                require_once api_get_path(
-                        LIBRARY_PATH
-                    ) . 'search/ChamiloIndexer.class.php';
+                require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
                 $di = new ChamiloIndexer();
                 $di->remove_document((int)$row['search_did']);
             }
@@ -588,15 +584,9 @@ class Link extends Model
             $res = Database:: query($sql);
 
             if (Database:: num_rows($res) > 0) {
-                require_once api_get_path(
-                        LIBRARY_PATH
-                    ).'search/ChamiloIndexer.class.php';
-                require_once api_get_path(
-                        LIBRARY_PATH
-                    ).'search/IndexableChunk.class.php';
-                require_once api_get_path(
-                        LIBRARY_PATH
-                    ).'specific_fields_manager.lib.php';
+                require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.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);
                 $specific_fields = get_specific_field_list();
@@ -1260,10 +1250,7 @@ class Link extends Model
             WHERE c_id = $course_id AND " . $urleq . ' AND ' . $cateq
         );
 
-        if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array(
-                $result
-            ))
-        ) {
+        if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array($result))) {
             $sql = "UPDATE $tbl_link SET 
                         title = '" . Database:: escape_string($title) . "', 
                         description = '" . Database:: escape_string($description) . "'
@@ -1573,7 +1560,6 @@ class Link extends Model
             }
 
             $header .= Security::remove_XSS($myrow['category_title']).'</a>';
-
             $header .= '<div class="pull-right">';
             if (api_is_allowed_to_edit(null, true)) {
                 if ($session_id == $myrow['session_id']) {