Merge branch 'MDL-41619_master' of https://github.com/markn86/moodle

This commit is contained in:
Eloy Lafuente (stronk7)
2013-09-10 23:45:20 +02:00
20 changed files with 46 additions and 5 deletions
+2 -1
View File
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Base event class.
*
@@ -24,7 +26,6 @@ namespace core\event;
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
/**
* All other event classes must extend this class.
*
+2
View File
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Event for when a new blog entry is added..
*
+2
View File
@@ -22,6 +22,8 @@
*/
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* class blog_entry_deleted
*
+2
View File
@@ -23,6 +23,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Class content_viewed.
*
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* category deleted event.
*
+2
View File
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Event when course completed.
*
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Course content_deleted event.
*
+2
View File
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Course created event.
*
+2
View File
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Course deleted event.
*
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Event when course module completion is updated.
*
+2
View File
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Course restored event.
*
+2
View File
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Course updated event.
*
+2
View File
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* New event manager class.
*
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Event when role allow assignments is updated.
*
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Event when role allow override is updated.
*
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Event when role allow switch is updated.
*
+3 -1
View File
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Role assigned event.
*
@@ -54,7 +56,7 @@ class role_assigned extends base {
* @return \moodle_url
*/
public function get_url() {
return new moodle_url('/admin/roles/assign.php', array('contextid'=>$this->contextid, 'roleid'=>$this->objectid));
return new moodle_url('/admin/roles/assign.php', array('contextid' => $this->contextid, 'roleid' => $this->objectid));
}
/**
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Role updated event.
*
@@ -64,7 +66,8 @@ class role_capabilities_updated extends base {
if ($this->contextlevel === CONTEXT_SYSTEM) {
return new \moodle_url('admin/roles/define.php', array('action' => 'view', 'roleid' => $this->objectid));
} else {
return new \moodle_url('/admin/roles/override.php', array('contextid' => $this->contextid, 'roleid' => $this->objectid));
return new \moodle_url('/admin/roles/override.php', array('contextid' => $this->contextid,
'roleid' => $this->objectid));
}
}
+4 -1
View File
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Role assigned event.
*
@@ -67,6 +69,7 @@ class role_deleted extends base {
* @return array
*/
protected function get_legacy_logdata() {
return array(SITEID, 'role', 'delete', 'admin/roles/manage.php?action=delete&roleid='.$this->objectid, $this->other['shortname'], '');
return array(SITEID, 'role', 'delete', 'admin/roles/manage.php?action=delete&roleid=' . $this->objectid,
$this->other['shortname'], '');
}
}
+3 -1
View File
@@ -16,6 +16,8 @@
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Role unassigned event.
*
@@ -54,7 +56,7 @@ class role_unassigned extends base {
* @return \moodle_url
*/
public function get_url() {
return new moodle_url('/admin/roles/assign.php', array('contextid'=>$this->contextid, 'roleid'=>$this->objectid));
return new moodle_url('/admin/roles/assign.php', array('contextid' => $this->contextid, 'roleid' => $this->objectid));
}
/**