From 9b3a26c19ae35d19023a33141f2b7aefe2f1fd4b Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Tue, 8 Jul 2014 17:45:22 -0400 Subject: [PATCH] Fix user deletion, remove spurious logging --- airtime_mvc/application/models/Systemstatus.php | 2 +- airtime_mvc/application/models/User.php | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/models/Systemstatus.php b/airtime_mvc/application/models/Systemstatus.php index b077c3376..1b07099c9 100644 --- a/airtime_mvc/application/models/Systemstatus.php +++ b/airtime_mvc/application/models/Systemstatus.php @@ -233,7 +233,7 @@ class Application_Model_Systemstatus $partitions[$totalSpace] = new stdClass(); $partitions[$totalSpace]->totalSpace = $totalSpace; $partitions[$totalSpace]->totalFreeSpace = $totalSpace - $usedSpace; - Logging::info($partitions[$totalSpace]->totalFreeSpace); + //Logging::info($partitions[$totalSpace]->totalFreeSpace); return array_values($partitions); } diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index 489d0e933..2001a97f8 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -245,10 +245,14 @@ class Application_Model_User } public static function getFirstAdmin() { - $admins = Application_Model_User::getUsersOfType('A'); - if (count($admins) > 0) { // found admin => pick first one - return $admins[0]; + $superAdmins = Application_Model_User::getUsersOfType('S'); + if (count($superAdmins) > 0) { // found superadmin => pick first one + return $superAdmins[0]; } else { + $admins = Application_Model_User::getUsersOfType('A'); + if (count($admins) > 0) { // found admin => pick first one + return $admins[0]; + } Logging::warn("Warning. no admins found in database"); return null; }