From 325aa87fa810926df1a5f6808617ac2b068a2c8f Mon Sep 17 00:00:00 2001
From: Jane Adelmann <jane.adelmann@plagiarismcheck.org>
Date: Thu, 1 Nov 2018 18:50:10 +0200
Subject: [PATCH] Fix linter issues. Prepare version 1.19

---
 .gitignore                     |  2 ++
 .travis.yml                    | 50 ++++++++++++++++++++++++++++++++++
 amd/build/main.min.js          |  1 -
 component/ApiProvider.php      |  1 +
 component/UrlGenerator.php     |  1 +
 db/access.php                  |  1 +
 db/events.php                  |  1 +
 db/install.php                 |  1 +
 form/plagiarism_form.php       |  3 +-
 form/send_text_form.php        |  8 +++---
 lang/en/plagiarism_pchkorg.php |  1 +
 lib.php                        |  1 +
 model/ConfigModel.php          |  1 +
 model/FileModel.php            |  1 +
 page/check.php                 |  1 +
 page/report.php                |  5 ++--
 settings.php                   |  1 +
 version.php                    |  5 ++--
 view/check_report.php          |  6 +++-
 view/report.php                | 47 ++++++++++++++++----------------
 view/send_text.php             |  6 +++-
 21 files changed, 109 insertions(+), 35 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 .travis.yml
 delete mode 100644 amd/build/main.min.js

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c6ef218
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea
+
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..10ca726
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,50 @@
+language: php
+
+sudo: true
+
+addons:
+  firefox: "47.0.1"
+  postgresql: "9.4"
+  apt:
+    packages:
+    - oracle-java8-installer
+    - oracle-java8-set-default
+
+cache:
+  directories:
+  - $HOME/.composer/cache
+  - $HOME/.npm
+
+php:
+- 7.0
+- 7.1
+
+env:
+  global:
+  - MOODLE_BRANCH=MOODLE_35_STABLE
+  matrix:
+  - DB=pgsql
+  - DB=mysqli
+
+before_install:
+- phpenv config-rm xdebug.ini
+- nvm install 8.9
+- nvm use 8.9
+- cd ../..
+- composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2
+- export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
+
+install:
+- moodle-plugin-ci install
+
+script:
+- moodle-plugin-ci phplint
+- moodle-plugin-ci phpcpd
+- moodle-plugin-ci phpmd
+#- moodle-plugin-ci codechecker
+- moodle-plugin-ci validate
+- moodle-plugin-ci savepoints
+- moodle-plugin-ci mustache
+#- moodle-plugin-ci grunt
+- moodle-plugin-ci phpunit
+- moodle-plugin-ci behat
\ No newline at end of file
diff --git a/amd/build/main.min.js b/amd/build/main.min.js
deleted file mode 100644
index 3dc7c1d..0000000
--- a/amd/build/main.min.js
+++ /dev/null
@@ -1 +0,0 @@
-define(["jquery"],function(a){return{checkReport:function(){window.console.log("loaded",a)}}});
\ No newline at end of file
diff --git a/component/ApiProvider.php b/component/ApiProvider.php
index 93416ad..9e8821f 100644
--- a/component/ApiProvider.php
+++ b/component/ApiProvider.php
@@ -1,5 +1,6 @@
 <?php
 
