summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2013-09-16 16:49:58 +0200
committerFlorian Pritz <bluewind@xinu.at>2013-09-16 16:49:58 +0200
commitbb9f9274e8c2d661a1adffd87c87c3d81ec47b4d (patch)
tree3a484bddf9f11da67c1c743443ae5140cf455fb9
parent2172c2049fc8b8eca5dbed7b659a089e20d1fadd (diff)
Duser: Rework optional functions
Not implemented functions return null and code using these no longer has to check if they are implemented, but it has to handle null properly. Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/libraries/Duser/Duser.php13
-rw-r--r--application/libraries/Duser/drivers/Duser_db.php2
-rw-r--r--application/views/user/profile.php2
3 files changed, 5 insertions, 12 deletions
diff --git a/application/libraries/Duser/Duser.php b/application/libraries/Duser/Duser.php
index b615528f7..38ee967c9 100644
--- a/application/libraries/Duser/Duser.php
+++ b/application/libraries/Duser/Duser.php
@@ -9,14 +9,11 @@
abstract class Duser_Driver extends CI_Driver {
- // List of optional functions or function groups that are implemented
+ // List of optional functions that are implemented
//
- // Possible values are names of functions already implemented in this
- // abstract class or the function groups listed below.
- //
- // Possible function groups are:
- // - can_register_new_users
- // - can_reset_password
+ // Possible values are:
+ // - can_register_new_users (only supported with the DB driver!)
+ // - can_reset_password (only supported with the DB driver!)
public $optional_functions = array();
/*
@@ -101,8 +98,6 @@ class Duser extends CI_Driver_Library {
public function username_exists($username)
{
- $this->require_implemented(__FUNCTION__);
-
if ($username === false) {
return false;
}
diff --git a/application/libraries/Duser/drivers/Duser_db.php b/application/libraries/Duser/drivers/Duser_db.php
index 5252ec48e..0f4298258 100644
--- a/application/libraries/Duser/drivers/Duser_db.php
+++ b/application/libraries/Duser/drivers/Duser_db.php
@@ -14,10 +14,8 @@ class Duser_db extends Duser_Driver {
* will NOT work with other drivers.
*/
public $optional_functions = array(
- 'username_exists',
'can_reset_password',
'can_register_new_users',
- 'get_email',
);
public function login($username, $password)
diff --git a/application/views/user/profile.php b/application/views/user/profile.php
index bcd740612..1840f9fc1 100644
--- a/application/views/user/profile.php
+++ b/application/views/user/profile.php
@@ -7,7 +7,7 @@
</div>
</div>
- <?php if(auth_driver_function_implemented("get_email")) { ?>
+ <?php if($profile_data["email"] !== null) { ?>
<div class="control-group">
<label class="control-label" for="inputEmail">Email</label>
<div class="controls">