? config.php ? secrss.patch ? calendar/rsslib.php Index: admin/settings/server.php =================================================================== RCS file: /cvsroot/moodle/moodle/admin/settings/server.php,v retrieving revision 1.41 diff -u -w -r1.41 server.php --- admin/settings/server.php 6 May 2008 14:52:32 -0000 1.41 +++ admin/settings/server.php 12 Jun 2008 20:56:49 -0000 @@ -96,6 +96,7 @@ // "rss" settingpage $temp = new admin_settingpage('rss', get_string('rss')); $temp->add(new admin_setting_configcheckbox('enablerssfeeds', get_string('enablerssfeeds', 'admin'), get_string('configenablerssfeeds', 'admin'), 0)); +$temp->add(new admin_setting_configcheckbox('calendar_enablerssfeeds', get_string('calendar_enablerssfeeds', 'admin'), get_string('configcalendarenablerssfeeds', 'admin'), 0)); $ADMIN->add('server', $temp); Index: blocks/calendar_month/block_calendar_month.php =================================================================== RCS file: /cvsroot/moodle/moodle/blocks/calendar_month/block_calendar_month.php,v retrieving revision 1.35 diff -u -w -r1.35 block_calendar_month.php --- blocks/calendar_month/block_calendar_month.php 3 Mar 2008 20:40:03 -0000 1.35 +++ blocks/calendar_month/block_calendar_month.php 14 Jun 2008 16:55:02 -0000 @@ -12,6 +12,7 @@ function get_content() { global $USER, $CFG, $SESSION, $COURSE; + $cal_m = optional_param( 'cal_m', 0, PARAM_INT ); $cal_y = optional_param( 'cal_y', 0, PARAM_INT ); @@ -75,6 +76,12 @@ } + // RSS Feed icon - MDL-15162 ( MDL-15122 ) + if (isset($CFG->enablerssfeeds) && isset($CFG->calendar_enablerssfeeds) && !empty($USER->id)) { + require_once($CFG->dirroot.'/lib/rsslib.php'); // We'll need this + $this->content->footer .= '
'.rss_get_link($courseshown, $USER->id, 'calendar', $courseshown); + } + // MDL-9059, unset this so that it doesn't stay in session if (!empty($courseset)) { unset($SESSION->cal_courses_shown[$COURSE->id]); Index: blocks/calendar_upcoming/block_calendar_upcoming.php =================================================================== RCS file: /cvsroot/moodle/moodle/blocks/calendar_upcoming/block_calendar_upcoming.php,v retrieving revision 1.30 diff -u -w -r1.30 block_calendar_upcoming.php --- blocks/calendar_upcoming/block_calendar_upcoming.php 17 Apr 2008 19:19:55 -0000 1.30 +++ blocks/calendar_upcoming/block_calendar_upcoming.php 14 Jun 2008 16:54:31 -0000 @@ -8,6 +8,7 @@ function get_content() { global $USER, $CFG, $SESSION, $COURSE; + $cal_m = optional_param( 'cal_m', 0, PARAM_INT ); $cal_y = optional_param( 'cal_y', 0, PARAM_INT ); @@ -25,7 +26,12 @@ $courseshown = false; $filtercourse = array(); - $this->content->footer = ''; + /// If RSS is activated at site and calendar level show rss icon and link + if (isset($CFG->enablerssfeeds) && isset($CFG->calendar_enablerssfeeds) && !empty($USER->id)) { + require_once($CFG->dirroot.'/lib/rsslib.php'); // We'll need this + + $this->content->footer = '
'.rss_get_link(SITEID, $USER->id, 'calendar', SITEID); + } } else { $courseshown = $COURSE->id; @@ -39,6 +45,13 @@ '/calendar/event.php?action=new&course='.$courseshown.'">'. get_string('newevent', 'calendar').'...'; } + /// MDL-15162 ( MDL-15122 ): If RSS is activated at site and calendar level show rss icon and link + if (isset($CFG->enablerssfeeds) && isset($CFG->calendar_enablerssfeeds) && !empty($USER->id)) { + require_once($CFG->dirroot.'/lib/rsslib.php'); // We'll need this + + $this->content->footer .= '
'.rss_get_link($courseshown, $USER->id, 'calendar', $courseshown); + } + if ($courseshown == SITEID) { // Being displayed at site level. This will cause the filter to fall back to auto-detecting // the list of courses it will be grabbing events from. Index: blog/rsslib.php =================================================================== RCS file: /cvsroot/moodle/moodle/blog/rsslib.php,v retrieving revision 1.14 diff -u -w -r1.14 rsslib.php --- blog/rsslib.php 2 Jun 2008 21:39:25 -0000 1.14 +++ blog/rsslib.php 10 Jun 2008 22:04:21 -0000 @@ -8,20 +8,25 @@ // needs some hacking to rss/file.php function blog_rss_print_link($filtertype, $filterselect, $tagid=0, $tooltiptext='') { - global $CFG, $USER; + global $CFG, $USER, $DB; if (empty($USER->id)) { $userid = 1; + $gen_hash_key=0; } else { $userid = $USER->id; + $gen_hash_key=1; } + $courseid = SITEID; + switch ($filtertype) { case 'site': $path = SITEID.'/'.$userid.'/blog/site/'.SITEID; break; case 'course': $path = $filterselect.'/'.$userid.'/blog/course/'.$filterselect; + $courseid = $filterselect; break; case 'group': $path = SITEID.'/'.$userid.'/blog/group/'.$filterselect; @@ -31,17 +36,32 @@ break; } + $info = array($filterselect); + if ($tagid) { $path .= '/'.$tagid; + $info[] = $tagid; + } + + if ($userid == 1){ /// User is a guest? + $hash_key = ''; + if ($course = $DB->get_record('course', array('id'=>$courseid))) { + if ($course->guest == 2) { + $hash_key = '/'.md5($course->password); + } + } + } + else { + $hash_key = '/'.rss_get_url_key($userid,$courseid,"blog",$filtertype, $info); } $path .= '/rss.xml'; $rsspix = $CFG->pixpath .'/i/rss.gif'; if ($CFG->slasharguments) { - $path = $CFG->wwwroot.'/rss/file.php/'.$path; + $path = $CFG->wwwroot.'/rss/file.php'.$hash_key.'/'.$path; } else { - $path = $CFG->wwwroot.'/rss/file.php?file='.$path; + $path = $CFG->wwwroot.'/rss/file.php?file='.$hash_key.'/'.$path; } print '
'.get_string('rss').'
'; @@ -49,13 +69,107 @@ // Generate any blog RSS feed via one function (called by ../rss/file.php) - function blog_generate_rss_feed($type, $id, $tagid=0) { + function blog_generate_rss_feed($type, $info) { global $CFG, $SITE, $DB; + $id=$info[0]; + if (isset($info[1])) { + $tagid=$info[1]; + } + else { + $tagid=0; + } if (empty($CFG->enablerssfeeds)) { debugging('Sorry, RSS feeds are disabled on this site'); return ''; } + $sitecontext = get_context_instance(CONTEXT_SYSTEM); + + //Check access first + //TODO: This code is merely a copy-paste. Consider reusing existing code + switch ($type) { + + case 'site': + if ($CFG->bloglevel < BLOG_SITE_LEVEL) { + print_error('siteblogdisable', 'blog'); + } + + if (!has_capability('moodle/blog:view', $sitecontext)) { + print_error('cannotviewsiteblog', 'blog'); + } + break; + + case 'course': + if ($CFG->bloglevel < BLOG_COURSE_LEVEL) { + print_error('courseblogdisable', 'blog'); + } + if (!$course = $DB->get_record('course', array('id'=>$id))) { + print_error('invalidcourseid'); + } + $courseid = $course->id; + $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); + if (!has_capability('moodle/blog:view', $coursecontext)) { + print_error('cannotviewcourseblog', 'blog'); + } + break; + + case 'group': + if ($CFG->bloglevel < BLOG_GROUP_LEVEL) { + print_error('groupblogdisable', 'blog'); + } + + if (! $group = groups_get_group($id)) { //TODO:check. + print_error('invalidgroupid'); + } + if (!$course = $DB->get_record('course', array('id'=>$group->courseid))) { + print_error('invalidcourseid'); + } + $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); + $courseid = $course->id; + if (!has_capability('moodle/blog:view', $coursecontext)) { + print_error('cannotviewcourseorgroupblog', 'blog'); + } + if (groups_get_course_groupmode($course) == SEPARATEGROUPS + and !has_capability('moodle/site:accessallgroups', $coursecontext)) { + if (!groups_is_member($id)) { + print_error('notmemberofgroup'); + } + } + + break; + + case 'user': + if ($CFG->bloglevel < BLOG_USER_LEVEL) { + print_error('blogdisable', 'blog'); + } + if (!$user = $DB->get_record('user', array('id'=>$id))) { + print_error('invaliduserid'); + } + if ($USER->id == $id) { + if (!has_capability('moodle/blog:create', $sitecontext) + and !has_capability('moodle/blog:view', $sitecontext)) { + print_error('donothaveblog', 'blog'); + } + } else { + $personalcontext = get_context_instance(CONTEXT_USER, $id); + if (!has_capability('moodle/blog:view', $sitecontext) + and !has_capability('moodle/user:readuserblogs', $personalcontext)) { + print_error('cannotviewuserblog', 'blog'); + } + if (!blog_user_can_view_user_post($id)) { + print_error('cannotviewcourseblog', 'blog'); + } + } + $userid = $id; + + + break; + + default: + print_error('incorrectblogfilter', 'blog'); + break; + } + $filename = blog_rss_file_name($type, $id, $tagid); @@ -87,7 +201,6 @@ } /// Get header and footer information - switch ($type) { case 'user': $info = fullname($DB->get_record('user', array('id'=>$id), 'firstname,lastname')); Index: calendar/lib.php =================================================================== RCS file: /cvsroot/moodle/moodle/calendar/lib.php,v retrieving revision 1.223 diff -u -w -r1.223 lib.php Index: calendar/view.php =================================================================== RCS file: /cvsroot/moodle/moodle/calendar/view.php,v retrieving revision 1.103 diff -u -w -r1.103 view.php --- calendar/view.php 1 Jun 2008 14:25:06 -0000 1.103 +++ calendar/view.php 14 Jun 2008 17:27:54 -0000 @@ -176,6 +176,10 @@ .'alt="'.get_string('ical', 'calendar').'" ' .'title="'.get_string('quickdownloadcalendar', 'calendar').'" />' .''; + if (isset($CFG->enablerssfeeds) && isset($CFG->calendar_enablerssfeeds) && !empty($USER->id)) { + require_once($CFG->dirroot.'/lib/rsslib.php'); + echo '
'.rss_get_link($courseid, $USER->id, 'calendar', $courseid); + } } echo ''; Index: install/lang/cy_utf8/installer.php =================================================================== RCS file: /cvsroot/moodle/moodle/install/lang/cy_utf8/installer.php,v retrieving revision 1.2 diff -u -w -r1.2 installer.php Index: install/lang/hu_utf8/installer.php =================================================================== RCS file: /cvsroot/moodle/moodle/install/lang/hu_utf8/installer.php,v retrieving revision 1.16 diff -u -w -r1.16 installer.php Index: install/lang/lt_utf8/installer.php =================================================================== RCS file: /cvsroot/moodle/moodle/install/lang/lt_utf8/installer.php,v retrieving revision 1.6 diff -u -w -r1.6 installer.php Index: install/lang/mn_utf8/installer.php =================================================================== RCS file: /cvsroot/moodle/moodle/install/lang/mn_utf8/installer.php,v retrieving revision 1.5 diff -u -w -r1.5 installer.php Index: install/lang/ta_lk_utf8/installer.php =================================================================== RCS file: /cvsroot/moodle/moodle/install/lang/ta_lk_utf8/installer.php,v retrieving revision 1.4 diff -u -w -r1.4 installer.php Index: install/lang/ta_utf8/installer.php =================================================================== RCS file: /cvsroot/moodle/moodle/install/lang/ta_utf8/installer.php,v retrieving revision 1.12 diff -u -w -r1.12 installer.php Index: install/lang/uz_utf8/installer.php =================================================================== RCS file: /cvsroot/moodle/moodle/install/lang/uz_utf8/installer.php,v retrieving revision 1.2 diff -u -w -r1.2 installer.php Index: install/lang/zh_tw_utf8/installer.php =================================================================== RCS file: /cvsroot/moodle/moodle/install/lang/zh_tw_utf8/installer.php,v retrieving revision 1.10 diff -u -w -r1.10 installer.php Index: lang/en_utf8/admin.php =================================================================== RCS file: /cvsroot/moodle/moodle/lang/en_utf8/admin.php,v retrieving revision 1.196 diff -u -w -r1.196 admin.php --- lang/en_utf8/admin.php 9 Jun 2008 08:44:02 -0000 1.196 +++ lang/en_utf8/admin.php 12 Jun 2008 21:00:18 -0000 @@ -105,6 +105,7 @@ $string['configenablegroupings'] = 'This setting enables groupings of groups.'; $string['configenablehtmlpurifier'] = 'Use HTML Purifier instead of KSES for cleaning of untrusted text. HTML Purifier is actively developed and is believed to be more secure, but it is more resource intensive. Expect minor visual differences in the resulting html code. Please note that embed and object tags can not be enabled, MathML tags and old lang tags are not supported. '; $string['configenablerssfeeds'] = 'This switch will enable RSS feeds from across the site. To actually see any change you will need to enable RSS feeds in the individual modules too - go to the Modules settings under Admin Configuration.'; +$string['configcalendarenablerssfeeds'] = 'This switch will enable RSS feeds for calendar and upcoming events blocks.'; $string['configenablerssfeedsdisabled'] = 'It is not available because RSS feeds are disabled in all the Site. To enable them, go to the Variables settings under Admin Configuration.'; $string['configenablerssfeedsdisabled2'] = 'RSS feeds are disabled at the server level. You need to enable them first in Server/RSS.'; $string['configenablestats'] = 'If you choose \'yes\' here, Moodle\'s cronjob will process the logs and gather some statistics. Depending on the amount of traffic on your site, this can take awhile. If you enable this, you will be able to see some interesting graphs and statistics about each of your courses, or on a sitewide basis.'; @@ -325,6 +326,7 @@ $string['enablehtmlpurifier'] = 'Enable HTML Purifier'; $string['enablerecordcache'] = 'Enable Record Cache'; $string['enablerssfeeds'] = 'Enable RSS feeds'; +$string['calendar_enablerssfeeds'] = 'Enable RSS feeds for calendar'; $string['enablestats'] = 'Enable statistics'; $string['enabletrusttext'] = 'Enable Trusted Content'; $string['encoding'] = 'Encoding'; Index: lang/en_utf8/moodle.php =================================================================== RCS file: /cvsroot/moodle/moodle/lang/en_utf8/moodle.php,v retrieving revision 1.185 diff -u -w -r1.185 moodle.php Index: lib/moodlelib.php =================================================================== RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v retrieving revision 1.1057 diff -u -w -r1.1057 moodlelib.php --- lib/moodlelib.php 9 Jun 2008 16:53:36 -0000 1.1057 +++ lib/moodlelib.php 10 Jun 2008 19:14:33 -0000 @@ -2134,7 +2134,7 @@ * @param string $script unique script identifier * @param int $instance optional instance id */ -function require_user_key_login($script, $instance=null) { +function require_user_key_login($script, $instance=null,$keyvalue=null) { global $nomoodlecookie, $USER, $SESSION, $CFG, $DB; if (empty($nomoodlecookie)) { @@ -2144,6 +2144,7 @@ /// extra safety @session_write_close(); + if($keyvalue === NULL) $keyvalue = required_param('key', PARAM_ALPHANUM); if (!$key = $DB->get_record('user_private_key', array('script'=>$script, 'value'=>$keyvalue, 'instance'=>$instance))) { @@ -7513,6 +7514,7 @@ // Used to make sure that $min <= $value <= $max function bounded_number($min, $value, $max) { + if($value < $min) { return $min; } Index: lib/rsslib.php =================================================================== RCS file: /cvsroot/moodle/moodle/lib/rsslib.php,v retrieving revision 1.55 diff -u -w -r1.55 rsslib.php --- lib/rsslib.php 30 May 2008 20:29:51 -0000 1.55 +++ lib/rsslib.php 14 Jun 2008 16:48:33 -0000 @@ -27,12 +27,32 @@ /** * This function returns the URL for the RSS XML file. */ -function rss_get_url($courseid, $userid, $modulename, $id) { - global $CFG; +function rss_get_url($courseid, $userid, $modulename, $id, $info = null) { + global $CFG,$COURSE; + //echo $userid; + if (empty($userid) || isguestuser($userid)){ /// User is a guest? + //Check course policy about guests + + if($COURSE->guest == 2) {/// Guests allowed with key + $hash_key='/'.md5($COURSE->password); ///Use course key as a hash_key + } + else { + $hash_key = ""; + } + } + else { + $hash_key = '/'.rss_get_url_key($userid,$courseid,$modulename,$id, $info); + } + if (is_array($info)) { + $info=implode('/',$info).'/'; + } + else if($info !== null) { + $info.='/'; + } if ($CFG->slasharguments) { - $rsspath = "$CFG->wwwroot/rss/file.php/$courseid/$userid/$modulename/$id/rss.xml"; + $rsspath = "$CFG->wwwroot/rss/file.php$hash_key/$courseid/$userid/$modulename/$id/".$info."rss.xml"; } else { - $rsspath = "$CFG->wwwroot/rss/file.php?file=/$courseid/$userid/$modulename/$id/rss.xml"; + $rsspath = "$CFG->wwwroot/rss/file.php?file=$hash_key/$courseid/$userid/$modulename/$id/".$info."rss.xml"; } return $rsspath; } @@ -40,8 +60,8 @@ /** * This function prints the icon (from theme) with the link to rss/file.php */ -function rss_print_link($courseid, $userid, $modulename, $id, $tooltiptext='') { - print rss_get_link($courseid, $userid, $modulename, $id, $tooltiptext); +function rss_print_link($courseid, $userid, $modulename, $id, $tooltiptext='', $info = null) { + print rss_get_link($courseid, $userid, $modulename, $id, $tooltiptext, $info); } @@ -207,61 +227,6 @@ } } -//This function returns the rss XML code for every item passed in the array -//item->title: The title of the item -//item->author: The author of the item. Optional !! -//item->pubdate: The pubdate of the item -//item->link: The link url of the item -//item->description: The content of the item -function rss_add_items($items) { - global $CFG; - - $result = ''; - - if (!empty($items)) { - foreach ($items as $item) { - $result .= rss_start_tag('item',2,true); - //Include the category if exists (some rss readers will use it to group items) - if (isset($item->category)) { - $result .= rss_full_tag('category',3,false,$item->category); - } - $result .= rss_full_tag('title',3,false,strip_tags($item->title)); - $result .= rss_full_tag('link',3,false,$item->link); - $result .= rss_add_enclosures($item); - $result .= rss_full_tag('pubDate',3,false,date('D, d M Y H:i:s T',$item->pubdate)); - //Include the author if exists - if (isset($item->author)) { - //$result .= rss_full_tag('author',3,false,$item->author); - //We put it in the description instead because it's more important - //for moodle than most other feeds, and most rss software seems to ignore - //the author field ... - $item->description = get_string('byname','',$item->author).'.  

'.$item->description.'

'; - } - $result .= rss_full_tag('description',3,false,$item->description); - $result .= rss_full_tag('guid',3,false,$item->link,array('isPermaLink' => 'true')); - $result .= rss_end_tag('item',2,true); - - } - } else { - $result = false; - } - return $result; -} - -/** - * This function return all the common footers for every rss feed in the site - */ -function rss_standard_footer($title = NULL, $link = NULL, $description = NULL) { - $status = true; - $result = ''; - - //Close the chanel - $result .= rss_end_tag('channel', 1, true); - ////Close the rss tag - $result .= ''; - - return $result; -} /** * This function return an error xml file (string) @@ -457,6 +422,7 @@ } + /** * Prints or returns a form for managing rss feed entries. * @param string $act The current action. If "rssedit" then and "update" button is used, otherwise "add" is used. @@ -608,4 +574,269 @@ return $returnstring; } + + +//This function returns the rss XML code for every item passed in the array +//item->title: The title of the item +//item->author: The author of the item. Optional !! +//item->pubdate: The pubdate of the item +//item->link: The link url of the item +//item->description: The content of the item +function rss_add_items($items) { + global $CFG; + + $result = ''; + + if (!empty($items)) { + foreach ($items as $item) { + $result .= rss_start_tag('item',2,true); + //Include the category if exists (some rss readers will use it to group items) + if (isset($item->category)) { + $result .= rss_full_tag('category',3,false,$item->category); + } + $result .= rss_full_tag('title',3,false,strip_tags($item->title)); + $result .= rss_full_tag('link',3,false,$item->link); + $result .= rss_add_enclosures($item); + $result .= rss_full_tag('pubDate',3,false,date('D, d M Y H:i:s T',$item->pubdate)); + //Include the author if exists + if (isset($item->author)) { + //$result .= rss_full_tag('author',3,false,$item->author); + //We put it in the description instead because it's more important + //for moodle than most other feeds, and most rss software seems to ignore + //the author field ... + $item->description = get_string('byname','',$item->author).'.  

'.$item->description.'

'; + } + $result .= rss_full_tag('description',3,false,$item->description); + $result .= rss_full_tag('guid',3,false,$item->link,array('isPermaLink' => 'true')); + $result .= rss_end_tag('item',2,true); + + } + } else { + $result = false; + } + return $result; +} + +/** + * This function return all the common footers for every rss feed in the site + */ +function rss_standard_footer($title = NULL, $link = NULL, $description = NULL) { + $status = true; + $result = ''; + + //Close the chanel + $result .= rss_end_tag('channel', 1, true); + ////Close the rss tag + $result .= ''; + + return $result; +} + + +/** + * Authenticates user by hash-string in URL, sets up $USER and other necessary stuff + * Checks if the user can access particular course and module. + * Function terminates with error if user doesn't have access to course\module. + * @param string $hash_key Long hash-like string from URL. + * @param int $user_id User id from URL + * @param int $course_id The id of the course this feeds belongs to + * @param string $module Module name or course module object this feeds belongs to + * @param string $instance Instance id. Could be blogid, forumid etc + * @param string $info Additonal information, which is used to accurately identify RSS feed. Can be array. + * @author Askar Salimbaev + */ +function rss_auth($hash_key, $user_id, $course_id, $module, $instance, $info = null ) +{ + global $USER, $DB; + + $USER=null; + + if (is_object($module)) { + $modulename=$module->modname; + } + else { + $modulename=$module; + $module=null; + } + + if ($info !== NULL && is_array($info)) { + $info = implode('_',$info); + } + + //Get course + if (!$course = $DB->get_record('course', array('id'=>$course_id))) { + rss_not_found(); // invalid course id + } + + //Check if hash_key is present + if( $hash_key !== NULL ) { + + if ($key = $DB->get_record('user_private_key', array('script' => 'rss', 'userid' => $user_id, 'instance' => $course_id))) { + $genuine_hash_key = md5($user_id.$modulename.($key->value).$instance.$info); + //Compare + if ($genuine_hash_key == $hash_key) { + require_user_key_login('rss', $course_id, $key->value); + } + } + } + + if ($USER == NULL) + $USER = guest_user(); //Still not logged in, consider as guest + + + //Check access + rss_checkcaps($course,$module,$hash_key); +} + + +/** + * Checks if the user can access particular course and module. + * Function terminates with error if user doesn't have access to course\module. + * @param object $course course object + * @param object $cm course module object + * @param string $key guest's enrollment key + * @author Askar Salimbaev + * TODO: This code is merely a copy-paste. Consider reusing existing code + */ +function rss_checkcaps($course,$cm,$key) +{ + global $CFG, $USER; +// Fetch the system context, we are going to use it a lot. + $sysctx = get_context_instance(CONTEXT_SYSTEM); + +/// If the site is currently under maintenance, then print a message + if (!has_capability('moodle/site:config', $sysctx)) { + if (file_exists($CFG->dataroot.'/'.SITEID.'/maintenance.html')) { + rss_not_found(); + } + } + +/// groupmembersonly access control + if (!empty($CFG->enablegroupings) and $cm and $cm->groupmembersonly and !has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_MODULE, $cm->id))) { + if (isguestuser() or !groups_has_membership($cm)) { + rss_not_found(); + } + } + + // Fetch the course context, and prefetch its child contexts + if (!isset($course->context)) { + if ( ! $course->context = get_context_instance(CONTEXT_COURSE, $course->id) ) { + rss_not_found(); + } + } + if ($course->id == SITEID) { + /// Eliminate hidden site activities straight away + if (!empty($cm) && !$cm->visible + && !has_capability('moodle/course:viewhiddenactivities', $course->context)) { + rss_not_found(); + } + + return; + + } else { + + /// Check if the user can be in a particular course + if (empty($USER->access['rsw'][$course->context->path])) { + // + // and the user hasn't the 'course:viewhiddencourses' capability, prevent access + // + if ( !($course->visible && course_parent_visible($course)) && + !has_capability('moodle/course:viewhiddencourses', $course->context)) { + rss_not_found(); + } + } + + /// Non-guests who don't currently have access, check if they can be allowed in as a guest + + if ($USER->username != 'guest' and !has_capability('moodle/course:view', $course->context)) { + if ($course->guest == 1) { + // Temporarily assign them guest role for this context, if it fails later user is asked to enrol + $USER->access = load_temp_role($course->context, $CFG->guestroleid, $USER->access); + } + } + + /// If the user is a guest then treat them according to the course policy about guests + + if (has_capability('moodle/legacy:guest', $course->context, NULL, false)) { + if (has_capability('moodle/site:doanything', $sysctx)) { + // administrators must be able to access any course - even if somebody gives them guest access + return; + } + + if($course->guest == 1) { + if (!has_capability('moodle/course:view', $course->context)) { // Prohibited by capability + rss_not_found(); + } + if (!empty($cm) and !$cm->visible) { // Not allowed to see module, send to course page + rss_not_found(); + } + + return; // User is allowed to see this course + } + else if(isguestuser() && $course->guest == 2 ) { + if (md5($course->password) == $key) + return; // User is allowed to see this course + else + rss_not_found(); + } + else { + rss_not_found(); + } + + /// For non-guests, check if they have course view access + + } else if (has_capability('moodle/course:view', $course->context)) { + if (!empty($USER->realuser)) { // Make sure the REAL person can also access this course + if (!has_capability('moodle/course:view', $course->context, $USER->realuser)) { + rss_not_found(); + } + } + + /// Make sure they can read this activity too, if specified + + if (!empty($cm) and !$cm->visible and !has_capability('moodle/course:viewhiddenactivities', $course->context)) { + rss_not_found(); + } + + return; // User is allowed to see this course + } + } +} + + + +/** + * Function returns long hash-like string, which can be used later to access specific RSS feed. Used when printing links. + * @param mixed $userid user id. + * @param int $courseid the id of the course this feeds belongs to + * @param string $modulename module name this feeds belongs to + * @param string $instance Instance id. Could be blogid, forumid etc + * @param string $info Additonal information, which is used to accurately identify RSS feed. Can be array. + * @return string hash_key + * @author Askar Salimbaev + */ +function rss_get_url_key( $userid, $courseid, $modulename, $instance, $info = null) { +global $DB; + if ($info !== NULL && is_array($info)) { + $info = implode('_',$info); + } + if (!$key = $DB->get_record('user_private_key', array('script' => "rss", 'userid' => $userid, 'instance' => $courseid))) { + //Create new key + $key->value = create_user_key('rss',$userid,$courseid); + } + + return md5($userid.$modulename.($key->value).$instance.$info); +} + + + +/** + * + * + */ +function rss_not_found() { + /// error, send some XML with error message + global $lifetime, $filename; + send_file(rss_geterrorxmlfile(), $filename, $lifetime, false, true); +} ?> Index: lib/editor/tinymce/jscripts/tiny_mce/license.txt =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/license.txt,v retrieving revision 1.3 diff -u -w -r1.3 license.txt Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js,v retrieving revision 1.3 diff -u -w -r1.3 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm,v retrieving revision 1.3 diff -u -w -r1.3 rule.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css,v retrieving revision 1.3 diff -u -w -r1.3 advhr.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js,v retrieving revision 1.3 diff -u -w -r1.3 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js,v retrieving revision 1.3 diff -u -w -r1.3 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm,v retrieving revision 1.3 diff -u -w -r1.3 link.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css,v retrieving revision 1.3 diff -u -w -r1.3 advlink.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js,v retrieving revision 1.3 diff -u -w -r1.3 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js,v retrieving revision 1.3 diff -u -w -r1.3 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/COPYRIGHT.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/COPYRIGHT.html,v retrieving revision 1.1 diff -u -w -r1.1 COPYRIGHT.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/LICENSE-gpl.txt =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/LICENSE-gpl.txt,v retrieving revision 1.1 diff -u -w -r1.1 LICENSE-gpl.txt Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/README.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/README.html,v retrieving revision 1.1 diff -u -w -r1.1 README.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/Release Notes.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/Release Notes.html,v retrieving revision 1.1 diff -u -w -r1.1 Release Notes.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/demo.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/demo.html,v retrieving revision 1.1 diff -u -w -r1.1 demo.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/editor_plugin_src.js,v retrieving revision 1.1 diff -u -w -r1.1 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/index.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/index.html,v retrieving revision 1.1 diff -u -w -r1.1 index.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/integrations.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/integrations.html,v retrieving revision 1.1 diff -u -w -r1.1 integrations.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/support.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/support.html,v retrieving revision 1.1 diff -u -w -r1.1 support.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/Latex.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/Latex.html,v retrieving revision 1.1 diff -u -w -r1.1 Latex.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/MathML.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/MathML.html,v retrieving revision 1.1 diff -u -w -r1.1 MathML.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/Maxima.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/Maxima.html,v retrieving revision 1.1 diff -u -w -r1.1 Maxima.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/MaximaPopup.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/MaximaPopup.html,v retrieving revision 1.1 diff -u -w -r1.1 MaximaPopup.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/WS_FTP.LOG =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/WS_FTP.LOG,v retrieving revision 1.1 diff -u -w -r1.1 WS_FTP.LOG Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/HotEqn/HotEqn.jar =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/HotEqn/HotEqn.jar,v retrieving revision 1.1 diff -u -w -r1.1 HotEqn.jar Binary files /tmp/cvsclrUoy and HotEqn.jar differ Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/HotEqn/WS_FTP.LOG =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/HotEqn/WS_FTP.LOG,v retrieving revision 1.1 diff -u -w -r1.1 WS_FTP.LOG Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/AbsoluteLayout.jar =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/AbsoluteLayout.jar,v retrieving revision 1.1 diff -u -w -r1.1 AbsoluteLayout.jar Binary files /tmp/cvs4AiJt7 and AbsoluteLayout.jar differ Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/Project.jar =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/Project.jar,v retrieving revision 1.1 diff -u -w -r1.1 Project.jar Binary files /tmp/cvsxodL3o and Project.jar differ Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/jdom.jar =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/jdom.jar,v retrieving revision 1.1 diff -u -w -r1.1 jdom.jar Binary files /tmp/cvskr0kIG and jdom.jar differ Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/jep.jar =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/jep.jar,v retrieving revision 1.1 diff -u -w -r1.1 jep.jar Binary files /tmp/cvs7OMzpY and jep.jar differ Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/swing-layout-1.0.jar =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/swing-layout-1.0.jar,v retrieving revision 1.1 diff -u -w -r1.1 swing-layout-1.0.jar Binary files /tmp/cvsowmv9f and swing-layout-1.0.jar differ Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/Display/WS_FTP.LOG =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/Display/WS_FTP.LOG,v retrieving revision 1.1 diff -u -w -r1.1 WS_FTP.LOG Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/formats/Latex.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/formats/Latex.xml,v retrieving revision 1.1 diff -u -w -r1.1 Latex.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/formats/Maple.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/formats/Maple.xml,v retrieving revision 1.1 diff -u -w -r1.1 Maple.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/formats/MathML.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/formats/MathML.xml,v retrieving revision 1.1 diff -u -w -r1.1 MathML.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/formats/Maxima.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/formats/Maxima.xml,v retrieving revision 1.1 diff -u -w -r1.1 Maxima.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/formats/WS_FTP.LOG =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/formats/WS_FTP.LOG,v retrieving revision 1.1 diff -u -w -r1.1 WS_FTP.LOG Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/WS_FTP.LOG =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/WS_FTP.LOG,v retrieving revision 1.1 diff -u -w -r1.1 WS_FTP.LOG Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/cz.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/cz.xml,v retrieving revision 1.1 diff -u -w -r1.1 cz.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/de.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/de.xml,v retrieving revision 1.1 diff -u -w -r1.1 de.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/en.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/en.xml,v retrieving revision 1.1 diff -u -w -r1.1 en.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/es.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/es.xml,v retrieving revision 1.1 diff -u -w -r1.1 es.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/fr.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/fr.xml,v retrieving revision 1.1 diff -u -w -r1.1 fr.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/nl.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/nl.xml,v retrieving revision 1.1 diff -u -w -r1.1 nl.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/pl.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/pl.xml,v retrieving revision 1.1 diff -u -w -r1.1 pl.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/pt-br.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/pt-br.xml,v retrieving revision 1.1 diff -u -w -r1.1 pt-br.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/ru.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/ru.xml,v retrieving revision 1.1 diff -u -w -r1.1 ru.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/sv.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/applet/classes/lang/sv.xml,v retrieving revision 1.1 diff -u -w -r1.1 sv.xml Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/WS_FTP.LOG =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/WS_FTP.LOG,v retrieving revision 1.1 diff -u -w -r1.1 WS_FTP.LOG Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/about.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/about.html,v retrieving revision 1.1 diff -u -w -r1.1 about.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/acknowledgments.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/acknowledgments.html,v retrieving revision 1.1 diff -u -w -r1.1 acknowledgments.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/browser.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/browser.html,v retrieving revision 1.1 diff -u -w -r1.1 browser.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/complex.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/complex.html,v retrieving revision 1.1 diff -u -w -r1.1 complex.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/cvs.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/cvs.html,v retrieving revision 1.1 diff -u -w -r1.1 cvs.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/editing.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/editing.html,v retrieving revision 1.1 diff -u -w -r1.1 editing.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/index.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/index.html,v retrieving revision 1.1 diff -u -w -r1.1 index.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/integrations.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/integrations.html,v retrieving revision 1.1 diff -u -w -r1.1 integrations.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/language.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/language.html,v retrieving revision 1.1 diff -u -w -r1.1 language.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/navframe.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/navframe.html,v retrieving revision 1.1 diff -u -w -r1.1 navframe.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/newformat.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/newformat.html,v retrieving revision 1.1 diff -u -w -r1.1 newformat.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/newobject.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/newobject.html,v retrieving revision 1.1 diff -u -w -r1.1 newobject.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/options.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/options.html,v retrieving revision 1.1 diff -u -w -r1.1 options.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/parameters.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/parameters.html,v retrieving revision 1.1 diff -u -w -r1.1 parameters.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/simple.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/simple.html,v retrieving revision 1.1 diff -u -w -r1.1 simple.html Binary files /tmp/cvsmEyxeO and simple.html differ Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/img/WS_FTP.LOG =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/doc/img/WS_FTP.LOG,v retrieving revision 1.1 diff -u -w -r1.1 WS_FTP.LOG Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/js/dragmath.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/js/dragmath.js,v retrieving revision 1.1 diff -u -w -r1.1 dragmath.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/langs/WS_FTP.LOG =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/langs/WS_FTP.LOG,v retrieving revision 1.1 diff -u -w -r1.1 WS_FTP.LOG Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/dragmath/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/emoticons/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/emoticons/editor_plugin_src.js,v retrieving revision 1.1 diff -u -w -r1.1 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/emoticons/emoticons.php =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/emoticons/emoticons.php,v retrieving revision 1.1 diff -u -w -r1.1 emoticons.php Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/emoticons/js/emoticons.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/emoticons/js/emoticons.js,v retrieving revision 1.1 diff -u -w -r1.1 emoticons.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/emoticons/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/emoticons/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js,v retrieving revision 1.3 diff -u -w -r1.3 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm,v retrieving revision 1.3 diff -u -w -r1.3 emotions.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js,v retrieving revision 1.1 diff -u -w -r1.1 emotions.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm,v retrieving revision 1.1 diff -u -w -r1.1 dialog.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js,v retrieving revision 1.1 diff -u -w -r1.1 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js,v retrieving revision 1.1 diff -u -w -r1.1 dialog.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js,v retrieving revision 1.1 diff -u -w -r1.1 en.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm,v retrieving revision 1.3 diff -u -w -r1.3 fullpage.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js,v retrieving revision 1.1 diff -u -w -r1.1 fullpage.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm,v retrieving revision 1.3 diff -u -w -r1.3 fullscreen.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js,v retrieving revision 1.3 diff -u -w -r1.3 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm,v retrieving revision 1.1 diff -u -w -r1.1 template.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js,v retrieving revision 1.3 diff -u -w -r1.3 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js,v retrieving revision 1.1 diff -u -w -r1.1 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css,v retrieving revision 1.1 diff -u -w -r1.1 content.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js,v retrieving revision 1.1 diff -u -w -r1.1 embed.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/editor_plugin_src.js,v retrieving revision 1.1 diff -u -w -r1.1 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/js/image.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/js/image.js,v retrieving revision 1.1 diff -u -w -r1.1 image.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/js/moodleimage.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/js/moodleimage.js,v retrieving revision 1.1 diff -u -w -r1.1 moodleimage.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/moodlelink/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodlelink/editor_plugin_src.js,v retrieving revision 1.1 diff -u -w -r1.1 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/moodlelink/js/moodlelink.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodlelink/js/moodlelink.js,v retrieving revision 1.1 diff -u -w -r1.1 moodlelink.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/moodlelink/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodlelink/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js,v retrieving revision 1.1 diff -u -w -r1.1 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/blank.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/blank.htm,v retrieving revision 1.3 diff -u -w -r1.3 blank.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm,v retrieving revision 1.3 diff -u -w -r1.3 pastetext.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm,v retrieving revision 1.3 diff -u -w -r1.3 pasteword.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/css/blank.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/css/blank.css,v retrieving revision 1.3 diff -u -w -r1.3 blank.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/css/pasteword.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/css/pasteword.css,v retrieving revision 1.3 diff -u -w -r1.3 pasteword.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js,v retrieving revision 1.1 diff -u -w -r1.1 pastetext.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js,v retrieving revision 1.1 diff -u -w -r1.1 pasteword.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/preview/example.html =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/preview/example.html,v retrieving revision 1.3 diff -u -w -r1.3 example.html Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js,v retrieving revision 1.1 diff -u -w -r1.1 embed.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js,v retrieving revision 1.3 diff -u -w -r1.3 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js,v retrieving revision 1.3 diff -u -w -r1.3 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm,v retrieving revision 1.1 diff -u -w -r1.1 searchreplace.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css,v retrieving revision 1.1 diff -u -w -r1.1 searchreplace.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js,v retrieving revision 1.1 diff -u -w -r1.1 searchreplace.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css,v retrieving revision 1.1 diff -u -w -r1.1 content.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/standardmenu/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/standardmenu/editor_plugin_src.js,v retrieving revision 1.1 diff -u -w -r1.1 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/style/css/props.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/style/css/props.css,v retrieving revision 1.1 diff -u -w -r1.1 props.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm,v retrieving revision 1.3 diff -u -w -r1.3 merge_cells.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css,v retrieving revision 1.3 diff -u -w -r1.3 cell.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/table/css/row.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/table/css/row.css,v retrieving revision 1.3 diff -u -w -r1.3 row.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/table/css/table.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/table/css/table.css,v retrieving revision 1.3 diff -u -w -r1.3 table.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/template/blank.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/template/blank.htm,v retrieving revision 1.1 diff -u -w -r1.1 blank.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/template/css/template.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/template/css/template.css,v retrieving revision 1.1 diff -u -w -r1.1 template.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js,v retrieving revision 1.1 diff -u -w -r1.1 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm,v retrieving revision 1.1 diff -u -w -r1.1 abbr.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm,v retrieving revision 1.1 diff -u -w -r1.1 acronym.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm,v retrieving revision 1.1 diff -u -w -r1.1 attributes.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm,v retrieving revision 1.1 diff -u -w -r1.1 cite.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm,v retrieving revision 1.1 diff -u -w -r1.1 del.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js,v retrieving revision 1.1 diff -u -w -r1.1 editor_plugin_src.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm,v retrieving revision 1.1 diff -u -w -r1.1 ins.htm Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css,v retrieving revision 1.1 diff -u -w -r1.1 attributes.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css,v retrieving revision 1.1 diff -u -w -r1.1 popup.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/xhtmlxtras.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/xhtmlxtras.css,v retrieving revision 1.1 diff -u -w -r1.1 xhtmlxtras.css Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js,v retrieving revision 1.1 diff -u -w -r1.1 abbr.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js,v retrieving revision 1.1 diff -u -w -r1.1 acronym.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js,v retrieving revision 1.1 diff -u -w -r1.1 attributes.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js,v retrieving revision 1.1 diff -u -w -r1.1 cite.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js,v retrieving revision 1.1 diff -u -w -r1.1 del.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js,v retrieving revision 1.1 diff -u -w -r1.1 ins.js Index: lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm,v retrieving revision 1.3 diff -u -w -r1.3 anchor.htm Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm,v retrieving revision 1.3 diff -u -w -r1.3 charmap.htm Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm,v retrieving revision 1.3 diff -u -w -r1.3 color_picker.htm Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm,v retrieving revision 1.3 diff -u -w -r1.3 image.htm Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm,v retrieving revision 1.3 diff -u -w -r1.3 link.htm Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm,v retrieving revision 1.3 diff -u -w -r1.3 source_editor.htm Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js,v retrieving revision 1.1 diff -u -w -r1.1 about.js Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js,v retrieving revision 1.1 diff -u -w -r1.1 charmap.js Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js,v retrieving revision 1.1 diff -u -w -r1.1 source_editor.js Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js,v retrieving revision 1.3 diff -u -w -r1.3 en.js Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js,v retrieving revision 1.1 diff -u -w -r1.1 en_dlg.js Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css,v retrieving revision 1.1 diff -u -w -r1.1 dialog.css Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css,v retrieving revision 1.1 diff -u -w -r1.1 dialog.css Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css,v retrieving revision 1.1 diff -u -w -r1.1 ui_black.css Index: lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css,v retrieving revision 1.1 diff -u -w -r1.1 ui_silver.css Index: lib/editor/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js,v retrieving revision 1.1 diff -u -w -r1.1 en.js Index: lib/editor/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css,v retrieving revision 1.1 diff -u -w -r1.1 content.css Index: lib/editor/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css,v retrieving revision 1.1 diff -u -w -r1.1 ui.css Index: lib/editor/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css,v retrieving revision 1.1 diff -u -w -r1.1 content.css Index: lib/editor/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css,v retrieving revision 1.1 diff -u -w -r1.1 ui.css Index: lib/editor/tinymce/jscripts/tiny_mce/utils/editable_selects.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/utils/editable_selects.js,v retrieving revision 1.1 diff -u -w -r1.1 editable_selects.js Index: lib/editor/tinymce/jscripts/tiny_mce/utils/form_utils.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/utils/form_utils.js,v retrieving revision 1.3 diff -u -w -r1.3 form_utils.js Index: lib/editor/tinymce/jscripts/tiny_mce/utils/mclayer.js =================================================================== RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/jscripts/tiny_mce/utils/mclayer.js,v retrieving revision 1.3 diff -u -w -r1.3 mclayer.js Index: lib/htmlpurifier/HTMLPurifier/Lexer/PH5P.php =================================================================== RCS file: /cvsroot/moodle/moodle/lib/htmlpurifier/HTMLPurifier/Lexer/PH5P.php,v retrieving revision 1.2 diff -u -w -r1.2 PH5P.php Index: lib/tcpdf/fonts/FreeMono.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeMono.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeMono.ctg.z Binary files /tmp/cvsFbrAHF and FreeMono.ctg.z differ Index: lib/tcpdf/fonts/FreeMono.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeMono.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeMono.z Binary files /tmp/cvsHrv5C0 and FreeMono.z differ Index: lib/tcpdf/fonts/FreeMonoBold.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeMonoBold.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeMonoBold.ctg.z Binary files /tmp/cvs0nANzl and FreeMonoBold.ctg.z differ Index: lib/tcpdf/fonts/FreeMonoBold.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeMonoBold.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeMonoBold.z Binary files /tmp/cvst456wG and FreeMonoBold.z differ Index: lib/tcpdf/fonts/FreeMonoBoldOblique.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeMonoBoldOblique.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeMonoBoldOblique.ctg.z Binary files /tmp/cvsTXCTu1 and FreeMonoBoldOblique.ctg.z differ Index: lib/tcpdf/fonts/FreeMonoBoldOblique.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeMonoBoldOblique.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeMonoBoldOblique.z Binary files /tmp/cvskNahtm and FreeMonoBoldOblique.z differ Index: lib/tcpdf/fonts/FreeMonoOblique.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeMonoOblique.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeMonoOblique.ctg.z Binary files /tmp/cvseCUosH and FreeMonoOblique.ctg.z differ Index: lib/tcpdf/fonts/FreeMonoOblique.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeMonoOblique.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeMonoOblique.z Binary files /tmp/cvsAERbs2 and FreeMonoOblique.z differ Index: lib/tcpdf/fonts/FreeSans.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSans.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSans.ctg.z Binary files /tmp/cvsRP3Lsn and FreeSans.ctg.z differ Index: lib/tcpdf/fonts/FreeSans.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSans.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSans.z Binary files /tmp/cvsW38puI and FreeSans.z differ Index: lib/tcpdf/fonts/FreeSansBold.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSansBold.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSansBold.ctg.z Binary files /tmp/cvsBIApx3 and FreeSansBold.ctg.z differ Index: lib/tcpdf/fonts/FreeSansBold.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSansBold.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSansBold.z Binary files /tmp/cvslecWAo and FreeSansBold.z differ Index: lib/tcpdf/fonts/FreeSansBoldOblique.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSansBoldOblique.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSansBoldOblique.ctg.z Binary files /tmp/cvsH78aFJ and FreeSansBoldOblique.ctg.z differ Index: lib/tcpdf/fonts/FreeSansBoldOblique.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSansBoldOblique.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSansBoldOblique.z Binary files /tmp/cvseINUJ4 and FreeSansBoldOblique.z differ Index: lib/tcpdf/fonts/FreeSansOblique.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSansOblique.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSansOblique.ctg.z Binary files /tmp/cvsJjEiPp and FreeSansOblique.ctg.z differ Index: lib/tcpdf/fonts/FreeSansOblique.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSansOblique.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSansOblique.z Binary files /tmp/cvsTWEaVK and FreeSansOblique.z differ Index: lib/tcpdf/fonts/FreeSerif.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSerif.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSerif.ctg.z Binary files /tmp/cvs4tJr15 and FreeSerif.ctg.z differ Index: lib/tcpdf/fonts/FreeSerif.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSerif.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSerif.z Binary files /tmp/cvsI28g9q and FreeSerif.z differ Index: lib/tcpdf/fonts/FreeSerifBold.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSerifBold.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSerifBold.ctg.z Binary files /tmp/cvsOQQojM and FreeSerifBold.ctg.z differ Index: lib/tcpdf/fonts/FreeSerifBold.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSerifBold.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSerifBold.z Binary files /tmp/cvsL9Edu7 and FreeSerifBold.z differ Index: lib/tcpdf/fonts/FreeSerifBoldItalic.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSerifBoldItalic.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSerifBoldItalic.ctg.z Binary files /tmp/cvsBXK0Fs and FreeSerifBoldItalic.ctg.z differ Index: lib/tcpdf/fonts/FreeSerifBoldItalic.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSerifBoldItalic.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSerifBoldItalic.z Binary files /tmp/cvsgrhlSN and FreeSerifBoldItalic.z differ Index: lib/tcpdf/fonts/FreeSerifItalic.ctg.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSerifItalic.ctg.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSerifItalic.ctg.z Binary files /tmp/cvsQ8Uq58 and FreeSerifItalic.ctg.z differ Index: lib/tcpdf/fonts/FreeSerifItalic.z =================================================================== RCS file: /cvsroot/moodle/moodle/lib/tcpdf/fonts/FreeSerifItalic.z,v retrieving revision 1.1 diff -u -w -r1.1 FreeSerifItalic.z Binary files /tmp/cvsdFxdju and FreeSerifItalic.z differ Index: mod/wiki/ewiki/README =================================================================== RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/README,v retrieving revision 1.1 diff -u -w -r1.1 README Index: mod/wiki/ewiki/README.de =================================================================== RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/README.de,v retrieving revision 1.1 diff -u -w -r1.1 README.de Index: mod/wiki/ewiki/ewiki.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/ewiki.php,v retrieving revision 1.44 diff -u -w -r1.44 ewiki.php Index: rss/file.php =================================================================== RCS file: /cvsroot/moodle/moodle/rss/file.php,v retrieving revision 1.21 diff -u -w -r1.21 file.php --- rss/file.php 31 May 2008 17:44:57 -0000 1.21 +++ rss/file.php 13 Jun 2008 14:17:48 -0000 @@ -9,9 +9,6 @@ //allow guest access then the user field is //required to see that the user is enrolled //in the course, else no check is performed. - //This allows to limit a bit the rss access - //to correct users. It isn't unbreakable, - //obviously, but its the best I've thought!! $nomoodlecookie = true; // Because it interferes with caching @@ -21,10 +18,6 @@ $lifetime = 3600; // Seconds for files to remain in caches - 1 hour - // hack for problems with concurrent use of $nomoodlecookie and capabilities MDL-7243 - // it should be replaced once we get to codes in urls - $USER = new object(); - $USER->id = 0; // disable moodle specific debug messages disable_debugging(); @@ -38,68 +31,55 @@ // extract relative path components $args = explode('/', trim($relativepath, '/')); - - if (count($args) < 5) { + $argc = count($args); + if ($argc < 5) { rss_not_found(); } - $courseid = (int)$args[0]; - $userid = (int)$args[1]; - $modulename = clean_param($args[2], PARAM_FILE); - $instance = $args[3]; - $filename = 'rss.xml'; - - if ($isblog = $modulename == 'blog') { - $blogid = (int)$args[4]; // could be groupid / courseid / userid depending on $instance - if ($args[5] != 'rss.xml') { - $tagid = (int)$args[5]; - } else { - $tagid = 0; + if (is_numeric($args[0])) { + $t=0; + $hash_key=NULL; } - } else { - $instance = (int)$instance; // we know it's an id number + else { + $t=1; + $hash_key=clean_param($args[0], PARAM_ALPHANUM); } + $courseid = (int)$args[$t++]; + $userid = (int)$args[$t++]; + $modulename = clean_param($args[$t++], PARAM_FILE); + $instance = $args[$t++]; + $filename = 'rss.xml'; - - if (!$course = $DB->get_record('course', array('id'=>$courseid))) { - rss_not_found(); + if (($argc-1)>$t) { + $info=array(); + for($i=0 ; $i<$argc-$t-1 ; $i++) + $info[$i] = $args[$t+$i]; } - - //Check name of module - if (!$isblog) { - $mods = get_list_of_plugins('mod'); - if (!in_array(strtolower($modulename), $mods)) { - rss_not_found(); + else { + $instance = (int)$instance; // we know it's an id number + $info = null; } - //Get course_module to check it's visible if (!$cm = get_coursemodule_from_instance($modulename,$instance,$courseid)) { - rss_not_found(); - } - $context = get_context_instance(CONTEXT_MODULE, $cm->id); - $isuser = has_capability('moodle/course:view', $context, $userid); // Not ideal, this should be module-specific, but deferring until RSS gets a revamp with codes in the URLs - } else { - $context = get_context_instance(CONTEXT_COURSE, $course->id); - $isuser = has_capability('moodle/course:view', $context, $userid); + $cm=$modulename; + require_once($CFG->dirroot.'/'.$modulename.'/rsslib.php'); } - //Check for "security" if !course->guest or course->password - if ($course->id != SITEID) { - if ((!$course->guest || $course->password) && (!$isuser)) { - rss_not_found(); - } - } + //Security + rss_auth( $hash_key, $userid, $courseid, $cm, $instance, $info ); - //Check for "security" if the course is hidden or the activity is hidden - if (!$isblog and (!$course->visible || !$cm->visible) && (!has_capability('moodle/course:viewhiddenactivities', $context))) { - rss_not_found(); + if (is_array($info)) { + $infourl='/'.implode('/',$info); + } + else { + $infourl=''; } //Work out the filename of the RSS file - if ($isblog) { - require_once($CFG->dirroot.'/blog/rsslib.php'); - $pathname = blog_generate_rss_feed($instance, $blogid, $tagid); + if (!is_object($cm) ) { + $rssfunc = $modulename.'_generate_rss_feed'; + $pathname = $rssfunc($instance, $info); } else { - $pathname = $CFG->dataroot.'/rss/'.$modulename.'/'.$instance.'.xml'; + $pathname = $CFG->dataroot.'/rss/'.$modulename.'/'.$instance.$infourl.'.xml'; } //Check that file exists @@ -110,9 +90,5 @@ //Send it to user! send_file($pathname, $filename, $lifetime); - function rss_not_found() { - /// error, send some XML with error message - global $lifetime, $filename; - send_file(rss_geterrorxmlfile(), $filename, $lifetime, false, true); - } + ?>