Minor - format code

main/inc/lib/course.lib.php

@@ -6675,6 +6675,50 @@ class CourseManager
         return api_get_path(WEB_COURSE_PATH).$course->getDirectory().'/course-pic85x85.png';
     }
 
+    /**
+     * @return int
+     */
+    public static function getCountOpenCourses()
+    {
+        $visibility = [
+            COURSE_VISIBILITY_REGISTERED,
+            COURSE_VISIBILITY_OPEN_PLATFORM,
+            COURSE_VISIBILITY_OPEN_WORLD,
+        ];
+
+        $table = Database::get_main_table(TABLE_MAIN_COURSE);
+        $sql = "SELECT count(id) count 
+                FROM $table 
+                WHERE visibility IN (".implode(',', $visibility).")";
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+
+        return (int) $row['count'];
+    }
+
+    /**
+     * @return int
+     */
+    public static function getCountExercisesFromOpenCourse()
+    {
+        $visibility = [
+            COURSE_VISIBILITY_REGISTERED,
+            COURSE_VISIBILITY_OPEN_PLATFORM,
+            COURSE_VISIBILITY_OPEN_WORLD,
+        ];
+
+        $table = Database::get_main_table(TABLE_MAIN_COURSE);
+        $tableExercise = Database::get_course_table(TABLE_QUIZ_TEST);
+        $sql = "SELECT count(e.iid) count 
+                FROM $table c INNER JOIN $tableExercise e
+                ON (c.id = e.c_id)
+                WHERE e.active <> -1 AND visibility IN (".implode(',', $visibility).")";
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+
+        return (int) $row['count'];
+    }
+
     /**
      * Check if a specific access-url-related setting is a problem or not.
      *
@@ -6742,48 +6786,4 @@ class CourseManager
         $courseFieldValue = new ExtraFieldValue('course');
         $courseFieldValue->saveFieldValues($params);
     }
-
-    /**
-     * @return int
-     */
-    public static function getCountOpenCourses()
-    {
-        $visibility = [
-            COURSE_VISIBILITY_REGISTERED,
-            COURSE_VISIBILITY_OPEN_PLATFORM,
-            COURSE_VISIBILITY_OPEN_WORLD,
-        ];
-
-        $table = Database::get_main_table(TABLE_MAIN_COURSE);
-        $sql = "SELECT count(id) count 
-                FROM $table 
-                WHERE visibility IN (".implode(',', $visibility).")";
-        $result = Database::query($sql);
-        $row = Database::fetch_array($result);
-
-        return (int) $row['count'];
-    }
-
-    /**
-     * @return int
-     */
-    public static function getCountExercisesFromOpenCourse()
-    {
-        $visibility = [
-            COURSE_VISIBILITY_REGISTERED,
-            COURSE_VISIBILITY_OPEN_PLATFORM,
-            COURSE_VISIBILITY_OPEN_WORLD,
-        ];
-
-        $table = Database::get_main_table(TABLE_MAIN_COURSE);
-        $tableExercise = Database::get_course_table(TABLE_QUIZ_TEST);
-        $sql = "SELECT count(e.iid) count 
-                FROM $table c INNER JOIN $tableExercise e
-                ON (c.id = e.c_id)
-                WHERE e.active <> -1 AND visibility IN (".implode(',', $visibility).")";
-        $result = Database::query($sql);
-        $row = Database::fetch_array($result);
-
-        return (int) $row['count'];
-    }
 }

main/inc/lib/document.lib.php

@@ -6400,6 +6400,49 @@ class DocumentManager
         ];
     }
 
