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

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

diff --git a/docs/admin/master_list.php b/docs/admin/master_list.php
index f118d6e..464748b 100644 (file)
--- a/docs/admin/master_list.php
+++ b/docs/admin/master_list.php
@@ -115,10 +115,18 @@ if (isset($_POST['submit'])) {
 \r
        exit;\r
 } else if (isset($_GET['edit'], $_GET['id'])) {\r
-       header('Location: '.$_base_href.'admin/master_list_edit.php?id='.$_GET['id']);\r
+       if (substr($_GET['id'], 0, 1) != '-') {\r
+               header('Location: '.$_base_href.'admin/edit_user.php?id='.$_GET['id']);\r
+       } else {\r
+               header('Location: '.$_base_href.'admin/master_list_edit.php?id='.substr($_GET['id'], 1));\r
+       }\r
        exit;\r
 } else if (isset($_GET['delete'], $_GET['id'])) {\r
-       header('Location: '.$_base_href.'admin/master_list_delete.php?id='.$_GET['id']);\r
+       if (substr($_GET['id'], 0, 1) != '-') {\r
+               header('Location: '.$_base_href.'admin/admin_delete.php?id='.$_GET['id']);\r
+       } else {\r
+               header('Location: '.$_base_href.'admin/master_list_delete.php?id='.substr($_GET['id'], 1));\r
+       }\r
        exit;\r
 } else if (isset($_GET['delete']) || isset($_GET['edit'])) {\r
        $msg->addError('NO_ITEM_SELECTED');\r
@@ -156,9 +164,9 @@ if ($_GET['reset_filter']) {
 \r
 if (isset($_GET['status']) && ($_GET['status'] != '')) {\r
        if ($_GET['status'] == 1) {\r
-               $status = ' member_id=0 ';\r
+               $status = ' M.member_id=0 ';\r
        } else {\r
-               $status = ' member_id>0 ';\r
+               $status = ' M.member_id>0 ';\r
        }\r
        $page_string .= SEP.'status='.$_GET['status'];\r
 } else {\r
@@ -179,16 +187,16 @@ if ($_GET['search']) {
                if ($term) {\r
                        if (strpos($term, '-') === FALSE) {\r
                                $term = '%'.$term.'%';\r
-                               $sql .= "(public_field LIKE '$term') OR ";\r
+                               $sql .= "(M.public_field LIKE '$term') OR ";\r
                        } else {\r
                                // range search\r
                                $range = explode('-', $term, 2);\r
                                $range[0] = trim($range[0]);\r
                                $range[1] = trim($range[1]);\r
                                if (is_numeric($range[0]) && is_numeric($range[1])) {\r
-                                       $sql .= "(public_field >= $range[0] AND public_field <= $range[1]) OR ";\r
+                                       $sql .= "(M.public_field >= $range[0] AND M.public_field <= $range[1]) OR ";\r
                                } else {\r
-                                       $sql .= "(public_field >= '$range[0]' AND public_field <= '$range[1]') OR ";\r
+                                       $sql .= "(M.public_field >= '$range[0]' AND M.public_field <= '$range[1]') OR ";\r
                                }\r
                        }\r
                }\r
@@ -199,7 +207,7 @@ if ($_GET['search']) {
        $search = '1';\r
 }\r
 \r
-$sql   = "SELECT COUNT(member_id) AS cnt FROM ".TABLE_PREFIX."master_list WHERE $status AND $search";\r
+$sql   = "SELECT COUNT(member_id) AS cnt FROM ".TABLE_PREFIX."master_list M WHERE $status AND $search";\r
 \r
 $result = mysql_query($sql, $db);\r
 $row = mysql_fetch_assoc($result);\r
@@ -213,7 +221,7 @@ if (!$page) {
        $page = 1;\r
 }\r
 \r
-$sql   = "SELECT * FROM ".TABLE_PREFIX."master_list WHERE $status AND $search ORDER BY public_field";\r
+$sql   = "SELECT M.*, B.login, B.first_name, B.second_name, B.last_name FROM ".TABLE_PREFIX."master_list M LEFT JOIN ".TABLE_PREFIX."members B USING (member_id) WHERE $status AND $search ORDER BY M.public_field";\r
 $result = mysql_query($sql, $db);\r
 ?>\r
 \r
@@ -268,22 +276,52 @@ $result = mysql_query($sql, $db);
        <th scope="col">&nbsp;</th>\r
        <th scope="col"><?php echo _AT('student_id'); ?></th>\r
        <th scope="col"><?php echo _AT('login_name'); ?></th>\r
+       <th scope="col"><?php echo _AT('first_name'); ?></th>\r
+       <th scope="col"><?php echo _AT('second_name'); ?></th>\r
+       <th scope="col"><?php echo _AT('last_name'); ?></th>\r
 </tr>\r
 </thead>\r
 <?php if ($num_results > 0): ?>\r
 <tfoot>\r
 <tr>\r
-       <td colspan="3"><input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" /> <input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" /></td>\r
+       <td colspan="6"><input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" /> <input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" /></td>\r
 </tr>\r
 </tfoot>\r
 <tbody>\r
        <?php while($row = mysql_fetch_assoc($result)): ?>\r
                <tr onmousedown="document.form['m<?php echo $row['public_field']; ?>'].checked = true;rowselect(this);" id="r_<?php echo $row['public_field']; ?>">\r
-                       <td><input type="radio" name="id" value="<?php echo $row['public_field']; ?>" id="m<?php echo $row['public_field']; ?>" /></td>\r
+                       <td><input type="radio" name="id" value="<?php \r
+                               if ($row['member_id']) {\r
+                                       echo $row['member_id'];\r
+                               } else {\r
+                                       echo '-'.$row['public_field'];\r
+                               }\r
+                               ?>" id="m<?php echo $row['public_field']; ?>" /></td>\r
                        <td><label for="m<?php echo $row['public_field']; ?>"><?php echo $row['public_field']; ?></label></td>\r
-                       <td><?php \r
+                       <td><?php\r
+                               if ($row['member_id']) {\r
+                                       echo $row['login'];\r
+                               } else {\r
+                                       echo '-';\r
+                               }\r
+                               ?></td>\r
+                       <td><?php\r
+                               if ($row['member_id']) {\r
+                                       echo $row['first_name'];\r
+                               } else {\r
+                                       echo '-';\r
+                               }\r
+                               ?></td>\r
+                       <td><?php\r
+                               if ($row['member_id']) {\r
+                                       echo $row['second_name'];\r
+                               } else {\r
+                                       echo '-';\r
+                               }\r
+                               ?></td>\r
+                       <td><?php\r
                                if ($row['member_id']) {\r
-                                       echo get_login($row['member_id']);\r
+                                       echo $row['last_name'];\r
                                } else {\r
                                        echo '-';\r
                                }\r
@@ -293,7 +331,7 @@ $result = mysql_query($sql, $db);
 </tbody>\r
 <?php else: ?>\r
        <tr>\r
-               <td colspan="3"><?php echo _AT('none_found'); ?></td>\r
+               <td colspan="6"><?php echo _AT('none_found'); ?></td>\r
        </tr>\r
 <?php endif; ?>\r
 </table>\r

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