Browse files

admin bookmark cleanup

  • Loading branch information...
1 parent a3d2367 commit 62f62bf9841427dc36c9d1c460c4be9222dfe704 skodak committed Sep 26, 2006
View
18 blocks/admin_bookmarks/block_admin_bookmarks.php
@@ -26,10 +26,10 @@ function create_item($visiblename,$link,$icon) {
function get_content() {
global $CFG, $USER, $PAGE;
-
+
require_once($CFG->libdir.'/adminlib.php');
$adminroot = admin_get_root();
-
+
if ($this->content !== NULL) {
return $this->content;
}
@@ -40,31 +40,31 @@ function get_content() {
$bookmarks = explode(',',$USER->preference['admin_bookmarks']);
// hmm... just a liiitle (potentially) processor-intensive
// (recall that $adminroot->locate is a huge recursive call... and we're calling it repeatedly here
-
+
/// Accessibility: markup as a list.
$this->content->text .= '<ol class="list">'."\n";
-
+
foreach($bookmarks as $bookmark) {
$temp = $adminroot->locate($bookmark);
if (is_a($temp, 'admin_settingpage')) {
$this->content->text .= '<li><a href="' . $CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $bookmark . '">' . $temp->visiblename . "</a></li>\n";
} elseif (is_a($temp, 'admin_externalpage')) {
$this->content->text .= '<li><a href="' . $temp->url . '">' . $temp->visiblename . "</a></li>\n";
- }
+ }
}
$this->content->text .= "</ol>\n";
} else {
$bookmarks = array();
}
-
+
if (($section = (isset($PAGE->section) ? $PAGE->section : '')) && (in_array($section, $bookmarks))) {
- $this->content->footer = '<a href="' . $CFG->wwwroot . '/blocks/admin_bookmarks/delete.php?section=' . $section . '&returnurl=' . $CFG->wwwroot . '">' . get_string('unbookmarkthispage','admin') . '</a>';
+ $this->content->footer = '<a href="' . $CFG->wwwroot . '/blocks/admin_bookmarks/delete.php?section=' . $section . '&amp;sesskey='.sesskey().'">' . get_string('unbookmarkthispage','admin') . '</a>';
} elseif ($section = (isset($PAGE->section) ? $PAGE->section : '')) {
- $this->content->footer = '<a href="' . $CFG->wwwroot . '/blocks/admin_bookmarks/create.php?section=' . $section . '">' . get_string('bookmarkthispage','admin') . '</a>';
+ $this->content->footer = '<a href="' . $CFG->wwwroot . '/blocks/admin_bookmarks/create.php?section=' . $section . '&amp;sesskey='.sesskey().'">' . get_string('bookmarkthispage','admin') . '</a>';
} else {
$this->content->footer = '';
}
-
+
return $this->content;
}
View
35 blocks/admin_bookmarks/create.php
@@ -4,46 +4,47 @@
require_once($CFG->libdir.'/adminlib.php');
$adminroot = admin_get_root();
+require_login();
-if ($section = optional_param('section', '', PARAM_ALPHAEXT)) {
+if ($section = optional_param('section', '', PARAM_ALPHAEXT) and confirm_sesskey()) {
if (isset($USER->preference['admin_bookmarks'])) {
$bookmarks = explode(',',$USER->preference['admin_bookmarks']);
-
+
if (in_array($section, $bookmarks)) {
error(get_string('bookmarkalreadyexists','admin'));
die;
}
-
+
} else {
$bookmarks = array();
}
$temp = $adminroot->locate($section);
-
+
if (is_a($temp, 'admin_settingpage') || is_a($temp, 'admin_externalpage')) {
-
+
$bookmarks[] = $section;
-
+
$bookmarks = implode(',',$bookmarks);
-
+
set_user_preference('admin_bookmarks', $bookmarks);
-
+
} else {
-
- error(get_string('invaludsection','admin'));
+
+ error(get_string('invaludsection','admin'));
die;
-
+
}
-
+
if (is_a($temp, 'admin_settingpage')) {
-
- redirect($CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $section, 'Bookmark added.',1);
-
+
+ redirect($CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $section, get_string('bookmarkadded','admin'), 1);
+
} elseif (is_a($temp, 'admin_externalpage')) {
-
+
redirect($temp->url, get_string('bookmarkadded','admin'), 1);
-
+
}
} else {
View
13 blocks/admin_bookmarks/delete.php
@@ -4,8 +4,9 @@
require_once($CFG->libdir.'/adminlib.php');
$adminroot = admin_get_root();
+require_login();
-if ($section = optional_param('section', '', PARAM_ALPHAEXT)) {
+if ($section = optional_param('section', '', PARAM_ALPHAEXT) and confirm_sesskey()) {
if (isset($USER->preference['admin_bookmarks'])) {
@@ -21,21 +22,21 @@
unset($bookmarks[$key]);
$bookmarks = implode(',',$bookmarks);
set_user_preference('admin_bookmarks', $bookmarks);
-
+
$temp = $adminroot->locate($section);
-
+
if (is_a($temp, 'admin_externalpage')) {
- redirect($temp->url, get_string('bookmarkdeleted','admin'),1);
+ redirect($temp->url, get_string('bookmarkdeleted','admin'));
} elseif (is_a($temp, 'admin_settingpage')) {
- redirect($CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $section, 'Bookmark deleted.',1);
+ redirect($CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $section, get_string('bookmarkdeleted','admin'), 1);
} else {
redirect($CFG->wwwroot, get_string('bookmarkdeleted', 'admin'),1);
}
die;
}
-
+
error(get_string('nobookmarksforuser','admin'));
die;

0 comments on commit 62f62bf

Please sign in to comment.