\n\n";
}
-function include_help_for_each_resource($forcelang, $skiplocal) {
- global $CFG;
-
- require_once($CFG->dirroot .'/mod/resource/lib.php');
- $typelist = resource_get_types();
-
- //add label type
- $labelType = new object();
- $labelType->modclass = MOD_CLASS_RESOURCE;
- $resourcetype = 'label';
- $labelType->name = $resourcetype;
- $labelType->type = "resource&type=$resourcetype";
- $labelType->typestr = get_string("resourcetype$resourcetype", 'resource');
- $typelist[] = $labelType;
-
- foreach ($typelist as $type) {
- list($filepath, $foundlang) = string_manager::instance()->find_help_file('type/' . $type->name . '.html', 'resource', $forcelang, $skiplocal);
- if ($filepath) {
- echo '';
- include($filepath);
- }
- }
-}
-
function include_help_for_each_assignment_type() {
global $CFG;
diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index b4ca3b02f9645..73601f1f31e6e 100644
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -208,6 +208,7 @@
$string['configminpasswordlower'] = 'Passwords must have at least these many lower case letters.';
$string['configminpasswordnonalphanum'] = 'Passwords must have at least these many non-alphanumeric characters.';
$string['configminpasswordupper'] = 'Passwords must have at least these many upper case letters.';
+$string['condifmodeditdefaults'] = 'The values you set here define the default values that are used in the activity settings form when you create a new activity. You can also configure which activity settings are considered advanced.';
$string['configmycoursesperpage'] = 'Maximum number of courses to display in any list of a user\'s own courses';
$string['configmymoodleredirect'] = 'This setting forces redirects to /my on login for non-admins and replaces the top level site navigation with /my';
$string['confignodefaultuserrolelists'] = 'This setting prevents all users from being returned from the database from deprecated calls of get_course_user, etc., for the site course if the default role provides that access. Check this, if you suffer a performance hit.';
@@ -600,6 +601,7 @@
$string['mnetrestore_extusers_mismatch'] = 'Note: This backup file apparently originates from a different Moodle installation and contains remote Moodle Network user accounts that may fail to restore. This operation is unsupported. If you are certain that it was created on this Moodle installation, or you can ensure that all the needed Moodle Network Hosts are configured, you may want to still try the restore.';
$string['mnetrestore_extusers_noadmin'] = 'Note: This backup file seems to come from a different Moodle installation and contains remote Moodle Network user accounts. You are not allowed to execute this type of restore. Contact the administrator of the site or, alternatively, restore this course without any user information (modules, files...)';
$string['mnetrestore_extusers_switchuserauth'] = 'Remote Moodle Network user $a->username (coming from $a->mnethosturl) switched to local $a->auth authenticated user.';
+$string['modeditdefaults'] = 'Default values for activity settings';
$string['modsettings'] = 'Manage activities';
$string['modulesecurity'] = 'Module security';
$string['multilangforceold'] = 'Force old multilang syntax: <span> without the class=\"multilang\" and <lang>';
@@ -738,6 +740,8 @@
$string['remotelangnotavailable'] = 'Because Moodle can not connect to download.moodle.org, we are unable to do language pack installation automatically. Please download the appropriate zip file(s) from the list below, copy them to your $a directory and unzip them manually.';
$string['renameerrors'] = 'Rename errors';
$string['requiredtemplate'] = 'Required. You may use template syntax here (%%l = lastname, %%f = firstname, %%u = username). See help for details and examples.';
+$string['requiremodintro'] = 'Require activity description';
+$string['configrequiremodintro'] = 'Disable this option if you do not want to force users to enter description of each activity.';
$string['requires'] = 'Requires';
$string['requiredentrieschanged'] = 'IMPORTANT - PLEASE READ (This warning message will only be displayed during this upgrade) Due to a bug fix, the behaviour of database activities using the \'Required entries\' and \'Required entries before viewing settings\' settings will change. A more detailed explaination of the changes can be read on the database module forum. The expected behavior of these settings can also be read on Moodle Docs.
This change affects the following databases in your system: (Please save this list now, and after the upgrade, check that these activities still work the way that the teacher intends.) $a->text ';
diff --git a/lang/en_utf8/resource.php b/lang/en_utf8/resource.php
index 31feddfcdadd2..2b45d8ab09f1b 100644
--- a/lang/en_utf8/resource.php
+++ b/lang/en_utf8/resource.php
@@ -1,8 +1,47 @@
-getFilename(), PARAM_FILE);
if ($filename === '') {
+ //unsupported chars, sorry
continue;
}
@@ -140,7 +141,12 @@ function upgrade_migrate_files_course($context, $path, $delete) {
continue; // modules are responsible
}
- $filepath = clean_param($filepath.$item->getFilename().'/', PARAM_PATH);
+ $dirname = clean_param($item->getFilename(), PARAM_PATH);
+ if ($dirname === '') {
+ //unsupported chars, sorry
+ continue;
+ }
+ $filepath = ($filepath.$dirname.'/');
if ($filepath !== '/backupdata/') {
$fs->create_directory($context->id, $filearea, 0, $filepath);
}
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 91feafc091b93..a1c2f6f9a1b6d 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -300,6 +300,8 @@
/** True if module supports groupmembersonly */
define('FEATURE_GROUPMEMBERSONLY', 'groupmembersonly');
+/** Type of module */
+define('FEATURE_MOD_ARCHETYPE', 'mod_archetype');
/** True if module supports intro editor */
define('FEATURE_MOD_INTRO', 'mod_intro');
/** True if module supports subplugins */
@@ -309,6 +311,13 @@
define('FEATURE_COMMENT', 'comment');
+/** Unspecified module archetype */
+define('MOD_ARCHETYPE_OTHER', 0);
+/** Resource-like type module */
+define('MOD_ARCHETYPE_RESOURCE', 1);
+/** Assignemnt module archetype */
+define('MOD_ARCHETYPE_ASSIGNMENT', 2);
+
/// PARAMETER HANDLING ////////////////////////////////////////////////////
diff --git a/lib/resourcelib.php b/lib/resourcelib.php
new file mode 100644
index 0000000000000..23e5d9fbfad7b
--- /dev/null
+++ b/lib/resourcelib.php
@@ -0,0 +1,426 @@
+.
+
+/**
+ * Recourse module like helper functions
+ *
+ * @package moodlecore
+ * @copyright 2009 Petr Skoda (http://skodak.org)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/** Try the best way */
+define('RESOURCELIB_DISPLAY_AUTO', 0);
+/** Display using object tag */
+define('RESOURCELIB_DISPLAY_EMBED', 1);
+/** Display inside frame */
+define('RESOURCELIB_DISPLAY_FRAME', 2);
+/** Display normal link in new window */
+define('RESOURCELIB_DISPLAY_NEW', 3);
+/** Force download of file instead of display */
+define('RESOURCELIB_DISPLAY_DOWNLOAD', 4);
+/** Open directly */
+define('RESOURCELIB_DISPLAY_OPEN', 5);
+/** Open in "emulated" pop-up without navigation */
+define('RESOURCELIB_DISPLAY_POPUP', 6);
+
+/** Legacy files not needed or new resource */
+define('RESOURCELIB_LEGACYFILES_NO', 0);
+/** Legacy files conversion marked as completed */
+define('RESOURCE_LEGACYYFILES_DONE', 1);
+/** Legacy files conversion in progress*/
+define('RESOURCELIB_LEGACYFILES_ACTIVE', 2);
+
+
+/**
+ * Returns list of available display options
+ * @param array $enabled list of options enabled in module configuration
+ * @param int $current current dispaly options for existing instances
+ * @return array of key=>name pairs
+ */
+function resourcelib_get_displayoptions(array $enabled, $current=null) {
+ if (is_number($current)) {
+ $enabled[] = $current;
+ }
+
+ $options = array(RESOURCELIB_DISPLAY_AUTO => get_string('displayauto', 'resource'),
+ RESOURCELIB_DISPLAY_EMBED => get_string('displayembed', 'resource'),
+ RESOURCELIB_DISPLAY_FRAME => get_string('displayframe', 'resource'),
+ RESOURCELIB_DISPLAY_NEW => get_string('displaynew', 'resource'),
+ RESOURCELIB_DISPLAY_DOWNLOAD => get_string('displaydownload', 'resource'),
+ RESOURCELIB_DISPLAY_OPEN => get_string('displayopen', 'resource'),
+ RESOURCELIB_DISPLAY_POPUP => get_string('displaypopup', 'resource'));
+
+ $result = array();
+
+ foreach ($options as $key=>$value) {
+ if (in_array($key, $enabled)) {
+ $result[$key] = $value;
+ }
+ }
+
+ if (empty($result)) {
+ // there should be always something in case admin misconfigures module
+ $result[RESOURCELIB_DISPLAY_OPEN] = $options[RESOURCELIB_DISPLAY_OPEN];
+ }
+
+ return $result;
+}
+
+/**
+ * Tries to guess correct mimetype for arbitrary URL
+ * @param string $fullurl
+ * @return string mimetype
+ */
+function resourcelib_guess_url_mimetype($fullurl) {
+ global $CFG;
+ require_once("$CFG->libdir/filelib.php");
+
+ if (preg_match("|^(.*)/[a-z]*file.php(\?file=)?(/[^&\?]*)|", $fullurl, $matches)) {
+ // remove the special moodle file serving hacks so that the *file.php is ignored
+ $fullurl = $matches[1].$matches[3];
+ }
+
+ if (strpos($fullurl, '.php')){
+ // we do not really know what is in general php script
+ return 'text/html';
+
+ } else if (substr($fullurl, -1) === '/') {
+ // directory index (http://example.com/smaples/)
+ return 'text/html';
+
+ } else if (strpos($fullurl, '//') !== false and substr_count($fullurl, '/') == 2) {
+ // just a host name (http://example.com), solves Australian servers "audio" problem too
+ return 'text/html';
+
+ } else {
+ // ok, this finally looks like a real file
+ return mimeinfo('type', $fullurl);
+ }
+}
+
+/**
+ * Returns image embedding html.
+ * @param string $fullurl
+ * @param string $title
+ * @return string html
+ */
+function resourcelib_embed_image($fullurl, $title) {
+ $code = '';
+ $code .= '
';
+ $code .= "";
+ $code .= '
';
+
+ return $code;
+}
+
+/**
+ * Returns mp3 embedding html.
+ * @param string $fullurl
+ * @param string $title
+ * @param string $clicktoopen
+ * @return string html
+ */
+function resourcelib_embed_mp3($fullurl, $title, $clicktoopen) {
+ global $CFG, $THEME, $PAGE;
+
+ if (!empty($THEME->resource_mp3player_colors)) {
+ $c = $THEME->resource_mp3player_colors; // You can set this up in your theme/xxx/config.php
+ } else {
+ $c = 'bgColour=000000&btnColour=ffffff&btnBorderColour=cccccc&iconColour=000000&'.
+ 'iconOverColour=00cc00&trackColour=cccccc&handleColour=ffffff&loaderColour=ffffff&'.
+ 'font=Arial&fontColour=FF33FF&buffer=10&waitForPlay=no&autoPlay=yes';
+ }
+ $c .= '&volText='.get_string('vol', 'resource').'&panText='.get_string('pan','resource');
+ $id = 'filter_mp3_'.time(); //we need something unique because it might be stored in text cache
+
+ $ufoargs = array('movie' => $CFG->wwwroot.'/lib/mp3player/mp3player.swf?src='.addslashes_js($fullurl),
+ 'width' => 600,
+ 'height' => 70,
+ 'majorversion' => 6,
+ 'build' => 40,
+ 'flashvars' => $c,
+ 'quality' => 'high');
+
+ // If we have Javascript, use UFO to embed the MP3 player, otherwise depend on plugins
+ $code = <<
+
+
+
+OET;
+
+ $PAGE->requires->yui_lib('dom')->in_head();
+ $PAGE->requires->js('lib/ufo.js')->in_head();
+ $PAGE->requires->js('lib/resourcelib.js')->in_head();
+ $code .= $PAGE->requires->data_for_js('FO', $ufoargs)->asap();
+ $code .= $PAGE->requires->js_function_call('resourcelib_create_UFO_object', array($id))->asap();
+ return $code;
+}
+
+/**
+ * Returns flash video embedding html.
+ * @param string $fullurl
+ * @param string $title
+ * @param string $clicktoopen
+ * @return string html
+ */
+function resourcelib_embed_flashvideo($fullurl, $title, $clicktoopen) {
+ global $CFG, $PAGE;
+
+ $id = 'filter_flv_'.time(); //we need something unique because it might be stored in text cache
+
+ $ufoargs = array('movie' => $CFG->wwwroot.'/filter/mediaplugin/flvplayer.swf?file='.addslashes_js($fullurl),
+ 'width' => 600,
+ 'height' => 400,
+ 'majorversion' => 6,
+ 'build' => 40,
+ 'allowscriptaccess' => 'never',
+ 'allowfullscreen' => 'true',
+ 'quality' => 'high');
+
+ // If we have Javascript, use UFO to embed the FLV player, otherwise depend on plugins
+
+ $code = <<
+
+
+
+EOT;
+
+ $PAGE->requires->yui_lib('dom')->in_head();
+ $PAGE->requires->js('lib/ufo.js')->in_head();
+ $PAGE->requires->js('lib/resourcelib.js')->in_head();
+ $code .= $PAGE->requires->data_for_js('FO', $ufoargs)->asap();
+ $code .= $PAGE->requires->js_function_call('resourcelib_create_UFO_object', array($id))->asap();
+ return $code;
+}
+
+/**
+ * Returns flash embedding html.
+ * @param string $fullurl
+ * @param string $title
+ * @param string $clicktoopen
+ * @return string html
+ */
+function resourcelib_embed_flash($fullurl, $title, $clicktoopen) {
+ $code = <<
+
+
+EOT;
+
+ return $code;
+}
+
+/**
+ * Returns ms media embedding html.
+ * @param string $fullurl
+ * @param string $title
+ * @param string $clicktoopen
+ * @return string html
+ */
+function resourcelib_embed_mediaplayer($fullurl, $title, $clicktoopen) {
+ $code = <<
+
+
+EOT;
+
+ return $code;
+}
+
+/**
+ * Returns quicktime embedding html.
+ * @param string $fullurl
+ * @param string $title
+ * @param string $clicktoopen
+ * @return string html
+ */
+function resourcelib_embed_quicktime($fullurl, $title, $clicktoopen) {
+ $code = <<
+
+
+EOT;
+
+ return $code;
+}
+
+/**
+ * Returns mpeg embedding html.
+ * @param string $fullurl
+ * @param string $title
+ * @param string $clicktoopen
+ * @return string html
+ */
+function resourcelib_embed_mpeg($fullurl, $title, $clicktoopen) {
+ $code = <<
+
+
+EOT;
+
+ return $code;
+}
+
+/**
+ * Returns real media embedding html.
+ * @param string $fullurl
+ * @param string $title
+ * @param string $clicktoopen
+ * @return string html
+ */
+function resourcelib_embed_real($fullurl, $title, $clicktoopen) {
+ $code = <<
+
+
+EOT;
+
+ return $code;
+}
+
+/**
+ * Returns general link or file embedding html.
+ * @param string $fullurl
+ * @param string $title
+ * @param string $clicktoopen
+ * @return string html
+ */
+function resourcelib_embed_general($fullurl, $title, $clicktoopen, $mimetype) {
+ global $CFG, $PAGE;
+
+ $iframe = false;
+ // IE can not embed stuff properly if stored on different server
+ // that is why we use iframe instead, unfortunately this tag does not validate
+ // in xhtml strict mode
+ if ($mimetype === 'text/html' and check_browser_version('MSIE', 5)) {
+ if (preg_match('(^https?://[^/]*)', $fullurl, $matches)) {
+ if (strpos($CFG->wwwroot, $matches[0]) !== 0) {
+ $iframe = true;
+ }
+ }
+ }
+
+ if ($iframe) {
+ $code = <<
+
+
+EOT;
+ } else {
+ $code = <<
+
+
+EOT;
+ }
+
+ return $code;
+}
diff --git a/mod/resource/backuplib.php b/mod/resource/backuplib.php
deleted file mode 100644
index fdd9d373b220a..0000000000000
--- a/mod/resource/backuplib.php
+++ /dev/null
@@ -1,176 +0,0 @@
-id,files)
- //
- // Meaning: pk->primary key field of the table
- // fk->foreign key to link with parent
- // nt->nested field (recursive data)
- // CL->course level info
- // UL->user level info
- // files->table may have files)
- //
- //-----------------------------------------------------------
-
- //This function executes all the backup procedure about this mod
- function resource_backup_mods($bf,$preferences) {
- global $CFG, $DB;
-
- $status = true;
-
- ////Iterate over resource table
- $resources = $DB->get_records ("resource", array("course"=>$preferences->backup_course),"id");
- if ($resources) {
- foreach ($resources as $resource) {
- if (backup_mod_selected($preferences,'resource',$resource->id)) {
- $status = resource_backup_one_mod($bf,$preferences,$resource);
- }
- }
- }
- return $status;
- }
-
- function resource_backup_one_mod($bf,$preferences,$resource) {
- global $CFG, $DB;
-
- if (is_numeric($resource)) {
- $resource = $DB->get_record('resource', array('id'=>$resource));
- }
-
- $status = true;
-
- //Start mod
- fwrite ($bf,start_tag("MOD",3,true));
- //Print assignment data
- fwrite ($bf,full_tag("ID",4,false,$resource->id));
- fwrite ($bf,full_tag("MODTYPE",4,false,"resource"));
- fwrite ($bf,full_tag("NAME",4,false,$resource->name));
- fwrite ($bf,full_tag("TYPE",4,false,$resource->type));
- fwrite ($bf,full_tag("REFERENCE",4,false,$resource->reference));
- fwrite ($bf,full_tag("SUMMARY",4,false,$resource->intro));
- fwrite ($bf,full_tag("ALLTEXT",4,false,$resource->alltext));
- fwrite ($bf,full_tag("POPUP",4,false,$resource->popup));
- fwrite ($bf,full_tag("OPTIONS",4,false,$resource->options));
- fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$resource->timemodified));
- //End mod
- $status = fwrite ($bf,end_tag("MOD",3,true));
-
- if ($status && ($resource->type == 'file' || $resource->type == 'directory' || $resource->type == 'ims')) { // more should go here later!
- // backup files for this resource.
- $status = resource_backup_files($bf,$preferences,$resource);
- }
-
- return $status;
- }
-
- ////Return an array of info (name,value)
- function resource_check_backup_mods($course,$user_data=false,$backup_unique_code,$instances=null) {
- if (!empty($instances) && is_array($instances) && count($instances)) {
- $info = array();
- foreach ($instances as $id => $instance) {
- $info += resource_check_backup_mods_instances($instance,$backup_unique_code);
- }
- return $info;
- }
- //First the course data
- $info[0][0] = get_string("modulenameplural","resource");
- if ($ids = resource_ids ($course)) {
- $info[0][1] = count($ids);
- } else {
- $info[0][1] = 0;
- }
-
- return $info;
- }
-
- ////Return an array of info (name,value)
- function resource_check_backup_mods_instances($instance,$backup_unique_code) {
- //First the course data
- $info[$instance->id.'0'][0] = ''.$instance->name.'';
- $info[$instance->id.'0'][1] = '';
-
- return $info;
- }
-
- //Return a content encoded to support interactivities linking. Every module
- //should have its own. They are called automatically from the backup procedure.
- function resource_encode_content_links ($content,$preferences) {
-
- global $CFG;
-
- $base = preg_quote($CFG->wwwroot,"/");
-
- //Link to the list of resources
- $buscar="/(".$base."\/mod\/resource\/index.php\?id\=)([0-9]+)/";
- $result= preg_replace($buscar,'$@RESOURCEINDEX*$2@$',$content);
-
- //Link to resource view by moduleid
- $buscar="/(".$base."\/mod\/resource\/view.php\?id\=)([0-9]+)/";
- $result= preg_replace($buscar,'$@RESOURCEVIEWBYID*$2@$',$result);
-
- //Link to resource view by resourceid
- $buscar="/(".$base."\/mod\/resource\/view.php\?r\=)([0-9]+)/";
- $result= preg_replace($buscar,'$@RESOURCEVIEWBYR*$2@$',$result);
-
- return $result;
- }
-
- // INTERNAL FUNCTIONS. BASED IN THE MOD STRUCTURE
-
- //Returns an array of resources id
- function resource_ids ($course) {
- global $CFG, $DB;
-
- return $DB->get_records_sql("SELECT a.id, a.course
- FROM {resource} a
- WHERE a.course = ?", array($course));
- }
-
- function resource_backup_files($bf,$preferences,$resource) {
- global $CFG;
- $status = true;
-
- if (!file_exists($CFG->dataroot.'/'.$preferences->backup_course.'/'.$resource->reference)) {
- return true ; // doesn't exist but we don't want to halt the entire process so still return true.
- }
-
- $status = $status && check_and_create_course_files_dir($preferences->backup_unique_code);
-
- // if this is somewhere deeply nested we need to do all the structure stuff first.....
- $bits = explode('/',$resource->reference);
- $newbit = '';
- for ($i = 0; $i< count($bits)-1; $i++) {
- $newbit .= $bits[$i].'/';
- $status = $status && check_dir_exists($CFG->dataroot.'/temp/backup/'.$preferences->backup_unique_code.'/course_files/'.$newbit,true);
- }
-
- if ($resource->reference === '') {
- $status = $status && backup_copy_course_files($preferences); // copy while ignoring backupdata and moddata!!!
- } else if (strpos($resource->reference, 'backupdata') === 0 or strpos($resource->reference, $CFG->moddata) === 0) {
- // no copying - these directories must not be shared anyway!
- } else {
- $status = $status && backup_copy_file($CFG->dataroot."/".$preferences->backup_course."/".$resource->reference,
- $CFG->dataroot."/temp/backup/".$preferences->backup_unique_code."/course_files/".$resource->reference);
- }
-
- // now, just in case we check moddata ( going forwards, resources should use this )
- $status = $status && check_and_create_moddata_dir($preferences->backup_unique_code);
- $status = $status && check_dir_exists($CFG->dataroot."/temp/backup/".$preferences->backup_unique_code."/".$CFG->moddata."/resource/",true);
-
- if ($status) {
- //Only if it exists !! Thanks to Daniel Miksik.
- $instanceid = $resource->id;
- if (is_dir($CFG->dataroot."/".$preferences->backup_course."/".$CFG->moddata."/resource/".$instanceid)) {
- $status = backup_copy_file($CFG->dataroot."/".$preferences->backup_course."/".$CFG->moddata."/resource/".$instanceid,
- $CFG->dataroot."/temp/backup/".$preferences->backup_unique_code."/moddata/resource/".$instanceid);
- }
- }
-
- return $status;
- }
-
-?>
diff --git a/mod/resource/db/access.php b/mod/resource/db/access.php
index a68a38249b8de..7a849104895e7 100644
--- a/mod/resource/db/access.php
+++ b/mod/resource/db/access.php
@@ -1,49 +1,38 @@
:
-//
-// component_name should be the same as the directory name of the mod or block.
-//
-// Core moodle capabilities are defined thus:
-// moodle/:
-//
-// Examples: mod/forum:viewpost
-// block/recent_activity:view
-// moodle/site:deleteuser
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
//
-// The variable name for the capability definitions array follows the format
-// $__capabilities
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
//
-// For the core capabilities, the variable is $moodle_capabilities.
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see .
+/**
+ * Resource module capability definition
+ *
+ * @package mod-resource
+ * @copyright 2009 Petr Skoda (http://skodak.org)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
$mod_resource_capabilities = array(
-
- 'mod/resource:exportresource' => array(
+/* TODO: review public portfolio API first!
+ 'mod/resource:portfolioexport' => array(
'captype' => 'read',
'contextlevel' => CONTEXT_MODULE,
'legacy' => array(
- 'admin' => CAP_ALLOW,
'teacher' => CAP_ALLOW,
'editingteacher' => CAP_ALLOW,
)
),
-
+*/
);
-
-?>
diff --git a/mod/resource/db/install.php b/mod/resource/db/install.php
index 06408c46f0835..cabec481e0d63 100644
--- a/mod/resource/db/install.php
+++ b/mod/resource/db/install.php
@@ -1,18 +1,40 @@
-.
+
+/**
+ * Resource module post install function
+ *
+ * This file replaces:
+ * - STATEMENTS section in db/install.xml
+ * - lib.php/modulename_install() post installation hook
+ * - partially defaults.php
+ *
+ * @package mod-resource
+ * @copyright 2009 Petr Skoda (http://skodak.org)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
function xmldb_resource_install() {
global $DB;
-/// Install logging support
-
+ // Install logging support
update_log_display_entry('resource', 'view', 'resource', 'name');
+ update_log_display_entry('resource', 'view all', 'resource', 'name');
update_log_display_entry('resource', 'update', 'resource', 'name');
update_log_display_entry('resource', 'add', 'resource', 'name');
- set_config("resource_hide_repository", "1");
}
diff --git a/mod/resource/db/install.xml b/mod/resource/db/install.xml
index 27fd6b7a4d39c..5c607d7a568e6 100644
--- a/mod/resource/db/install.xml
+++ b/mod/resource/db/install.xml
@@ -1,10 +1,34 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -16,13 +40,19 @@
-
+
+
+
+
+
+
-
+
+
diff --git a/mod/resource/db/upgrade.php b/mod/resource/db/upgrade.php
index 4709051f283f3..94ee5c8d9c466 100644
--- a/mod/resource/db/upgrade.php
+++ b/mod/resource/db/upgrade.php
@@ -1,27 +1,52 @@
-.
+
+/**
+ * Resource module upgrade code
+ *
+ * This file keeps track of upgrades to
+ * the resource module
+ *
+ * Sometimes, changes between versions involve
+ * alterations to database structures and other
+ * major things that may break installations.
+ *
+ * The upgrade function in this file will attempt
+ * to perform all the necessary actions to upgrade
+ * your older installtion to the current version.
+ *
+ * If there's something it cannot do itself, it
+ * will tell you what you need to do.
+ *
+ * The commands in here will all be database-neutral,
+ * using the methods of database_manager class
+ *
+ * Please do not forget to use upgrade_set_timeout()
+ * before any action that may take longer time to finish.
+ *
+ * @package mod-resource
+ * @copyright 2009 Petr Skoda (http://skodak.org)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
function xmldb_resource_upgrade($oldversion) {
global $CFG, $DB;
+ require_once("$CFG->dirroot/mod/resource/db/upgradelib.php");
$dbman = $DB->get_manager();
$result = true;
@@ -29,35 +54,162 @@ function xmldb_resource_upgrade($oldversion) {
//===== 1.9.0 upgrade line ======//
if ($result && $oldversion < 2009042000) {
-
- /// Rename field summary on table resource to intro
+ // Rename field summary on table resource to intro
$table = new xmldb_table('resource');
$field = new xmldb_field('summary', XMLDB_TYPE_TEXT, 'small', null, null, null, null, 'reference');
- /// Launch rename field summary
+ // Launch rename field summary
$dbman->rename_field($table, $field, 'intro');
- /// resource savepoint reached
+ // resource savepoint reached
upgrade_mod_savepoint($result, 2009042000, 'resource');
}
if ($result && $oldversion < 2009042001) {
-
- /// Define field introformat to be added to resource
+ // Define field introformat to be added to resource
$table = new xmldb_table('resource');
$field = new xmldb_field('introformat', XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'intro');
- /// Launch add field introformat
+ // Launch add field introformat
$dbman->add_field($table, $field);
- /// set format to current
+ // set format to current
$DB->set_field('resource', 'introformat', FORMAT_MOODLE, array());
- /// resource savepoint reached
+ // resource savepoint reached
upgrade_mod_savepoint($result, 2009042001, 'resource');
}
+ if ($result && $oldversion < 2009062500) {
+ // fix log actions
+ update_log_display_entry('resource', 'view all', 'resource', 'name');
+ // resource savepoint reached
+ upgrade_mod_savepoint($result, 2009062500, 'resource');
+ }
+
+ if ($result && $oldversion < 2009062501) {
+ resource_20_prepare_migration();
+ // resource savepoint reached
+ upgrade_mod_savepoint($result, 2009062501, 'resource');
+ }
+
+ if ($result && $oldversion < 2009062600) {
+ $res_count = $DB->count_records('resource');
+ $old_count = $DB->count_records('resource_old', array('migrated'=>0));
+ if ($res_count != $old_count) {
+ //we can not continue, something is very wrong!!
+ upgrade_log(UPGRADE_LOG_ERROR, null, 'Resource migration failed.');
+ upgrade_mod_savepoint(false, 2009062600, 'resource');
+ }
+
+ // Drop obsoleted fields from resource table
+ $table = new xmldb_table('resource');
+ $fields = array('type', 'reference', 'alltext', 'popup', 'options');
+ foreach ($fields as $fname) {
+ $field = new xmldb_field($fname);
+ $dbman->drop_field($table, $field);
+ }
+
+ // resource savepoint reached
+ upgrade_mod_savepoint($result, 2009062600, 'resource');
+ }
+
+ if ($result && $oldversion < 2009062601) {
+ $table = new xmldb_table('resource');
+ // Define field tobemigrated to be added to resource
+ $field = new xmldb_field('tobemigrated', XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'introformat');
+ // Conditionally launch add field tobemigrated
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+ // Define field mainfile to be added to resource
+ $field = new xmldb_field('mainfile', XMLDB_TYPE_CHAR, '255', null, null, null, null, 'tobemigrated');
+ // Conditionally launch add field mainfile
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+ // Define field legacyfiles to be added to resource
+ $field = new xmldb_field('legacyfiles', XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'mainfile');
+ // Conditionally launch add field legacyfiles
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+ // Define field legacyfileslast to be added to resource
+ $field = new xmldb_field('legacyfileslast', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null, 'legacyfiles');
+ // Conditionally launch add field legacyfileslast
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+ // Define field display to be added to resource
+ $field = new xmldb_field('display', XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'legacyfileslast');
+ // Conditionally launch add field display
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+ // Define field displayoptions to be added to resource
+ $field = new xmldb_field('displayoptions', XMLDB_TYPE_TEXT, 'small', null, null, null, null, 'display');
+ // Conditionally launch add field displayoptions
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+ // Define field filterfiles to be added to resource
+ $field = new xmldb_field('filterfiles', XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'displayoptions');
+ // Conditionally launch add field filterfiles
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+ // Define field revision to be added to resource
+ $field = new xmldb_field('revision', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'filterfiles');
+ // Conditionally launch add field revision
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+
+ //mark all records as awaiting migration
+ $DB->set_field('resource', 'tobemigrated', 1, array());
+
+ // resource savepoint reached
+ upgrade_mod_savepoint($result, 2009062601, 'resource');
+ }
+
+ if ($result && $oldversion < 2009062603) {
+ resource_20_migrate();
+ upgrade_mod_savepoint($result, 2009062603, 'resource');
+ }
+
+ if ($result && $oldversion < 2009063000) {
+ //migrate and prune old settings - admins need to review and set up all module settings anyway
+ if (!empty($CFG->resource_framesize)) {
+ set_config('framesize', $CFG->resource_framesize, 'resource');
+ }
+ if (!empty($CFG->resource_popupheight)) {
+ set_config('popupheight', $CFG->resource_popupheight, 'resource');
+ }
+ if (!empty($CFG->resource_popupwidth)) {
+ set_config('popupwidth', $CFG->resource_popupwidth, 'resource');
+ }
+
+ $cleanupsettings = array(
+ // migrated settings
+ 'resource_framesize', 'resource_popupheight', 'resource_popupwidth', 'resource_popupmenubar',
+
+ // obsoleted settings
+ 'resource_websearch', 'resource_defaulturl', 'resource_allowlocalfiles',
+ 'resource_popup', 'resource_popupresizable', 'resource_popupscrollbars',
+ 'resource_popupdirectories', 'resource_popuplocation',
+ 'resource_popuptoolbar', 'resource_popupstatus',
+
+ //waiting for some other modules or plugins to pick these up
+ /*
+ 'resource_secretphrase',
+ */
+ );
+ foreach ($cleanupsettings as $setting) {
+ unset_config($setting);
+ }
+
+ upgrade_mod_savepoint($result, 2009063000, 'resource');
+ }
+
return $result;
}
-
-?>
diff --git a/mod/resource/db/upgradelib.php b/mod/resource/db/upgradelib.php
new file mode 100644
index 0000000000000..f4d8a84a834c0
--- /dev/null
+++ b/mod/resource/db/upgradelib.php
@@ -0,0 +1,337 @@
+.
+
+/**
+ * Resource module upgrade related helper functions
+ *
+ * @package mod-resource
+ * @copyright 2009 Petr Skoda (http://skodak.org)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Try on demand migration of file from old course files
+ * @param string $filepath old file path
+ * @param int $cmid migrated course module if
+ * @param int $courseid
+ * @param string $filearea new file area
+ * @param int $itemid migrated file item id
+ * @return mixed, false if not found, stored_file instance if migrated to new area
+ */
+function resource_try_file_migration($filepath, $cmid, $courseid, $filearea, $itemid) {
+ $fs = get_file_storage();
+
+ if (stripos($filepath, '/backupdata/') === 0 or stripos($filepath, '/moddata/') === 0) {
+ // do not steal protected files!
+ return false;
+ }
+
+ if (!$context = get_context_instance(CONTEXT_MODULE, $cmid)) {
+ return false;
+ }
+ if (!$coursecontext = get_context_instance(CONTEXT_COURSE, $courseid)) {
+ return false;
+ }
+
+ $pathnamehash = sha1($coursecontext->id.'course_content0'.$filepath);
+ if (!$file = $fs->get_file_by_hash($pathnamehash)) {
+ return false;
+ }
+
+ // copy and keep the same path, name, etc.
+ $file_record = array('contextid'=>$context->id, 'filearea'=>$filearea, 'itemid'=>$itemid);
+ try {
+ return $fs->create_file_from_storedfile($file_record, $file);
+ } catch (Exception $e) {
+ // file may exist - highly unlikely, we do not want upgrades to stop here
+ return false;
+ }
+}
+
+/**
+ * Migrate resource module data from 1.9 resource_old table to new resource table
+ * @return void
+ */
+function resource_20_migrate() {
+ global $CFG, $DB;
+
+ require_once("$CFG->libdir/filelib.php");
+ require_once("$CFG->libdir/resourcelib.php");
+ require_once("$CFG->dirroot/course/lib.php");
+
+ $fs = get_file_storage();
+
+ $withrelativelinks = array('text/html', 'text/xml', 'application/xhtml+xml', 'application/x-shockwave-flash');
+ // note: pdf doc and other types may contain links too, but we do not support relative links there
+
+ if (!$candidates = $DB->get_recordset('resource_old', array('type'=>'file', 'migrated'=>0))) {
+ return;
+ }
+
+ foreach ($candidates as $candidate) {
+ upgrade_set_timeout();
+
+ $path = $candidate->reference;
+ $siteid = get_site()->id;
+ $fs = get_file_storage();
+
+ if (strpos($path, 'LOCALPATH') === 0) {
+ // ignore not maintained local files - sorry
+ continue;
+
+ } else if (preg_match("|$CFG->wwwroot/file.php(\?file=)?/$siteid(/[^\s'\"&\?#]+)|", $path, $matches)) {
+ // public site files
+ $path = $matches[2];
+
+ $resource = new object();
+ $resource->id = $candidate->oldid;
+ $resource->tobemigrated = 0;
+ $resource->mainfile = $path;
+ $resource->filterfiles = $CFG->filteruploadedfiles;
+ $resource->legacyfiles = RESOURCELIB_LEGACYFILES_NO; // on-demand-migration not possible for site files, sorry
+
+ $context = get_context_instance(CONTEXT_MODULE, $candidate->cmid);
+ $sitecontext = get_context_instance(CONTEXT_COURSE, $siteid);
+ $file_record = array('contextid'=>$context->id, 'filearea'=>'resource_content', 'itemid'=>0);
+ if ($file = $fs->get_file_by_hash(sha1($sitecontext->id.'course_content0'.$path))) {
+ try {
+ $fs->create_file_from_storedfile($file_record, $file);
+ } catch (Exception $x) {
+ }
+ $resource->mainfile = $file->get_filepath().$file->get_filename();
+ }
+
+ } else if (preg_match("|$CFG->wwwroot/file.php(\?file=)?/$candidate->course(/[^\s'\"&\?#]+)|", $path, $matches)) {
+ // current course files
+ $path = $matches[2];
+
+ $resource = new object();
+ $resource->id = $candidate->oldid;
+ $resource->tobemigrated = 0;
+ $resource->mainfile = $path;
+ $resource->filterfiles = $CFG->filteruploadedfiles;
+ $mimetype = mimeinfo('type', $resource->mainfile);
+ if (in_array($mimetype, $withrelativelinks)) {
+ $resource->legacyfiles = RESOURCELIB_LEGACYFILES_ACTIVE;
+ } else {
+ $resource->legacyfiles = RESOURCELIB_LEGACYFILES_NO;
+ }
+
+ // try migration of main file - ignore if does not exist
+ if ($file = resource_try_file_migration($resource->mainfile, $candidate->cmid, $candidate->course, 'resource_content', 0)) {
+ $resource->mainfile = $file->get_filepath().$file->get_filename();
+ }
+
+ } else if (strpos($path, '://') or strpos($path, '/') === 0) {
+ // http:// https:// ftp:// OR starts with slash - to be converted to link resource
+ continue;
+
+ } else {
+ // current course files
+ // cleanup old path first
+ $path = '/'.trim(trim($path), '/');
+ if (strpos($path, '?forcedownload=1') !== false) {
+ // eliminate old force download tricks
+ $candidate->options = 'forcedownload';
+ $path = str_replace('?forcedownload=1', '', $path);
+ }
+ // get rid of any extra url parameters, sorry we can not support these
+ preg_match("/^[^?#]+/", $path, $matches);
+ $parts = $matches[0];
+
+ $resource = new object();
+ $resource->id = $candidate->oldid;
+ $resource->tobemigrated = 0;
+ $resource->mainfile = $path;
+ $resource->filterfiles = $CFG->filteruploadedfiles;
+ $mimetype = mimeinfo('type', $resource->mainfile);
+ if (in_array($mimetype, $withrelativelinks)) {
+ $resource->legacyfiles = RESOURCELIB_LEGACYFILES_ACTIVE;
+ } else {
+ $resource->legacyfiles = RESOURCELIB_LEGACYFILES_NO;
+ }
+
+ // try migration of main file - ignore if does not exist
+ if ($file = resource_try_file_migration($resource->mainfile, $candidate->cmid, $candidate->course, 'resource_content', 0)) {
+ $resource->mainfile = $file->get_filepath().$file->get_filename();
+ }
+ }
+
+ $options = array('printheading'=>0, 'printintro'=>1);
+ if ($candidate->options == 'frame') {
+ $resource->display = RESOURCELIB_DISPLAY_FRAME;
+
+ } else if ($candidate->options == 'objectframe') {
+ $resource->display = RESOURCELIB_DISPLAY_EMBED;
+
+ } else if ($candidate->options == 'forcedownload') {
+ $resource->display = RESOURCELIB_DISPLAY_DOWNLOAD;
+
+ } else if ($candidate->popup) {
+ $resource->display = RESOURCELIB_DISPLAY_POPUP;
+ if ($candidate->popup) {
+ $rawoptions = explode(',', $candidate->popup);
+ foreach ($rawoptions as $rawoption) {
+ list($name, $value) = explode('=', trim($rawoption), 2);
+ if ($value > 0 and ($name == 'width' or $name == 'height')) {
+ $options['popup'.$name] = $value;
+ continue;
+ }
+ }
+ }
+
+ } else {
+ $resource->display = RESOURCELIB_DISPLAY_AUTO;
+ }
+ $resource->displayoptions = serialize($options);
+
+ // update resource instance and mark as migrated
+ $DB->update_record('resource', $resource);
+ $candidate->newmodule = 'resource';
+ $candidate->newid = $candidate->oldid;
+ $candidate->migrated = time();
+ $DB->update_record('resource_old', $candidate);
+ }
+
+ $candidates->close();
+
+ // clear all course modinfo caches
+ rebuild_course_cache(0, true);
+}
+
+/**
+ * This function creates resource_old table adn copies all data
+ * from resource table, this functions has to be called from
+ * all modules that are sucessors of old resource module types.
+ * @return bool true if migration required, false if not
+ */
+function resource_20_prepare_migration() {
+ global $DB;
+
+ $dbman = $DB->get_manager();
+
+ // If tresource not created yet, this is probably a new install
+ $table = new xmldb_table('resource');
+ if (!$dbman->table_exists($table)) {
+ return false;
+ }
+
+ // Define table resource_old to be created
+ $table = new xmldb_table('resource_old');
+
+ if ($dbman->table_exists($table)) {
+ //already executed
+ return true;
+ }
+
+ // Adding fields to table resource_old
+ $table->add_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
+ $table->add_field('course', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0');
+ $table->add_field('name', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('type', XMLDB_TYPE_CHAR, '30', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('reference', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('intro', XMLDB_TYPE_TEXT, 'small', null, null, null, null);
+ $table->add_field('introformat', XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0');
+ $table->add_field('alltext', XMLDB_TYPE_TEXT, 'medium', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('popup', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('options', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('timemodified', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0');
+ $table->add_field('oldid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null);
+ $table->add_field('cmid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null);
+ $table->add_field('newmodule', XMLDB_TYPE_CHAR, '50', null, null, null, null);
+ $table->add_field('newid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null);
+ $table->add_field('migrated', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0');
+
+ // Adding keys to table resource_old
+ $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
+
+ // Adding indexes to table resource_old
+ $table->add_index('oldid', XMLDB_INDEX_UNIQUE, array('oldid'));
+ $table->add_index('cmid', XMLDB_INDEX_NOTUNIQUE, array('cmid'));
+
+ // Launch create table for resource_old
+ $dbman->create_table($table);
+
+ $module = $DB->get_field('modules', 'id', array('name'=>'resource'));
+
+ if (!$DB->count_records('resource')) {
+ // upgrade of fresh new server from 1.9 - no upgrade needed
+ return false;
+ }
+
+ // find out if resource contains new 2.0dev fields already
+ $table = new xmldb_table('resource');
+ $field = new xmldb_field('introformat', XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'intro');
+ if ($dbman->field_exists($table, $field)) {
+ $sql = "INSERT INTO {resource_old} (oldid, course, name, type, reference, intro, introformat, alltext, popup, options, timemodified, cmid)
+ SELECT r.id, r.course, r.name, r.type, r.reference, r.intro, r.introformat, r.alltext, r.popup, r.options, r.timemodified, cm.id
+ FROM {resource} r
+ LEFT JOIN {course_modules} cm ON (r.id = cm.instance AND cm.module = :module)";
+ } else {
+ $sql = "INSERT INTO {resource_old} (oldid, course, name, type, reference, intro, introformat, alltext, popup, options, timemodified, cmid)
+ SELECT r.id, r.course, r.name, r.type, r.reference, r.summary, 0, r.alltext, r.popup, r.options, r.timemodified, cm.id
+ FROM {resource} r
+ LEFT JOIN {course_modules} cm ON (r.id = cm.instance AND cm.module = :module)";
+ }
+
+ $DB->execute($sql, array('module'=>$module));
+
+ return true;
+}
+
+/**
+ * Migrate old resource type to new module, updates all related info, keeps the context id.
+ * @param string $modname name of new module
+ * @param object $candidate old instance from resource_old
+ * @param object $newinstance new module instance to be insterted into db
+ * @return mixed false if error, object new instance with id if success
+ */
+function resource_migrate_to_module($modname, $candidate, $newinstance) {
+ global $DB;
+
+ if (!$cm = get_coursemodule_from_id('resource', $candidate->cmid)) {
+ return false;
+ }
+
+ if (!$module = $DB->get_record('modules', array('name'=>$modname))) {
+ return false;
+ }
+
+ if (!$resource = $DB->get_record('resource', array('id'=>$candidate->oldid))) {
+ return false;
+ }
+
+ // insert new instance
+ $newinstance->id = $DB->insert_record($modname, $newinstance);
+
+ // update course modules
+ $cm->module = $module->id;
+ $cm->instance = $newinstance->id;
+ $DB->update_record('course_modules', $cm);
+
+ //delete old record
+ $DB->delete_records('resource', array('id'=>$resource->id));
+
+ //mark as migrated
+ $candidate->newmodule = $modname;
+ $candidate->newid = $newinstance->id;
+ $candidate->migrated = time();
+ $DB->update_record('resource_old', $candidate);
+
+ //no need to upgrade data in logs because resource module is able to redirect to migrated instances
+ return $newinstance;
+}
diff --git a/mod/resource/filter.php b/mod/resource/filter.php
deleted file mode 100644
index 6ecfcc7594cf8..0000000000000
--- a/mod/resource/filter.php
+++ /dev/null
@@ -1,79 +0,0 @@
-sql_length('r.name') . " DESC, cm.section ASC";
-
- if (!$resources = $DB->get_records_sql($resource_sql, array($courseid)) ){
- $nothingtodo = true;
- return $text;
- }
-
- $resourcelist = array();
-
- foreach ($resources as $resource) {
- $currentname = trim($resource->name);
- $entitisedname = s($currentname);
- $strippedname = strip_tags($currentname);
- /// Avoid empty or unlinkable resource names
- if (!empty($strippedname)) {
- $resourcelist[] = new filterobject($currentname,
- 'frametarget.'>',
- '', false, true);
- if ($currentname != $entitisedname) { /// If name has some entity (& " < >) add that filter too. MDL-17518
- $resourcelist[] = new filterobject($entitisedname,
- 'frametarget.'>',
- '', false, true);
-
- }
- }
- }
-
- }
- return filter_phrases($text, $resourcelist); // Look for all these links in the text
- }
-
-?>
diff --git a/mod/resource/functions.js b/mod/resource/functions.js
new file mode 100644
index 0000000000000..6025cfa02e08a
--- /dev/null
+++ b/mod/resource/functions.js
@@ -0,0 +1,69 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see .
+
+/**
+ * Javascript helper function for Resource module
+ *
+ * @package mod-resource
+ * @copyright 2009 Petr Skoda (http://skodak.org)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+function resource_init_object() {
+ YAHOO.util.Event.onDOMReady(function () {
+ imscp_setup_object();
+ });
+}
+
+function imscp_setup_object() {
+ resource_resize_object();
+
+ // fix layout if window resized too
+ window.onresize = function() {
+ resource_resize_object();
+ };
+}
+
+function resource_resize_object() {
+ var obj = YAHOO.util.Dom.get('resourceobject');
+ obj.style.width = '0px';
+ obj.style.height = '0px';
+ var newwidth = resource_get_htmlelement_size('content', 'width') - 15;
+ if (newwidth > 600) {
+ obj.style.width = newwidth + 'px';
+ } else {
+ obj.style.width = '600px';
+ }
+ var pageheight = resource_get_htmlelement_size('page', 'height');
+ var objheight = resource_get_htmlelement_size(obj, 'height');
+ var newheight = objheight + parseInt(YAHOO.util.Dom.getViewportHeight()) - pageheight - 30;
+ if (newheight > 400) {
+ obj.style.height = newheight + 'px';
+ } else {
+ obj.style.height = '400px';
+ }
+}
+
+
+function resource_get_htmlelement_size(el, prop) {
+ var val = YAHOO.util.Dom.getStyle(el, prop);
+ if (val == 'auto') {
+ if (el.get) {
+ el = el.get('element'); // get real HTMLElement from YUI element
+ }
+ val = YAHOO.util.Dom.getComputedStyle(YAHOO.util.Dom.get(el), prop);
+ }
+ return parseInt(val);
+}
diff --git a/mod/resource/icon.gif b/mod/resource/icon.gif
index 745ef3462c71e..41edc0e95df8e 100644
Binary files a/mod/resource/icon.gif and b/mod/resource/icon.gif differ
diff --git a/mod/resource/index.php b/mod/resource/index.php
index 63e968f6ef5c5..a81b0d1a65c44 100644
--- a/mod/resource/index.php
+++ b/mod/resource/index.php
@@ -1,88 +1,104 @@
-get_record('course', array('id'=>$id))) {
- print_error('invalidcourseid');
- }
-
- require_course_login($course, true);
-
- if ($course->id != SITEID) {
- require_login($course->id);
- }
- add_to_log($course->id, "resource", "view all", "index.php?id=$course->id", "");
-
- $strresource = get_string("modulename", "resource");
- $strresources = get_string("modulenameplural", "resource");
- $strweek = get_string("week");
- $strtopic = get_string("topic");
- $strname = get_string("name");
- $strsummary = get_string("summary");
- $strlastmodified = get_string("lastmodified");
-
- $navlinks = array();
- $navlinks[] = array('name' => $strresources, 'link' => '', 'type' => 'activityinstance');
- $navigation = build_navigation($navlinks);
-
- print_header("$course->shortname: $strresources", $course->fullname, $navigation,
- "", "", true, "", navmenu($course));
-
- if (! $resources = get_all_instances_in_course("resource", $course)) {
- notice(get_string('thereareno', 'moodle', $strresources), "../../course/view.php?id=$course->id");
- exit;
- }
-
- if ($course->format == "weeks") {
- $table->head = array ($strweek, $strname, $strsummary);
- $table->align = array ("center", "left", "left");
- } else if ($course->format == "topics") {
- $table->head = array ($strtopic, $strname, $strsummary);
- $table->align = array ("center", "left", "left");
- } else {
- $table->head = array ($strlastmodified, $strname, $strsummary);
- $table->align = array ("left", "left", "left");
- }
-
- $currentsection = "";
- foreach ($resources as $resource) {
- if ($course->format == "weeks" or $course->format == "topics") {
- $printsection = "";
- if ($resource->section !== $currentsection) {
- if ($resource->section) {
- $printsection = $resource->section;
- }
- if ($currentsection !== "") {
- $table->data[] = 'hr';
- }
- $currentsection = $resource->section;
+.
+
+/**
+ * List of all resources in course
+ *
+ * @package mod-resource
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require('../../config.php');
+
+$id = required_param('id', PARAM_INT); // course id
+
+$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
+
+require_course_login($course, true);
+
+add_to_log($course->id, 'resource', 'view all', "index.php?id=$course->id", '');
+
+$strresource = get_string('modulename', 'resource');
+$strresources = get_string('modulenameplural', 'resource');
+$strweek = get_string('week');
+$strtopic = get_string('topic');
+$strname = get_string('name');
+$strintro = get_string('moduleintro');
+$strlastmodified = get_string('lastmodified');
+
+$PAGE->set_url('mod/resource/index.php', array('id' => $course->id));
+$PAGE->set_title($course->shortname.': '.$strresources);
+$PAGE->set_heading($course->fullname);
+$navlinks = array(array('name' => $strresources, 'link' => '', 'type' => 'activityinstance'));
+echo $OUTPUT->header(build_navigation($navlinks), navmenu($course));
+
+if (!$resources = get_all_instances_in_course('resource', $course)) {
+ notice(get_string('thereareno', 'moodle', $strresources), "$CFG->wwwroot/course/view.php?id=$course->id");
+ exit;
+}
+
+$table = new html_table();
+$table->set_classes(array('generaltable', 'mod_index'));
+
+if ($course->format == 'weeks') {
+ $table->head = array ($strweek, $strname, $strintro);
+ $table->align = array ('center', 'left', 'left');
+} else if ($course->format == 'topics') {
+ $table->head = array ($strtopic, $strname, $strintro);
+ $table->align = array ('center', 'left', 'left');
+} else {
+ $table->head = array ($strlastmodified, $strname, $strintro);
+ $table->align = array ('left', 'left', 'left');
+}
+
+$modinfo = get_fast_modinfo($course);
+$currentsection = '';
+foreach ($resources as $resource) {
+ $cm = $modinfo->cms[$resource->coursemodule];
+ if ($course->format == 'weeks' or $course->format == 'topics') {
+ $printsection = '';
+ if ($resource->section !== $currentsection) {
+ if ($resource->section) {
+ $printsection = $resource->section;
}
- } else {
- $printsection = ''.userdate($resource->timemodified)."";
- }
- if (!empty($resource->extra)) {
- $extra = urldecode($resource->extra);
- } else {
- $extra = "";
- }
- if (!$resource->visible) { // Show dimmed if the mod is hidden
- $table->data[] = array ($printsection,
- "coursemodule\">".format_string($resource->name,true)."",
- format_module_intro('resource', $resource, $resource->coursemodule));
-
- } else { //Show normal if the mod is visible
- $table->data[] = array ($printsection,
- "coursemodule\">".format_string($resource->name,true)."",
- format_module_intro('resource', $resource, $resource->coursemodule));
+ if ($currentsection !== '') {
+ $table->data[] = 'hr';
+ }
+ $currentsection = $resource->section;
}
+ } else {
+ $printsection = ''.userdate($resource->timemodified)."";
}
- echo " ";
+ $extra = empty($cm->extra) ? '' : $cm->extra;
+ $icon = '';
+ if (!empty($cm->icon)) {
+ // each resource file has an icon in 2.0
+ $icon = ' ';
+ }
- print_table($table);
+ $class = $resource->visible ? '' : 'class="dimmed"'; // hidden modules are dimmed
+ $table->data[] = array (
+ $printsection,
+ "id\">".$icon.format_string($resource->name)."",
+ format_module_intro('resource', $resource, $cm->id));
+}
- print_footer($course);
+echo $OUTPUT->table($table);
-?>
+echo $OUTPUT->footer();
diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index 62a84e9161091..0ccd7a357e79e 100644
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -17,349 +17,182 @@
/**
* @package mod-resource
- * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
+ * @copyright 2009 Petr Skoda (http://skodak.org)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-/** Require {@link portfoliolib.php} */
-require_once($CFG->libdir.'/portfoliolib.php');
+/**
+ * List of features supported in Resource module
+ * @param string $feature FEATURE_xx constant for requested feature
+ * @return mixed True if module supports feature, false if not, null if doesn't know
+ */
+function resource_supports($feature) {
+ switch($feature) {
+ case FEATURE_MOD_ARCHETYPE: return MOD_ARCHETYPE_RESOURCE;
+ case FEATURE_GROUPS: return false;
+ case FEATURE_GROUPINGS: return false;
+ case FEATURE_GROUPMEMBERSONLY: return true;
+ case FEATURE_MOD_INTRO: return true;
+ case FEATURE_COMPLETION_TRACKS_VIEWS: return true;
+ case FEATURE_GRADE_HAS_GRADE: return false;
+ case FEATURE_GRADE_OUTCOMES: return false;
-/** RESOURCE_LOCALPATH = LOCALPATH */
-define('RESOURCE_LOCALPATH', 'LOCALPATH');
+ default: return null;
+ }
+}
/**
- * @global array $RESOURCE_WINDOW_OPTIONS
- * @name $RESOURCE_WINDOW_OPTIONS
+ * Returns all other caps used in module
+ * @return array
*/
-global $RESOURCE_WINDOW_OPTIONS; // must be global because it might be included from a function!
-$RESOURCE_WINDOW_OPTIONS = array('resizable', 'scrollbars', 'directories', 'location',
- 'menubar', 'toolbar', 'status', 'width', 'height');
+function resource_get_extra_capabilities() {
+ return array('moodle/site:accessallgroups');
+}
/**
- * resource_base is the base class for resource types
- *
- * This class provides all the functionality for a resource
- * @package mod-resource
- * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * This function is used by the reset_course_userdata function in moodlelib.
+ * @param $data the data submitted from the reset course.
+ * @return array status array
*/
-class resource_base {
-
- var $cm;
- var $course;
- var $resource;
- var $navlinks;
-
- /**
- * Constructor for the base resource class
- *
- * Constructor for the base resource class.
- * If cmid is set create the cm, course, resource objects.
- * and do some checks to make sure people can be here, and so on.
- *
- * @global stdClass
- * @global object
- * @global object
- * @uses CONTEXT_MODULE
- * @param int $cmid the current course module id - not set for new resources
- */
- function resource_base($cmid=0) {
- global $CFG, $COURSE, $DB;
-
- $this->navlinks = array();
-
- if ($cmid) {
- if (! $this->cm = get_coursemodule_from_id('resource', $cmid)) {
- print_error('invalidcoursemodule');
- }
-
- if (! $this->course = $DB->get_record("course", array("id"=>$this->cm->course))) {
- print_error('coursemisconf');
- }
+function resource_reset_userdata($data) {
+ return array();
+}
- if (! $this->resource = $DB->get_record("resource", array("id"=>$this->cm->instance))) {
- print_error('invalidid', 'resource');
- }
+/**
+ * List of view style log actions
+ * @return array
+ */
+function resource_get_view_actions() {
+ return array('view','view all');
+}
- $this->strresource = get_string("modulename", "resource");
- $this->strresources = get_string("modulenameplural", "resource");
+/**
+ * List of update style log actions
+ * @return array
+ */
+function resource_get_post_actions() {
+ return array('update', 'add');
+}
- if (!$this->cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_MODULE, $this->cm->id))) {
- $pagetitle = strip_tags($this->course->shortname.': '.$this->strresource);
- $navigation = build_navigation($this->navlinks, $this->cm);
+/**
+ * Add resource instance.
+ * @param object $data
+ * @param object $mform
+ * @return int new resoruce instance id
+ */
+function resource_add_instance($data, $mform) {
+ global $CFG, $DB;
+ require_once("$CFG->libdir/resourcelib.php");
- print_header($pagetitle, $this->course->fullname, $navigation, "", "", true, '', navmenu($this->course, $this->cm));
- notice(get_string("activityiscurrentlyhidden"), "$CFG->wwwroot/course/view.php?id={$this->course->id}");
- }
+ $cmid = $data->coursemodule;
+ $draftitemid = $data->files;
- } else {
- $this->course = $COURSE;
- }
+ $data->timemodified = time();
+ $displayoptions = array();
+ if ($data->display == RESOURCELIB_DISPLAY_POPUP) {
+ $displayoptions['popupwidth'] = $data->popupwidth;
+ $displayoptions['popupheight'] = $data->popupheight;
}
-
-
- /**
- * Display function does nothing in the base class
- */
- function display() {
-
+ if (in_array($data->display, array(RESOURCELIB_DISPLAY_AUTO, RESOURCELIB_DISPLAY_EMBED, RESOURCELIB_DISPLAY_FRAME))) {
+ $displayoptions['printheading'] = (int)!empty($data->printheading);
+ $displayoptions['printintro'] = (int)!empty($data->printintro);
}
+ $data->displayoptions = serialize($displayoptions);
+ $data->id = $DB->insert_record('resource', $data);
- /**
- * Display the resource with the course blocks.
- */
- function display_course_blocks_start() {
- global $CFG, $USER, $PAGE;
-
- /// Print the page header
- $edit = optional_param('edit', -1, PARAM_BOOL);
-
- if (($edit != -1) and $PAGE->user_allowed_editing()) {
- $USER->editing = $edit;
- }
-
- $morenavlinks = array($this->strresources => 'index.php?id='.$this->course->id,
- $this->resource->name => '');
+ // we need to use context now, so we need to make sure all needed info is already in db
+ $DB->set_field('course_modules', 'instance', $data->id, array('id'=>$cmid));
+ $context = get_context_instance(CONTEXT_MODULE, $cmid);
- $PAGE->print_header($this->course->shortname.': %fullname%', $morenavlinks, "", "",
- update_module_button($this->cm->id, $this->course->id, $this->strresource));
+ if ($draftitemid) {
+ file_save_draft_area_files($draftitemid, $context->id, 'resource_content', 0, array('subdirs'=>true));
}
-
- /**
- * Finish displaying the resource with the course blocks
- */
- function display_course_blocks_end() {
- global $CFG, $THEME;
-
- $PAGE = $this->PAGE;
- $pageblocks = blocks_setup($PAGE);
- $blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), 210);
-
- $lt = (empty($THEME->layouttable)) ? array('left', 'middle', 'right') : $THEME->layouttable;
- foreach ($lt as $column) {
- if ($column != 'middle') {
- array_shift($lt);
- } else if ($column == 'middle') {
- break;
- }
+ $fs = get_file_storage();
+ $files = $fs->get_area_files($context->id, 'resource_content', 0, '', false);
+ if (count($files) == 1) {
+ $file = reset($files);
+ $path = $file->get_filepath().$file->get_filename();
+ if ($path !== $data->mainfile) {
+ $data->mainfile = $path;
+ $DB->set_field('resource', 'mainfile', $path, array('id'=>$data->id));
}
- foreach ($lt as $column) {
- switch ($column) {
- case 'left':
- if((blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) {
- echo '
';
-
- print_footer($course);
- exit;
- }
-
-
- /// Now check whether we need to display a frameset
-
- $frameset = optional_param('frameset', '', PARAM_ALPHA);
- if (empty($frameset) and !$embedded and !$inpopup and ($resource->options == "frame" || $resource->options == "objectframe") and empty($USER->screenreader)) {
- /// display the resource into a object tag
- if ($resource->options == "objectframe") {
-
- ///Moodle Header and navigation bar
- $navigation = build_navigation($this->navlinks, $cm);
- print_header($pagetitle, $course->fullname, $navigation, "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm, "parent"));
- $options = new object();
- $options->para = false;
- if (!empty($localpath)) { // Show some help
- echo '
';
- }
- echo '';
-
- /// embedded file into iframe if the resource is on another domain
- ///
- /// This case is not XHTML strict but there is no alternative
- /// The object tag alternative is XHTML strict, however IE6-7 displays a blank object on accross domain by default,
- /// so we decided to use iframe for accross domain MDL-10021
- if (!stristr($fullurl,$CFG->wwwroot)) {
- echo '';
- }
- else {
- ///embedded HTML file into an object tag
- echo '';
- }
-
- if (!empty($resource->intro)) {
- $viewportheight = 230;
- } else {
- $viewportheight = 120;
- }
- ///add some javascript in order to fit this object tag into the browser window
- $PAGE->requires->js('mod/resource/type/file/file.js');
- $PAGE->requires->js_function_call('file_resource_init', Array($viewportheight));
-
- ///print the intro
- if (!empty($resource->intro)) {
- print_simple_box(format_module_intro('resource', $resource, $cm->id), "center");
- }
- print_footer();
- exit;
- } else {
- /// display the resource into a frame tag
- @header('Content-Type: text/html; charset=utf-8');
- echo "\n";
- echo "\n";
- echo '';
- echo '';
- echo "" . format_string($course->shortname) . ": ".strip_tags(format_string($resource->name,true))."\n";
- echo "";
- echo "";
- exit;
- }
- }
-
-
- /// We can only get here once per resource, so add an entry to the log
-
- add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id);
-
-
- /// If we are in a frameset, just print the top of it
-
- if (!empty( $frameset ) and ($frameset == "top") ) {
- $navigation = build_navigation($this->navlinks, $cm);
- print_header($pagetitle, $course->fullname, $navigation,
- "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm, "parent"));
-
- echo '
';
-
- } else if ($resourcetype == "mp3") {
- if (!empty($THEME->resource_mp3player_colors)) {
- $c = $THEME->resource_mp3player_colors; // You can set this up in your theme/xxx/config.php
- } else {
- $c = 'bgColour=000000&btnColour=ffffff&btnBorderColour=cccccc&iconColour=000000&'.
- 'iconOverColour=00cc00&trackColour=cccccc&handleColour=ffffff&loaderColour=ffffff&'.
- 'font=Arial&fontColour=FF33FF&buffer=10&waitForPlay=no&autoPlay=yes';
- }
- $c .= '&volText='.get_string('vol', 'resource').'&panText='.get_string('pan','resource');
- $id = 'filter_mp3_'.time(); //we need something unique because it might be stored in text cache
- $cleanurl = addslashes_js($fullurl);
-
-
- // If we have Javascript, use UFO to embed the MP3 player, otherwise depend on plugins
-
- echo '
';
-
- } else if ($resourcetype == "flv") {
- $id = 'filter_flv_'.time(); //we need something unique because it might be stored in text cache
- $cleanurl = addslashes_js($fullurl);
-
-
- // If we have Javascript, use UFO to embed the FLV player, otherwise depend on plugins
-
- echo '
';
-
-///
-/// End of main process, where everything is deployed
-///
-
-/// Print the footer of the page
- print_footer();
-
-///
-/// Common and useful functions used by the body of the script
-///
-
- /*** This function will return a tree of manifests (xmlized) as they are
- * found and extracted from one manifest file. The first manifest in the
- * will be the main one, while the rest will be submanifests. In the
- * future (when IMS CP suppors it, external submanifest will be detected
- * and retrieved here too). See IMS specs for more info.
- */
- function ims_extract_manifests($data) {
-
- $manifest = new stdClass; //To store found manifests in a tree structure
-
- /// If there are some manifests
- if (!empty($data['manifest'])) {
- /// Add manifest to results array
- $manifest->data = $data['manifest'];
- /// Look for submanifests
- $submanifests = ims_extract_submanifests($data['manifest']['#']);
- /// Add them as child
- if (!empty($submanifests)) {
- $manifest->childs = $submanifests;
- }
- }
- /// Return tree of manifests found
- return $manifest;
- }
-
- /* This function will search recursively for submanifests returning an array
- * containing them (xmlized) following a tree structure.
- */
- function ims_extract_submanifests($data) {
-
- $submanifests = array(); //To store found submanifests
-
- /// If there are some manifests
- if (!empty($data['manifest'])) {
- /// Get them
- foreach ($data['manifest'] as $submanifest) {
- /// Create a new submanifest object
- $submanifest_object = new stdClass;
- $submanifest_object->data = $submanifest;
- /// Look for more submanifests recursively
- $moresubmanifests = ims_extract_submanifests($submanifest['#']);
- /// Add them to results array
- if (!empty($moresubmanifests)) {
- $submanifest_object->childs = $moresubmanifests;
- }
- /// Add submanifest object to results array
- $submanifests[] = $submanifest_object;
- }
- }
- /// Return array of manifests found
- return $submanifests;
- }
-
- /*** This function will return an ordered and nested array of items
- * that is a perfect representation of the prefered organization
- */
- function ims_process_organizations($data) {
-
- global $CFG;
-
- /// Get the default organization
- $default_organization = $data['@']['default'];
- debugging('default_organization: '.$default_organization);
-
- /// Iterate (reverse) over organizations until we find the default one
- if (empty($data['#']['organization'])) { /// Verify exists
- return false;
- }
- $count_organizations = count($data['#']['organization']);
- debugging('count_organizations: '.$count_organizations);
-
- $current_organization = $count_organizations - 1;
- while ($current_organization >= 0) {
- /// Load organization and check it
- $organization = $data['#']['organization'][$current_organization];
- if ($organization['@']['identifier'] == $default_organization) {
- $current_organization = -1; //Match, so exit.
- }
- $current_organization--;
- }
-
- /// At this point we MUST have the final organization
- debugging('final organization: '.$organization['#']['title'][0]['#']);
- if (empty($organization)) {
- return false; //Error, no organization found
- }
-
- /// Extract items map from organization
- $items = $organization['#']['item'];
- if (empty($organization['#']['item'])) { /// Verify exists
- return false;
- }
- if (!$itemmap = ims_process_items($items)) {
- return false; //Error, no items found
- }
- return $itemmap;
- }
-
- /*** This function gets the xmlized representation of the items
- * and returns an array of items, ordered, with level and info
- */
- function ims_process_items($items, $level = 1, $id = 1, $parent = 0) {
- global $CFG;
-
- $itemmap = array();
-
- /// Iterate over items from start to end
- $count_items = count($items);
- debugging('level '.$level.'-count_items: '.$count_items);
-
- $current_item = 0;
- while ($current_item < $count_items) {
- /// Load item
- $item = $items[$current_item];
- $obj_item = new stdClass;
- $obj_item->title = $item['#']['title'][0]['#'];
- $obj_item->identifier = $item['@']['identifier'];
- $obj_item->identifierref = $item['@']['identifierref'];
- $obj_item->id = $id;
- $obj_item->level = $level;
- $obj_item->parent = $parent;
- /// Only if the item has everything
- if (!empty($obj_item->title) &&
- !empty($obj_item->identifier)) {
- /// Add to itemmap
- $itemmap[$id] = $obj_item;
- debugging('level '.$level.'-id '.$id.'-parent '.$parent.'-'.$obj_item->title);
- /// Counters go up
- $id++;
- /// Check for subitems recursively
- $subitems = $item['#']['item'];
- if (count($subitems)) {
- /// Recursive call
- $subitemmap = ims_process_items($subitems, $level+1, $id, $obj_item->id);
- /// Add at the end and counters if necessary
- if ($count_subitems = count($subitemmap)) {
- foreach ($subitemmap as $subitem) {
- /// Add the subitem to the main items array
- $itemmap[$subitem->id] = $subitem;
- /// Counters go up
- $id++;
- }
- }
- }
- }
- $current_item++;
- }
- return $itemmap;
- }
-
- /*** This function will load an array of resources to be used later.
- * Keys are identifiers
- */
- function ims_load_resources($data, $manifest_base, $resources_base) {
- global $CFG;
-
- $resources = array();
-
- if (empty($data)) { /// Verify exists
- return false;
- }
- $count_resources = count($data);
- debugging('count_resources: '.$count_resources);
-
- $current_resource = 0;
- while ($current_resource < $count_resources) {
- /// Load resource
- $resource = $data[$current_resource];
-
- /// Create a new object resource
- $obj_resource = new stdClass;
- $obj_resource->identifier = $resource['@']['identifier'];
- $obj_resource->resource_base = $resource['@']['xml:base'];
- $obj_resource->href = $resource['@']['href'];
- if (empty($obj_resource->href)) {
- $obj_resource->href = $resource['#']['file']['0']['@']['href'];
- }
-
- /// Some packages are poorly done and use \ in roots. This makes them
- /// not display since the URLs are not valid.
- if (!empty($obj_resource->href)) {
- $obj_resource->href = strtr($obj_resource->href, "\\", '/');
- }
-
- /// Only if the resource has everything
- if (!empty($obj_resource->identifier) &&
- !empty($obj_resource->href)) {
- /// Add to resources (identifier as key)
- /// Depending of $manifest_base, $resources_base and the particular
- /// $resource_base variable, concatenate them to build the correct href
- $href_base = '';
- if (!empty($manifest_base)) {
- $href_base = $manifest_base;
- }
- if (!empty($resources_base)) {
- $href_base .= $resources_base;
- }
- if (!empty($obj_resource->resource_base)) {
- $href_base .= $obj_resource->resource_base;
- }
- $resources[$obj_resource->identifier] = $href_base.$obj_resource->href;
- }
- /// Counters go up
- $current_resource++;
- }
- return $resources;
- }
-
-?>
diff --git a/mod/resource/type/ims/dummyapi.js b/mod/resource/type/ims/dummyapi.js
deleted file mode 100644
index 2a956948eb0ff..0000000000000
--- a/mod/resource/type/ims/dummyapi.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* Dummy SCORM API
-*/
-
-function GenericAPIAdaptor(){
- this.LMSInitialize = LMSInitializeMethod;
- this.LMSGetValue = LMSGetValueMethod;
- this.LMSSetValue = LMSSetValueMethod;
- this.LMSCommit = LMSCommitMethod;
- this.LMSFinish = LMSFinishMethod;
- this.LMSGetLastError = LMSGetLastErrorMethod;
- this.LMSGetErrorString = LMSGetErrorStringMethod;
- this.LMSGetDiagnostic = LMSGetDiagnosticMethod;
-}
-/*
-* LMSInitialize.
-*/
-function LMSInitializeMethod(parameter){return "true";}
-/*
-* LMSFinish.
-*/
-function LMSFinishMethod(parameter){return "true";}
-/*
-* LMSCommit.
-*/
-function LMSCommitMethod(parameter){return "true";}
-/*
-* LMSGetValue.
-*/
-function LMSGetValueMethod(element){return "";}
-/*
-* LMSSetValue.
-*/
-function LMSSetValueMethod(element, value){return "true";}
-/*
-* LMSGetLastErrorString
-*/
-function LMSGetErrorStringMethod(errorCode){return "No error";}
-/*
-* LMSGetLastError
-*/
-function LMSGetLastErrorMethod(){return "0";}
-/*
-* LMSGetDiagnostic
-*/
-function LMSGetDiagnosticMethod(errorCode){return "No error. No errors were encountered. Successful API call.";}
-
-var API = new GenericAPIAdaptor;
\ No newline at end of file
diff --git a/mod/resource/type/ims/finder.php b/mod/resource/type/ims/finder.php
deleted file mode 100644
index 91ff27fa1654e..0000000000000
--- a/mod/resource/type/ims/finder.php
+++ /dev/null
@@ -1,139 +0,0 @@
-repository/$directory"))) die("Can't open directory \"$CFG->repository/$directory\"");
-
-/// Loops though dir building a list of all relevent entries. Ignores files.
-/// Asks for deploy if admin user AND no serialized file found.
- while (false !== ($filename = readdir($repository_dir))) {
- if ($filename != '.' && $filename != '..' && is_dir("$CFG->repository/$directory/$filename")) {
- unset($item);
- $item->type = '';
- $item->name = 0;
- $item->path = "$directory/$filename";
-
- /// No manifest => normal, browsable directory.
- if (!file_exists("$CFG->repository/$item->path/imsmanifest.xml")) {
- $item->type = 'directory';
- $item->name = $filename;
- }
- /// Manifest, so IMS CP.
- else {
- if (file_exists("$CFG->repository/$item->path/moodle_inx.ser")) {
- $item->type = 'deployed';
- $index = ims_load_serialized_file("$CFG->repository/$item->path/moodle_inx.ser");
- $item->name = $index['title'];
- }
- else {
- $item->type = 'not deployed';
- $item->name = $filename;
- }
- }
- $items[] = $item;
- }
- }
- closedir($repository_dir);
-
-/// Prints the toolbar.
- echo '
![\"IMS](\"images/ims.gif\")
$item->name" .
- "(path', true); set_opener_value('$name', '$item->name', false); window.close()\" href=\"#\">$strchoose) " .
- "(path&choose=$choose\">$strpreview)![\"IMS](\"images/dir.gif\")
path&choose=$choose\">$item->name