';
- }
-
- /**
- * Strip a specified parameter from the query string of a URL, if present.
- * Adds a separator to the end of the URL, so that a new parameter
- * can easily be appended. For example (assuming $param = 'frog'):
- *
- * http://example.com/index.php -> http://example.com/index.php?
- * http://example.com/index.php?frog=1 -> http://example.com/index.php?
- * http://example.com/index.php?toad=1 -> http://example.com/index.php?toad=1&
- * http://example.com/index.php?frog=1&toad=1 -> http://example.com/index.php?toad=1&
- *
- * @param string $url the URL to modify.
- * @param string $param the parameter to strip from the URL, if present.
- *
- * @return string The modified URL.
- */
- function _stripParameterFromUrl($url, $param) {
- $url = preg_replace('/(\?|&)' . $param . '=[^&]*&?/', '$1', $url);
- if (strpos($url, '?') === false) {
- $url = $url . '?';
- } else {
- $url = $url . '&';
- }
- return $url;
- }
-
- /**
- * Look up a lang string in the appropriate file.
- */
- function get_string($identifier, $a = NULL) {
- return get_string($identifier, 'simpletest', $a);
- }
-}
-?>
Index: moodle/admin/report/simpletest/ex_simple_test.php
--- moodle/admin/report/simpletest/ex_simple_test.php Base (1.4)
+++ moodle/admin/report/simpletest/ex_simple_test.php Locally Deleted
@@ -1,210 +0,0 @@
-libdir . '/simpletestlib/test_case.php');
-
-/**
- * This is a composite test class for finding test cases and
- * other RunnableTest classes in a directory tree and combining
- * them into a group test.
- * @package SimpleTestEx
- */
-class AutoGroupTest extends GroupTest {
-
- var $thorough;
- var $showsearch;
-
- function AutoGroupTest($showsearch, $thorough, $test_name = null) {
- $this->GroupTest($test_name);
- $this->showsearch = $showsearch;
- $this->thorough = $thorough;
- }
-
- function setLabel($test_name) {
- //:HACK: there is no GroupTest::setLabel, so access parent::_label.
- $this->_label = $test_name;
- }
-
- function addIgnoreFolder($ignorefolder) {
- $this->ignorefolders[]=$ignorefolder;
- }
-
- function _recurseFolders($path) {
- if ($this->showsearch) {
- echo '
' . basename(realpath($path)) . '
';
- }
-
- $files = scandir($path);
- static $s_count = 0;
-
- foreach ($files as $file) {
- if ($file == '.' || $file == '..') {
- continue;
- }
- $file_path = $path . '/' . $file;
- if (is_dir($file_path)) {
- if ($file != 'CVS' && !in_array($file_path, $this->ignorefolders)) {
- $this->_recurseFolders($file_path);
- }
- } elseif (preg_match('/simpletest(\/|\\\\)test.*\.php$/', $file_path) ||
- ($this->thorough && preg_match('/simpletest(\/|\\\\)slowtest.*\.php$/', $file_path))) {
-
- $s_count++;
- // OK, found: this shows as a 'Notice' for any 'simpletest/test*.php' file.
- $this->addTestCase(new FindFileNotice($file_path, 'Found unit test file, '. $s_count));
-
- // addTestFile: Unfortunately this doesn't return fail/success (bool).
- $this->addTestFile($file_path, true);
- }
- }
-
- if ($this->showsearch) {
- echo '
';
- }
- return $s_count;
- }
-
- function findTestFiles($dir) {
- if ($this->showsearch) {
- echo '
Searching folder: ' . realpath($dir) . '
';
- }
- $path = $dir;
- $count = $this->_recurseFolders($path);
- if ($count <= 0) {
- $this->addTestCase(new BadAutoGroupTest($path, 'Search complete. No unit test files found'));
- } else {
- $this->addTestCase(new AutoGroupTestNotice($path, 'Search complete. Total unit test files found: '. $count));
- }
- if ($this->showsearch) {
- echo '
';
- }
- return $count;
- }
-
- function addTestFile($file, $internalcall = false) {
- if ($this->showsearch) {
- if ($internalcall) {
- echo '
' . basename($file) . '
';
- } else {
- echo '
Adding test file: ' . realpath($file) . '
';
- }
- // Make sure that syntax errors show up suring the search, otherwise you often
- // get blank screens because evil people turn down error_reporting elsewhere.
- error_reporting(E_ALL);
- }
- if(!is_file($file) ){
- parent::addTestCase(new BadTest($file, 'Not a file or does not exist'));
- }
- parent::addTestFile($file);
- }
-}
-
-
-/* ======================================================================= */
-// get_class_ex: Insert spaces to prettify the class-name.
-function get_class_ex($object) {
- return preg_replace('/(.?)([A-Z])/', '${1} ${2}', get_class($object));
-}
-
-
-/**
- * A failing test base-class for when a test suite has NOT loaded properly.
- * See class, simple_test.php: BadGroupTest.
- * @package SimpleTestEx
- */
-class BadTest {
-
- var $label;
- var $error;
-
- function BadTest($label, $error) {
- $this->label = $label;
- $this->error = $error;
- }
-
- function getLabel() {
- return $this->label;
- }
-
- function run(&$reporter) {
- $reporter->paintGroupStart(basename(__FILE__), $this->getSize());
- $reporter->paintFail(get_class_ex($this) .' [' . $this->getLabel() .
- '] with error [' . $this->error . ']');
- $reporter->paintGroupEnd($this->getLabel());
- return $reporter->getStatus();
- }
-
- /**
- * @return int the number of test cases starting.
- */
- function getSize() {
- return 0;
- }
-}
-
-/**
- * An informational notice base-class for when a test suite is being processed.
- * See class, simple_test.php: BadGroupTest.
- * @package SimpleTestEx
- */
-class Notice {
-
- var $label;
- var $status;
-
- function Notice($label, $error) {
- $this->label = $label;
- $this->status = $error;
- }
-
- function getLabel() {
- return $this->label;
- }
-
- function run(&$reporter) {
- $reporter->paintGroupStart(basename(__FILE__), $this->getSize());
- $reporter->paintNotice(get_class_ex($this) .
- ' ['. $this->getLabel() .'] with status [' . $this->status . ']');
- $reporter->paintGroupEnd($this->getLabel());
- return $reporter->getStatus();
- }
-
- function getSize() {
- return 0;
- }
-}
-
-/**
- * A failing folder test for when the test-user specifies an invalid directory
- * (run.php?folder=woops).
- * @package SimpleTestEx
- */
-class BadFolderTest extends BadTest { }
-
-/**
- * A failing auto test for when no unit test files are found.
- * @package SimpleTestEx
- */
-class BadAutoGroupTest extends BadTest { }
-
-/**
- * Auto group test notices - 1. Search complete. 2. A test file has been found.
- * @package SimpleTestEx
- */
-class AutoGroupTestNotice extends Notice { }
-
-class FindFileNotice extends Notice { }
-?>
Index: moodle/admin/report/simpletest/index.php
--- moodle/admin/report/simpletest/index.php Base (1.11.4.1)
+++ moodle/admin/report/simpletest/index.php Locally Deleted
@@ -1,110 +0,0 @@
-libdir.'/adminlib.php');
-require_once($CFG->libdir.'/simpletestlib.php');
-require_once('ex_simple_test.php');
-require_once('ex_reporter.php');
-
-require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-
-/* The UNITTEST constant can be checked elsewhere if you need to know
- * when your code is being run as part of a unit test. */
-define('UNITTEST', true);
-$langfile = 'simpletest';
-
-// CGI arguments
-$path = optional_param('path', null, PARAM_PATH);
-$showpasses = optional_param('showpasses', false, PARAM_BOOL);
-$showsearch = optional_param('showsearch', false, PARAM_BOOL);
-$thorough = optional_param('thorough', false, PARAM_BOOL);
-
-// Print the header.
-admin_externalpage_setup('reportsimpletest');
-$strtitle = get_string('unittests', $langfile);
-admin_externalpage_print_header();
-
-if (!is_null($path)) {
- // Create the group of tests.
- $test =& new AutoGroupTest($showsearch, $thorough);
-
- // OU specific. We use the _nonproject folder for stuff we want to
- // keep in CVS, but which is not really relevant. It does no harm
- // to leave this here.
- $test->addIgnoreFolder($CFG->dirroot . '/_nonproject');
-
- // Make the reporter, which is what displays the results.
- $reporter = new ExHtmlReporter($showpasses);
-
- if ($showsearch) {
- print_heading('Searching for test cases');
- }
- flush();
-
- // Work out what to test.
- if (substr($path, 0, 1) == '/') {
- $path = substr($path, 1);
- }
- $path = $CFG->dirroot . '/' . $path;
- if (substr($path, -1) == '/') {
- $path = substr($path, 0, -1);
- }
- $displaypath = substr($path, strlen($CFG->dirroot) + 1);
- $ok = true;
- if (is_file($path)) {
- $test->addTestFile($path);
- } else if (is_dir($path)){
- $test->findTestFiles($path);
- } else {
- print_simple_box(get_string('pathdoesnotexist', $langfile, $path), '', '', '', '', 'errorbox');
- $ok = false;
- }
-
- // If we have something to test, do it.
- if ($ok) {
- if ($path == $CFG->dirroot) {
- $title = get_string('moodleunittests', $langfile, get_string('all', $langfile));
- } else {
- $title = get_string('moodleunittests', $langfile, $displaypath);
- }
- print_heading($title);
- $test->run($reporter);
- }
-
- $formheader = get_string('retest', $langfile);
-} else {
- $displaypath = '';
- $formheader = get_string('rununittests', $langfile);
-}
-// Print the form for adjusting options.
-print_simple_box_start('center', '70%');
-echo '';
-print_simple_box_end();
-
-// Footer.
-admin_externalpage_print_footer();
-
-?>
Index: moodle/admin/report/stats/index.php
--- moodle/admin/report/stats/index.php Base (1.12.4.1)
+++ moodle/admin/report/stats/index.php Locally Modified (Based On 1.12.4.1)
@@ -47,8 +47,6 @@
redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3);
}
- require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM));
-
add_to_log($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id);
stats_check_uptodate($course->id);
Index: moodle/admin/report/stats/settings.php
--- moodle/admin/report/stats/settings.php No Base Revision
+++ moodle/admin/report/stats/settings.php Locally New
@@ -0,0 +1,8 @@
+add('reports', new admin_externalpage('reportstats', get_string('stats', 'admin'), "$CFG->wwwroot/$CFG->admin/report/stats/index.php", 'coursereport/stats:view'));
+
Index: moodle/admin/report/unittest/db/access.php
--- moodle/admin/report/unittest/db/access.php No Base Revision
+++ moodle/admin/report/unittest/db/access.php Locally New
@@ -0,0 +1,40 @@
+ array(
+ 'riskbitmask' => RISK_DATALOSS,
+ 'captype' => 'read',
+ 'contextlevel' => CONTEXT_SYSTEM,
+ 'legacy' => array(
+ 'admin' => CAP_ALLOW
+ ),
+
+ 'clonepermissionsfrom' => 'moodle/site:config',
+ )
+);
+
+?>
Index: moodle/admin/report/unittest/ex_reporter.php
--- moodle/admin/report/unittest/ex_reporter.php No Base Revision
+++ moodle/admin/report/unittest/ex_reporter.php Locally New
@@ -0,0 +1,196 @@
+libdir . '/simpletestlib/reporter.php');
+
+/**
+ * Extended in-browser test displayer. HtmlReporter generates
+ * only failure messages and a pass count. ExHtmlReporter also
+ * generates pass messages and a time-stamp.
+ *
+ * @package SimpleTestEx
+ */
+class ExHtmlReporter extends HtmlReporter {
+
+ // Options set when the class is created.
+ var $showpasses;
+
+ // Lang strings. Set in the constructor.
+ var $strrunonlyfolder;
+ var $strrunonlyfile;
+
+ var $strseparator;
+
+ /**
+ * Constructor.
+ *
+ * @param bool $showpasses Whether this reporter should output anything for passes.
+ */
+ function ExHtmlReporter($showpasses) {
+ global $CFG, $THEME;
+
+ $this->HtmlReporter();
+ $this->showpasses = $showpasses;
+
+ $this->strrunonlyfolder = $this->get_string('runonlyfolder');
+ $this->strrunonlyfile = $this->get_string('runonlyfile');
+ $this->strseparator = get_separator();
+ }
+
+ /**
+ * Called when a pass needs to be output.
+ */
+ function paintPass($message) {
+ //(Implicitly call grandparent, as parent not implemented.)
+ parent::paintPass($message);
+ if ($this->showpasses) {
+ $this->_paintPassFail('pass', $message);
+ }
+ }
+
+ /**
+ * Called when a fail needs to be output.
+ */
+ function paintFail($message) {
+ // Explicitly call grandparent, not parent::paintFail.
+ SimpleScorer::paintFail($message);
+ $this->_paintPassFail('fail', $message);
+ }
+
+ /**
+ * Called when an error (uncaught exception or PHP error) needs to be output.
+ */
+ function paintError($message) {
+ // Explicitly call grandparent, not parent::paintFail.
+ SimpleScorer::paintError($message);
+ $this->_paintPassFail('exception', $message);
+ }
+
+ /**
+ * Private method. Used by printPass/Fail/Error.
+ */
+ function _paintPassFail($passorfail, $message) {
+ global $FULLME, $CFG;
+
+ print_simple_box_start('', '100%', '', 5, $passorfail . ' generalbox');
+ $url = $this->_htmlEntities($this->_stripParameterFromUrl($FULLME, 'path'));
+ echo '', $this->get_string($passorfail), ': ';
+ $breadcrumb = $this->getTestList();
+ array_shift($breadcrumb);
+ $file = array_shift($breadcrumb);
+ $pathbits = preg_split('/\/|\\\\/', substr($file, strlen($CFG->dirroot) + 1));
+ $file = array_pop($pathbits);
+ $folder = '';
+ foreach ($pathbits as $pathbit) {
+ $folder .= $pathbit . '/';
+ echo "strrunonlyfolder\">$pathbit/";
+ }
+ echo "strrunonlyfile\">$file";
+ echo $this->strseparator, implode($this->strseparator, $breadcrumb);
+ echo $this->strseparator, ' ', $this->_htmlEntities($message), "\n\n";
+ print_simple_box_end();
+ flush();
+ }
+
+ /**
+ * Called when a notice needs to be output.
+ */
+ function paintNotice($message) {
+ $this->paintMessage($this->_htmlEntities($message));
+ }
+
+ /**
+ * Paints a simple supplementary message.
+ * @param string $message Text to display.
+ */
+ function paintMessage($message) {
+ if ($this->showpasses) {
+ print_simple_box_start('', '100%');
+ echo '', $this->get_string('notice'), ': ';
+ $breadcrumb = $this->getTestList();
+ array_shift($breadcrumb);
+ echo implode($this->strseparator, $breadcrumb);
+ echo $this->strseparator, ' ', $message, "\n";
+ print_simple_box_end();
+ flush();
+ }
+ }
+
+ /**
+ * Output anything that should appear above all the test output.
+ */
+ function paintHeader($test_name) {
+ // We do this the moodle way instead.
+ }
+
+ /**
+ * Output anything that should appear below all the test output, e.g. summary information.
+ */
+ function paintFooter($test_name) {
+ $summarydata = new stdClass;
+ $summarydata->run = $this->getTestCaseProgress();
+ $summarydata->total = $this->getTestCaseCount();
+ $summarydata->passes = $this->getPassCount();
+ $summarydata->fails = $this->getFailCount();
+ $summarydata->exceptions = $this->getExceptionCount();
+
+ if ($summarydata->fails == 0 && $summarydata->exceptions == 0) {
+ $status = "passed";
+ } else {
+ $status = "failed";
+ }
+ echo '
';
+ }
+
+ /**
+ * Strip a specified parameter from the query string of a URL, if present.
+ * Adds a separator to the end of the URL, so that a new parameter
+ * can easily be appended. For example (assuming $param = 'frog'):
+ *
+ * http://example.com/index.php -> http://example.com/index.php?
+ * http://example.com/index.php?frog=1 -> http://example.com/index.php?
+ * http://example.com/index.php?toad=1 -> http://example.com/index.php?toad=1&
+ * http://example.com/index.php?frog=1&toad=1 -> http://example.com/index.php?toad=1&
+ *
+ * @param string $url the URL to modify.
+ * @param string $param the parameter to strip from the URL, if present.
+ *
+ * @return string The modified URL.
+ */
+ function _stripParameterFromUrl($url, $param) {
+ $url = preg_replace('/(\?|&)' . $param . '=[^&]*&?/', '$1', $url);
+ if (strpos($url, '?') === false) {
+ $url = $url . '?';
+ } else {
+ $url = $url . '&';
+ }
+ return $url;
+ }
+
+ /**
+ * Look up a lang string in the appropriate file.
+ */
+ function get_string($identifier, $a = NULL) {
+ return get_string($identifier, 'simpletest', $a);
+ }
+}
+?>
\ No newline at end of file
Index: moodle/admin/report/unittest/ex_simple_test.php
--- moodle/admin/report/unittest/ex_simple_test.php No Base Revision
+++ moodle/admin/report/unittest/ex_simple_test.php Locally New
@@ -0,0 +1,210 @@
+libdir . '/simpletestlib/test_case.php');
+
+/**
+ * This is a composite test class for finding test cases and
+ * other RunnableTest classes in a directory tree and combining
+ * them into a group test.
+ * @package SimpleTestEx
+ */
+class AutoGroupTest extends GroupTest {
+
+ var $thorough;
+ var $showsearch;
+
+ function AutoGroupTest($showsearch, $thorough, $test_name = null) {
+ $this->GroupTest($test_name);
+ $this->showsearch = $showsearch;
+ $this->thorough = $thorough;
+ }
+
+ function setLabel($test_name) {
+ //:HACK: there is no GroupTest::setLabel, so access parent::_label.
+ $this->_label = $test_name;
+ }
+
+ function addIgnoreFolder($ignorefolder) {
+ $this->ignorefolders[]=$ignorefolder;
+ }
+
+ function _recurseFolders($path) {
+ if ($this->showsearch) {
+ echo '
' . basename(realpath($path)) . '
';
+ }
+
+ $files = scandir($path);
+ static $s_count = 0;
+
+ foreach ($files as $file) {
+ if ($file == '.' || $file == '..') {
+ continue;
+ }
+ $file_path = $path . '/' . $file;
+ if (is_dir($file_path)) {
+ if ($file != 'CVS' && !in_array($file_path, $this->ignorefolders)) {
+ $this->_recurseFolders($file_path);
+ }
+ } elseif (preg_match('/simpletest(\/|\\\\)test.*\.php$/', $file_path) ||
+ ($this->thorough && preg_match('/simpletest(\/|\\\\)slowtest.*\.php$/', $file_path))) {
+
+ $s_count++;
+ // OK, found: this shows as a 'Notice' for any 'simpletest/test*.php' file.
+ $this->addTestCase(new FindFileNotice($file_path, 'Found unit test file, '. $s_count));
+
+ // addTestFile: Unfortunately this doesn't return fail/success (bool).
+ $this->addTestFile($file_path, true);
+ }
+ }
+
+ if ($this->showsearch) {
+ echo '
';
+ }
+ return $s_count;
+ }
+
+ function findTestFiles($dir) {
+ if ($this->showsearch) {
+ echo '
Searching folder: ' . realpath($dir) . '
';
+ }
+ $path = $dir;
+ $count = $this->_recurseFolders($path);
+ if ($count <= 0) {
+ $this->addTestCase(new BadAutoGroupTest($path, 'Search complete. No unit test files found'));
+ } else {
+ $this->addTestCase(new AutoGroupTestNotice($path, 'Search complete. Total unit test files found: '. $count));
+ }
+ if ($this->showsearch) {
+ echo '
';
+ }
+ return $count;
+ }
+
+ function addTestFile($file, $internalcall = false) {
+ if ($this->showsearch) {
+ if ($internalcall) {
+ echo '
' . basename($file) . '
';
+ } else {
+ echo '
Adding test file: ' . realpath($file) . '
';
+ }
+ // Make sure that syntax errors show up suring the search, otherwise you often
+ // get blank screens because evil people turn down error_reporting elsewhere.
+ error_reporting(E_ALL);
+ }
+ if(!is_file($file) ){
+ parent::addTestCase(new BadTest($file, 'Not a file or does not exist'));
+ }
+ parent::addTestFile($file);
+ }
+}
+
+
+/* ======================================================================= */
+// get_class_ex: Insert spaces to prettify the class-name.
+function get_class_ex($object) {
+ return preg_replace('/(.?)([A-Z])/', '${1} ${2}', get_class($object));
+}
+
+
+/**
+ * A failing test base-class for when a test suite has NOT loaded properly.
+ * See class, simple_test.php: BadGroupTest.
+ * @package SimpleTestEx
+ */
+class BadTest {
+
+ var $label;
+ var $error;
+
+ function BadTest($label, $error) {
+ $this->label = $label;
+ $this->error = $error;
+ }
+
+ function getLabel() {
+ return $this->label;
+ }
+
+ function run(&$reporter) {
+ $reporter->paintGroupStart(basename(__FILE__), $this->getSize());
+ $reporter->paintFail(get_class_ex($this) .' [' . $this->getLabel() .
+ '] with error [' . $this->error . ']');
+ $reporter->paintGroupEnd($this->getLabel());
+ return $reporter->getStatus();
+ }
+
+ /**
+ * @return int the number of test cases starting.
+ */
+ function getSize() {
+ return 0;
+ }
+}
+
+/**
+ * An informational notice base-class for when a test suite is being processed.
+ * See class, simple_test.php: BadGroupTest.
+ * @package SimpleTestEx
+ */
+class Notice {
+
+ var $label;
+ var $status;
+
+ function Notice($label, $error) {
+ $this->label = $label;
+ $this->status = $error;
+ }
+
+ function getLabel() {
+ return $this->label;
+ }
+
+ function run(&$reporter) {
+ $reporter->paintGroupStart(basename(__FILE__), $this->getSize());
+ $reporter->paintNotice(get_class_ex($this) .
+ ' ['. $this->getLabel() .'] with status [' . $this->status . ']');
+ $reporter->paintGroupEnd($this->getLabel());
+ return $reporter->getStatus();
+ }
+
+ function getSize() {
+ return 0;
+ }
+}
+
+/**
+ * A failing folder test for when the test-user specifies an invalid directory
+ * (run.php?folder=woops).
+ * @package SimpleTestEx
+ */
+class BadFolderTest extends BadTest { }
+
+/**
+ * A failing auto test for when no unit test files are found.
+ * @package SimpleTestEx
+ */
+class BadAutoGroupTest extends BadTest { }
+
+/**
+ * Auto group test notices - 1. Search complete. 2. A test file has been found.
+ * @package SimpleTestEx
+ */
+class AutoGroupTestNotice extends Notice { }
+
+class FindFileNotice extends Notice { }
+?>
\ No newline at end of file
Index: moodle/admin/report/unittest/index.php
--- moodle/admin/report/unittest/index.php No Base Revision
+++ moodle/admin/report/unittest/index.php Locally New
@@ -0,0 +1,109 @@
+libdir.'/adminlib.php');
+require_once($CFG->libdir.'/simpletestlib.php');
+require_once('ex_simple_test.php');
+require_once('ex_reporter.php');
+
+require_login();
+
+/* The UNITTEST constant can be checked elsewhere if you need to know
+ * when your code is being run as part of a unit test. */
+define('UNITTEST', true);
+$langfile = 'simpletest';
+
+// CGI arguments
+$path = optional_param('path', null, PARAM_PATH);
+$showpasses = optional_param('showpasses', false, PARAM_BOOL);
+$showsearch = optional_param('showsearch', false, PARAM_BOOL);
+$thorough = optional_param('thorough', false, PARAM_BOOL);
+
+// Print the header.
+admin_externalpage_setup('reportunittest');
+$strtitle = get_string('unittests', $langfile);
+admin_externalpage_print_header();
+
+if (!is_null($path)) {
+ // Create the group of tests.
+ $test =& new AutoGroupTest($showsearch, $thorough);
+
+ // OU specific. We use the _nonproject folder for stuff we want to
+ // keep in CVS, but which is not really relevant. It does no harm
+ // to leave this here.
+ $test->addIgnoreFolder($CFG->dirroot . '/_nonproject');
+
+ // Make the reporter, which is what displays the results.
+ $reporter = new ExHtmlReporter($showpasses);
+
+ if ($showsearch) {
+ print_heading('Searching for test cases');
+ }
+ flush();
+
+ // Work out what to test.
+ if (substr($path, 0, 1) == '/') {
+ $path = substr($path, 1);
+ }
+ $path = $CFG->dirroot . '/' . $path;
+ if (substr($path, -1) == '/') {
+ $path = substr($path, 0, -1);
+ }
+ $displaypath = substr($path, strlen($CFG->dirroot) + 1);
+ $ok = true;
+ if (is_file($path)) {
+ $test->addTestFile($path);
+ } else if (is_dir($path)){
+ $test->findTestFiles($path);
+ } else {
+ print_simple_box(get_string('pathdoesnotexist', $langfile, $path), '', '', '', '', 'errorbox');
+ $ok = false;
+ }
+
+ // If we have something to test, do it.
+ if ($ok) {
+ if ($path == $CFG->dirroot) {
+ $title = get_string('moodleunittests', $langfile, get_string('all', $langfile));
+ } else {
+ $title = get_string('moodleunittests', $langfile, $displaypath);
+ }
+ print_heading($title);
+ $test->run($reporter);
+ }
+
+ $formheader = get_string('retest', $langfile);
+} else {
+ $displaypath = '';
+ $formheader = get_string('rununittests', $langfile);
+}
+// Print the form for adjusting options.
+print_simple_box_start('center', '70%');
+echo '';
+print_simple_box_end();
+
+// Footer.
+admin_externalpage_print_footer();
+
+?>
Index: moodle/admin/report/unittest/settings.php
--- moodle/admin/report/unittest/settings.php No Base Revision
+++ moodle/admin/report/unittest/settings.php Locally New
@@ -0,0 +1,8 @@
+add('reports', new admin_externalpage('reportunittest', get_string('unittests', 'simpletest'), "$CFG->wwwroot/$CFG->admin/report/unittest/index.php", 'report/unittest:view'));
+
Index: moodle/admin/report/unittest/version.php
--- moodle/admin/report/unittest/version.php No Base Revision
+++ moodle/admin/report/unittest/version.php Locally New
@@ -0,0 +1,29 @@
+version = 2007101502;
+$plugin->requires = 2007101532;
+
+?>
Index: moodle/admin/settings/top.php
--- moodle/admin/settings/top.php Base (1.15.2.6)
+++ moodle/admin/settings/top.php Locally Modified (Based On 1.15.2.6)
@@ -34,22 +34,18 @@
$ADMIN->add('root', new admin_category('reports', get_string('reports')));
foreach (get_list_of_plugins($CFG->admin.'/report') as $plugin) {
-/// This snippet is temporary until simpletest can be fixed to use xmldb. See MDL-7377 XXX TODO
- if ($plugin == 'simpletest' && $CFG->dbfamily != 'mysql' && $CFG->dbfamily != 'postgres') {
+ $settings_path = "$CFG->dirroot/$CFG->admin/report/$plugin/settings.php";
+ if (file_exists($settings_path)) {
+ include($settings_path);
continue;
}
-/// End of removable snippet
- $reportname = get_string($plugin, 'report_' . $plugin);
- if ($reportname[1] == '[') {
- $reportname = get_string($plugin, 'admin');
+
+ $index_path = "$CFG->dirroot/$CFG->admin/report/$plugin/index.php";
+ if (!file_exists($index_path)) {
+ continue;
}
- // ugly hack for special access control in reports
- switch($plugin) {
- case 'backups': $cap = 'moodle/site:backup'; break;
- case 'simpletest': $cap = 'moodle/site:config'; break;
- default: $cap = 'moodle/site:viewreports';
- }
- $ADMIN->add('reports', new admin_externalpage('report'.$plugin, $reportname, "$CFG->wwwroot/$CFG->admin/report/$plugin/index.php",$cap));
+ // old style 3rd party plugin without settings.php
+ $ADMIN->add('reports', new admin_externalpage('report'.$plugin, $plugin, $index_path, 'moodle/site:viewreports'));
}
$ADMIN->add('root', new admin_category('misc', get_string('miscellaneous')));
Index: moodle/course/lib.php
--- moodle/course/lib.php Base (1.538.2.56)
+++ moodle/course/lib.php Locally Modified (Based On 1.538.2.56)
@@ -758,8 +758,8 @@
echo "(".get_string("gdneed").")";
} else {
// MDL-10818, do not display broken graph when user has no permission to view graph
- if (has_capability('moodle/site:viewreports', get_context_instance(CONTEXT_COURSE, $course->id)) ||
- ($course->showreports and $USER->id == $userid)) {
+ $context = get_context_instance(CONTEXT_COURSE, $course->id);
+ if (has_capability('coursereport/log:view', $context) || ($course->showreports and $USER->id == $userid)) {
echo '';
}
Index: moodle/course/report.php
--- moodle/course/report.php Base (1.6)
+++ moodle/course/report.php Locally Modified (Based On 1.6)
@@ -9,9 +9,10 @@
error("That's an invalid course id");
}
- require_login($course->id);
+ require_login($course);
+ $context = get_context_instance(CONTEXT_COURSE, $course->id);
- require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_COURSE, $course->id));
+ require_capability('moodle/site:viewreports', $context);
$strreports = get_string('reports');
@@ -25,10 +26,15 @@
foreach ($directories as $directory) {
$pluginfile = $CFG->dirroot.'/course/report/'.$directory.'/mod.php';
if (file_exists($pluginfile)) {
- echo '
';
- //echo $pluginfile;
- include_once($pluginfile); // Fragment for listing
- echo '
';
+ ob_start();
+ include($pluginfile); // Fragment for listing
+ $html = ob_get_contents();
+ ob_end_clean();
+ if ($html !== '') {
+ echo '
';
+ echo $html;
+ echo '
';
+ }
}
}
Index: moodle/course/report/log/db/access.php
--- moodle/course/report/log/db/access.php No Base Revision
+++ moodle/course/report/log/db/access.php Locally New
@@ -0,0 +1,42 @@
+ array(
+ 'riskbitmask' => RISK_PERSONAL,
+ 'captype' => 'read',
+ 'contextlevel' => CONTEXT_COURSE,
+ 'legacy' => array(
+ 'teacher' => CAP_ALLOW,
+ 'editingteacher' => CAP_ALLOW,
+ 'admin' => CAP_ALLOW
+ ),
+
+ 'clonepermissionsfrom' => 'moodle/site:viewreports',
+ )
+);
+
+?>
Index: moodle/course/report/log/graph.php
--- moodle/course/report/log/graph.php Base (1.4)
+++ moodle/course/report/log/graph.php Locally Modified (Based On 1.4)
@@ -14,12 +14,13 @@
error("Course is misconfigured");
}
- require_login($course->id);
+ require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
- if (! (has_capability('moodle/site:viewreports', $context)
- or ($course->showreports and $USER->id == $user)) ) {
- error("Sorry, you aren't allowed to see this.");
+ if ($course->showreports and $userid == $USER->id) {
+ // no cap needed
+ } else {
+ require_capability('coursereport/log:view', $context);
}
if ($user) {
Index: moodle/course/report/log/index.php
--- moodle/course/report/log/index.php Base (1.19.2.1)
+++ moodle/course/report/log/index.php Locally Modified (Based On 1.19.2.1)
@@ -48,7 +48,7 @@
$context = get_context_instance(CONTEXT_COURSE, $course->id);
- require_capability('moodle/site:viewreports', $context);
+ require_capability('coursereport/log:view', $context);
add_to_log($course->id, "course", "report log", "report/log/index.php?id=$course->id", $course->id);
Index: moodle/course/report/log/lib.php
--- moodle/course/report/log/lib.php Base (1.22.2.1)
+++ moodle/course/report/log/lib.php Locally Modified (Based On 1.22.2.1)
@@ -98,7 +98,7 @@
$courses = array();
$sites = array();
if ($CFG->mnet_localhost_id == $hostid) {
- if (has_capability('moodle/site:viewreports', $sitecontext) && $showcourses) {
+ if (has_capability('coursereport/stats:view', $sitecontext) && $showcourses) {
if ($ccc = get_records("course", "", "", "fullname","id,fullname,category")) {
foreach ($ccc as $cc) {
if ($cc->id == SITEID) {
@@ -110,7 +110,7 @@
}
}
} else {
- if (has_capability('moodle/site:viewreports', $sitecontext) && $showcourses) {
+ if (has_capability('coursereport/stats:view', $sitecontext) && $showcourses) {
$sql = "select distinct course, coursename from {$CFG->prefix}mnet_log where hostid = '$hostid'";
if ($ccc = get_records_sql($sql)) {
foreach ($ccc as $cc) {
@@ -163,7 +163,7 @@
}
}
- if (has_capability('moodle/site:viewreports', $sitecontext) && !$course->category) {
+ if (has_capability('coursereport/stats:view', $sitecontext) && !$course->category) {
$activities["site_errors"] = get_string("siteerrors");
if ($modid === "site_errors") {
$selectedactivity = "site_errors";
@@ -217,14 +217,14 @@
echo "\n";
echo "\n";
echo "\n";
- if (has_capability('moodle/site:viewreports', $sitecontext) && $showcourses) {
+ if (has_capability('coursereport/stats:view', $sitecontext) && $showcourses) {
$cid = empty($course->id)? '1' : $course->id;
choose_from_menu_nested($dropdown, "host_course", $hostid.'/'.$cid, "");
} else {
$courses = array();
$courses[$course->id] = $course->fullname . ((empty($course->category)) ? ' ('.get_string('site').') ' : '');
choose_from_menu($courses,"id",$course->id,false);
- if (has_capability('moodle/site:viewreports', $sitecontext)) {
+ if (has_capability('coursereport/stats:view', $sitecontext)) {
$a = new object();
$a->url = "$CFG->wwwroot/course/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser"
."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showcourses=1&showusers=$showusers";
@@ -331,7 +331,7 @@
}
}
- if (has_capability('moodle/site:viewreports', $sitecontext) && $showcourses) {
+ if (has_capability('coursereport/stats:view', $sitecontext) && $showcourses) {
if ($ccc = get_records("course", "", "", "fullname","id,fullname,category")) {
foreach ($ccc as $cc) {
if ($cc->category) {
@@ -378,7 +378,7 @@
}
}
- if (has_capability('moodle/site:viewreports', $sitecontext) && ($course->id == SITEID)) {
+ if (has_capability('coursereport/stats:view', $sitecontext) && ($course->id == SITEID)) {
$activities["site_errors"] = get_string("siteerrors");
if ($modid === "site_errors") {
$selectedactivity = "site_errors";
@@ -432,14 +432,14 @@
echo "\n";
echo "\n";
echo "\n";
- if (has_capability('moodle/site:viewreports', $sitecontext) && $showcourses) {
+ if (has_capability('coursereport/stats:view', $sitecontext) && $showcourses) {
choose_from_menu ($courses, "id", $course->id, "");
} else {
// echo '';
$courses = array();
$courses[$course->id] = $course->fullname . (($course->id == SITEID) ? ' ('.get_string('site').') ' : '');
choose_from_menu($courses,"id",$course->id,false);
- if (has_capability('moodle/site:viewreports', $sitecontext)) {
+ if (has_capability('coursereport/stats:view', $sitecontext)) {
$a = new object();
$a->url = "$CFG->wwwroot/course/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser"
."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showcourses=1&showusers=$showusers";
Index: moodle/course/report/log/live.php
--- moodle/course/report/log/live.php Base (1.8)
+++ moodle/course/report/log/live.php Locally Modified (Based On 1.8)
@@ -14,9 +14,7 @@
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
- if (!has_capability('moodle/site:viewreports', $context)) {
- error('You need do not have the required permission to view this report');
- }
+ require_capability('coursereport/log:view', $context);
add_to_log($course->id, "course", "report live", "report/log/live.php?id=$course->id", $course->id);
Index: moodle/course/report/log/mod.php
--- moodle/course/report/log/mod.php Base (1.7)
+++ moodle/course/report/log/mod.php Locally Modified (Based On 1.7)
@@ -7,13 +7,14 @@
require_once($CFG->dirroot.'/course/lib.php');
require_once($CFG->dirroot.'/course/report/log/lib.php');
+ if (has_capability('coursereport/log:view', $context)) {
- print_heading(get_string('chooselogs') .':');
+ print_heading(get_string('chooselogs') .':');
- print_log_selector_form($course);
+ print_log_selector_form($course);
- print_heading(get_string('chooselivelogs') .':');
- echo '