updated to latest wfpl

[contractor-progress.git] / code / config.php

diff --git a/code/config.php b/code/config.php
index 82fb0cc..30691ab 100644 (file)
--- a/code/config.php
+++ b/code/config.php
@@ -10,33 +10,23 @@ function cms_get() {
        return false;
 }
 
-function logged_in_as_admin() {
+# whether currently logged in as admin (can be changed with su)
+function logged_in_as_contractor() {
        if(!isset($GLOBALS['logged_in_as_admin'])) {
                $GLOBALS['logged_in_as_admin'] = (logged_in() == 1); # logged_in() returns id. id #1 is admin
        }
        return $GLOBALS['logged_in_as_admin'];
 }
 
-function logged_in_as_contractor() {
-       return logged_in_as_admin();
-}
-
+# whether originally logged in as contractor (reguardless of current su)
 function ever_was_contractor() {
-       return logged_in_as_contractor() || session_get('auth_was_contractor') == 'Yes';
-}
-
-function set_was_contractor() {
-       session_set('auth_was_contractor', 'Yes');
+       return logged_in_as_admin();
 }
 
 function enc_money($float) {
        return format_money($float, $cents = false);
 }
 
-function logged_in() {
-       return session_exists_and_authed();
-}
-
 # 1st arg: the correct encrypted password
 # 2nd arg: clear-text password entered by someone
 function check_password($encrypted, $pass) {