no static methods in auth app

diff --git a/ipf/admin/app.php b/ipf/admin/app.php
index 976aba0a2e53a785a108f66510e8535bc39f806a..815555ed6e383e6c59a30600e2cb6a2d57e06ef5 100644 (file)
--- a/ipf/admin/app.php
+++ b/ipf/admin/app.php
@@ -109,7 +109,7 @@ class IPF_Admin_App extends IPF_Application
         if (count(array_diff($requiredPermissions, $component->getPerms($request))))
             return false;
 
-        if ($request->user->is_superuser || !\IPF_Auth_App::ArePermissionsEnabled())
+        if ($request->user->is_superuser || !\PFF\Container::auth()->arePermissionsEnabled())
             return true;
 
         $authPermissions = F::bind('array_map',

diff --git a/ipf/auth/admin.php b/ipf/auth/admin.php
index 87b9c5ae73c23a6bc9cd73579d5557f4a1a99821..a0c39b1355f014624159c70646cc12027b7b2ac1 100644 (file)
--- a/ipf/auth/admin.php
+++ b/ipf/auth/admin.php
@@ -89,7 +89,7 @@ class UserForm extends \IPF_ObjectForm
         }
 
         $permissions = array('is_active', 'is_staff', 'is_superuser');
-        if (\IPF_Auth_App::ArePermissionsEnabled()) {
+        if (\PFF\Container::auth()->arePermissionsEnabled()) {
             $permissions[] = 'permissions';
             $permissions[] = 'roles';
 
@@ -165,7 +165,7 @@ class AdminUser extends \IPF_Admin_Component
             'is_staff',
             'is_superuser',
         );
-        if (\IPF_Auth_App::ArePermissionsEnabled()) {
+        if ($this->auth_app->arePermissionsEnabled()) {
             $columns[] = 'groups';
         }
         return $columns;
@@ -266,7 +266,7 @@ class RoleForm extends \IPF_ObjectForm
             'max_length' => 255,
         ));
 
-        if (\IPF_Auth_App::ArePermissionsEnabled()) {
+        if (\PFF\Container::auth()->arePermissionsEnabled()) {
             $this->fields['permissions'] = new \IPF_Form_Field_MultipleChoice(array(
                 'label'     => __('Permissions'),
                 'choices'   => permissionChoices(),
@@ -356,7 +356,7 @@ class AdminRole extends \IPF_Admin_Component
     public function slug() { return 'role'; }
 }
 
-if (\IPF_Auth_App::ArePermissionsEnabled()) {
+if (\PFF\Container::auth()->arePermissionsEnabled()) {
     return array(
         'IPF\Auth\Admin\AdminUser',
         'IPF\Auth\Admin\AdminRole',

diff --git a/ipf/auth/app.php b/ipf/auth/app.php
index 4626c1e2fdb7bb4308627b15b210a8c759fde3f5..f4121b310e9ee6c751a58c73c4d892ebd6c951ff 100644 (file)
--- a/ipf/auth/app.php
+++ b/ipf/auth/app.php
@@ -55,16 +55,16 @@ class IPF_Auth_App extends IPF_Application
         );
     }
 
-    private static $permissionsEnabled = null;
+    private $permissionsEnabled = null;
 
-    static function ArePermissionsEnabled()
+    function arePermissionsEnabled()
     {
-        if (self::$permissionsEnabled === null)
-            self::$permissionsEnabled = (bool)\PFF\Container::databaseQuery()
+        if ($this->permissionsEnabled === null)
+            $this->permissionsEnabled = (bool)\PFF\Container::databaseQuery()
                 ->from('auth_permission')
                 ->select('COUNT(1)')
                 ->fetchColumn();
-        return self::$permissionsEnabled;
+        return $this->permissionsEnabled;
     }
 
     public function commands()