Bug 1609112: Pass the plugin type to is_plugin_active()

So that we can differentiate between plugin types that have the same
plugin name, eg comment artefact vs comment blocktype

behatnotneeded

Change-Id: I0f7ffe6da3f7a4ff88cf625a1010c6d2012932d0
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit f30bcd12)

htdocs/auth/webservice/lib.php

@@ -89,7 +89,7 @@ class PluginAuthWebservice extends PluginAuth {
 
     public static function admin_menu_items() {
 
-        if (!is_plugin_active('webservice')) {
+        if (!is_plugin_active('webservice', 'auth')) {
             return array();
         }
         return array(

htdocs/lib/mahara.php

@@ -1509,14 +1509,23 @@ function safe_require_plugin($plugintype, $pluginname, $filename='lib.php', $fun
  * Check to see if a particular plugin is installed and is active by plugin name
  *
  * @param   string $pluginname Name of plugin
+ * @param   string $type       Name of plugin type
  * @return  bool
  */
-function is_plugin_active($pluginname) {
-    foreach (plugin_types() as $type) {
+function is_plugin_active($pluginname, $type = null) {
+    if ($type) {
         if (record_exists($type . '_installed', 'name', $pluginname, 'active', 1)) {
             return true;
         }
     }
+    else {
+        log_debug("Calling 'is_plugin_active()' without specifying plugin 'type'. This function may return incorrect results. Please update your 'is_plugin_active()' calls.");
+        foreach (plugin_types() as $type) {
+            if (record_exists($type . '_installed', 'name', $pluginname, 'active', 1)) {
+                return true;
+            }
+        }
+    }
     return false;
 }