';
- }
- $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)
* to be sent when a rss is required (file.php)
* and something goes wrong
*/
-function rss_geterrorxmlfile() {
+function rss_geterrorxml($msg) {
global $CFG;
$return = '';
@@ -278,8 +198,8 @@
$item->title = "RSS Error";
$item->link = $CFG->wwwroot;
$item->pubdate = time();
- $item->description = get_string("rsserror");
- $return .= rss_add_items(array($item));
+ $item->description = $msg;
+ $return .= rss_add_items(array($item),1);
}
//XML Footer
@@ -337,6 +257,18 @@
return $st.$co.$et;
}
+/**
+ * Return the start tag, the contents inside CDATA and the end tag
+ */
+function rss_fullcdata_tag($tag,$level=0,$endline=true,$content,$attributes=null) {
+ $st = rss_start_tag($tag,$level,$endline,$attributes);
+ $co="";
+ $co = '';
+ $et = rss_end_tag($tag,0,true);
+
+ return $st.$co.$et;
+}
+
//////////////////// LIBRARY FUNCTIONS FOR RSS_CLIENT BLOCK ////////////////
//initialize default config vars for rss_client block if needed
@@ -453,6 +385,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.
@@ -604,4 +537,328 @@
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. Optional
+//item->guid: The guid for the item. Optional if item->link is present
+//item->description: The content of the item
+function rss_add_items($items,$cdatadesc = 0) {
+ 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));
+ if (isset($item->link)) {
+ $result .= rss_full_tag('link',3,false,$item->link);
+ }
+ $result .= rss_add_enclosures($item);
+ $result .= rss_full_tag('pubDate',3,false,date(DATE_RFC2822,$item->pubdate)); // Fix for MDL-12563
+ //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.'
';
+ }
+ if ($cdatadesc) {
+ $result .= rss_fullcdata_tag('description',3,false,$item->description);
+ }
+ else {
+ $result .= rss_full_tag('description',3,false,$item->description);
+ }
+ if (!isset($item->guid)) {
+ $result .= rss_full_tag('guid',3,false,$item->link,array('isPermaLink' => 'true'));
+ } else {
+ $result .= rss_full_tag('guid',3,false,$item->guid,array('isPermaLink' => 'false'));
+ }
+ $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;
+}
+
+/**
+ * Setup global course variables.
+ * ( This function actually is a wrapper for course_setup() in moodlelib.php )
+ * @param int $course_id id of the course
+ */
+function rss_course_setup($courseid) {
+ ob_start();
+ course_setup($courseid,1);
+ $err=ob_get_contents();
+ if (!empty($err)) {
+ rss_error('invalidcourse','error');
+ }
+ ob_end_clean();
+}
+
+/**
+ * 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 int $context_id The id of the context 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, $context_id, $module, $instance, $info = null ) {
+ global $USER, $DB,$COURSE,$CFG;
+
+ if (is_object($module)) {
+ $modulename=$module->modname;
+ } else {
+ $modulename=$module;
+ $module=null;
+ }
+
+ //Interpret $info
+ if (!empty($info) && is_array($info)) {
+ $info = implode('_',$info);
+ } else if (empty($info)) {
+ $info = '';
+ }
+
+
+ //Check if hash_key is present
+ if( !empty($hash_key) ) {
+
+ if ($key = $DB->get_record('user_private_key', array('script' => 'rss', 'userid' => $user_id, 'instance' => $context_id))) {
+ $genuine_hash_key = md5($user_id.$modulename.($key->value).$instance.$info);
+ //Compare
+ if ($genuine_hash_key == $hash_key) {
+ require_user_key_login('rss', $context_id, $key->value);
+ }
+ }
+ }
+
+ if (isset($USER->isDummy)) {
+ if (!empty($CFG->forcelogin)) {
+ rss_error('rssnoguests');
+ }
+ $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 && !empty($CFG->guestloginbutton)) {
+ 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 & !empty($CFG->guestloginbutton)) {
+ if (sha1(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 $contextid the id of the context 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, $contextid, $modulename, $instance, $info = '') {
+ global $DB;
+
+ //Load prefs
+ $rss_iprestriction = get_user_preferences( 'rss_iprestriction', '');
+
+ if (empty($info)) {
+ $info = '';
+ }else if (is_array($info)) {
+ $info = implode('_',$info);
+ }
+ if (!$key = $DB->get_record('user_private_key', array('script' => "rss", 'userid' => $userid, 'instance' => $contextid))) {
+ //Create new key
+ $key->value = create_user_key('rss',$userid,$contextid, $rss_iprestriction);
+ } else {
+ if (!empty($rss_iprestriction) && empty($key->iprestriction)) {
+ $key->iprestriction = $rss_iprestriction;
+ $DB->update_record('user_private_key', $key);
+ }
+ }
+
+ return md5($userid.$modulename.($key->value).$instance.$info);
+}
+
+
+/**
+* Generates RSS feed containing an error message.
+*
+* @uses $CFG
+* @param string $errorcode The name of the string from error.php to print
+* @param string $modname Module name
+* @param object $a Extra words and phrases that might be required in the error string
+*/
+function rss_error ($errorcode, $module='error', $a=NULL) {
+ global $CFG;
+
+ if (!empty($CFG->errordocroot)) {
+ $errordocroot = $CFG->errordocroot;
+ } else if (!empty($CFG->docroot)) {
+ $errordocroot = $CFG->docroot;
+ } else {
+ $errordocroot = 'http://docs.moodle.org';
+ }
+
+ $message = get_string($errorcode, $module, $a).'
+ '.
+ get_string('moreinformation').'';
+ rss_output(rss_geterrorxml($message),time());
+}
+
+
+/**
+ * Returns RSS with error message
+ */
+function rss_not_found() {
+ rss_error('rssnotfound');
+}
?>
Index: lib/sessionlib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/sessionlib.php,v
retrieving revision 1.2
diff -u -r1.2 sessionlib.php
--- lib/sessionlib.php 22 Jun 2008 11:56:01 -0000 1.2
+++ lib/sessionlib.php 26 Aug 2008 14:50:24 -0000
@@ -55,7 +55,7 @@
global $CFG;
/// disable checks when working in cookieless mode
- if (empty($CFG->usesid) || !empty($_COOKIE['MoodleSession'.$CFG->sessioncookie])) {
+ if (!NO_MOODLE_COOKIES && (empty($CFG->usesid) || !empty($_COOKIE['MoodleSession'.$CFG->sessioncookie]))) {
if ($this->session != NULL) {
if (empty($_COOKIE['MoodleSessionTest'.$CFG->sessioncookie])) {
$this->report_session_error();
Index: lib/db/install.xml
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/install.xml,v
retrieving revision 1.168
diff -u -r1.168 install.xml
--- lib/db/install.xml 26 Aug 2008 07:20:58 -0000 1.168
+++ lib/db/install.xml 26 Aug 2008 14:50:26 -0000
@@ -74,7 +74,9 @@
-
+
+
+
Index: lib/db/upgrade.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/upgrade.php,v
retrieving revision 1.230
diff -u -r1.230 upgrade.php
--- lib/db/upgrade.php 26 Aug 2008 07:20:58 -0000 1.230
+++ lib/db/upgrade.php 26 Aug 2008 14:50:26 -0000
@@ -768,6 +768,32 @@
upgrade_main_savepoint($result, 2008082600);
}
+ ///Enable Course Recent activity RSS setting
+ if ($result && $oldversion < 2008082602) {
+
+ /// Define field enablerss to be added to course
+ $table = new xmldb_table('course');
+ $field = new xmldb_field('rsstype', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0', 'enablecompletion');
+
+ /// Conditionally launch add field enablerss
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+
+ // Define field rssarticles to be added to course
+ $table = new xmldb_table('course');
+ $field = new xmldb_field('rssarticles', XMLDB_TYPE_INTEGER, '2', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0', 'rsstype');
+
+ /// Conditionally launch add field rssarticles
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+
+ /// Main savepoint reached
+ upgrade_main_savepoint($result, 2008082602);
+ }
+
+
return $result;
}
Index: message/discussion.php
===================================================================
RCS file: /cvsroot/moodle/moodle/message/discussion.php,v
retrieving revision 1.24
diff -u -r1.24 discussion.php
--- message/discussion.php 5 Jul 2008 14:52:40 -0000 1.24
+++ message/discussion.php 26 Aug 2008 14:50:28 -0000
@@ -190,7 +190,12 @@
echo '';
echo '