L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-42131-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2013-10-08 13:33:25 +08:00
parent 8431c290fd 1d45b0e469
commit fa96fb0cea
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/feedback/editpdf/ajax.php
+4 -4
View File
@@ -26,11 +26,9 @@ use \assignfeedback_editpdf\document_services;
use \assignfeedback_editpdf\page_editor;
use \assignfeedback_editpdf\comments_quick_list;
if (!defined('AJAX_SCRIPT')) {
define('AJAX_SCRIPT', true);
}
define('AJAX_SCRIPT', true);
require_once('../../../../config.php');
require('../../../../config.php');
require_once($CFG->dirroot . '/mod/assign/locallib.php');
require_sesskey();
@@ -45,6 +43,8 @@ $context = \context_module::instance($cm->id);
$assignment = new \assign($context, null, null);
require_login($assignment->get_course(), false, $cm);
if (!$assignment->can_view_submission($userid)) {
print_error('nopermission');
}
mod/assign/feedback/editpdf/testgs.php
+13 -5
View File
@@ -22,14 +22,26 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require_once(dirname(__FILE__).'/../../../../config.php');
require('../../../../config.php');
global $PAGE, $OUTPUT;
$PAGE->set_url(new moodle_url('/mod/assign/feedback/editpdf/testgs.php'));
$PAGE->set_context(context_system::instance());
require_login();
require_capability('moodle/site:config', context_system::instance());
$strheading = get_string('testgs', 'assignfeedback_editpdf');
$PAGE->navbar->add(get_string('administrationsite'));
$PAGE->navbar->add(get_string('plugins', 'admin'));
$PAGE->navbar->add(get_string('assignmentplugins', 'mod_assign'));
$PAGE->navbar->add(get_string('feedbackplugins', 'mod_assign'));
$PAGE->navbar->add(get_string('pluginname', 'assignfeedback_editpdf'), new moodle_url('/admin/settings.php?section=assignfeedback_editpdf'));
$PAGE->navbar->add($strheading);
$PAGE->set_heading($strheading);
$PAGE->set_title($strheading);
if (optional_param('sendimage', false, PARAM_BOOL)) {
// Serve the generated test image.
assignfeedback_editpdf\pdf::send_test_image();
@@ -58,10 +70,6 @@ switch ($result->status) {
$returl = new moodle_url('/admin/settings.php', array('section' => 'assignfeedback_editpdf'));
$msg .= $OUTPUT->continue_button($returl);
$strheading = get_string('testgs', 'assignfeedback_editpdf');
$PAGE->set_heading($strheading);
$PAGE->set_title($strheading);
echo $OUTPUT->header();
echo $OUTPUT->box($msg, 'generalbox ');
echo $OUTPUT->footer();