cleanup in admin/index.php; preparation for health center, loginas gui, password...

diff --git a/admin/courses.php b/admin/courses.php
new file mode 100644 (file)
index 0000000..4a6816f
--- /dev/null
+++ b/admin/courses.php
@@ -0,0 +1,42 @@
+<?php // $Id$
+
+    require_once('../config.php');
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only admins can access this page");
+    }
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    $stradministration = get_string("administration");
+    $strcourses        = get_string("courses");
+
+    print_header("$site->shortname: $stradministration: $strcourses", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strcourses");
+
+    print_heading($strcourses);
+
+    $table->align = array ("right", "left");
+
+    $table->data[] = array('<b><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string("managecourses")."</a></b>",
+                           get_string("adminhelpcourses"));
+    $table->data[] = array("<b><a href=\"enrol.php?sesskey=$USER->sesskey\">".get_string("enrolmentplugins")."</a></b>",
+                           get_string("adminhelpenrolments"));
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=off&amp;sesskey=$USER->sesskey\">".get_string("assignstudents")."</a></b>",
+                           get_string("adminhelpassignstudents"));
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("assignteachers")."</a></b>",
+                           get_string("adminhelpassignteachers")." <img src=\"../pix/t/user.gif\" height=\"11\" width=\"11\" alt=\"\" />");
+    $table->data[] = array("<b><a href=\"creators.php?sesskey=$USER->sesskey\">".get_string("assigncreators")."</a></b>",
+                           get_string("adminhelpassigncreators"));
+    $table->data[] = array("<b><a href=\"admin.php?sesskey=$USER->sesskey\">".get_string("assignadmins")."</a></b>",
+                           get_string("adminhelpassignadmins"));
+
+    print_table($table);
+
+    print_footer($site);
+
+?>

diff --git a/admin/environment.php b/admin/environment.php
index 1190c5643e75364252f2aa42a87a72b6994b6e26..8b59eb8981d5a9923d705e89dd51e74f34afe905 100644 (file)
--- a/admin/environment.php
+++ b/admin/environment.php
@@ -57,10 +57,12 @@
     $strmoodleversion = get_string('moodleversion');
     $strupdate = get_string('updatecomponent', 'admin');
     $strupwards = get_string('upwards', 'admin');
+    $strmisc = get_string('miscellaneous');
 
 /// Print the header stuff
     print_header("$SITE->shortname: $strenvironment", $SITE->fullname,
-                 "<a href=\"index.php\">$stradmin</a> -> ".$strenvironment);
+                 "<a href=\"index.php\">$stradmin</a> -> <a href=\"misc.php\">$strmisc</a> -> "
+                 .$strenvironment);
 
 /// Print the component download link
     echo '<div class="reportlink"><a href="environment.php?action=updatecomponent&amp;sesskey='.$USER->sesskey.'">'.$strupdate.'</a></div>';

diff --git a/admin/health.php b/admin/health.php
index 10955ae87052f5f613bf641d1216c31752a24afc..d4a50de80dd24cf0522d0656a182ccd3b68c8d68 100644 (file)
--- a/admin/health.php
+++ b/admin/health.php
@@ -18,9 +18,11 @@
     $site = get_site();
     $stradmin         = get_string('administration');
     $strhealthcenter  = get_string('healthcenter');
+    $strmisc          = get_string('miscellaneous');
 
     print_header($site->shortname.': '.$strhealthcenter, $site->fullname,
-                  '<a href="index.php">'.$stradmin.'</a> -> '.$strhealthcenter);
+                  '<a href="index.php">'.$stradmin.'</a> -> <a href="misc.php">'.$strmisc.'</a> ->'.
+                  $strhealthcenter);
 
 echo <<<STYLES
 <style type="text/css">

