Minor - Fix from master, fix php warning, format code, avoid globals

main/dropbox/dropbox_init.inc.php

@@ -180,7 +180,7 @@ if (empty($session_id)) {
 // only when it is needed.
 if ($action == 'add') {
     $dropbox_person = new Dropbox_Person(
-        $_user['user_id'],
+        $user_id,
         $is_courseAdmin,
         $is_courseTutor
     );

main/dropbox/index.php

@@ -4,6 +4,8 @@
 // The file that contains all the initialisation stuff (and includes all the configuration stuff)
 require_once 'dropbox_init.inc.php';
 
+$_course = api_get_course_info();
+
 $last_access = '';
 // get the last time the user accessed the tool
 if (isset($_SESSION[$_course['id']]) &&

main/gradebook/gradebook_add_eval.php

@@ -14,9 +14,12 @@ api_block_anonymous_users();
 GradebookUtils::block_students();
 
 $select_cat = isset($_GET['selectcat']) ? (int) $_GET['selectcat'] : 0;
-$is_allowedToEdit = $is_courseAdmin;
+$is_allowedToEdit = api_is_course_admin();
+
+$userId = api_get_user_id();
+
 $evaladd = new Evaluation();
-$evaladd->set_user_id($_user['user_id']);
+$evaladd->set_user_id($userId);
 if (!empty($select_cat)) {
     $evaladd->set_category_id($_GET['selectcat']);
     $cat = Category::load($_GET['selectcat']);

main/inc/lib/social.lib.php

@@ -3132,7 +3132,8 @@ class SocialManager extends UserManager
             }
         } else {
             // Load my groups
-            $results = $userGroup->get_groups_by_user($userId,
+            $results = $userGroup->get_groups_by_user(
+                $userId,
                 [
                     GROUP_USER_PERMISSION_ADMIN,
                     GROUP_USER_PERMISSION_READER,

main/lp/learnpath.class.php

@@ -4716,6 +4716,10 @@ class learnpath
             return false;
         }
 
+        if (empty($courseId)) {
+            return false;
+        }
+
         $link = self::getCategoryLinkForTool($id);
 
         /** @var CTool $tool */

main/lp/lp_add_audio.php

@@ -162,7 +162,6 @@ $documentTree = DocumentManager::get_document_preview(
     api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?action=add_audio&lp_id='.$lp->get_id().'&id='.$lp_item_id,
     false,
     true
-    //$folderId = false
 );
 
 $page .= $recordVoiceForm;

main/wiki/wiki.inc.php

@@ -2739,23 +2739,17 @@ class Wiki
                     $sql = "SELECT * FROM ".$tbl_wiki."
                             WHERE
                                 c_id = $course_id AND
-                                title LIKE '%".Database::escape_string(
-                            $search_term
-                        )."%' OR
+                                title LIKE '%".Database::escape_string($search_term)."%' OR
                                 content LIKE '%".Database::escape_string(
                             $search_term
-                        )."%' AND
-                                ".$groupfilter.$condition_session."";
-                //search all pages and all versions
+                        )."%' AND ".$groupfilter.$condition_session;
                 } else {
                     $sql = "SELECT * FROM ".$tbl_wiki."
                             WHERE
                                 c_id = $course_id AND
                                 title LIKE '%".Database::escape_string(
                             $search_term
-                        )."%' AND
-                                ".$groupfilter.$condition_session."";
-                    //search all pages and all versions
+                        )."%' AND ".$groupfilter.$condition_session;
                 }
             } else {
                 if ($search_content == '1') {
@@ -2797,24 +2791,16 @@ class Wiki
                             WHERE
                                 c_id = $course_id AND
                                 visibility=1 AND
-                                title LIKE '%".Database::escape_string(
-                            $search_term
-                        )."%' OR
-                                content LIKE '%".Database::escape_string(
-                            $search_term
-                        )."%' AND
-                                ".$groupfilter.$condition_session."";
-                //search all pages and all versions
+                                title LIKE '%".Database::escape_string($search_term)."%' OR
+                                content LIKE '%".Database::escape_string($search_term)."%' AND
+                                ".$groupfilter.$condition_session;
                 } else {
                     $sql = "SELECT * FROM ".$tbl_wiki."
                             WHERE
                                 c_id = $course_id AND
                                 visibility=1 AND
-                                title LIKE '%".Database::escape_string(
-                            $search_term
-                        )."%' AND
-                                ".$groupfilter.$condition_session."";
-                    //search all pages and all versions
+                                title LIKE '%".Database::escape_string($search_term)."%' AND
+                                ".$groupfilter.$condition_session;
                 }
             } else {
                 if ($search_content == '1') {
@@ -2822,12 +2808,8 @@ class Wiki
                             WHERE
                                 s1.c_id = $course_id AND
                                 visibility=1 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