+    /**
+     * @param int $userId
+     *
+     * @return array Example [ 0 => ['code' => 'ABC', 'directory' => 'ABC0', 'path' => '/images/gallery/test.png', 'code_path' => 'ABC:/images/gallery/test.png'], 1 => ...]
+     */
+    public static function getAllDocumentsCreatedByUser($userId)
+    {
+        $tblItemProperty = Database::get_course_table(TABLE_ITEM_PROPERTY);
+        $tblDocument = Database::get_course_table(TABLE_DOCUMENT);
+        $tblCourse = Database::get_main_table(TABLE_MAIN_COURSE);
+        $userId = (int) $userId;
+
+        $sql = "SELECT DISTINCT c.code, c.directory, docs.path
+                FROM $tblItemProperty AS last
+                INNER JOIN $tblDocument AS docs
+                ON (
+                    docs.id = last.ref AND
+                    docs.c_id = last.c_id AND
+                    docs.filetype <> 'folder'
+                )
+                INNER JOIN $tblCourse as c
+                ON (
+                    docs.c_id = c.id
+                )
+                WHERE                                
+                    last.tool = '".TOOL_DOCUMENT."' AND   
+                    last.insert_user_id = $userId AND
+                    docs.path NOT LIKE '%_DELETED_%'                     
+                ORDER BY c.directory, docs.path
+                ";
+        $result = Database::query($sql);
+
+        $list = [];
+        if (Database::num_rows($result) != 0) {
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
+                $row['code_path'] = $row['code'].':'.$row['path'];
+                $list[] = $row;
+            }
+        }
+
+        return $list;
+    }
+
     /**
      * Parse file information into a link.
      *
@@ -6826,47 +6869,4 @@ class DocumentManager
 
         return $btn;
     }
-
-    /**
-     * @param int $userId
-     *
-     * @return array Example [ 0 => ['code' => 'ABC', 'directory' => 'ABC0', 'path' => '/images/gallery/test.png', 'code_path' => 'ABC:/images/gallery/test.png'], 1 => ...]
-     */
-    public static function getAllDocumentsCreatedByUser($userId)
-    {
-        $tblItemProperty = Database::get_course_table(TABLE_ITEM_PROPERTY);
-        $tblDocument = Database::get_course_table(TABLE_DOCUMENT);
-        $tblCourse = Database::get_main_table(TABLE_MAIN_COURSE);
-        $userId = (int) $userId;
-
-        $sql = "SELECT DISTINCT c.code, c.directory, docs.path
-                FROM $tblItemProperty AS last
-                INNER JOIN $tblDocument AS docs
-                ON (
-                    docs.id = last.ref AND
-                    docs.c_id = last.c_id AND
-                    docs.filetype <> 'folder'
-                )
-                INNER JOIN $tblCourse as c
-                ON (
-                    docs.c_id = c.id
-                )
-                WHERE                                
-                    last.tool = '".TOOL_DOCUMENT."' AND   
-                    last.insert_user_id = $userId AND
-                    docs.path NOT LIKE '%_DELETED_%'                     
-                ORDER BY c.directory, docs.path
-                ";
-        $result = Database::query($sql);
-
-        $list = [];
-        if (Database::num_rows($result) != 0) {
-            while ($row = Database::fetch_array($result, 'ASSOC')) {
-                $row['code_path'] = $row['code'].':'.$row['path'];
-                $list[] = $row;
-            }
-        }
-
-        return $list;
-    }
 }

main/inc/lib/extra_field.lib.php

@@ -179,7 +179,7 @@ class ExtraField extends Model
             'career',
             'user_certificate',
             'survey',
-            'terms_and_condition'
+            'terms_and_condition',
         ];
 
         if (api_get_configuration_value('allow_scheduled_announcements')) {

main/inc/lib/usermanager.lib.php

@@ -6311,6 +6311,19 @@ SQL;
         }
     }
 
+    /**
+     * @return int
+     */
+    public static function getCountActiveUsers()
+    {
+        $table = Database::get_main_table(TABLE_MAIN_USER);
+        $sql = "SELECT count(id) count FROM $table WHERE active = 1 AND status <> ".ANONYMOUS;
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+
+        return (int) $row['count'];
+    }
+
     /**
      * @return EncoderFactory
      */
@@ -6408,17 +6421,4 @@ SQL;
 
         return $url;
     }
-
-    /**
-     * @return int
-     */
-    public static function getCountActiveUsers()
-    {
-        $table = Database::get_main_table(TABLE_MAIN_USER);
-        $sql = "SELECT count(id) count FROM $table WHERE active = 1 AND status <> ".ANONYMOUS;
-        $result = Database::query($sql);
-        $row = Database::fetch_array($result);
-
-        return (int)$row['count'];
-    }
 }

src/Chamilo/CoreBundle/Entity/ExtraField.php

@@ -30,7 +30,7 @@ class ExtraField extends BaseAttribute
     const USER_CERTIFICATE = 11;
     const SURVEY_FIELD_TYPE = 12;
     const SCHEDULED_ANNOUNCEMENT = 13;
-    const TERMS_AND_CONDITION_TYPE= 14;
+    const TERMS_AND_CONDITION_TYPE = 14;
 
     /**
      * @var int