diff --git a/admin/index.php b/admin/index.php
index c78af9422d267dbe5ce745e753758d09554ecc06..e90bf180eeae466bd6de065914cae7f7e542afbe 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -399,38 +399,43 @@
     $userdata .= '<div class="adminlink"><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/uploaduser.php?sesskey='.$USER->sesskey.'">'.
                  get_string('uploadusers').'</a> - <span class="explanation">'.get_string('adminhelpuploadusers').'</span></div>';
 
-    $userdata .= '<hr /><div class="adminlink"><a href="enrol.php?sesskey='.$USER->sesskey.'">'.get_string('enrolmentplugins').
+    $table->data[] = array('<strong><a href="users.php">'.get_string('users').'</a></strong>', $userdata);
+
+    $coursedata = '<div class="adminlink"><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string('managecourses').
+                 '</a> - <span class="explanation">'.get_string('adminhelpcourses').'</span></div>';
+    $coursedata .= '<div class="adminlink"><a href="enrol.php?sesskey='.$USER->sesskey.'">'.get_string('enrolmentplugins').
                  '</a> - <span class="explanation">'.get_string('adminhelpenrolments').'</span></div>';
-    $userdata .= '<div class="adminlink"><a href="../course/index.php?edit=off&amp;sesskey='.$USER->sesskey.'">'.
+    $coursedata .= '<div class="adminlink"><a href="../course/index.php?edit=off&amp;sesskey='.$USER->sesskey.'">'.
                  get_string('assignstudents').'</a> - <span class="explanation">'.get_string('adminhelpassignstudents').'</span></div>';
-
-    $userdata .= '<div class="adminlink"><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.
+    $coursedata .= '<div class="adminlink"><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.
                  get_string('assignteachers').'</a> - <span class="explanation">'.get_string('adminhelpassignteachers').
                  ' <img src="../pix/t/user.gif" height="11" width="11" alt="" /></span></div>';
-    $userdata .= '<div class="adminlink"><a href="creators.php?sesskey='.$USER->sesskey.'">'.get_string('assigncreators').
+    $coursedata .= '<div class="adminlink"><a href="creators.php?sesskey='.$USER->sesskey.'">'.get_string('assigncreators').
                  '</a> - <span class="explanation">'.get_string('adminhelpassigncreators').'</span></div>';
-    $userdata .= '<div class="adminlink"><a href="admin.php?sesskey='.$USER->sesskey.'">'.get_string('assignadmins').
+    $coursedata .= '<div class="adminlink"><a href="admin.php?sesskey='.$USER->sesskey.'">'.get_string('assignadmins').
                  '</a> - <span class="explanation">'.get_string('adminhelpassignadmins').'</span></div>';
 
