add namespace for classes in classes/output

Author: Friederike-cil

action.php

@@ -30,6 +30,10 @@
  * @authors   Rabea de Groot, Anna Heynkes, Friederike Schwager
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
+use mod_pdfannotator\output\comment;
+use mod_pdfannotator\output\printview;
+
 require_once('../../config.php');
 require_once('model/annotation.class.php');
 require_once('model/comment.class.php');
@@ -325,7 +329,6 @@
 
     require_capability('mod/pdfannotator:create', $context);
 
-    require_once($CFG->dirroot . '/mod/pdfannotator/classes/output/comment.php');
     // Get the annotation to be commented.
     $annotationid = required_param('annotationId', PARAM_INT);
     $PAGE->set_context($context);
@@ -359,7 +362,6 @@
 
 if ($action === 'getInformation') { // This concerns only textbox and drawing.
 
-    require_once($CFG->dirroot . '/mod/pdfannotator/classes/output/comment.php');
     $annotationid = required_param('annotationId', PARAM_INT);
 
     $comment = pdfannotator_annotation::get_information($annotationid);
@@ -384,7 +386,8 @@
 
     $comments = pdfannotator_comment::read($documentid, $annotationid, $context);
 
-    require_once($CFG->dirroot . '/mod/pdfannotator/classes/output/comment.php');
+ //   require_once($CFG->dirroot . '/mod/pdfannotator/classes/output/comment.php');
+    
     $myrenderer = $PAGE->get_renderer('mod_pdfannotator');
     $templatable = new comment($comments, $cm, $context);
 
@@ -604,8 +607,6 @@
         return;
     }
 
-    require_once($CFG->dirroot.'/mod/pdfannotator/classes/output/printview.php');
-
     global $DB;
 
     // The model retrieves and selects data.

classes/output/answermenu.php

@@ -22,6 +22,10 @@
  * @author    Friederike Schwager
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
+namespace mod_pdfannotator\output;
+use moodle_url;
+
 defined('MOODLE_INTERNAL') || die();
 
 class answermenu implements \renderable, \templatable {

classes/output/comment.php

@@ -14,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace mod_pdfannotator\output;
+use moodle_url;
+
 /**
  * Renderable for comments.
  *

classes/output/index.php

@@ -28,9 +28,14 @@
  *
  * @author degroot
  */
+
+namespace mod_pdfannotator\output;
+
+use stdClass;
+
 defined('MOODLE_INTERNAL') || die();
 
-class index implements renderable, templatable { // Class should be placed elsewhere.
+class index implements \renderable, \templatable { // Class should be placed elsewhere.
 
     private $usestudenttextbox;
     private $usestudentdrawing;
@@ -61,7 +66,7 @@ public function __construct($pdfannotator, $capabilities, $file) {
 
     }
 
-    public function export_for_template(renderer_base $output) {
+    public function export_for_template(\renderer_base $output) {
         global $OUTPUT, $PAGE;
         $url = $PAGE->url;
         $data = new stdClass();

classes/output/printview.php

@@ -25,6 +25,9 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  *
  */
+
+namespace mod_pdfannotator\output;
+
 defined('MOODLE_INTERNAL') || die();
 
 class printview implements \renderable, \templatable {

classes/output/questionmenu.php

@@ -22,6 +22,10 @@
  * @author    Friederike Schwager
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
+namespace mod_pdfannotator\output;
+use moodle_url;
+
 defined('MOODLE_INTERNAL') || die();
 
 class questionmenu implements \renderable, \templatable {

classes/output/reportmenu.php

@@ -22,6 +22,10 @@
  * @author    Friederike Schwager
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
+namespace mod_pdfannotator\output;
+use moodle_url;
+
 defined('MOODLE_INTERNAL') || die();
 
 class reportmenu implements \renderable, \templatable {

classes/output/statistics.php

@@ -24,6 +24,11 @@
  * @author    Friederike Schwager
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
+namespace mod_pdfannotator\output;
+
+use pdfannotator_statistics;
+
 defined('MOODLE_INTERNAL') || die();
 
 /**

controller.php

@@ -20,6 +20,9 @@
  * @authors   Anna Heynkes, Friederike Schwager
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
+use mod_pdfannotator\output\statistics;
+
 defined('MOODLE_INTERNAL') || die();
 
 $action = optional_param('action', 'view', PARAM_ALPHA); // The default action is 'view'.
@@ -435,7 +438,6 @@
     require_capability('mod/pdfannotator:viewstatistics', $context);
 
     require_once($CFG->dirroot . '/mod/pdfannotator/model/statistics.class.php');
-    require_once($CFG->dirroot . '/mod/pdfannotator/classes/output/statistics.php');
 
     echo $myrenderer->pdfannotator_render_tabs($taburl, $action, $pdfannotator->name, $context);
     $PAGE->set_title("statisticview");

locallib.php

@@ -19,6 +19,12 @@
  * @authors   Rabea de Groot, Anna Heynkes, Friederike Schwager
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
+use mod_pdfannotator\output\answermenu;
+use mod_pdfannotator\output\questionmenu;
+use mod_pdfannotator\output\reportmenu;
+use mod_pdfannotator\output\index;
+
 defined('MOODLE_INTERNAL') || die;
 
 require_once("$CFG->libdir/filelib.php");
@@ -35,7 +41,6 @@
  */
 function pdfannotator_display_embed($pdfannotator, $cm, $course, $file, $page = 1, $annoid = null, $commid = null) {
     global $CFG, $PAGE, $OUTPUT, $USER;
-    require_once($CFG->dirroot . '/mod/pdfannotator/classes/output/index.php');
 
     // The revision attribute's existance is demanded by moodle for versioning and could be saved in the pdfannotator table in the future.
     // Note, however, that we forbid file replacement in order to prevent a change of meaning in other people's comments.
@@ -1575,7 +1580,6 @@ function pdfannotator_questionstable_add_row($thiscourse, $table, $question, $ur
     $data = array($content, $author . '<br>' . $time, $question->votes, $question->answercount, $lastanswered, $pdfannotatorname);
 
     if ($showdropdown) {
-        require_once($CFG->dirroot . '/mod/pdfannotator/classes/output/questionmenu.php');
         $myrenderer = $PAGE->get_renderer('mod_pdfannotator');
         $dropdown = $myrenderer->render_dropdownmenu(new questionmenu($question->commentid, $urlparams));
         $data[] = $dropdown;
@@ -1627,7 +1631,6 @@ function pdfannotator_answerstable_add_row($thiscourse, $table, $answer, $cmid,
         $classname = 'dimmed_text';
     }
 
-    require_once($CFG->dirroot . '/mod/pdfannotator/classes/output/answermenu.php');
     $myrenderer = $PAGE->get_renderer('mod_pdfannotator');
     $dropdown = $myrenderer->render_dropdownmenu(new answermenu($answer->annoid, $issubscribed, $cmid, $currentpage, $itemsperpage, $answerfilter));
 
@@ -1684,7 +1687,6 @@ function pdfannotator_reportstable_add_row($thiscourse, $table, $report, $cmid,
     }
 
     // Create action dropdown menu.
-    require_once($CFG->dirroot . '/mod/pdfannotator/classes/output/reportmenu.php');
     $myrenderer = $PAGE->get_renderer('mod_pdfannotator');
     $dropdown = $myrenderer->render_dropdownmenu(new reportmenu($report, $cmid, $currentpage, $itemsperpage, $reportfilter));