Removing some unused code.

This commit is contained in:
Chris Scribner 2011-10-05 12:29:56 -04:00
parent 32c079dc1a
commit 67ddf8472b
2 changed files with 85 additions and 86 deletions

View File

@ -1,85 +1,84 @@
<?php
// This file is part of BasicLTI4Moodle
//
// BasicLTI4Moodle is an IMS BasicLTI (Basic Learning Tools for Interoperability)
// consumer for Moodle 1.9 and Moodle 2.0. BasicLTI is a IMS Standard that allows web
// based learning tools to be easily integrated in LMS as native ones. The IMS BasicLTI
// specification is part of the IMS standard Common Cartridge 1.1 Sakai and other main LMS
// are already supporting or going to support BasicLTI. This project Implements the consumer
// for Moodle. Moodle is a Free Open source Learning Management System by Martin Dougiamas.
// BasicLTI4Moodle is a project iniciated and leaded by Ludo(Marc Alier) and Jordi Piguillem
// at the GESSI research group at UPC.
// SimpleLTI consumer for Moodle is an implementation of the early specification of LTI
// by Charles Severance (Dr Chuck) htp://dr-chuck.com , developed by Jordi Piguillem in a
// Google Summer of Code 2008 project co-mentored by Charles Severance and Marc Alier.
//
// BasicLTI4Moodle is copyright 2009 by Marc Alier Forment, Jordi Piguillem and Nikolas Galanis
// of the Universitat Politecnica de Catalunya http://www.upc.edu
// Contact info: Marc Alier Forment granludo @ gmail.com or marc.alier @ upc.edu
//
// 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 <http://www.gnu.org/licenses/>.
/**
* This file contains all necessary code to view a basiclti activity instance
*
* @package lti
* @copyright 2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
* marc.alier@upc.edu
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
*
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require_once("../../config.php");
require_once($CFG->dirroot.'/mod/lti/lib.php');
require_once($CFG->dirroot.'/mod/lti/locallib.php');
$id = optional_param('id', 0, PARAM_INT); // Course Module ID, or
$object = optional_param('withobject', false, PARAM_BOOL); // Launch BasicLTI in an object
if ($id) {
if (! $cm = $DB->get_record("course_modules", array("id" => $id))) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course Module ID was incorrect');
}
if (! $course = $DB->get_record("course", array("id" => $cm->course))) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course is misconfigured');
}
if (! $basiclti = $DB->get_record("lti", array("id" => $cm->instance))) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course module is incorrect');
}
} else {
if (! $basiclti = $DB->get_record("lti", array("id" => $a))) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course module is incorrect');
}
if (! $course = $DB->get_record("course", array("id" => $basiclti->course))) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course is misconfigured');
}
if (! $cm = get_coursemodule_from_instance("lti", $basiclti->id, $course->id)) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course Module ID was incorrect');
}
}
require_login($course);
add_to_log($course->id, "lti", "launch", "launch.php?id=$cm->id", "$basiclti->id");
lti_view($basiclti, $object);
<?php
// This file is part of BasicLTI4Moodle
//
// BasicLTI4Moodle is an IMS BasicLTI (Basic Learning Tools for Interoperability)
// consumer for Moodle 1.9 and Moodle 2.0. BasicLTI is a IMS Standard that allows web
// based learning tools to be easily integrated in LMS as native ones. The IMS BasicLTI
// specification is part of the IMS standard Common Cartridge 1.1 Sakai and other main LMS
// are already supporting or going to support BasicLTI. This project Implements the consumer
// for Moodle. Moodle is a Free Open source Learning Management System by Martin Dougiamas.
// BasicLTI4Moodle is a project iniciated and leaded by Ludo(Marc Alier) and Jordi Piguillem
// at the GESSI research group at UPC.
// SimpleLTI consumer for Moodle is an implementation of the early specification of LTI
// by Charles Severance (Dr Chuck) htp://dr-chuck.com , developed by Jordi Piguillem in a
// Google Summer of Code 2008 project co-mentored by Charles Severance and Marc Alier.
//
// BasicLTI4Moodle is copyright 2009 by Marc Alier Forment, Jordi Piguillem and Nikolas Galanis
// of the Universitat Politecnica de Catalunya http://www.upc.edu
// Contact info: Marc Alier Forment granludo @ gmail.com or marc.alier @ upc.edu
//
// 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 <http://www.gnu.org/licenses/>.
/**
* This file contains all necessary code to view a basiclti activity instance
*
* @package lti
* @copyright 2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
* marc.alier@upc.edu
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
*
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require_once("../../config.php");
require_once($CFG->dirroot.'/mod/lti/lib.php');
require_once($CFG->dirroot.'/mod/lti/locallib.php');
$id = optional_param('id', 0, PARAM_INT); // Course Module ID, or
if ($id) {
if (! $cm = $DB->get_record("course_modules", array("id" => $id))) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course Module ID was incorrect');
}
if (! $course = $DB->get_record("course", array("id" => $cm->course))) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course is misconfigured');
}
if (! $basiclti = $DB->get_record("lti", array("id" => $cm->instance))) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course module is incorrect');
}
} else {
if (! $basiclti = $DB->get_record("lti", array("id" => $a))) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course module is incorrect');
}
if (! $course = $DB->get_record("course", array("id" => $basiclti->course))) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course is misconfigured');
}
if (! $cm = get_coursemodule_from_instance("lti", $basiclti->id, $course->id)) {
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Course Module ID was incorrect');
}
}
require_login($course);
add_to_log($course->id, "lti", "launch", "launch.php?id=$cm->id", "$basiclti->id");
lti_view($basiclti);

View File

@ -73,7 +73,7 @@ define('LTI_SETTING_DEFAULT', 2);
*
* $param int $basicltiid Basic LTI activity id
*/
function lti_view($instance, $makeobject=false) {
function lti_view($instance) {
global $PAGE, $CFG;
if(empty($instance->typeid)){