http://atutor.ca/atutor/mantis/view.php?id=4612

"Modules" section is always available to the newly-created administrator regardless whether this privilege is assigned or not.

diff --git a/docs/include/lib/menu_pages.php b/docs/include/lib/menu_pages.php
index 8bff497..c8fa66e 100644 (file)
--- a/docs/include/lib/menu_pages.php
+++ b/docs/include/lib/menu_pages.php
@@ -19,7 +19,7 @@ global $system_courses;
        5 sections: public, my_start_page, course, admin, home
 */
 if (isset($_pages[AT_NAV_ADMIN])) {
-    array_unshift($_pages[AT_NAV_ADMIN], 'admin/index.php', 'mods/_core/modules/index.php');
+    array_unshift($_pages[AT_NAV_ADMIN], 'admin/index.php');
 }
 
 if($_config['allow_browse'] && $_config['just_social'] != "1") {
@@ -140,61 +140,10 @@ if (isset($_SESSION['course_id']) && $_SESSION['course_id'] > 0) {
 
         if (admin_authenticate(AT_ADMIN_PRIV_ADMIN, TRUE)) {
         // hide modules from non-super admins
-
-            $_pages['mods/_core/modules/index.php']['title_var'] = 'modules';
-            $_pages['mods/_core/modules/index.php']['parent']    = AT_NAV_ADMIN;
-            $_pages['mods/_core/modules/index.php']['guide']     = 'admin/?p=modules.php';
-            $_pages['mods/_core/modules/index.php']['children']  = array('mods/_core/modules/install_modules.php');
-
-            $_pages['mods/_core/modules/details.php']['title_var'] = 'details';
-            $_pages['mods/_core/modules/details.php']['parent']    = 'mods/_core/modules/index.php';
-
-            $_pages['mods/_core/modules/module_uninstall_step_1.php']['title_var'] = 'module_uninstall';
-            $_pages['mods/_core/modules/module_uninstall_step_1.php']['parent']    = 'mods/_core/modules/index.php';
-
-            $_pages['mods/_core/modules/module_uninstall_step_2.php']['title_var'] = 'module_uninstall';
-            $_pages['mods/_core/modules/module_uninstall_step_2.php']['parent']    = 'mods/_core/modules/index.php';
-
-            $_pages['mods/_core/modules/module_uninstall_step_3.php']['title_var'] = 'module_uninstall';
-            $_pages['mods/_core/modules/module_uninstall_step_3.php']['parent']    = 'mods/_core/modules/index.php';
-
-            $_pages['mods/_core/modules/install_modules.php']['title_var'] = 'install_modules';
-            $_pages['mods/_core/modules/install_modules.php']['parent']    = 'mods/_core/modules/index.php';
-            $_pages['mods/_core/modules/install_modules.php']['guide']     = 'admin/?p=modules.php';
-
-            $_pages['mods/_core/modules/version_history.php']['title_var'] = 'version_history';
-            $_pages['mods/_core/modules/version_history.php']['parent']    = 'mods/_core/modules/install_modules.php';
-
-            $_pages['mods/_core/modules/module_install_step_1.php']['title_var'] = 'details';
-            $_pages['mods/_core/modules/module_install_step_1.php']['parent']    = 'mods/_core/modules/install_modules.php';
-
-            $_pages['mods/_core/modules/module_install_step_2.php']['title_var'] = 'details';
-            $_pages['mods/_core/modules/module_install_step_2.php']['parent']    = 'mods/_core/modules/install_modules.php';
-
-            $_pages['mods/_core/modules/module_install_step_3.php']['title_var'] = 'details';
-            $_pages['mods/_core/modules/module_install_step_3.php']['parent']    = 'mods/_core/modules/install_modules.php';
-
-            $_pages['mods/_core/modules/confirm.php']['title_var'] = 'confirm';
-            $_pages['mods/_core/modules/confirm.php']['parent']    = 'mods/_core/modules/add_new.php';
-
             $_pages['admin/cron_config.php']['title_var'] = 'cron_config';
             $_pages['admin/cron_config.php']['parent']    = 'admin/config_edit.php';
             $_pages['admin/cron_config.php']['guide']     = 'admin/?p=cron_setup.php';
             $_pages['admin/config_edit.php']['children']  = array_merge((array) $_pages['admin/config_edit.php']['children'], array('admin/cron_config.php'));
-/*
-            $_pages['admin/auto_enroll.php']['title_var'] = 'auto_enroll';
-            $_pages['admin/auto_enroll.php']['parent']    = 'admin/config_edit.php';
-            $_pages['admin/auto_enroll.php']['guide']     = 'admin/?p=auto_enroll.php';
-            $_pages['admin/auto_enroll.php']['children']  = array_merge(array('admin/auto_enroll_edit.php'));
-            $_pages['admin/config_edit.php']['children']  = array_merge((array) $_pages['admin/config_edit.php']['children'], array('admin/auto_enroll.php'));
-
-            $_pages['admin/auto_enroll_edit.php']['title_var'] = 'auto_enroll_edit';
-            $_pages['admin/auto_enroll_edit.php']['parent']    = 'admin/auto_enroll.php';
-            $_pages['admin/auto_enroll_edit.php']['guide']     = 'admin/?p=auto_enroll.php';
-
-            $_pages['admin/auto_enroll_delete.php']['title_var'] = 'auto_enroll_delete';
-            $_pages['admin/auto_enroll_delete.php']['parent']    = 'admin/auto_enroll.php';
-*/
         }
     }
 

diff --git a/docs/mods/_core/modules/add_new.php b/docs/mods/_core/modules/add_new.php
index 7ff2648..66f2d78 100644 (file)
--- a/docs/mods/_core/modules/add_new.php
+++ b/docs/mods/_core/modules/add_new.php
@@ -13,7 +13,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 require(AT_INCLUDE_PATH.'../mods/_core/modules/classes/ModuleParser.class.php');
 
 if (isset($_GET['mod'])) {

diff --git a/docs/mods/_core/modules/create.php b/docs/mods/_core/modules/create.php
index c054a27..7edcf10 100644 (file)
--- a/docs/mods/_core/modules/create.php
+++ b/docs/mods/_core/modules/create.php
@@ -13,7 +13,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 
 unset($module_xml);
 

diff --git a/docs/mods/_core/modules/default_mods.php b/docs/mods/_core/modules/default_mods.php
index e6acb1c..bcf5f86 100644 (file)
--- a/docs/mods/_core/modules/default_mods.php
+++ b/docs/mods/_core/modules/default_mods.php
@@ -14,7 +14,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require (AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 
 if (isset($_POST['cancel'])) {
        $msg->addFeedback('CANCELLED');

diff --git a/docs/mods/_core/modules/default_side.php b/docs/mods/_core/modules/default_side.php
index 6238220..a303eac 100644 (file)
--- a/docs/mods/_core/modules/default_side.php
+++ b/docs/mods/_core/modules/default_side.php
@@ -14,7 +14,7 @@
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
 
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 
 
 if (isset($_POST['cancel'])) {

diff --git a/docs/mods/_core/modules/details.php b/docs/mods/_core/modules/details.php
index d0879e1..f6f89f9 100644 (file)
--- a/docs/mods/_core/modules/details.php
+++ b/docs/mods/_core/modules/details.php
@@ -13,7 +13,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 
 require(AT_INCLUDE_PATH.'../mods/_core/modules/classes/ModuleParser.class.php');
 

diff --git a/docs/mods/_core/modules/index.php b/docs/mods/_core/modules/index.php
index 1567050..888f9fc 100644 (file)
--- a/docs/mods/_core/modules/index.php
+++ b/docs/mods/_core/modules/index.php
@@ -13,7 +13,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 
 require_once(AT_INCLUDE_PATH.'../mods/_core/file_manager/filemanager.inc.php');
 

diff --git a/docs/mods/_core/modules/install_modules.php b/docs/mods/_core/modules/install_modules.php
index 9d61ff9..bed2965 100644 (file)
--- a/docs/mods/_core/modules/install_modules.php
+++ b/docs/mods/_core/modules/install_modules.php
@@ -14,7 +14,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require (AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 require(AT_INCLUDE_PATH.'../mods/_core/modules/classes/ModuleListParser.class.php');
 require_once(AT_INCLUDE_PATH.'../mods/_core/file_manager/filemanager.inc.php');
 

diff --git a/docs/mods/_core/modules/module.php b/docs/mods/_core/modules/module.php
index b1e417c..8123974 100644 (file)
--- a/docs/mods/_core/modules/module.php
+++ b/docs/mods/_core/modules/module.php
@@ -6,43 +6,44 @@ if (!isset($this) || (isset($this) && (strtolower(get_class($this)) != 'module')
 define('AT_ADMIN_PRIV_MODULES', $this->getAdminPrivilege());\r
 \r
 //admin pages\r
-//if (admin_authenticate(AT_ADMIN_PRIV_RSS, TRUE) || admin_authenticate(AT_ADMIN_PRIV_ADMIN, TRUE)) {\r
+if (admin_authenticate(AT_ADMIN_PRIV_MODULES, TRUE) || admin_authenticate(AT_ADMIN_PRIV_ADMIN, TRUE)) {\r
+       $this->_pages[AT_NAV_ADMIN] = array('mods/_core/modules/index.php');\r
+       $this->_pages['mods/_core/modules/index.php']['parent'] = AT_NAV_ADMIN;\r
+       \r
+       $this->_pages['mods/_core/modules/index.php']['title_var'] = 'modules';\r
+       $this->_pages['mods/_core/modules/index.php']['guide']     = 'admin/?p=modules.php';\r
+       $this->_pages['mods/_core/modules/index.php']['children']  = array('mods/_core/modules/install_modules.php');\r
 \r
-           $this->_pages['mods/_core/modules/index.php']['title_var'] = 'modules';\r
-            $this->_pages['mods/_core/modules/index.php']['parent']    = AT_NAV_ADMIN;\r
-            $this->_pages['mods/_core/modules/index.php']['guide']     = 'admin/?p=modules.php';\r
-            $this->_pages['mods/_core/modules/index.php']['children']  = array('mods/_core/modules/install_modules.php');\r
+       $this->_pages['mods/_core/modules/details.php']['title_var'] = 'details';\r
+       $this->_pages['mods/_core/modules/details.php']['parent']    = 'mods/_core/modules/index.php';\r
 \r
-            $this->_pages['mods/_core/modules/details.php']['title_var'] = 'details';\r
-            $this->_pages['mods/_core/modules/details.php']['parent']    = 'mods/_core/modules/index.php';\r
+       $this->_pages['mods/_core/modules/module_uninstall_step_1.php']['title_var'] = 'module_uninstall';\r
+       $this->_pages['mods/_core/modules/module_uninstall_step_1.php']['parent']    = 'mods/_core/modules/index.php';\r
 \r
-            $this->_pages['mods/_core/modules/module_uninstall_step_1.php']['title_var'] = 'module_uninstall';\r
-            $this->_pages['mods/_core/modules/module_uninstall_step_1.php']['parent']    = 'mods/_core/modules/index.php';\r
+       $this->_pages['mods/_core/modules/module_uninstall_step_2.php']['title_var'] = 'module_uninstall';\r
+       $this->_pages['mods/_core/modules/module_uninstall_step_2.php']['parent']    = 'mods/_core/modules/index.php';\r
 \r
-            $this->_pages['mods/_core/modules/module_uninstall_step_2.php']['title_var'] = 'module_uninstall';\r
-            $this->_pages['mods/_core/modules/module_uninstall_step_2.php']['parent']    = 'mods/_core/modules/index.php';\r
+       $this->_pages['mods/_core/modules/module_uninstall_step_3.php']['title_var'] = 'module_uninstall';\r
+       $this->_pages['mods/_core/modules/module_uninstall_step_3.php']['parent']    = 'mods/_core/modules/index.php';\r
 \r
-            $this->_pages['mods/_core/modules/module_uninstall_step_3.php']['title_var'] = 'module_uninstall';\r
-            $this->_pages['mods/_core/modules/module_uninstall_step_3.php']['parent']    = 'mods/_core/modules/index.php';\r
+       $this->_pages['mods/_core/modules/install_modules.php']['title_var'] = 'install_modules';\r
+       $this->_pages['mods/_core/modules/install_modules.php']['parent']    = 'mods/_core/modules/index.php';\r
+       $this->_pages['mods/_core/modules/install_modules.php']['guide']     = 'admin/?p=modules.php';\r
 \r
-            $this->_pages['mods/_core/modules/install_modules.php']['title_var'] = 'install_modules';\r
-            $this->_pages['mods/_core/modules/install_modules.php']['parent']    = 'mods/_core/modules/index.php';\r
-            $this->_pages['mods/_core/modules/install_modules.php']['guide']     = 'admin/?p=modules.php';\r
+       $this->_pages['mods/_core/modules/version_history.php']['title_var'] = 'version_history';\r
+       $this->_pages['mods/_core/modules/version_history.php']['parent']    = 'mods/_core/modules/install_modules.php';\r
 \r
-            $this->_pages['mods/_core/modules/version_history.php']['title_var'] = 'version_history';\r
-            $this->_pages['mods/_core/modules/version_history.php']['parent']    = 'mods/_core/modules/install_modules.php';\r
+       $this->_pages['mods/_core/modules/module_install_step_1.php']['title_var'] = 'details';\r
+       $this->_pages['mods/_core/modules/module_install_step_1.php']['parent']    = 'mods/_core/modules/install_modules.php';\r
 \r
-            $this->_pages['mods/_core/modules/module_install_step_1.php']['title_var'] = 'details';\r
-            $this->_pages['mods/_core/modules/module_install_step_1.php']['parent']    = 'mods/_core/modules/install_modules.php';\r
+       $this->_pages['mods/_core/modules/module_install_step_2.php']['title_var'] = 'details';\r
+       $this->_pages['mods/_core/modules/module_install_step_2.php']['parent']    = 'mods/_core/modules/install_modules.php';\r
 \r
-            $this->_pages['mods/_core/modules/module_install_step_2.php']['title_var'] = 'details';\r
-            $this->_pages['mods/_core/modules/module_install_step_2.php']['parent']    = 'mods/_core/modules/install_modules.php';\r
+       $this->_pages['mods/_core/modules/module_install_step_3.php']['title_var'] = 'details';\r
+       $this->_pages['mods/_core/modules/module_install_step_3.php']['parent']    = 'mods/_core/modules/install_modules.php';\r
 \r
-            $this->_pages['mods/_core/modules/module_install_step_3.php']['title_var'] = 'details';\r
-            $this->_pages['mods/_core/modules/module_install_step_3.php']['parent']    = 'mods/_core/modules/install_modules.php';\r
-\r
-            $this->_pages['mods/_core/modules/confirm.php']['title_var'] = 'confirm';\r
-            $this->_pages['mods/_core/modules/confirm.php']['parent']    = 'mods/_core/modules/add_new.php';\r
-//}\r
+       $this->_pages['mods/_core/modules/confirm.php']['title_var'] = 'confirm';\r
+       $this->_pages['mods/_core/modules/confirm.php']['parent']    = 'mods/_core/modules/add_new.php';\r
+}\r
 \r
 ?>
\ No newline at end of file

diff --git a/docs/mods/_core/modules/module_install_step_1.php b/docs/mods/_core/modules/module_install_step_1.php
index eaf043c..4001bcb 100644 (file)
--- a/docs/mods/_core/modules/module_install_step_1.php
+++ b/docs/mods/_core/modules/module_install_step_1.php
@@ -14,7 +14,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 
 $module_folder = '../../../mods/';
 

diff --git a/docs/mods/_core/modules/module_install_step_2.php b/docs/mods/_core/modules/module_install_step_2.php
index 3425cff..f7c1cd7 100644 (file)
--- a/docs/mods/_core/modules/module_install_step_2.php
+++ b/docs/mods/_core/modules/module_install_step_2.php
@@ -14,7 +14,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 
 require(AT_INCLUDE_PATH.'../mods/_core/modules/classes/ModuleParser.class.php');
 require_once(AT_INCLUDE_PATH.'../mods/_core/file_manager/filemanager.inc.php');

diff --git a/docs/mods/_core/modules/module_install_step_3.php b/docs/mods/_core/modules/module_install_step_3.php
index af7e0c6..17a9dcc 100644 (file)
--- a/docs/mods/_core/modules/module_install_step_3.php
+++ b/docs/mods/_core/modules/module_install_step_3.php
@@ -14,7 +14,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 
 $module_folder = '../../../mods/';
 

diff --git a/docs/mods/_core/modules/module_uninstall_step_1.php b/docs/mods/_core/modules/module_uninstall_step_1.php
index 381add9..fdc414f 100644 (file)
--- a/docs/mods/_core/modules/module_uninstall_step_1.php
+++ b/docs/mods/_core/modules/module_uninstall_step_1.php
@@ -14,7 +14,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 
 if (isset($_GET["mod"])) $mod = $_GET["mod"];
 else if (isset($_POST["mod"])) $mod = $_POST["mod"];

diff --git a/docs/mods/_core/modules/module_uninstall_step_2.php b/docs/mods/_core/modules/module_uninstall_step_2.php
index 0307c03..1fd3d36 100644 (file)
--- a/docs/mods/_core/modules/module_uninstall_step_2.php
+++ b/docs/mods/_core/modules/module_uninstall_step_2.php
@@ -14,7 +14,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 
 $mod = isset($_REQUEST['mod']) ? $_REQUEST['mod'] : "";
 $args = isset($_REQUEST['args']) ? $_REQUEST['args'] : "";

diff --git a/docs/mods/_core/modules/module_uninstall_step_3.php b/docs/mods/_core/modules/module_uninstall_step_3.php
index 54ba115..c801be7 100644 (file)
--- a/docs/mods/_core/modules/module_uninstall_step_3.php
+++ b/docs/mods/_core/modules/module_uninstall_step_3.php
@@ -14,7 +14,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 
 if (isset($_REQUEST['cancelled']))
        $cancelled = $_REQUEST['cancelled'];

diff --git a/docs/mods/_core/modules/version_history.php b/docs/mods/_core/modules/version_history.php
index 6ce2351..54ff2a7 100644 (file)
--- a/docs/mods/_core/modules/version_history.php
+++ b/docs/mods/_core/modules/version_history.php
@@ -14,7 +14,7 @@
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require (AT_INCLUDE_PATH.'vitals.inc.php');
-admin_authenticate(AT_ADMIN_PRIV_ADMIN);
+admin_authenticate(AT_ADMIN_PRIV_MODULES);
 require(AT_INCLUDE_PATH.'../mods/_core/modules/classes/ModuleListParser.class.php');
 
 if (isset($_POST["cancel"]))