Fixed lots of bodgy little things

diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index 9ce4872ed29096e10a8350aea8786e9e3ff85b10..d386d124aaca12917976bdcee3257e26238f19a2 100644 (file)
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -83,7 +83,7 @@ function display() {
 }
 
 
-function setup($form) {
+function setup(&$form) {
     global $CFG, $usehtmleditor;
 
     if (! empty($form->course)) {
@@ -107,6 +107,9 @@ function setup($form) {
     if (empty($form->alltext)) {
         $form->alltext = "";
     }
+    if (empty($form->options)) {
+        $form->options = "";
+    }
     $nohtmleditorneeded = true;
 
     print_heading_with_help(get_string("resourcetype$form->type", 'resource'), $form->type, 'resource');
@@ -217,7 +220,8 @@ function resource_add_instance($resource) {
     global $CFG;
     
     require_once("$CFG->dirroot/mod/resource/type/$resource->type/resource.class.php");
-    $res = new resource();
+    $resourceclass = "resource_$resource->type";
+    $res = new $resourceclass();
 
     return $res->add_instance($resource);
 }
@@ -226,7 +230,8 @@ function resource_update_instance($resource) {
     global $CFG;
     
     require_once("$CFG->dirroot/mod/resource/type/$resource->type/resource.class.php");
-    $res = new resource();
+    $resourceclass = "resource_$resource->type";
+    $res = new $resourceclass();
 
     return $res->update_instance($resource);
 }
@@ -239,7 +244,8 @@ function resource_delete_instance($id) {
     }
     
     require_once("$CFG->dirroot/mod/resource/type/$resource->type/resource.class.php");
-    $res = new resource();
+    $resourceclass = "resource_$resource->type";
+    $res = new $resourceclass();
 
     return $res->delete_instance($id);
 }

diff --git a/mod/resource/mod.html b/mod/resource/mod.html
index 1a58d0a0a761f8a1bcea727b3b727a848c182261..47e759115b8b9a33bf79f9c9a8fae2e497b26784 100644 (file)
--- a/mod/resource/mod.html
+++ b/mod/resource/mod.html
@@ -1,13 +1,13 @@
-<?php
+<?php // $Id$
+      // This script prints the setup screen for any resource
+      // It does this by calling the setup method in the appropriate class
 
 require_once("$CFG->dirroot/mod/resource/lib.php");
+require_once("$CFG->dirroot/mod/resource/type/$form->type/resource.class.php");
 
-include_once("$CFG->dirroot/mod/resource/type/$form->type/resource.class.php");
-
-$resource = new resource();
+$resourceclass = "resource_$form->type";
+$resource = new $resourceclass();
 
 $resource->setup($form);
 
-
-
 ?>

diff --git a/mod/resource/type/directory/resource.class.php b/mod/resource/type/directory/resource.class.php
index ced302d6e7113febafce076830f7f91b22824214..5c58b93bac0a73c02241e2534ab800b2b7e95e66 100644 (file)
--- a/mod/resource/type/directory/resource.class.php
+++ b/mod/resource/type/directory/resource.class.php
@@ -1,9 +1,8 @@
 <?php // $Id$
 
-class resource extends resource_base {
+class resource_directory extends resource_base {
 
-
-function resource($cmid=0) {
+function resource_directory($cmid=0) {
     parent::resource_base($cmid);
 }
 

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 67de708427e55030055e7474d316b691c093ee1c..acef107a6a318929b2d95739678fe1ac98684019 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -6,13 +6,16 @@
 * Extend the base resource class for file resources
 *
 */
-class resource extends resource_base {
+class resource_file extends resource_base {
+
+function resource_file($cmid=0) {
+    parent::resource_base($cmid);
+}
 
 var $parameters;
 var $maxparameters = 5;
 
 
-
 /**
 * Sets the parameters property of the extended class
 *

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index a571857ab6511f24f6ed41a60dc446f8f8d649b4..2e532fc1af6ea59488978e69f94b17c19c5503f8 100644 (file)
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -1,9 +1,9 @@
 <?php // $Id$
 
-class resource extends resource_base {
+class resource_html extends resource_base {
 
 
-function resource($cmid=0) {
+function resource_html($cmid=0) {
     parent::resource_base($cmid);
 }
 

diff --git a/mod/resource/type/reference/resource.class.php b/mod/resource/type/reference/resource.class.php
index e2eb2817702f60023efe285067bda5f5c4cd7421..178d4dd0aef63631ae44a7dc57cd25f5a2bea907 100644 (file)
--- a/mod/resource/type/reference/resource.class.php
+++ b/mod/resource/type/reference/resource.class.php
@@ -1,9 +1,9 @@
 <?php // $Id$
 
-class resource extends resource_base {
+class resource_reference extends resource_base {
 
 
-function resource($cmid=0) {
+function resource_reference($cmid=0) {
     parent::resource_base($cmid);
 }
 

diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php
index 1b18bdd6454af3b62ee74459bfb562e0073e7475..4177537599f77d6e49b9e6e6db22bb36ef28cd2e 100644 (file)
--- a/mod/resource/type/text/resource.class.php
+++ b/mod/resource/type/text/resource.class.php
@@ -1,9 +1,9 @@
 <?php // $Id$
 
-class resource extends resource_base {
+class resource_text extends resource_base {
 
 
-function resource($cmid=0) {
+function resource_text($cmid=0) {
     parent::resource_base($cmid);
 }
 
@@ -46,7 +46,7 @@ function setup($form) {
     $editorfields = 'summary';
     
     parent::setup($form);
-    
+
     $format_array = format_text_menu();
     unset($format_array[FORMAT_HTML]);
     include("$CFG->dirroot/mod/resource/type/text/text.html");

diff --git a/mod/resource/view.php b/mod/resource/view.php
index 4938781644be98b2aeebde4fba2c2096775442d4..e8ff0028f747c1c7bdfd3ab79d73082b2885bd92 100644 (file)
--- a/mod/resource/view.php
+++ b/mod/resource/view.php
@@ -4,8 +4,6 @@
     require_once("lib.php");
  
     require_variable($id);    // Course Module ID
-//    optional_variable($frameset, "");
-//    optional_variable($subdir, "");
 
     if (!empty($CFG->forcelogin)) {
         require_login();
@@ -20,8 +18,8 @@
     }
 
     require ("$CFG->dirroot/mod/resource/type/$resource->type/resource.class.php");
-
-    $resourceinstance = new resource($id);
+    $resourceclass = "resource_$resource->type";
+    $resourceinstance = new $resourceclass($id);
 
     $resourceinstance->display();