Change the name of identity library from Identity to IdentityProvider. Create a helper class called identity to simplify call the Identity Provider. Move the contents of MY_Session.php to the new helper class and remove the MY_Session class

3 files changed, 6 insertions, 6 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 258de843..8b96ebd2 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -69,7 +69,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function delete_user($id) {
     access::verify_csrf();
 
-    if ($id == Session::active_user()->id || $id == user::guest()->id) {
+    if ($id == identity::active_user()->id || $id == user::guest()->id) {
       access::forbidden();
     }
 
@@ -136,7 +136,7 @@ class Admin_Users_Controller extends Admin_Controller {
       }
 
       // An admin can change the admin status for any user but themselves
-      if ($user->id != Session::active_user()->id) {
+      if ($user->id != identity::active_user()->id) {
         $user->admin = $form->edit_user->admin->checked;
       }
       $user->save();
@@ -158,7 +158,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     $form = $this->_get_user_edit_form_admin($user);
     // Don't allow the user to control their own admin bit, else you can lock yourself out
-    if ($user->id == Session::active_user()->id) {
+    if ($user->id == identity::active_user()->id) {
       $form->edit_user->admin->disabled(1);
     }
     print $form;
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index a8f1c5ca..6bef1a17 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -46,7 +46,7 @@ class Password_Controller extends Controller {
 
     $valid = $form->validate();
     if ($valid) {
-      $user = Identity::lookup_user_by_name($form->reset->inputs["name"]->value);
+      $user = identity::lookup_user_by_name($form->reset->inputs["name"]->value);
       if (!$user->loaded || empty($user->email)) {
         $form->reset->inputs["name"]->add_error("no_email", 1);
         $valid = false;
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 0ccf3e2a..dee54f63 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -21,7 +21,7 @@ class Users_Controller extends Controller {
   public function update($id) {
     $user = user::lookup($id);
 
-    if ($user->guest || $user->id != Session::active_user()->id) {
+    if ($user->guest || $user->id != identity::active_user()->id) {
       access::forbidden();
     }
 
@@ -59,7 +59,7 @@ class Users_Controller extends Controller {
 
   public function form_edit($id) {
     $user = user::lookup($id);
-    if ($user->guest || $user->id != Session::active_user()->id) {
+    if ($user->guest || $user->id != identity::active_user()->id) {
       access::forbidden();
     }