webinterface.git

@@ -41,6 +41,7 @@ case ROLE_MAILACCOUNT:

 case ROLE_SYSTEMUSER:

   $role = "{$_SESSION['userinfo']['name']}, angemeldet als Benutzer";

   break;

+case ROLE_SYSTEMUSER | ROLE_SUBUSER:

 case ROLE_SYSTEMUSER | ROLE_CUSTOMER | ROLE_SUBUSER:

   $role = "{$_SESSION['subuser']}, Unternutzer von {$_SESSION['userinfo']['username']}";

   break;

@@ -296,11 +296,17 @@ function setup_session($role, $useridentity)

     DEBUG("We are a sub-user");

     $info = get_subuser_info($useridentity);

     $_SESSION['userinfo'] = $info;

+    $_SESSION['role'] = ROLE_SYSTEMUSER | ROLE_SUBUSER;

     $_SESSION['subuser'] = $useridentity;

+    $data = db_query("SELECT kundenaccount FROM system.useraccounts WHERE username='{$info['username']}'");

+    if ($entry = mysql_fetch_assoc($data)) {

+      if ($entry['kundenaccount'] == 1) {

         $customer = get_customer_info($_SESSION['userinfo']['username']);

         $_SESSION['customerinfo'] = $customer;

         $_SESSION['role'] = ROLE_SYSTEMUSER | ROLE_CUSTOMER | ROLE_SUBUSER;

         $_SESSION['restrict_modules'] = explode(',', $info['modules']);

+      }

+    }

     logger(LOG_INFO, "session/start", "login", "logged in user »{$info['username']}«");

   }

   if ($role & ROLE_SYSTEMUSER)