From de8d91ce3848970b7506fc8ab3eb2143ca9e0ac5 Mon Sep 17 00:00:00 2001
From: Dan Marsden <dan@danmarsden.com>
Date: Fri, 7 Feb 2020 10:54:00 +1300
Subject: [PATCH 1/2] MDL-67872 lib: correct plagiarism config frankenstyle
 naming.

---
 lib/plagiarismlib.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/plagiarismlib.php b/lib/plagiarismlib.php
index 26322503b875e..aa7c5db8d4154 100644
--- a/lib/plagiarismlib.php
+++ b/lib/plagiarismlib.php
@@ -182,19 +182,35 @@ function plagiarism_print_disclosure($cmid) {
 }
 
 /**
- * helper function - also loads lib file of plagiarism plugin
+ * Helper function - also loads lib file of plagiarism plugin
+ *
+ * @todo MDL-67872 the deprecated code in this function to be removed in Moodle 4.3
  * @return array of available plugins
  */
 function plagiarism_load_available_plugins() {
     global $CFG;
+    static $showndeprecatedmessage = array(); // Only show message once per page load.
+
     if (empty($CFG->enableplagiarism)) {
         return array();
     }
     $plagiarismplugins = core_component::get_plugin_list('plagiarism');
     $availableplugins = array();
-    foreach($plagiarismplugins as $plugin => $dir) {
-        //check this plugin is enabled and a lib file exists.
-        if (get_config('plagiarism', $plugin."_use") && file_exists($dir."/lib.php")) {
+    foreach ($plagiarismplugins as $plugin => $dir) {
+        // Check this plugin is enabled and a lib file exists.
+        if (get_config('plagiarism', $plugin."_use")) {
+            // Deprecated Since Moodle 3.9.
+            $pluginenabled = true;
+            if (empty($showndeprecatedmessage[$plugin])) {
+                $text = 'The setting plagiarism:'.$plugin.'_use is deprecated.';
+                $text .= ' Use plagiarism_' . $plugin . ':enabled instead';
+                debugging($text, DEBUG_DEVELOPER);
+                $showndeprecatedmessage[$plugin] = true;
+            }
+        } else {
+            $pluginenabled = get_config('plagiarism_'.$plugin, 'enabled');
+        }
+        if ($pluginenabled && file_exists($dir."/lib.php")) {
             require_once($dir.'/lib.php');
             $plagiarismclass = "plagiarism_plugin_$plugin";
             if (class_exists($plagiarismclass)) {

From c61619fd1ffb7cae676812034a49989a96290266 Mon Sep 17 00:00:00 2001
From: Dan Marsden <dan@danmarsden.com>
Date: Fri, 7 Feb 2020 10:57:24 +1300
Subject: [PATCH 2/2] MDL-67872 lib: fix code compliance with guidelines.

---
 lib/plagiarismlib.php | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/plagiarismlib.php b/lib/plagiarismlib.php
index aa7c5db8d4154..b711ac98860c1 100644
--- a/lib/plagiarismlib.php
+++ b/lib/plagiarismlib.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -19,16 +18,14 @@
  * plagiarismlib.php - Contains core Plagiarism related functions.
  *
  * @since Moodle 2.0
- * @package    moodlecore
+ * @package    core
  * @subpackage plagiarism
  * @copyright  2010 Dan Marsden http://danmarsden.com
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-///// GENERIC PLAGIARISM FUNCTIONS ////////////////////////////////////////////////////
-
 if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+    die('Direct access to this script is forbidden.');
 }
 
 /**
@@ -44,7 +41,7 @@ function plagiarism_get_links($linkarray) {
     }
     $plagiarismplugins = plagiarism_load_available_plugins();
     $output = '';
-    foreach($plagiarismplugins as $plugin => $dir) {
+    foreach ($plagiarismplugins as $plugin => $dir) {
         require_once($dir.'/lib.php');
         $plagiarismclass = "plagiarism_plugin_$plugin";
         $plagiarismplugin = new $plagiarismclass;
@@ -69,7 +66,7 @@ function plagiarism_get_file_results($cmid, $userid, $file) {
         return $allresults;
     }
     $plagiarismplugins = plagiarism_load_available_plugins();
-    foreach($plagiarismplugins as $plugin => $dir) {
+    foreach ($plagiarismplugins as $plugin => $dir) {
         require_once($dir.'/lib.php');
         $plagiarismclass = "plagiarism_plugin_$plugin";
         $plagiarismplugin = new $plagiarismclass;
@@ -91,7 +88,7 @@ function plagiarism_save_form_elements($data) {
         return '';
     }
     $plagiarismplugins = plagiarism_load_available_plugins();
-    foreach($plagiarismplugins as $plugin => $dir) {
+    foreach ($plagiarismplugins as $plugin => $dir) {
         require_once($dir.'/lib.php');
         $plagiarismclass = "plagiarism_plugin_$plugin";
         $plagiarismplugin = new $plagiarismclass;
@@ -122,7 +119,7 @@ function plagiarism_get_form_elements_module($mform, $context, $modulename = "")
         return '';
     }
     $plagiarismplugins = plagiarism_load_available_plugins();
-    foreach($plagiarismplugins as $plugin => $dir) {
+    foreach ($plagiarismplugins as $plugin => $dir) {
         require_once($dir.'/lib.php');
         $plagiarismclass = "plagiarism_plugin_$plugin";
         $plagiarismplugin = new $plagiarismclass;
@@ -151,7 +148,7 @@ function plagiarism_update_status($course, $cm) {
     }
     $plagiarismplugins = plagiarism_load_available_plugins();
     $output = '';
-    foreach($plagiarismplugins as $plugin => $dir) {
+    foreach ($plagiarismplugins as $plugin => $dir) {
         require_once($dir.'/lib.php');
         $plagiarismclass = "plagiarism_plugin_$plugin";
         $plagiarismplugin = new $plagiarismclass;
@@ -161,10 +158,10 @@ function plagiarism_update_status($course, $cm) {
 }
 
 /**
-* Function that prints the student disclosure notifying that the files will be checked for plagiarism
-* @param integer $cmid - the cmid of this module
-* @return string
-*/
+ * Function that prints the student disclosure notifying that the files will be checked for plagiarism
+ * @param integer $cmid - the cmid of this module
+ * @return string
+ */
 function plagiarism_print_disclosure($cmid) {
     global $CFG;
     if (empty($CFG->enableplagiarism)) {
@@ -172,7 +169,7 @@ function plagiarism_print_disclosure($cmid) {
     }
     $plagiarismplugins = plagiarism_load_available_plugins();
     $output = '';
-    foreach($plagiarismplugins as $plugin => $dir) {
+    foreach ($plagiarismplugins as $plugin => $dir) {
         require_once($dir.'/lib.php');
         $plagiarismclass = "plagiarism_plugin_$plugin";
         $plagiarismplugin = new $plagiarismclass;