|
- config) && isset($this->config->block_rss_client_show_channel_image)) {
$selected = $this->config->block_rss_client_show_channel_image;
} else {
diff --git a/blocks/rss_client/config_instance_tabs.php b/blocks/rss_client/config_instance_tabs.php
index a577497..3134327 100644
--- a/blocks/rss_client/config_instance_tabs.php
+++ b/blocks/rss_client/config_instance_tabs.php
@@ -2,7 +2,6 @@
/// This file to be included so we can assume config.php has already been included.
/// We also assume that $inactive, $activetab and $currentaction have been set
-global $USER;
$tabs = $row = array();
// TODO - temporary hack to get the block context only if it already exists.
@@ -14,12 +13,12 @@ $tabs = $row = array();
}
if (has_capability('moodle/site:manageblocks', $context)) {
- $script = $page->url->out(array('instanceid' => $this->instance->id, 'sesskey' => sesskey(), 'blockaction' => 'config', 'currentaction' => 'configblock', 'id' => $id, 'section' => 'rss'));
+ $script = $this->page->url->out(false, array('instanceid' => $this->instance->id, 'sesskey' => sesskey(), 'blockaction' => 'config', 'currentaction' => 'configblock', 'id' => $id));
$row[] = new tabobject('configblock', $script,
get_string('configblock', 'block_rss_client'));
}
-$script = $page->url->out(array('instanceid' => $this->instance->id, 'sesskey' => sesskey(), 'blockaction' => 'config', 'currentaction' => 'managefeeds', 'id' => $id, 'section' => 'rss'));
+$script = $this->page->url->out(false, array('instanceid' => $this->instance->id, 'sesskey' => sesskey(), 'blockaction' => 'config', 'currentaction' => 'managefeeds', 'id' => $id));
$row[] = new tabobject('managefeeds', $script,
get_string('managefeeds', 'block_rss_client'));
diff --git a/blocks/rss_client/db/upgrade.php b/blocks/rss_client/db/upgrade.php
index 76eb452..5741ef0 100644
--- a/blocks/rss_client/db/upgrade.php
+++ b/blocks/rss_client/db/upgrade.php
@@ -1,6 +1,6 @@
get_manager();
$result = true;
-/// And upgrade begins here. For each one, you'll need one
-/// block of code similar to the next one. Please, delete
+/// And upgrade begins here. For each one, you'll need one
+/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -39,6 +39,13 @@ function xmldb_block_rss_client_upgrade($oldversion) {
upgrade_block_savepoint($result, 2007080100, 'rss_client');
}
+ if ($result && $oldversion < 2009041200) {
+ // Config variable which is no longer used..
+
+ $result = $result && $DB->delete_records('config', array('name' =>'block_rss_client_submitters'));
+ upgrade_block_savepoint($result, 2009041200, 'rss_client');
+ }
+
return $result;
}
diff --git a/blocks/rss_client/locallib.php b/blocks/rss_client/locallib.php
new file mode 100644
index 0000000..1ea91d0
--- /dev/null
+++ b/blocks/rss_client/locallib.php
@@ -0,0 +1,177 @@
+
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL
+ */
+
+if (!defined('MOODLE_INTERNAL')) {
+ die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page.
+}
+
+/**
+ * @param int $courseid The id of the course the user is currently viewing
+ * @param int $userid We need this to know which feeds the user is allowed to manage
+ * @param int $rssid If present the rss entry matching this id alone will be displayed
+ * as long as the user is allowed to manage this feed
+ * @param object $context we need the context object to check what the user is allowed to do.
+ */
+function rss_display_feeds($courseid, $userid, $rssid='', $context) {
+ global $USER, $CFG, $DB;
+
+ require_once($CFG->libdir.'/tablelib.php');
+
+ $select = '';
+ $managesharedfeeds = has_capability('block/rss_client:manageanyfeeds', $context);
+ $manageownfeeds = has_capability('block/rss_client:manageownfeeds', $context);
+
+ if ($rssid != '') {
+ $select = 'id = '.$rssid.' AND ';
+ }
+ if ($managesharedfeeds) {
+ $select .= '(userid = '.$userid.' OR shared = 1)';
+ } else if ($manageownfeeds) {
+ $select .= 'userid = '.$userid;
+ }
+
+ $table = new flexible_table('rss-display-feeds');
+
+ $table->define_columns(array('feed', 'actions'));
+ $table->define_headers(array(get_string('feed', 'block_rss_client'), get_string('actions', 'moodle')));
+
+ $table->set_attribute('cellspacing', '0');
+ $table->set_attribute('id', 'rssfeeds');
+ $table->set_attribute('class', 'generaltable generalbox');
+ $table->column_class('feed', 'feed');
+ $table->column_class('actions', 'actions');
+
+ $table->setup();
+
+ $feeds = $DB->get_records_select('block_rss_client', $select, null, $DB->sql_order_by_text('title'));
+
+ if(!empty($feeds)) {
+ foreach($feeds as $feed) {
+
+ if (!empty($feed->preferredtitle)) {
+ $feedtitle = $feed->preferredtitle;
+ } else {
+ $feedtitle = $feed->title;
+ }
+
+ if ( ($feed->userid == $USER->id && $manageownfeeds)
+ || ($feed->shared && $managesharedfeeds) ) {
+
+ $feedicons = ''.
+ ' '.
+
+ ''.
+ ' ';
+ }
+ else {
+ $feedicons = '';
+ }
+
+ $feedinfo = '
+
+
+ '.$feed->description.' ';
+
+ $table->add_data(array($feedinfo, $feedicons));
+ }
+ }
+
+ $table->print_html();
+}
+
+/**
+ * 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.
+ * @param string $url The url of the feed that is being updated or NULL
+ * @param int $rssid The dataabse id of the feed that is being updated or NULL
+ * @param string $preferredtitle The preferred title to display for this feed
+ * @param int $shared Whether this feed is to be shared or not
+ * @param int $courseid The id of the course that is currently being viewed if applicable
+ * @param object $context The context that we will use to check for permissions
+ * @return string Either the form is printed directly and nothing is returned or the form is returned as a string
+ */
+function rss_print_form($act='none', $url='', $rssid='', $preferredtitle='', $shared=0, $courseid='', $context) {
+ global $USER, $CFG, $blockid, $blockaction;
+
+ $stredit = get_string('edit');
+ $stradd = get_string('add');
+ $strupdatefeed = get_string('updatefeed', 'block_rss_client');
+ $straddfeed = get_string('addfeed', 'block_rss_client');
+
+ $returnstring = '';
+
+ $returnstring .= ' |
'."\n";
- //print ''. get_string('blogthis', 'blog') .''."\n";
- } else {
- print '