From: vinkmar <vinkmar>
Date: Mon, 21 Aug 2006 04:08:57 +0000 (+0000)
Subject: changes made to ensure compatibility with core admin (admin/adminlib.php) where ... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e277678dabc58325ab6dd6cf4892cd7951454431;p=moodle.git

changes made to ensure compatibility with core admin (admin/adminlib.php) where $_GET is no longer used; changed 'admin' to $CFG->admin in dir paths
---

diff --git a/blocks/admin_bookmarks/block_admin_bookmarks.php b/blocks/admin_bookmarks/block_admin_bookmarks.php
index f76ebe07fb..e6f273b1d2 100644
--- a/blocks/admin_bookmarks/block_admin_bookmarks.php
+++ b/blocks/admin_bookmarks/block_admin_bookmarks.php
@@ -21,7 +21,7 @@ class block_admin_bookmarks extends block_base {
 
     function get_content() {
 
-        global $CFG, $USER, $ADMIN;
+        global $CFG, $USER, $ADMIN, $PAGE;
 		
 		if (!$ADMIN) {
             require_once($CFG->dirroot . '/admin/adminlib.php');
@@ -40,7 +40,7 @@ class block_admin_bookmarks extends block_base {
             foreach($bookmarks as $bookmark) {
 			    $temp = $ADMIN->locate($bookmark);
 			    if (is_a($temp, 'admin_settingpage')) {
-                    $this->content->text .= '<a href="' . $CFG->wwwroot . '/admin/settings.php?section=' . $bookmark . '">' . $temp->visiblename . '</a>' . '<br />';
+                    $this->content->text .= '<a href="' . $CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $bookmark . '">' . $temp->visiblename . '</a>' . '<br />';
                 } elseif (is_a($temp, 'admin_externalpage')) {
                     $this->content->text .= '<a href="' . $temp->url . '">' . $temp->visiblename . '</a>' . '<br />';
                 }                
@@ -49,9 +49,9 @@ class block_admin_bookmarks extends block_base {
 			$bookmarks = array();
 		}
 		
-        if (($section = optional_param('section','',PARAM_ALPHAEXT)) && (in_array($section, $bookmarks))) {
+        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 . '">unbookmark this page</a>';	
-		} elseif ($section = optional_param('section','',PARAM_ALPHAEXT)) {
+		} elseif ($section = (isset($PAGE->section) ? $PAGE->section : '')) {
     	    $this->content->footer = '<a href="' . $CFG->wwwroot . '/blocks/admin_bookmarks/create.php?section=' . $section . '">bookmark this page</a>';		
 		} else {
 		    $this->content->footer = '';
diff --git a/blocks/admin_bookmarks/create.php b/blocks/admin_bookmarks/create.php
index 2d2e3df4f9..d66c81e48e 100644
--- a/blocks/admin_bookmarks/create.php
+++ b/blocks/admin_bookmarks/create.php
@@ -2,7 +2,7 @@
 
 require('../../config.php');
 
-require_once($CFG->dirroot . '/admin/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/adminlib.php');
 
 if ($section = optional_param('section', '', PARAM_ALPHAEXT)) {
 
@@ -37,7 +37,7 @@ if ($section = optional_param('section', '', PARAM_ALPHAEXT)) {
 	
 	if (is_a($temp, 'admin_settingpage')) {
 	
-        redirect("$CFG->wwwroot/admin/settings.php?section=" . $section, 'Bookmark added.',1);	
+        redirect($CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $section, 'Bookmark added.',1);	
     
     } elseif (is_a($temp, 'admin_externalpage')) {
     
diff --git a/blocks/admin_bookmarks/delete.php b/blocks/admin_bookmarks/delete.php
index e53f1f29cb..22fd1860b4 100644
--- a/blocks/admin_bookmarks/delete.php
+++ b/blocks/admin_bookmarks/delete.php
@@ -2,7 +2,7 @@
 
 require('../../config.php');
 
-require_once($CFG->dirroot . '/admin/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/adminlib.php');
 
 if ($section = optional_param('section', '', PARAM_ALPHAEXT)) {
 
@@ -26,7 +26,7 @@ if ($section = optional_param('section', '', PARAM_ALPHAEXT)) {
         if (is_a($temp, 'admin_externalpage')) {
             redirect($temp->url, 'Bookmark deleted.',1);
         } elseif (is_a($temp, 'admin_settingpage')) {
-            redirect($CFG->wwwroot . '/admin/settings.php?section=' . $section, 'Bookmark deleted.',1);        
+            redirect($CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $section, 'Bookmark deleted.',1);        
         } else {
             redirect($CFG->wwwroot, 'Bookmark deleted.',1);
         }