-    $table->data[] = array('<strong><a href="users.php">'.get_string('users').'</a></strong>', $userdata);
-
-    $table->data[] = array('<strong><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string('courses').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpcourses').'</div>');
-    $table->data[] = array('<strong><a href="../files/index.php?id='.$site->id.'">'.get_string('sitefiles').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpsitefiles').'</div>');
-    $table->data[] = array('<strong><a href="stickyblocks.php">'.get_string('stickyblocks','admin').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpstickyblocks').'</div>');
-    $table->data[] = array('<strong><a href="report.php">'.get_string('reports').'</a></strong>', 
-                           '<div class="explanation">'.get_string('adminhelpreports').'</div>');
-    $table->data[] = array('<strong><a href="environment.php">'.get_string('environment','admin').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpenvironment').'</div>');
-
+    $table->data[] = array('<strong><a href="courses.php">'.get_string('courses').'</a></strong>', $coursedata);
+
+    $miscdata = '<div class="adminlink"><a href="../files/index.php?id='.$site->id.'">'.get_string('sitefiles').
+                 '</a> - <span class="explanation">'.get_string('adminhelpsitefiles').'</span></div>';
+    $miscdata .= '<div class="adminlink"><a href="stickyblocks.php">'.get_string('stickyblocks','admin').
+                 '</a> - <span class="explanation">'.get_string('adminhelpstickyblocks').'</span></div>';
+    $miscdata .= '<div class="adminlink"><a href="report.php">'.get_string('reports').
+                 '</a> - <span class="explanation">'.get_string('adminhelpreports').'</span></div>';
+    $miscdata .= '<div class="adminlink"><a href="health.php">'.get_string('healthcenter').
+                 '</a> - <span class="explanation">'.get_string('adminhelphealthcenter').'</span></div>';
+    $miscdata .= '<div class="adminlink"><a href="environment.php">'.get_string('environment', 'admin').
+                 '</a> - <span class="explanation">'.get_string('adminhelpenvironment').'</span></div>';
 /// Optional stuff
     if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
         $table->data[] = array("<strong><a href=\"$CFG->dbtype/frame.php\">".get_string('managedatabase').'</a></strong>',
                                '<div class="explanation">'.get_string('adminhelpmanagedatabase').'</div>');
     }
 
+    $table->data[] = array('<strong><a href="misc.php">'.get_string('miscellaneous').'</a></strong>', $miscdata);
+
+
 /// Hooks for Matt Oquists contrib code for repositories and portfolio.  
 /// The eventual official versions may not look like this
     if (isset($CFG->portfolio) && file_exists("$CFG->dirroot/$CFG->portfolio")) {

diff --git a/admin/misc.php b/admin/misc.php
new file mode 100644 (file)
index 0000000..c1fccd0
--- /dev/null
+++ b/admin/misc.php
@@ -0,0 +1,42 @@
+<?php // $Id$
+
+    require_once('../config.php');
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only admins can access this page");
+    }
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    $stradministration = get_string("administration");
+    $strmisc           = get_string("miscellaneous");
+
+    print_header("$site->shortname: $stradministration: $strmisc", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strmisc");
+
+    print_heading($strmisc);
+
+    $table->align = array ("right", "left");
+
+    $table->data[] = array('<b><a href="../files/index.php?id='.$site->id.'">'.get_string('sitefiles').'</a></b>',
+                           get_string("adminhelpsitefiles"));
+    $table->data[] = array('<b><a href="stickyblocks.php">'.get_string('stickyblocks','admin')."</a></b>",
+                           get_string('adminhelpstickyblocks'));
+    $table->data[] = array('<b><a href="report.php">'.get_string('reports')."</a></b>",
+                           get_string('adminhelpreports'));
+    $table->data[] = array('<b><a href="health.php">'.get_string('healthcenter')."</a></b>",
+                           get_string('adminhelphealthcenter'));
+    $table->data[] = array('<b><a href="environment.php">'.get_string('environment', 'admin')."</a></b>",
+                           get_string('adminhelpenvironment'));
+
+    print_table($table);
+
+    print_footer($site);
+
+?>
+
+

diff --git a/admin/report.php b/admin/report.php
index 2845053c17cbb5dc38db46f7ada14c897de1109b..3ba172466d4821ebf5bd9fb3191171703e969b24 100644 (file)
--- a/admin/report.php
+++ b/admin/report.php
@@ -9,9 +9,11 @@
 
     $stradmin = get_string('administration');
     $strreports = get_string('reports');
+    $strmisc = get_string('miscellaneous');
 
     print_header($strreports, $strreports,
-                 '<a href="index.php">'.$stradmin.'</a> -> '.$strreports);
+                 '<a href="index.php">'.$stradmin.'</a> -> <a href="misc.php">'.$strmisc.'</a> ->'.
+                 $strreports);
 
     $directories = get_list_of_plugins('admin/report');
 

diff --git a/admin/stickyblocks.php b/admin/stickyblocks.php
index 32f5435bbb81d76e016f22999c57624e87cba30f..a5fa1860b31a0352242781b2c3d7bac30d4a050b 100644 (file)
--- a/admin/stickyblocks.php
+++ b/admin/stickyblocks.php
@@ -34,7 +34,8 @@
     $strheading = get_string('adminhelpstickyblocks');
     
     print_header($strtitle,$strtitle,'<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/index.php">'.
-                 get_string('admin').'</a> -> '.$strtitle);
+                 get_string('admin').'</a> -> <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/misc.php">'.
+                 get_string('miscellaneous').'</a> ->'.$strtitle);
 
     echo '<table border="0" cellpadding="3" cellspacing="0" width="100%" id="layout-table">';
     echo '<tr valign="top">';

diff --git a/admin/users.php b/admin/users.php
index 607a14a6955944387e0be1a3997d0c91e27f1559..ca30960f1c4a68caec9194a4f7e66a2e194c0184 100644 (file)
--- a/admin/users.php
+++ b/admin/users.php
@@ -24,27 +24,15 @@
 
     $table->data[] = array("<b><a href=\"auth.php?sesskey=$USER->sesskey\">".get_string("authentication")."</a></b>",
                            get_string("adminhelpauthentication"));
-
     $table->data[] = array("<b><a href=\"user.php\">".get_string("edituser")."</a></b>",
                            get_string("adminhelpedituser"));
     $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string("addnewuser")."</a></b>",
                                get_string("adminhelpaddnewuser"));
     $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/uploaduser.php?sesskey=$USER->sesskey\">".get_string("uploadusers")."</a></b>",
                                get_string("adminhelpuploadusers"));
