Skip to content

Commit

Permalink
Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Hemelryk committed Apr 8, 2014
2 parents 6a90bc5 + d999407 commit e97b942
Show file tree
Hide file tree
Showing 15 changed files with 1,477 additions and 120 deletions.
5 changes: 3 additions & 2 deletions course/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -1628,6 +1628,7 @@ function course_delete_module($cmid) {
require_once($CFG->libdir.'/gradelib.php');
require_once($CFG->dirroot.'/blog/lib.php');
require_once($CFG->dirroot.'/calendar/lib.php');
require_once($CFG->dirroot . '/tag/lib.php');

// Get the course module.
if (!$cm = $DB->get_record('course_modules', array('id' => $cmid))) {
Expand Down Expand Up @@ -1692,8 +1693,8 @@ function course_delete_module($cmid) {
$DB->delete_records('course_completion_criteria', array('moduleinstance' => $cm->id,
'criteriatype' => COMPLETION_CRITERIA_TYPE_ACTIVITY));

// Delete the tag instances.
$DB->delete_records('tag_instance', array('component' => 'mod_' . $modulename, 'contextid' => $modcontext->id));
// Delete all tag instances associated with the instance of this module.
tag_delete_instances('mod_' . $modulename, $modcontext->id);

// Delete the context.
context_helper::delete_instance(CONTEXT_MODULE, $cm->id);
Expand Down
8 changes: 7 additions & 1 deletion lang/en/tag.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,15 @@
$string['description'] = 'Description';
$string['edittag'] = 'Edit this tag';
$string['entertags'] = 'Enter tags separated by commas';
$string['errordeleting'] = 'Error deleting tag with id {$a}, please report to your system administrator.';
$string['errortagfrontpage'] = 'Tagging the site main page is not allowed';
$string['errorupdatingrecord'] = 'Error updating tag record';
$string['eventitemtagged'] = 'Item tagged';
$string['eventitemuntagged'] = 'Item untagged';
$string['eventtagcreated'] = 'Tag created';
$string['eventtagdeleted'] = 'Tag deleted';
$string['eventtagflagged'] = 'Tag flagged';
$string['eventtagunflagged'] = 'Tag unflagged';
$string['eventtagupdated'] = 'Tag updated';
$string['flag'] = 'Flag';
$string['flagasinappropriate'] = 'Flag as inappropriate';
$string['helprelatedtags'] = 'Comma separated related tags';
Expand Down
7 changes: 4 additions & 3 deletions lib/adminlib.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ function uninstall_plugin($type, $name) {

echo $OUTPUT->heading($pluginname);

// Delete all tag instances associated with this plugin.
require_once($CFG->dirroot . '/tag/lib.php');
tag_delete_instances($component);

// Custom plugin uninstall.
$plugindirectory = core_component::get_plugin_directory($type, $name);
$uninstalllib = $plugindirectory . '/db/uninstall.php';
Expand Down Expand Up @@ -231,9 +235,6 @@ function uninstall_plugin($type, $name) {
$fs = get_file_storage();
$fs->delete_component_files($component);

// Delete all tag instances for this component.
$DB->delete_records('tag_instance', array('component' => $component));

// Finally purge all caches.
purge_all_caches();

Expand Down
112 changes: 112 additions & 0 deletions lib/classes/event/item_tagged.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<?php
// 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 <http://www.gnu.org/licenses/>.

/**
* Item tagged event.
*
* @property-read array $other {
* Extra information about event.
*
* - int tagid: the id of the tag.
* - string tagname: the name of the tag.
* - string tagrawname: the raw name of the tag.
* - int itemid: the id of the item tagged.
* - string itemtype: the type of item tagged.
* }
*
* @package core
* @copyright 2014 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

namespace core\event;

defined('MOODLE_INTERNAL') || die();

class item_tagged extends base {

/**
* Initialise the event data.
*/
protected function init() {
$this->data['objecttable'] = 'tag_instance';
$this->data['crud'] = 'c';
$this->data['edulevel'] = self::LEVEL_OTHER;
}

/**
* Returns localised general event name.
*
* @return string
*/
public static function get_name() {
return get_string('eventitemtagged', 'tag');
}

/**
* Returns non-localised description of what happened.
*
* @return string
*/
public function get_description() {
return 'The tag with the id ' . $this->other['tagid'] . ' was added to the item type \'' . s($this->other['itemtype']) .
'\' with the id ' . $this->other['itemid'] . ' by the user with the id ' . $this->userid;
}

/**
* Return legacy data for add_to_log().
*
* @return array
*/
protected function get_legacy_logdata() {
if ($this->other['itemtype'] === 'course') {
$url = 'tag/search.php?query=' . urlencode($this->other['tagrawname']);
return array($this->courseid, 'coursetags', 'add', $url, 'Course tagged');
}

return null;
}

/**
* Custom validation.
*
* @throws \coding_exception when validation does not pass.
* @return void
*/
protected function validate_data() {
parent::validate_data();

if (!isset($this->other['tagid'])) {
throw new \coding_exception('The tagid must be set in $other.');
}

if (!isset($this->other['itemid'])) {
throw new \coding_exception('The itemid must be set in $other.');
}

if (!isset($this->other['itemtype'])) {
throw new \coding_exception('The itemtype must be set in $other.');
}

if (!isset($this->other['tagname'])) {
throw new \coding_exception('The tagname must be set in $other.');
}

if (!isset($this->other['tagrawname'])) {
throw new \coding_exception('The tagrawname must be set in $other.');
}
}
}
98 changes: 98 additions & 0 deletions lib/classes/event/item_untagged.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?php
// 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 <http://www.gnu.org/licenses/>.

/**
* Item untagged event.
*
* @property-read array $other {
* Extra information about event.
*
* - int tagid: the id of the tag.
* - string tagname: the name of the tag.
* - string tagrawname: the raw name of the tag.
* - int itemid: the id of the item tagged.
* - string itemtype: the type of item tagged.
* }
*
* @package core
* @copyright 2014 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

namespace core\event;

defined('MOODLE_INTERNAL') || die();

class item_untagged extends base {

/**
* Initialise the event data.
*/
protected function init() {
$this->data['objecttable'] = 'tag_instance';
$this->data['crud'] = 'd';
$this->data['edulevel'] = self::LEVEL_OTHER;
}

/**
* Returns localised general event name.
*
* @return string
*/
public static function get_name() {
return get_string('eventitemuntagged', 'tag');
}

/**
* Returns non-localised description of what happened.
*
* @return string
*/
public function get_description() {
return 'The tag with the id ' . $this->other['tagid'] . ' was removed from the item type \'' . s($this->other['itemtype']) .
'\' with the id ' . $this->other['itemid'] . ' by the user with the id ' . $this->userid;
}

/**
* Custom validation.
*
* @throws \coding_exception when validation does not pass.
* @return void
*/
protected function validate_data() {
parent::validate_data();

if (!isset($this->other['tagid'])) {
throw new \coding_exception('The tagid must be set in $other.');
}

if (!isset($this->other['itemid'])) {
throw new \coding_exception('The itemid must be set in $other.');
}

if (!isset($this->other['itemtype'])) {
throw new \coding_exception('The itemtype must be set in $other.');
}

if (!isset($this->other['tagname'])) {
throw new \coding_exception('The tagname must be set in $other.');
}

if (!isset($this->other['tagrawname'])) {
throw new \coding_exception('The tagrawname must be set in $other.');
}
}
}
82 changes: 82 additions & 0 deletions lib/classes/event/tag_created.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?php
// 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 <http://www.gnu.org/licenses/>.

/**
* Tag created event.
*
* @property-read array $other {
* Extra information about event.
*
* - string name: the name of the tag.
* - string rawname: the raw name of the tag.
* }
*
* @package core
* @copyright 2014 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

namespace core\event;

defined('MOODLE_INTERNAL') || die();

class tag_created extends base {

/**
* Initialise the event data.
*/
protected function init() {
$this->data['objecttable'] = 'tag';
$this->data['crud'] = 'c';
$this->data['edulevel'] = self::LEVEL_OTHER;
}

/**
* Returns localised general event name.
*
* @return string
*/
public static function get_name() {
return get_string('eventtagcreated', 'tag');
}

/**
* Returns non-localised description of what happened.
*
* @return string
*/
public function get_description() {
return 'The tag with the id ' . $this->objectid . ' was created by the user with the id ' . $this->userid;
}

/**
* Custom validation.
*
* @throws \coding_exception
* @return void
*/
protected function validate_data() {
parent::validate_data();

if (!isset($this->other['name'])) {
throw new \coding_exception('The name must be set in $other.');
}

if (!isset($this->other['rawname'])) {
throw new \coding_exception('The rawname must be set in $other.');
}
}
}
Loading

0 comments on commit e97b942

Please sign in to comment.