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

diff --git a/docs/admin/admin_delete.php b/docs/admin/admin_delete.php
index ccf0e2b..b9e11db 100644 (file)
--- a/docs/admin/admin_delete.php
+++ b/docs/admin/admin_delete.php
@@ -110,11 +110,19 @@ if (isset($_POST['submit_yes'])) {
        write_to_log(AT_ADMIN_LOG_DELETE, 'member_track', mysql_affected_rows($db), $sql);
 
        $msg->addFeedback('USER_DELETED');
-       header('Location: users.php');
+       if (isset($_POST['ml']) && $_REQUEST['ml']) {
+               header('Location: '.$_base_href.'admin/master_list.php');
+       } else {
+               header('Location: '.$_base_href.'admin/users.php');
+       }
        exit;
 } else if (isset($_POST['submit_no'])) {
        $msg->addFeedback('CANCELLED');
-       header('Location: users.php');
+       if (isset($_POST['ml']) && $_REQUEST['ml']) {
+               header('Location: '.$_base_href.'admin/master_list.php');
+       } else {
+               header('Location: '.$_base_href.'admin/users.php');
+       }
        exit;
 }
 
@@ -136,6 +144,7 @@ if (!($row_log = mysql_fetch_assoc($result))) {
        } else {
                require(AT_INCLUDE_PATH.'header.inc.php'); 
                $hidden_vars['id'] = $id;
+               $hidden_vars['ml'] = intval($_REQUEST['ml']);
                $confirm = array('DELETE_USER', AT_print($row_log['login'], 'members.login'));
                $msg->addConfirm($confirm, $hidden_vars);
                $msg->printConfirm();

diff --git a/docs/admin/edit_user.php b/docs/admin/edit_user.php
index c213797..d16a29e 100644 (file)
--- a/docs/admin/edit_user.php
+++ b/docs/admin/edit_user.php
@@ -17,7 +17,11 @@ require(AT_INCLUDE_PATH.'vitals.inc.php');
 admin_authenticate(AT_ADMIN_PRIV_USERS);\r
 \r
 if (isset($_POST['cancel'])) {\r
-       header('Location: ./users.php');\r
+       if (isset($_POST['ml']) && $_REQUEST['ml']) {\r
+               header('Location: '.$_base_href.'admin/master_list.php');\r
+       } else {\r
+               header('Location: '.$_base_href.'admin/users.php');\r
+       }\r
        exit;\r
 }\r
 \r
@@ -181,7 +185,11 @@ if (isset($_POST['submit'])) {
                }\r
 \r
                $msg->addFeedback('PROFILE_UPDATED_ADMIN');\r
-               header('Location: '.$_base_href.'admin/users.php');\r
+               if (isset($_POST['ml']) && $_REQUEST['ml']) {\r
+                       header('Location: '.$_base_href.'admin/master_list.php');\r
+               } else {\r
+                       header('Location: '.$_base_href.'admin/users.php');\r
+               }\r
                exit;\r
        }\r
 }\r
@@ -215,6 +223,14 @@ if (empty($_POST)) {
 \r
 $savant->assign('languageManager', $languageManager);\r
 \r
+if (isset($_REQUEST['ml']) && $_REQUEST['ml']) {\r
+       // redirect back to the master list\r
+       $savant->assign('ml', 1);\r
+} else {\r
+       $savant->assign('ml', 0);\r
+}\r
+\r
+\r
 /* HAVE TO SEND MEMBER_ID THROUGH FORM AS A HIDDEN POST VARIABLE!!! */\r
 /* PUT IN IF LOOP THAT LETS YOU SEE STATUS RADIO BUTTONS */\r
 $savant->display('registration.tmpl.php');\r

diff --git a/docs/admin/master_list.php b/docs/admin/master_list.php
index 464748b..9761746 100644 (file)
--- a/docs/admin/master_list.php
+++ b/docs/admin/master_list.php
@@ -116,16 +116,16 @@ if (isset($_POST['submit'])) {
        exit;\r
 } else if (isset($_GET['edit'], $_GET['id'])) {\r
        if (substr($_GET['id'], 0, 1) != '-') {\r
-               header('Location: '.$_base_href.'admin/edit_user.php?id='.$_GET['id']);\r
+               header('Location: '.$_base_href.'admin/edit_user.php?id='.$_GET['id'] . SEP . 'ml=1');\r
        } else {\r
-               header('Location: '.$_base_href.'admin/master_list_edit.php?id='.substr($_GET['id'], 1));\r
+               header('Location: '.$_base_href.'admin/master_list_edit.php?id='.substr($_GET['id'], 1) . SEP . 'ml=1');\r
        }\r
        exit;\r
 } else if (isset($_GET['delete'], $_GET['id'])) {\r
        if (substr($_GET['id'], 0, 1) != '-') {\r
-               header('Location: '.$_base_href.'admin/admin_delete.php?id='.$_GET['id']);\r
+               header('Location: '.$_base_href.'admin/admin_delete.php?id='.$_GET['id'] . SEP . 'ml=1');\r
        } else {\r
-               header('Location: '.$_base_href.'admin/master_list_delete.php?id='.substr($_GET['id'], 1));\r
+               header('Location: '.$_base_href.'admin/master_list_delete.php?id='.substr($_GET['id'], 1) . SEP . 'ml=1');\r
        }\r
        exit;\r
 } else if (isset($_GET['delete']) || isset($_GET['edit'])) {\r

diff --git a/docs/admin/master_list_edit.php b/docs/admin/master_list_edit.php
index b908ab2..e7ecf14 100644 (file)
--- a/docs/admin/master_list_edit.php
+++ b/docs/admin/master_list_edit.php
@@ -1,5 +1,4 @@
 <?php\r
-exit('no longer used');\r
 /****************************************************************************/\r
 /* ATutor                                                                                                                                      */\r
 /****************************************************************************/\r

diff --git a/docs/themes/default/registration.tmpl.php b/docs/themes/default/registration.tmpl.php
index bde4020..f06f8f4 100644 (file)
--- a/docs/themes/default/registration.tmpl.php
+++ b/docs/themes/default/registration.tmpl.php
@@ -2,6 +2,7 @@
 
 <form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="form">
 <?php global $languageManager, $_config; ?>
+<input name="ml" type="hidden" value="<?php echo $this->ml; ?>" />
 <div class="input-form">
 
        <?php if (!$_POST['member_id'] && defined('AT_MASTER_LIST') && AT_MASTER_LIST && !admin_authenticate(AT_ADMIN_PRIV_USERS, TRUE)): ?>