### Eclipse Workspace Patch 1.0
#P core
Index: tag/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/tag/lib.php,v
retrieving revision 1.46
diff -u -r1.46 lib.php
--- tag/lib.php 1 Nov 2007 12:32:59 -0000 1.46
+++ tag/lib.php 20 Dec 2007 14:05:28 -0000
@@ -364,9 +364,13 @@
* @param string $item_id id of the item to be tagged
* @param string $tag_names_or_ids_csv comma separated tag names (can be unormalized) or ids of existing tags
* @param string $tag_type type of the tags that are beeing added (optional, default value is "default")
+ *
+ * coursetag addition
+ * the addition of userid here allows a tag to be associated with both an item and a user
+ * @param int $userid userid of creator of this tag instance or 0
*/
-function tag_an_item($item_type, $item_id, $tag_names_or_ids_csv, $tag_type="default") {
+function tag_an_item($item_type, $item_id, $tag_names_or_ids_csv, $tag_type="default", $userid=0) {
global $CFG;
//convert any tag ids passed to their corresponding tag names
@@ -400,6 +404,7 @@
$tag_instance = new StdClass;
$tag_instance->itemtype = $item_type;
$tag_instance->itemid = $item_id;
+ $tag_instance->tiuserid = $userid;
//create tag instances
@@ -408,7 +413,9 @@
$tag_instance->tagid = $tag_id;
$tag_instance->ordering = $ordering[$tag_normalized_name];
$tag_instance->timemodified = time();
- $tag_instance_exists = get_record('tag_instance', 'tagid', $tag_id, 'itemtype', $item_type, 'itemid', $item_id);
+ //$tag_instance_exists = get_record('tag_instance', 'tagid', $tag_id, 'itemtype', $item_type, 'itemid', $item_id);
+ $query = "tagid = $tag_id AND itemtype = '$item_type' AND itemid = $item_id AND tiuserid = $userid";
+ $tag_instance_exists = get_record_select('tag_instance', $query);
if (!$tag_instance_exists) {
insert_record('tag_instance',$tag_instance);
@@ -842,9 +849,10 @@
// query that counts how many times any tag appears together in items
// with the tag passed as argument ($tag_id)
- $query = "SELECT tb.tagid , COUNT(*) nr
+ $query = "SELECT tb.tagid , COUNT(*) as nr
FROM {$CFG->prefix}tag_instance ta
- INNER JOIN {$CFG->prefix}tag_instance tb ON ta.itemid = tb.itemid
+ INNER JOIN {$CFG->prefix}tag_instance tb
+ ON ta.itemid = tb.itemid
WHERE ta.tagid = {$tag_id}
GROUP BY tb.tagid
ORDER BY nr DESC";
@@ -900,18 +908,17 @@
// then this tag_instance is an orphan and it will be removed.
foreach ($items_types as $type) {
- $query = "
- {$CFG->prefix}tag_instance.id
- IN
- ( SELECT sq1.id
- FROM
- (SELECT sq2.*
+ $query = "{$CFG->prefix}tag_instance.id
+ IN (
+ SELECT sq1.id
+ FROM (
+ SELECT sq2.*
FROM {$CFG->prefix}tag_instance sq2
- LEFT JOIN {$CFG->prefix}{$type->itemtype} item
+ LEFT JOIN {$CFG->prefix}tag item
ON sq2.itemid = item.id
WHERE item.id IS NULL
- AND sq2.itemtype = '{$type->itemtype}')
- sq1
+ AND sq2.itemtype = '{$type->itemtype}'
+ ) sq1
) ";
delete_records_select('tag_instance', $query);
@@ -1129,10 +1136,12 @@
function tag_cron(){
+ mtrace('Start of tag cron - tag instance table cleanup');
tag_instance_table_cleanup();
if ($tags = get_all_tags('*')) {
+ mtrace(' Preparing to update correlated tags cache');
foreach ($tags as $tag){
cache_correlated_tags($tag->id);
}
@@ -1510,7 +1519,13 @@
$size = ceil($size);
$style = 'style="font-size: '.$size.'%"';
+
+ if ($tag->count > 1) {
$title = 'title="'.s(get_string('thingstaggedwith','tag', $tag)).'"';
+ } else {
+ $title = 'title="'.s(get_string('thingtaggedwith','tag', $tag)).'"';
+ }
+
$href = 'href="'.$CFG->wwwroot.'/tag/index.php?id='.$tag->id.'"';
//highlight tags that have been flagged as inappropriate for those who can manage them
Index: tag/index.php
===================================================================
RCS file: /cvsroot/moodle/moodle/tag/index.php,v
retrieving revision 1.16
diff -u -r1.16 index.php
--- tag/index.php 31 Aug 2007 05:46:33 -0000 1.16
+++ tag/index.php 20 Dec 2007 14:05:28 -0000
@@ -94,7 +94,7 @@
// Print last 10 blogs
-// I was not able to use get_items_tagged_with() because it automatically
+// I was not able to use get_items_tagged_with() because it automatically
// tries to join on 'blog' table, since the itemtype is 'blog'. However blogs
// uses the post table so this would not really work. - Yu 29/8/07
if ($blogs = blog_fetch_entries('', 10, 0, 'site', '', $tag->id)) {
@@ -114,7 +114,7 @@
echo '';
echo format_string($blog->subject);
echo '';
- echo ' - ';
+ echo ' - ';
echo '';
echo fullname($blog);
echo '';
@@ -129,6 +129,27 @@
}
+// Display courses tagged with the tag
+require_once($CFG->dirroot.'/blocks/tags/coursetagslib.php');
+if ($courses = coursetag_get_tagged_courses($tag->id)) {
+
+ $totalcount = count( $courses );
+
+ print_box_start('generalbox', 'tag-blogs');
+
+ print_heading('Units tagged with "'.$tagname.'": '.$totalcount, '', 3);
+
+ foreach ($courses as $course) {
+ //echo '
";
+ $coursetagdivs .= '"f_commtags", ';
+ }
+ // Tidy up the end of a javascript array
+ $coursetagdivs = rtrim($coursetagdivs, ', ');
+
+ // Add the divs (containing the tags) to the block's content
+ $this->content->text = "
+
+ ";
+ if ($alltags) $this->content->text .= $alltagscontent;
+ if ($mytags) $this->content->text .= $mytagscontent;
+ if ($officialtags) $this->content->text .= $officialtagscontent;
+ if ($coursetags) $this->content->text .= $coursetagscontent;
+ if ($commtags) $this->content->text .= $commtagscontent;
+
+ // add the input form section (allowing a user to tag the current course) and navigation, or loggin message
+ if ($loggedin) {
+ // only show the input form on course pages for those allowed (or not barred)
+ if ($coursepage && $canedit) {
+ $this->content->footer .= coursetag_get_jscript();
+ $this->content->footer .= "
+ ";
+ // add the edit link
+ $this->content->footer .= "
+ ".get_string('edittags', $tagslang)."";
+ }
+
+ // Navigation elements at the bottom of the block
+ // show the alternative displays options if available
+ if ($mytags or $officialtags or $commtags or $coursetags) {
+ $this->content->footer .= "";
+ }
+ if ($mytags) {
+ $this->content->footer .= "
+
+ ".get_string('mytags2', $tagslang)." |";
+ }
+ if ($alltags and ($mytags or $officialtags or $commtags or $coursetags)) {
+ $this->content->footer .= "
+
+ ".get_string('alltags1', $tagslang)." |";
+ }
+ if ($officialtags) {
+ $this->content->footer .= "
+
+ ".get_string('officialtags1', $tagslang)." |";
+ }
+ if ($commtags) {
+ $this->content->footer .= "
+
+ ".get_string('communitytags1', $tagslang)." |";
+ }
+ if ($coursetags) {
+ $this->content->footer .= "
+
+ ".get_string('coursetags1', $tagslang)." |";
+ }
+ $this->content->footer = rtrim($this->content->footer, '|');
+ $this->content->footer .= '
';
+ } else {
+ //if not logged in
+ $this->content->footer = "".get_string('please', $tagslang)."
+ ".get_string('login', $tagslang)."
+ ".get_string('tagunits', $tagslang).'';
+ }
+ } // end of SHOWCOURSETAGS section
return $this->content;
}
@@ -81,6 +330,22 @@
notice(get_string('blockconfigbad'), str_replace('blockaction=', 'dummy=', qualified_me()));
}
}
-}
+
+ /*
+ * function removed unit rsslib supports dc/cc
+ */
+ /*
+ function cron() {
+ if (SHOWCOURSETAGS) {
+ global $CFG;
+ require_once($CFG->dirroot.'/blocks/tags/coursetagslib.php');
+ return coursetag_rss_feeds();
+ } else {
+ return TRUE;
+ }
+ }
+ */
+
+}
?>
Index: course/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/course/lib.php,v
retrieving revision 1.541
diff -u -r1.541 lib.php
--- course/lib.php 27 Nov 2007 01:56:21 -0000 1.541
+++ course/lib.php 20 Dec 2007 14:05:24 -0000
@@ -13,11 +13,11 @@
define('COURSE_MAX_SUMMARIES_PER_PAGE', 10); // courses
define('COURSE_MAX_COURSES_PER_DROPDOWN',1000); // max courses in log dropdown before switching to optional
define('COURSE_MAX_USERS_PER_DROPDOWN',1000); // max users in log dropdown before switching to optional
-define('FRONTPAGENEWS', 0);
-define('FRONTPAGECOURSELIST', 1);
-define('FRONTPAGECATEGORYNAMES', 2);
-define('FRONTPAGETOPICONLY', 3);
-define('FRONTPAGECATEGORYCOMBO', 4);
+define('FRONTPAGENEWS', '0');
+define('FRONTPAGECOURSELIST', '1');
+define('FRONTPAGECATEGORYNAMES', '2');
+define('FRONTPAGETOPICONLY', '3');
+define('FRONTPAGECATEGORYCOMBO', '4');
define('FRONTPAGECOURSELIMIT', 200); // maximum number of courses displayed on the frontpage
define('EXCELROWS', 65535);
define('FIRSTUSEDEXCELROW', 3);
@@ -260,6 +260,9 @@
case 'upload':
return $url;
break;
+ case 'coursetags':
+ return '/'.$url;
+ break;
case 'library':
case '':
return '/';
@@ -280,11 +283,11 @@
// and so the next 86400 seconds worth of logs are printed.
/// Setup for group handling.
-
- // TODO: I don't understand group/context/etc. enough to be able to do
+
+ // TODO: I don't understand group/context/etc. enough to be able to do
// something interesting with it here
// What is the context of a remote course?
-
+
/// If the group mode is separate, and this user does not have editing privileges,
/// then only the user's group can be viewed.
//if ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/course:managegroups', get_context_instance(CONTEXT_COURSE, $course->id))) {
@@ -301,14 +304,14 @@
$qry = "
SELECT
l.*,
- u.firstname,
- u.lastname,
+ u.firstname,
+ u.lastname,
u.picture
FROM
{$CFG->prefix}mnet_log l
- LEFT JOIN
+ LEFT JOIN
{$CFG->prefix}user u
- ON
+ ON
l.userid = u.id
WHERE
";
@@ -327,7 +330,7 @@
if ('site_errors' === $modid) {
$where .= " AND\n ( l.action='error' OR l.action='infected' )";
} else if ($modid) {
- //TODO: This assumes that modids are the same across sites... probably
+ //TODO: This assumes that modids are the same across sites... probably
//not true
$where .= " AND\n l.cmid = '$modid'";
}
@@ -404,7 +407,7 @@
}
}
-
+
/// Getting all members of a group.
if ($groupid and !$user) {
if ($gusers = groups_get_members($groupid)) {
@@ -489,7 +492,7 @@
if (empty($logs['logs'])) {
$logs['logs'] = array();
}
-
+
$row = 1;
foreach ($logs['logs'] as $log) {
@@ -550,16 +553,16 @@
function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC", $page=0, $perpage=100,
$url="", $modname="", $modid=0, $modaction="", $groupid=0) {
-
+
global $CFG;
-
+
if (!$logs = build_mnet_logs_array($hostid, $course, $user, $date, $order, $page*$perpage, $perpage,
$modname, $modid, $modaction, $groupid)) {
notify("No logs found!");
print_footer($course);
exit;
}
-
+
if ($course->id == SITEID) {
$courses[0] = '';
if ($ccc = get_courses('all', 'c.id ASC', 'c.id,c.shortname,c.visible')) {
@@ -568,7 +571,7 @@
}
}
}
-
+
$totalcount = $logs['totalcount'];
$count=0;
$ldcache = array();
@@ -602,7 +605,7 @@
$row = 1;
foreach ($logs['logs'] as $log) {
-
+
$log->info = $log->coursename;
$row = ($row + 1) % 2;
@@ -621,7 +624,7 @@
}
}
- //Filter log->info
+ //Filter log->info
$log->info = format_string($log->info);
$log->url = strip_tags(urldecode($log->url)); // Some XSS protection
@@ -1344,7 +1347,7 @@
/// Casting $course->modinfo to string prevents one notice when the field is null
$modinfo = unserialize((string)$course->modinfo);
-
+
$groupings = groups_get_all_groupings($course->id);
//Acccessibility: replace table with list
, but don't output empty list.
@@ -1498,7 +1501,7 @@
static $resources = false;
static $activities = false;
- if ($resources === false) {
+ if ($resources === false) {
$resources = array();
$activities = array();
@@ -1507,7 +1510,7 @@
continue;
}
- require_once("$CFG->dirroot/mod/$modname/lib.php");
+ include_once("$CFG->dirroot/mod/$modname/lib.php");
$gettypesfunc = $modname.'_get_types';
if (function_exists($gettypesfunc)) {
$types = $gettypesfunc();
@@ -1580,6 +1583,32 @@
}
+function get_child_categories($parent) {
+/// Returns an array of the children categories for the given category
+/// ID by caching all of the categories in a static hash
+
+ static $allcategories = null;
+
+ // only fill in this variable the first time
+ if (null == $allcategories) {
+ $allcategories = array();
+
+ $categories = get_categories();
+ foreach ($categories as $category) {
+ if (empty($allcategories[$category->parent])) {
+ $allcategories[$category->parent] = array();
+ }
+ $allcategories[$category->parent][] = $category;
+ }
+ }
+
+ if (empty($allcategories[$parent])) {
+ return array();
+ } else {
+ return $allcategories[$parent];
+ }
+}
+
function make_categories_list(&$list, &$parents, $category=NULL, $path="") {
/// Given an empty array, this function recursively travels the
@@ -1605,7 +1634,7 @@
$category->id = 0;
}
- if ($categories = get_categories($category->id)) { // Print all the children recursively
+ if ($categories = get_child_categories($category->id)) { // Print all the children recursively
foreach ($categories as $cat) {
if (!empty($category->id)) {
if (isset($parents[$category->id])) {
@@ -1643,7 +1672,7 @@
$category->id = "0";
}
- if ($categories = get_categories($category->id)) { // Print all the children recursively
+ if ($categories = get_child_categories($category->id)) { // Print all the children recursively
$countcats = count($categories);
$count = 0;
$first = true;
@@ -1782,21 +1811,21 @@
global $CFG;
if (!is_object($category) && $category==0) {
- $categories = get_categories(0); // Parent = 0 ie top-level categories only
+ $categories = get_child_categories(0); // Parent = 0 ie top-level categories only
if (is_array($categories) && count($categories) == 1) {
$category = array_shift($categories);
- $courses = get_courses_wmanagers($category->id,
- 'c.sortorder ASC',
+ $courses = get_courses_wmanagers($category->id,
+ 'c.sortorder ASC',
array('password','summary','currency'));
} else {
- $courses = get_courses_wmanagers('all',
- 'c.sortorder ASC',
+ $courses = get_courses_wmanagers('all',
+ 'c.sortorder ASC',
array('password','summary','currency'));
}
unset($categories);
} else {
- $courses = get_courses_wmanagers($category->id,
- 'c.sortorder ASC',
+ $courses = get_courses_wmanagers($category->id,
+ 'c.sortorder ASC',
array('password','summary','currency'));
}
@@ -1842,12 +1871,12 @@
echo '
';
+echo $outstr;
+
+print_footer();
+?>
Index: blocks/tags/coursetags_add.php
===================================================================
RCS file: blocks/tags/coursetags_add.php
diff -N blocks/tags/coursetags_add.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ blocks/tags/coursetags_add.php 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,37 @@
+dirroot.'/blocks/tags/coursetagslib.php');
+
+ if ($entryid > 0 and $userid > 0) {
+ $myurl = 'tag/search.php?query='.urlencode($keyword);
+ $keywords = (array)$keyword;
+ try {
+ coursetag_store_keywords($keywords, $entryid, $userid, 'personal', $myurl);
+ }
+ catch (Exception $e) {
+ error($e->getmessage());
+ }
+ }
+}
+
+// send back to originating page, where the new tag will be visible in the block
+if ($entryid > 0) {
+ $myurl = $CFG->wwwroot.'/course/view.php?id='.$entryid;
+} else {
+ $myurl = $CFG->wwwroot.'/';
+}
+redirect($myurl);
+?>
Index: blocks/tags/arrow_left.gif
===================================================================
RCS file: blocks/tags/arrow_left.gif
diff -N blocks/tags/arrow_left.gif
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ blocks/tags/arrow_left.gif 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,5 @@
+GIF89a
+
+ ¢ fffÿÌ °°°ÿÿÿÝÝݵµµ !ù ,
+
+ º¼ M?Û$/‡KºB'Œ#„ÙãU¤Fp? ;
Index: lang/en_utf8/help/block_tags/addtags.html
===================================================================
RCS file: lang/en_utf8/help/block_tags/addtags.html
diff -N lang/en_utf8/help/block_tags/addtags.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/en_utf8/help/block_tags/addtags.html 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,27 @@
+
Adding a tag for a course
+
+
Logged on users may 'tag' courses.
+
+
A tag is a shortcut or way of navigating to your favourite things.
+
+
Not only can you tag courses, but you may also tag your blogs, or even your own profile.
+
+
Clicking on a tag will take you to a page listing all the things associated with that tag.
+If the tag is a popular one you will be able to see what other things other users have associated
+with that tag.
+
+
You may add as many tags as you like. While it is recommended to only add one tag at a time,
+more tags could be entered on one occasion by seperating the tags with a comma.
+As you are adding a tag you may notice a word appearing in the background where you are typing.
+If this word is what you want as your tag then you can click on the little
+arrow next to the entry box to save typing the that word (and don't forget to click submit to save).
+
+
Tags must be more than one character and may be up to 50 characters long.
+Please note that while extended characters are allowed (e.g. French acute
+accented characters or Chinese characters), special characters will be
+stripped (e.g. "',\,_,<,-,~,?").
+Also note that tags cannot be pure integers or float number (e.g. 1 or 1.11)
+but number and letter combinations are fine (e.g. 1a).
+Finally, commas cannot be used in tag names, as these are separators between tags entered.
+
+
Don't forget to click the 'Submit' button below to save your new tag.
Index: blocks/tags/styles.php
===================================================================
RCS file: blocks/tags/styles.php
diff -N blocks/tags/styles.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ blocks/tags/styles.php 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,108 @@
+/*
+ * CSS for course tags
+ * @author j.beedell@open.ac.uk July07
+ *
+ * Styles for block_tags.php
+ */
+
+.coursetag_form_positioner {
+ position: relative;
+ margin: 5px 0 0 0;
+ height: 25px;
+}
+
+.coursetag_form_input1 {
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 1;
+}
+
+.coursetag_form_input2 {
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 2;
+ width: 10em;
+}
+
+.coursetag_form_input3 {
+ position: absolute;
+ top: 3px;
+ left: 13em;
+ display: none;
+}
+
+.coursetag_form_input1a {
+ background-color: transparent;
+ border: 1px solid #999;
+ width: 12em;
+ padding: 2px
+}
+
+.coursetag_form_input2a {
+ background: transparent;
+ color: #669954;
+ border: 1px solid #999;
+ width: 12em;
+ padding: 2px
+}
+
+.coursetag_morelink {
+ float: right;
+ font-size: 0.8em;
+ margin: -10px 5px 5px 0;
+}
+
+/* Styles for edit_tags.php */
+
+.coursetag_edit_centered {
+ position: relative;
+ width: 600px;
+ margin: 20px auto;
+}
+
+.coursetag_edit_row {
+ margin: 5px 0 5px 0;
+ height: 30px;
+}
+
+.coursetag_edit_left {
+ position: relative;
+ float: left;
+ padding: 3px 5px;
+}
+
+.coursetag_edit_right {
+ position: relative;
+ float: left;
+ padding: 3px 0px;
+}
+
+.coursetag_edit_input3 {
+ position: relative;
+ left: 10.5em;
+ display: none;
+}
+
+/* Styles for more_tags.php */
+
+.coursetag_more_title {
+ margin: 30px 30px -25px 30px;
+}
+
+.coursetag_more_tags {
+ margin: 30px;
+}
+
+.coursetag_more_large {
+ font-size: 120%
+}
+
+.coursetag_more_small {
+ font-size: 80%
+}
+
+.coursetag_more_link {
+ font-size: 80%;
+}
Index: blocks/tags/coursetags.js
===================================================================
RCS file: blocks/tags/coursetags.js
diff -N blocks/tags/coursetags.js
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ blocks/tags/coursetags.js 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,79 @@
+/**
+ * coursetags.js
+ * @author j.beedell@open.ac.uk July07
+ *
+ * getKeywords modified from an original script (Auto Complete Textfield)
+ * from The JavaScript Source http://javascript.internet.com
+ * originally created by: Timothy Groves http://www.brandspankingnew.net/
+ */
+
+
+function ctags_show_div(mydiv) {
+ for(x in coursetagdivs) {
+ if(mydiv == coursetagdivs[x]) {
+ document.getElementById(coursetagdivs[x]).style.display="block";
+ } else {
+ document.getElementById(coursetagdivs[x]).style.display="none";
+ }
+ }
+ return false;
+}
+
+function ctags_checkinput(val) {
+ var len = val.length;
+ if (len < 2 || len > 50) {
+ alert("Tags must have more that one and less than 50 characters. Please adjust your tag.");
+ return false;
+ } else if (val.indexOf("'") > 0) {
+ alert("Regretably tags cannot contain apostrophies at the moment. Please adjust your tag.");
+ return false;
+ } else if (val.indexOf("_") > 0) {
+ alert("Tags cannot contain underscores. Please adjust your tag.");
+ return false;
+ } else if (val.indexOf("-") > 0) {
+ alert("Tags cannot contain hyphens. Please adjust your tag.");
+ return false;
+ } else if (isFinite(val)) {
+ alert("Tags cannot be an integer or float. Please adjust your tag.");
+ return false;
+ } else {
+ return true;
+ }
+}
+
+var sug = "";
+var sug_disp = "";
+
+function ctags_getKeywords() {
+ var input = document.forms['coursetag'].coursetag_new_tag.value;
+ var len = input.length;
+ sug_disp = ""; sug = "";
+
+ if (input.length) {
+ // get matching folks_tag from array
+ for (ele in coursetag_tags)
+ {
+ if (coursetag_tags[ele].substr(0,len).toLowerCase() == input.toLowerCase())
+ {
+ sug_disp = input + coursetag_tags[ele].substr(len);
+ sug = coursetag_tags[ele];
+ break;
+ }
+ }
+ }
+ document.forms['coursetag'].coursetag_sug_keyword.value = sug_disp;
+ if (!sug.length || input == sug_disp)
+ document.getElementById('coursetag_sug_btn').style.display = "none";
+ else
+ document.getElementById('coursetag_sug_btn').style.display = "block";
+}
+
+function ctags_setKeywords() {
+ document.forms['coursetag'].coursetag_new_tag.value = sug;
+ ctags_hideSug();
+}
+
+function ctags_hideSug() {
+ document.forms['coursetag'].coursetag_sug_keyword.value = "";
+ document.getElementById('coursetag_sug_btn').style.display = "none";
+}
Index: blocks/tags/coursetagslib.php
===================================================================
RCS file: blocks/tags/coursetagslib.php
diff -N blocks/tags/coursetagslib.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ blocks/tags/coursetagslib.php 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,443 @@
+dirroot.'/tag/lib.php';
+
+/**
+ * Returns an ordered array of tags associated with visible courses
+ * (boosted replacement of get_all_tags() allowing association with user and tagtype).
+ *
+ * @uses $CFG
+ * @param int $courseid, a 0 will return all distinct tags for visible courses
+ * @param int $userid optional the user id, a default of 0 will return all users tags for the course
+ * @param string $tagtype optional 'official' or 'personal', default returns both tag types
+ * @param int $numtags optional number of tags to display, default of 20 is set in the block, 0 returns all
+ * @param string $sort optional selected sorting, default is alpha sort (name) also timemodified or popularity
+ * @param int $timewithin optional limit to age of tags to be displayed, default returns all
+ * @return array
+ */
+function coursetag_get_tags($courseid, $userid=0, $tagtype='', $numtags=0, $sort='name', $timewithin=10) {
+
+ global $CFG;
+
+ // get visible course ids
+ if ($courseid === 0) {
+ $courselist = '(';
+ if ($courses = get_records_select('course', 'visible=1 AND category>0', '', 'id')) {
+ foreach ($courses as $key => $value) {
+ $courselist .= "$key, ";
+ }
+ $courselist = rtrim($courselist, ', ');
+ $courselist .= ')';
+ } else {
+ $courselist = '';
+ }
+ }
+
+ // get tags from the db ordered by highest count first
+ $sql = "SELECT id as key, name, id, tagtype, rawname, f.timemodified, flag, count
+ FROM {$CFG->prefix}tag t,
+ (SELECT tagid, MAX(timemodified) as timemodified, COUNT(id) as count
+ FROM {$CFG->prefix}tag_instance
+ WHERE itemtype = 'course'
+ AND timemodified > $timewithin ";
+ if ($courseid > 0) {
+ $sql .= "AND itemid = $courseid ";
+ } else {
+ if ($courselist) {
+ $sql .= "AND itemid IN $courselist ";
+ }
+ }
+ if ($userid > 0) $sql .= "AND tiuserid = $userid ";
+ $sql .= "GROUP BY tagid) f
+ WHERE t.id = f.tagid ";
+ if ($tagtype == 'official') $sql .= "AND tagtype = '$tagtype' ";
+ $sql .= "ORDER BY count DESC, name ASC";
+
+ // limit the number of tags for output
+ if ($numtags == 0) {
+ $tags = get_records_sql($sql);
+ } else {
+ $tags = get_records_sql($sql, 0, $numtags);
+ }
+
+ // prepare the return
+ $return = array();
+ if ($tags) {
+ // sort the tag display order
+ if ($sort != 'popularity') {
+ $CFG->tagsort = $sort;
+ usort($tags, "coursetag_sort");
+ }
+ // avoid print_tag_cloud()'s ksort upsetting ordering by setting the key here
+ foreach ($tags as $value) {
+ $return[] = $value;
+ }
+ }
+
+ return $return;
+
+}
+
+/**
+ * Returns an ordered array of tags
+ * (replaces popular_tags_count() allowing sorting).
+ *
+ * @uses $CFG
+ * @param string $sort optional selected sorting, default is alpha sort (name) also timemodified or popularity
+ * @param int $numtags optional number of tags to display, default of 20 is set in the block, 0 returns all
+ * @return array
+ */
+function coursetag_get_all_tags($sort='name', $numtags=0) {
+
+ global $CFG;
+
+ $sql = "SELECT id as key, name, id, tagtype, rawname, f.timemodified, flag, count
+ FROM {$CFG->prefix}tag t,
+ (SELECT tagid, MAX(timemodified) as timemodified, COUNT(id) as count
+ FROM {$CFG->prefix}tag_instance
+ GROUP BY tagid) f
+ WHERE t.id = f.tagid
+ ORDER BY count DESC, name ASC";
+
+ if ($numtags == 0) {
+ $tags = get_records_sql($sql);
+ } else {
+ $tags = get_records_sql($sql, 0, $numtags);
+ }
+
+ $return = array();
+ if ($tags) {
+ if ($sort != 'popularity') {
+ $CFG->tagsort = $sort;
+ usort($tags, "coursetag_sort");
+ }
+ foreach ($tags as $value) {
+ $return[] = $value;
+ }
+ }
+
+ return $return;
+
+}
+
+/**
+ * Callback function for coursetag_get_tags() and coursetag_get_tags() only
+ * @uses $CFG
+ */
+function coursetag_sort($a, $b) {
+ // originally from block_blog_tags
+ global $CFG;
+
+ // set up the variable $tagsort as either 'name' or 'timemodified' only, 'popularity' does not need sorting
+ if (empty($CFG->tagsort)) {
+ $tagsort = 'name';
+ } else {
+ $tagsort = $CFG->tagsort;
+ }
+
+ if (is_numeric($a->$tagsort)) {
+ return ($a->$tagsort == $b->$tagsort) ? 0 : ($a->$tagsort < $b->$tagsort) ? 1 : -1;
+ } elseif (is_string($a->$tagsort)) {
+ return strcmp($a->$tagsort, $b->$tagsort);
+ } else {
+ return 0;
+ }
+}
+
+/**
+ * Return a javascript block for use in tags block and supporting pages
+ * @uses $CFG
+ */
+function coursetag_get_jscript() {
+
+ global $CFG;
+
+ $coursetags = get_all_tags('*', $sort='name ASC', $fields='name, id');
+ $a = 0;
+ $coursetagscript = '';
+ if (!empty($coursetags)) {
+ foreach ($coursetags as $key => $value) {
+ $coursetagscript .= "coursetag_tags[$a] = \"$key\"; ";
+ $a++;
+ }
+ }
+ $str = "";
+
+ return $str;
+
+}
+
+/**
+ * Returns all tags created by a user for a course
+ *
+ * @uses $CFG
+ * @param int $courseid
+ * @param int $userid
+ */
+function coursetag_get_records($courseid, $userid) {
+
+ global $CFG;
+
+ $sql = "SELECT t.id, name, rawname
+ FROM {$CFG->prefix}tag t, {$CFG->prefix}tag_instance ti
+ WHERE t.id = ti.tagid
+ AND t.tagtype = 'personal'
+ AND ti.tiuserid = '$userid'
+ AND ti.itemid = '$courseid'
+ ORDER by name ASC";
+ $return = get_records_sql($sql);
+
+ return $return;
+
+}
+
+/**
+ * Stores a tag for a course for a user
+ *
+ * @uses $CFG
+ * @param array $tags simple array of keywords to be stored
+ * @param integer $courseid
+ * @param integer $userid defaults to admin user
+ * @param string $tagtype official (default) or personal only
+ * @param string $myurl optional for logging creation of course tags
+ */
+function coursetag_store_keywords($tags, $courseid, $userid=3, $tagtype='official', $myurl='') {
+
+ global $CFG;
+
+ if (is_array($tags) and !empty($tags)) {
+ foreach($tags as $tag) {
+ // don't store non-existant tags
+ if (strlen($tag) > 0) {
+ tag_an_item('course', $courseid, $tag, $tagtype, $userid);
+ if ($tagtype == 'personal' and $myurl != '') {
+ // log the tagging request
+ add_to_log($courseid, 'coursetags', 'add', $myurl, 'Personal tag \''.$tag.'\'');
+ }
+ }
+ }
+ }
+
+}
+
+/**
+ * Deletes a personal tag for a user for a course.
+ *
+ * @uses $CFG
+ * @param int $tagid
+ * @param int $userid
+ * @param int $courseid
+ */
+function coursetag_delete_keyword($tagid, $userid, $courseid) {
+
+ global $CFG;
+
+ $sql = "SELECT COUNT(*)
+ FROM {$CFG->prefix}tag_instance
+ WHERE tagid = $tagid
+ AND tiuserid = $userid
+ AND itemtype = 'course'
+ AND itemid = $courseid";
+ if (count_records_sql($sql) == 1) {
+ $sql = "tagid = $tagid
+ AND tiuserid = $userid
+ AND itemtype = 'course'
+ AND itemid = $courseid";
+ delete_records_select('tag_instance', $sql);
+ // if there are no other instances of the tag then consider deleting the tag as well
+ if (!record_exists('tag_instance', 'tagid', $tagid)) {
+ // if the tag is a personal tag then delete it
+ if (record_exists('tag', 'id', $tagid, 'tagtype', 'personal')) {
+ delete_records('tag', 'id', $tagid, 'tagtype', 'personal');
+ }
+ }
+ } else {
+ error("Error deleting tag with id $tagid, please report to your system administrator.");
+ }
+
+}
+
+/**
+ * Function used only during the deletion of a course (lib/moodlelib.php)
+ *
+ * @param $courseid
+ */
+function coursetag_delete_course_tags($courseid) {
+ if ($tags = get_records_select('tag_instance', "itemtype='course' AND itemid=".$courseid)) {
+ foreach ($tags as $tag) {
+ //delete the course tag instance record
+ delete_records('tag_instance', 'tagid', $tag->tagid, 'itemtype', 'course');
+ // delete tag if there are no other tag_instance entries now
+ if (!record_exists('tag_instance', 'tagid', $tag->tagid)) {
+ delete_records('tag', 'id', $tag->tagid);
+ }
+ }
+ }
+}
+
+/**
+ * Get courses tagged with a tag
+ *
+ * @param $tagid
+ * @return array of course objects
+ */
+function coursetag_get_tagged_courses($tagid) {
+
+ $courses = array();
+ if ($crs = get_records_select('tag_instance', "tagid='$tagid' AND itemtype='course'", '', 'itemid')) {
+ foreach ($crs as $c) {
+ $course = get_record('course', 'id', $c->itemid);
+ $courses[$c->itemid] = $course;
+ }
+ }
+ return $courses;
+
+}
+
+/**
+ * Function called by cron to create/update users rss feeds
+ *
+ * @uses $CFG
+ * @return true
+ *
+ * Function removed because rsslib needs updating to accept dc/cc input before this can work.
+ */
+/*
+function coursetag_rss_feeds() {
+
+ global $CFG;
+ require_once($CFG->dirroot.'/lib/dmllib.php');
+ require_once($CFG->dirroot.'/lib/rsslib.php');
+
+ $status = true;
+ mtrace(' Preparing to update all user unit tags RSS feeds');
+ if (empty($CFG->enablerssfeeds)) {
+ mtrace(' RSS DISABLED (admin variables - enablerssfeeds)');
+ } else {
+
+ // Load all the categories for use later on
+ $categories = get_records('course_categories');
+
+ // get list of users who have tagged a unit
+ $sql = "
+ SELECT DISTINCT u.id as userid, u.username, u.firstname, u.lastname, u.email
+ FROM {$CFG->prefix}user u, {$CFG->prefix}course c, {$CFG->prefix}tag_instance cti, {$CFG->prefix}tag t
+ WHERE c.id = cti.itemid
+ AND u.id = cti.tiuserid
+ AND t.id = cti.tagid
+ AND t.tagtype = 'personal'
+ AND u.confirmed = 1
+ AND u.deleted = 0
+ ORDER BY userid";
+ if ($users = get_records_sql($sql)) {
+
+ $items = array(); //contains rss data items for each user
+ foreach ($users as $user) {
+
+ // loop through each user, getting the data (tags for courses)
+ $sql = "
+ SELECT cti.id, c.id as courseid, c.fullname, c.shortname, c.category, t.rawname, cti.timemodified
+ FROM {$CFG->prefix}course c, {$CFG->prefix}tag_instance cti, {$CFG->prefix}tag t
+ WHERE c.id = cti.itemid
+ AND cti.tiuserid = {$user->userid}
+ AND cti.tagid = t.id
+ AND t.tagtype = 'personal'
+ ORDER BY courseid";
+ if ($usertags = get_records_sql($sql)) {
+ $latest_date = 0; //latest date any tag was created by a user
+ $c = 0; //course identifier
+
+ foreach ($usertags as $usertag) {
+ if ($usertag->courseid != $c) {
+ $c = $usertag->courseid;
+ $items[$c] = new stdClass();
+ $items[$c]->title = $usertag->fullname . '(' . $usertag->shortname . ')';
+ $items[$c]->link = $CFG->wwwroot . '/course/view.php?name=' . $usertag->shortname;
+ $items[$c]->description = ''; //needs to be blank
+ $items[$c]->category = $categories[$usertag->category]->name;
+ $items[$c]->subject[] = $usertag->rawname;
+ $items[$c]->pubdate = $usertag->timemodified;
+ $items[$c]->tag = true;
+ } else {
+ $items[$c]->subject[] .= $usertag->rawname;
+ }
+ // Check and set the latest modified date.
+ $latest_date = $usertag->timemodified > $latest_date ? $usertag->timemodified : $latest_date;
+ }
+
+ // Setup some vars for use while creating the file
+ $path = $CFG->dataroot.'/1/usertagsrss/'.$user->userid;
+ $file_name = 'user_unit_tags_rss.xml';
+ $title = 'The OpenLearn Unit Tags RSS Feed for user: '.ucwords(strtolower($user->firstname.' '.$user->lastname));
+ $desc = 'This RSS feed was automatically generated by OpenLearn folksonomies and contains user generated tags for units.';
+ // check that the path exists
+ if (!file_exists($path)) {
+ mtrace(' Creating folder '.$path);
+ check_dir_exists($path, TRUE, TRUE);
+ }
+
+ // create or update the feed for the user
+ // this functionality can be copied entirely once rsslib is adjusted
+ require_once($CFG->dirroot.'/local/ocilib.php');
+ oci_create_rss_feed( $path, $file_name, $latest_date, $items, $title, $desc, true);
+ }
+ }
+ }
+ }
+
+ return $status;
+}
+ */
+
+/**
+ * Get official keywords for the in header.html
+ * use: echo '';
+ * @uses $CFG
+ * @param int $courseid
+ * @return string
+ *
+ * This function is potentially useful to anyone wanting to improve search results for course pages.
+ * The idea is to add official (not personal ones, so users cannot delete) tags to all
+ * courses (facility not added yet) which wil be automatically added to the page to boost
+ * search engine specificity/ratings.
+ */
+/*
+function coursetag_get_official_keywords($courseid, $asarray=false) {
+ global $CFG;
+ $returnstr = '';
+ $sql = "SELECT t.id, name, rawname
+ FROM {$CFG->prefix}tag t, {$CFG->prefix}tag_instance ti
+ WHERE ti.itemid = $courseid
+ AND ti.itemtype = 'course'
+ AND t.tagtype = 'official'
+ AND ti.tagid = t.id
+ ORDER BY name ASC";
+ if ($tags = get_records_sql($sql)) {
+ if ($asarray) {
+ return $tags;
+ }
+ foreach ($tags as $tag) {
+ if( empty($CFG->keeptagnamecase) ) {
+ $textlib = textlib_get_instance();
+ $name = $textlib->strtotitle($tag->name);
+ } else {
+ $name = $tag->rawname;
+ }
+ $returnstr .= $name.', ';
+ }
+ $returnstr = rtrim($returnstr, ', ');
+ }
+ return $returnstr;
+}
+*/
+
+?>
Index: lang/en_utf8/help/block_tags/usingtags.html
===================================================================
RCS file: lang/en_utf8/help/block_tags/usingtags.html
diff -N lang/en_utf8/help/block_tags/usingtags.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/en_utf8/help/block_tags/usingtags.html 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,21 @@
+
Using course tagging
+
+
A note about the tag count. Hovering the mouse over a tag will reveal a tag count message
+like '2 things tagged with ...'.
+This count (number) will vary depending on where the tag is being displayed at the time.
+
+
The 'More tags' page (and the tags block) can display several different selections of tags
+- for instance 'all tags' or 'my tags'.
+The count displayed for a tag under 'all tags' may be different to the count for the same tag
+displayed under the 'my tags' or one of the other selections.
+This is because when 'all tags' is showing, all tags for courses, blogs and user profiles
+are displayed and counted.
+Where as when 'my tags' is showing, only your own tags for courses you have tagged
+are displayed and counted.
+So the count could be quite different for one tag under different sections.
+
+
Of course the size of the tag is also a clue to the count. The bigger the font size for the tag the
+more popular the tag is.
+
+
In fact it is easy to re-order the tags displayed by popularity, using the link provided.
+And the tags may be re-ordered alphabetically or in date of creation order as well. Try it.
Index: blocks/tags/coursetags_edit.php
===================================================================
RCS file: blocks/tags/coursetags_edit.php
diff -N blocks/tags/coursetags_edit.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ blocks/tags/coursetags_edit.php 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,165 @@
+dirroot.'/blocks/tags/coursetagslib.php');
+require_once($CFG->dirroot.'/tag/lib.php');
+
+$courseid = optional_param('courseid', 1, PARAM_INT);
+$keyword = optional_param('coursetag_new_tag', '', PARAM_TEXT);
+$deltag = optional_param('del_tag', 0, PARAM_INT);
+
+if ($courseid > 0) {
+ if (! ($COURSE = get_record('course', 'id', $courseid)) ) {
+ error('Invalid course id');
+ }
+} else {
+ error('Invalid course id');
+}
+
+// Permissions
+$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+$isguest = has_capability('moodle/legacy:guest', $sitecontext, $USER->id, false);
+$loggedin = isloggedin() && !$isguest;
+$canedit = has_capability('moodle/tag:create', $sitecontext);
+
+// Language strings
+$tagslang = 'block_tags';
+
+// Store data
+if ($data = data_submitted()) {
+ if (confirm_sesskey() and $courseid > 0 and $USER->id > 0 and $canedit) {
+ // store personal tag
+ if (trim($keyword)) {
+ //$keywords = folks_input_to_keywords($keyword);
+ $keywords = (array)$keyword;
+ try {
+ coursetag_store_keywords($keywords, $courseid, $USER->id, 'personal');
+ }
+ catch (Exception $e) {
+ error($e->getmessage());
+ }
+ }
+ // delete personal tag
+ if ($deltag > 0) {
+ coursetag_delete_keyword($deltag, $USER->id, $courseid);
+ }
+ }
+}
+
+// The title and breadcrumb
+$title = get_string('edittitle', $tagslang);
+$nav = build_navigation(array(array('name' => $title, 'link' => null, 'type' => 'misc')));
+print_header_simple($title, '', $nav, '', '', false);
+
+// Tags for all - providing navigation to units
+print_heading($title, 'centre');
+
+// Personal tags section for logged in users
+if ($loggedin) {
+
+ $mytags = print_tag_cloud(coursetag_get_tags(0, $USER->id, 'personal'), false, 500, 100, true);
+ if ($mytags) {
+ $outstr = "
+
+ ".get_string('editmytags', $tagslang)."
+
+
+ $mytags
+
";
+ echo $outstr;
+ }
+
+ // Personal tag editing - not for site front page
+ if ($canedit and $courseid > 1) {
+ $title = get_string('editedit', $tagslang).' "'.$COURSE->fullname.' ('.$COURSE->shortname.')"';
+ print_heading($title);
+
+ // Deletion here is open to the registered users own tags for this course only
+ $selectoptions = "";
+ $coursetabs = '';
+ if ($options = coursetag_get_records($COURSE->id, $USER->id)) {
+ $coursetabs = '"';
+ foreach ($options as $value) {
+ $selectoptions .= "\n";
+ $coursetabs .= $value->rawname . ', ';
+ }
+ $coursetabs = rtrim($coursetabs, ', ');
+ $coursetabs .= '"';
+ }
+
+ // Print course tags
+ $outstr = '
My Unit Tags RSS',
+ $height=600, $width=800,
+ $title='My Unit Tags RSS', $options='menubar=1,scrollbars,resizable', $return=true).'