projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switched PlImage's fields from private to protected
[platal.git]
/
classes
/
pluser.php
diff --git
a/classes/pluser.php
b/classes/pluser.php
index
03abb2a
..
3e4418a
100644
(file)
--- a/
classes/pluser.php
+++ b/
classes/pluser.php
@@
-61,9
+61,11
@@
abstract class PlUser
protected $hruid = null;
// User main email aliases (forlife is the for-life email address, bestalias
protected $hruid = null;
// User main email aliases (forlife is the for-life email address, bestalias
- // is user-chosen preferred email address).
+ // is user-chosen preferred email address, email might be any email available
+ // for the user).
protected $forlife = null;
protected $bestalias = null;
protected $forlife = null;
protected $bestalias = null;
+ protected $email = null;
// Display name is user-chosen name to display (eg. in "Welcome
// <display name> !"), while full name is the official full name.
// Display name is user-chosen name to display (eg. in "Welcome
// <display name> !"), while full name is the official full name.
@@
-135,11
+137,17
@@
abstract class PlUser
public function bestEmail()
{
public function bestEmail()
{
- return $this->bestalias;
+ if (!empty($this->bestalias)) {
+ return $this->bestalias;
+ }
+ return $this->email;
}
public function forlifeEmail()
{
}
public function forlifeEmail()
{
- return $this->forlife;
+ if (!empty($this->forlife)) {
+ return $this->forlife;
+ }
+ return $this->email;
}
public function displayName()
}
public function displayName()
@@
-192,6
+200,15
@@
abstract class PlUser
return property_exists($this, $name) || isset($this->data[$name]);
}
return property_exists($this, $name) || isset($this->data[$name]);
}
+ public function __unset($name)
+ {
+ if (property_exists($this, $name)) {
+ $this->$name = null;
+ } else {
+ unset($this->data[$name]);
+ }
+ }
+
/**
* Fills the object properties using the @p associative array; the intended
* user case is to fill the object using SQL obtained arrays.
/**
* Fills the object properties using the @p associative array; the intended
* user case is to fill the object using SQL obtained arrays.