Fixed lots of bodgy little things

This commit is contained in:
moodler 2004-07-28 06:56:59 +00:00
parent 63308949f7
commit 1aef6fb798
8 changed files with 32 additions and 26 deletions

View File

@ -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);
}

View File

@ -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);
?>

View File

@ -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);
}

View File

@ -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
*

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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");

View File

@ -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();