improved coding style, removing unused globals

diff --git a/lib/filebrowser/file_browser.php b/lib/filebrowser/file_browser.php
index 0c482c7..298811a 100644 (file)
--- a/lib/filebrowser/file_browser.php
+++ b/lib/filebrowser/file_browser.php
@@ -151,7 +151,7 @@ class file_browser {
      * @return file_info instance or null if not found or access not allowed
      */
     private function get_file_info_context_coursecat($context, $component, $filearea, $itemid, $filepath, $filename) {
-        global $DB, $CFG;
+        global $DB;
 
         if (!$category = $DB->get_record('course_categories', array('id'=>$context->instanceid))) {
             return null;

diff --git a/lib/filebrowser/file_info_context_course.php b/lib/filebrowser/file_info_context_course.php
index 20a39eb..0263a8b 100644 (file)
--- a/lib/filebrowser/file_info_context_course.php
+++ b/lib/filebrowser/file_info_context_course.php
@@ -53,8 +53,6 @@ class file_info_context_course extends file_info {
      * @param $filename
      */
     public function get_file_info($component, $filearea, $itemid, $filepath, $filename) {
-        global $DB;
-
         if (!$this->course->visible and !has_capability('moodle/course:viewhiddencourses', $this->context)) {
             return null;
         }
@@ -396,7 +394,7 @@ class file_info_area_course_section extends file_info {
      * @return string
      */
     public function get_visible_name() {
-        $format = $this->course->format;
+        //$format = $this->course->format;
         $sectionsname = get_string("coursesectionsummaries");
 
         return $sectionsname;
@@ -495,10 +493,7 @@ class file_info_area_backup_section extends file_info {
      * @return string
      */
     public function get_visible_name() {
-        $format = $this->course->format;
-        $sectionsname = get_string('sectionbackup', 'repository');
-
-        return $sectionsname;
+        return get_string('sectionbackup', 'repository');
     }
 
     /**

diff --git a/lib/filebrowser/file_info_context_module.php b/lib/filebrowser/file_info_context_module.php
index 45b2d5a..e72e315 100644 (file)
--- a/lib/filebrowser/file_info_context_module.php
+++ b/lib/filebrowser/file_info_context_module.php
@@ -42,7 +42,7 @@ class file_info_context_module extends file_info {
     protected $areas;
 
     public function __construct($browser, $context, $course, $cm, $modname) {
-        global $DB, $CFG;
+        global $CFG;
 
         parent::__construct($browser, $context);
         $this->course  = $course;
@@ -75,8 +75,6 @@ class file_info_context_module extends file_info {
      * @param $filename
      */
     public function get_file_info($component, $filearea, $itemid, $filepath, $filename) {
-        global $USER;
-
         if (!is_enrolled($this->context) and !is_viewing($this->context)) {
             // no peaking here if not enrolled or inspector
             return null;

diff --git a/lib/filebrowser/file_info_context_user.php b/lib/filebrowser/file_info_context_user.php
index c9f3a3e..6ba756e 100644 (file)
--- a/lib/filebrowser/file_info_context_user.php
+++ b/lib/filebrowser/file_info_context_user.php
@@ -86,7 +86,7 @@ class file_info_context_user extends file_info {
 
         if (is_null($itemid)) {
             // go to parent, we do not use itemids here in private area
-            return $this;;
+            return $this;
         }
 
         $fs = get_file_storage();
@@ -111,7 +111,7 @@ class file_info_context_user extends file_info {
     }
 
     protected function get_area_user_profile($itemid, $filepath, $filename) {
-        global $USER, $CFG;
+        global $CFG;
 
         if (!has_capability('moodle/user:update', $this->context)) {
             // the idea here is that only admins should be able to list/modify files in user profile, the rest has to use profile page
@@ -229,8 +229,6 @@ class file_info_context_user extends file_info {
      * @return array of file_info instances
      */
     public function get_children() {
-        global $USER, $CFG;
-
         $children = array();
 
         if ($child = $this->get_area_user_private(0, '/', '.')) {

diff --git a/lib/filebrowser/file_info_stored.php b/lib/filebrowser/file_info_stored.php
index 6720316..400c186 100644 (file)
--- a/lib/filebrowser/file_info_stored.php
+++ b/lib/filebrowser/file_info_stored.php
@@ -417,7 +417,7 @@ class file_info_stored extends file_info {
      * Create new file from stored file - make sure
      * params are valid.
      * @param string $newfilename name of new file
-     * @param mixed dile id or stored_file of file
+     * @param mixed file id or stored_file of file
      * @param int id of author, default $USER->id
      * @return file_info new file
      */