updated to latest wfpl

[contractor-progress.git] / su.php

diff --git a/su.php b/su.php
index 2ff23ae..6f26627 100644 (file)
--- a/su.php
+++ b/su.php
@@ -18,9 +18,8 @@
 require_once('code/wfpl/format.php');
 
 function su_main() {
-       if(logged_in_as_contractor()) {
-               set_was_contractor();
-       } elseif(!ever_was_contractor()) {
+       # If you log in to the admin account, you can su to a customer account and still have access to su back to admin. That's why we're checking for admin not "contractor" here.
+       if(!logged_in_as_admin()) {
                $GLOBALS['url'] = this_url();
                message('You must be logged in as an administrator to access that function');
                return 'login';
@@ -41,12 +40,13 @@ function _su_main() {
                return './';
        }
 
-       $rows = db_get_rows('people', 'id,name');
+       $rows = db_get_rows('people', 'id,name,username', 'order by name');
 
        if($rows) foreach($rows as $row) {
-               list($id, $name) = $row;
+               list($id, $name, $username) = $row;
                tem_set('client_id', $id);
                tem_set('client_name', $name);
+               tem_set('client_username', $username);
                tem_show('su_row');
        }
 }