+
 class ApiProvider
 {
 
diff --git a/component/UrlGenerator.php b/component/UrlGenerator.php
index a44fc22..2d59c28 100644
--- a/component/UrlGenerator.php
+++ b/component/UrlGenerator.php
@@ -1,5 +1,6 @@
 <?php
 
+
 class UrlGenerator
 {
     public function getCheckUrl($cmid, $fileid)
diff --git a/db/access.php b/db/access.php
index 651ba34..0e98718 100644
--- a/db/access.php
+++ b/db/access.php
@@ -1,4 +1,5 @@
 <?php
+
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/db/events.php b/db/events.php
index 6e5aaeb..518292c 100644
--- a/db/events.php
+++ b/db/events.php
@@ -1,3 +1,4 @@
 <?php
 
+
 $observers = array();
\ No newline at end of file
diff --git a/db/install.php b/db/install.php
index 85dd84c..ebbcdf7 100644
--- a/db/install.php
+++ b/db/install.php
@@ -1,4 +1,5 @@
 <?php
+
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/form/plagiarism_form.php b/form/plagiarism_form.php
index 5936233..4f3f201 100644
--- a/form/plagiarism_form.php
+++ b/form/plagiarism_form.php
@@ -1,8 +1,9 @@
 <?php
 
+
 class plagiarism_setup_form extends moodleform {
 
-/// Define the form
+// Define the form
     function definition () {
         global $CFG;
 
diff --git a/form/send_text_form.php b/form/send_text_form.php
index 225d487..8d57680 100644
--- a/form/send_text_form.php
+++ b/form/send_text_form.php
@@ -1,11 +1,11 @@
 <?php
 
-//moodleform is defined in formslib.php
+// moodleform is defined in formslib.php
 require_once("$CFG->libdir/formslib.php");
 
 class send_text_form extends moodleform
 {
-    //Add elements to form
+    // Add elements to form
     public function definition()
     {
         global $CFG;
@@ -21,9 +21,9 @@ class send_text_form extends moodleform
 
     }
 
-    //Custom validation should be added here
+    // Custom validation should be added here
     function validation($data, $files)
     {
         return array();
     }
-}
\ No newline at end of file
+}
diff --git a/lang/en/plagiarism_pchkorg.php b/lang/en/plagiarism_pchkorg.php
index 90d76a5..975b5ca 100644
--- a/lang/en/plagiarism_pchkorg.php
+++ b/lang/en/plagiarism_pchkorg.php
@@ -1,4 +1,5 @@
 <?php
+
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/lib.php b/lib.php
index db02e88..0f481b3 100644
--- a/lib.php
+++ b/lib.php
@@ -1,4 +1,5 @@
 <?php
+
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/model/ConfigModel.php b/model/ConfigModel.php
index 74ef158..3ac6862 100644
--- a/model/ConfigModel.php
+++ b/model/ConfigModel.php
@@ -1,5 +1,6 @@
 <?php
 
+
 class ConfigModel
 {
     private $db;
diff --git a/model/FileModel.php b/model/FileModel.php
index 0fc4bb2..4cebfd9 100644
--- a/model/FileModel.php
+++ b/model/FileModel.php
@@ -1,5 +1,6 @@
 <?php
 
+
 class FileModel
 {
     private $db;
diff --git a/page/check.php b/page/check.php
index f489e43..d7f1479 100644
--- a/page/check.php
+++ b/page/check.php
@@ -1,4 +1,5 @@
 <?php
+
 require_once(__DIR__ . '/../../../config.php');
 require_once(__DIR__ . '/../lib.php');
 require_once(__DIR__ . '/../form/send_text_form.php');
diff --git a/page/report.php b/page/report.php
index 17a6562..ebbc2b4 100644
--- a/page/report.php
+++ b/page/report.php
@@ -1,5 +1,6 @@
 <?php
 
+
 require_once(__DIR__ . '/../../../config.php');
 require_once(__DIR__ . '/../lib.php');
 require_once(__DIR__ . '/../form/send_text_form.php');
@@ -39,7 +40,7 @@ if ('POST' === $_SERVER['REQUEST_METHOD']) {// form submission
 
     $file = $fs->get_file_by_id($fileid);
     if (!$file) {
-        //file not found
+        // file not found
 
         die('404 not exists');
     }
@@ -74,7 +75,7 @@ if ('POST' === $_SERVER['REQUEST_METHOD']) {// form submission
 
 $file = $fs->get_file_by_id($fileid);
 if (!$file) {
-    //file not found
+    // file not found
 
     die('404 not exists');
 }
diff --git a/settings.php b/settings.php
index 4dfd95f..2a3111b 100644
--- a/settings.php
+++ b/settings.php
@@ -1,4 +1,5 @@
 <?php
+
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/version.php b/version.php
index 60add90..9952054 100644
--- a/version.php
+++ b/version.php
@@ -1,4 +1,5 @@
 <?php
+
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -26,9 +27,9 @@ defined('MOODLE_INTERNAL') || die();
 if (!isset($plugin)) {
     $plugin = new stdClass();
 }
-$plugin->version = 2018103102;
+$plugin->version = 2018110101;
 $plugin->requires = 2017051501; // Requires Moodle 3.3 .
-$plugin->release = 'v1.18';
+$plugin->release = 'v1.19';
 $plugin->maturity = MATURITY_STABLE;
 
 $plugin->component = 'plagiarism_pchkorg';
diff --git a/view/check_report.php b/view/check_report.php
index 5bbb30b..b971d28 100644
--- a/view/check_report.php
+++ b/view/check_report.php
@@ -1,5 +1,6 @@
 <?php
 
+
 echo $OUTPUT->header();
 ?>
 <style>
@@ -19,7 +20,10 @@ echo $OUTPUT->header();
 </style>
 
 <div>
-    <div id="plagcheck-loader" data-cmid="<?php echo intval($cmid)?>" data-file="<?php echo intval($fileid)?>" class="loader"></div>
+    <div id="plagcheck-loader" data-cmid="<?php
+ echo intval($cmid)?>" data-file="<?php
+ echo intval($fileid)?>" class="loader"></div>
 </div>
 <?php
+
 echo $OUTPUT->footer();
\ No newline at end of file
diff --git a/view/report.php b/view/report.php
index 4289898..f7fbc39 100644
--- a/view/report.php
+++ b/view/report.php
@@ -1,4 +1,5 @@
 <?php
+
 $PAGE->requires->css('/plagiarism/pchkorg/assets/viewer/report-viewer.min.css');
 
 echo $OUTPUT->header();
@@ -6,32 +7,32 @@ echo $OUTPUT->header();
 ?>
     <div class="pCheck-container"></div>
     <div id="report-root"></div>
-
 <?php
 
-    if (empty($error)) {
-        ?>
-        <script src="/plagiarism/pchkorg/assets/viewer/report-viewer.min.js"></script>
-        <script>
-          (function(window, document, ReportViewer, localData) {
-            var element = document.getElementById('report-root');
-            var widget = ReportViewer.create();
 
-            widget.init({
-              element: element,
-              localData: localData
-            });
-          })(window, window.document, window.ReportViewer, <?php echo empty($data) ? '{}': $data ?>);
-        </script>
-        <?
-    } elseif (isset($error)) {
-        ?>
-            <h2>Error: <?php echo $error ?></h2>
+if (empty($error)) {
+    ?>
+    <script src="/plagiarism/pchkorg/assets/viewer/report-viewer.min.js"></script>
+    <script>
+      (function (window, document, ReportViewer, localData) {
+        var element = document.getElementById('report-root');
+        var widget = ReportViewer.create();
 
-        <?
-    }
-?>
+        widget.init({
+          element: element,
+          localData: localData
+        });
+      })(window, window.document, window.ReportViewer, <?php
+ echo empty($data) ? '{}' : $data ?>);
+    </script>
+    <?php
 
-<?php
+} elseif (isset($error)) {
+    ?>
+    <h2>Error: <?php
+ echo $error ?></h2>
+    <?php
 
-echo $OUTPUT->footer();
\ No newline at end of file
+}
+
+echo $OUTPUT->footer();
diff --git a/view/send_text.php b/view/send_text.php
index 9e096a9..a444a9e 100644
--- a/view/send_text.php
+++ b/view/send_text.php
@@ -1,5 +1,6 @@
 <?php
 
+
 echo $OUTPUT->header();
 ?>
 
@@ -17,13 +18,15 @@ echo $OUTPUT->header();
     <br/>
     <div class="plagiarism-preview-content">
         <div class="plagiarism-preview-content-inner">
-            <?php echo nl2br(htmlspecialchars($content, ENT_COMPAT | ENT_HTML401, $encoding = 'UTF-8')) ?>
+            <?php
+ echo nl2br(htmlspecialchars($content, ENT_COMPAT | ENT_HTML401, $encoding = 'UTF-8')) ?>
         </div>
     </div>
     <br/>
     <div>
         <?php
 
+
         if ($isSupported) {
             echo $form->display();
         } else {
@@ -32,4 +35,5 @@ echo $OUTPUT->header();
         ?>
     </div>
 <?php
+
 echo $OUTPUT->footer();
\ No newline at end of file