-    $table->data[] = array('', '<hr />');
-    $table->data[] = array("<b><a href=\"enrol.php?sesskey=$USER->sesskey\">".get_string("enrolmentplugins")."</a></b>",
-                           get_string("adminhelpenrolments"));
-    $table->data[] = array("<b><a href=\"../course/index.php?edit=off&amp;sesskey=$USER->sesskey\">".get_string("assignstudents")."</a></b>",
-                           get_string("adminhelpassignstudents"));
-    $table->data[] = array("<b><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("assignteachers")."</a></b>",
-                           get_string("adminhelpassignteachers")." <img src=\"../pix/t/user.gif\" height=\"11\" width=\"11\" alt=\"\" />");
-    $table->data[] = array("<b><a href=\"creators.php?sesskey=$USER->sesskey\">".get_string("assigncreators")."</a></b>",
-                           get_string("adminhelpassigncreators"));
-    $table->data[] = array("<b><a href=\"admin.php?sesskey=$USER->sesskey\">".get_string("assignadmins")."</a></b>",
-                           get_string("adminhelpassignadmins"));
 
     print_table($table);
-    
+
     print_footer($site);
 
 ?>

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index d584023aa3acb2e36000953707db76be487455f9..33a6fa7234b55b7bf37c9dc95781a58886f48ea9 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -53,6 +53,7 @@ $string['adminhelpedituser'] = 'Browse the list of user accounts and edit any of
 $string['adminhelpenrolments'] = 'Choose internal or external ways to control enrolments';
 $string['adminhelpenvironment'] = 'Check how your server suits current and future installation requirements';
 $string['adminhelpfailurelogs'] = 'Browse logs of failed logins';
+$string['adminhelphealthcenter'] = 'Automatic detection of site problems';
 $string['adminhelplanguage'] = 'For checking and editing the current language pack';
 $string['adminhelplogs'] = 'Browse logs of all activity on this site';
 $string['adminhelpmanageblocks'] = 'Manage installed blocks and their settings';
@@ -754,6 +755,7 @@ $string['makeafolder'] = 'Make a folder';
 $string['makeeditable'] = 'If you make \'$a\' editable by the web server process (eg apache) then you could edit this file directly from this page';
 $string['manageblocks'] = 'Blocks';
 $string['managedatabase'] = 'Database';
+$string['managecourses'] = 'Manage courses';
 $string['managefilters'] = 'Filters';
 $string['managemeta'] = 'Is this a meta course?';
 $string['managemetaexplan'] = '(This means that enrolments are inherited from other courses)';