diff options
Diffstat (limited to 'lib/Model')
| -rw-r--r-- | lib/Model/Contact.php | 3 | ||||
| -rw-r--r-- | lib/Model/User.php | 9 | ||||
| -rw-r--r-- | lib/Model/UserGroupClass.php | 10 |
3 files changed, 12 insertions, 10 deletions
diff --git a/lib/Model/Contact.php b/lib/Model/Contact.php index 5d292070..478515f2 100644 --- a/lib/Model/Contact.php +++ b/lib/Model/Contact.php @@ -30,6 +30,9 @@ class Contact extends UserGroupClass { public const TYPE = 'contact'; public const ICON = 'icon-mail'; + /** @var Array */ + private $contact; + /** * User constructor. * @param $id diff --git a/lib/Model/User.php b/lib/Model/User.php index b59b9c26..3a8ea92f 100644 --- a/lib/Model/User.php +++ b/lib/Model/User.php @@ -28,6 +28,8 @@ class User extends UserGroupClass { public const TYPE = 'user'; public const ICON = 'icon-user'; + private $user; + /** * User constructor. * @param $id @@ -38,13 +40,12 @@ class User extends UserGroupClass { parent::__construct($id, self::TYPE); $this->icon = self::ICON; $this->isNoUser = false; + $this->description = \OC::$server->getL10N('polls')->t('User'); $this->user = \OC::$server->getUserManager()->get($this->id); - $this->language = \OC::$server->getConfig()->getUserValue($this->id, 'core', 'lang'); - - $this->displayName = \OC::$server->getUserManager()->get($this->id)->getDisplayName(); - $this->description = \OC::$server->getL10N('polls')->t('User'); + $this->displayName = $this->user->getDisplayName(); $this->emailAddress = $this->user->getEMailAddress(); + $this->language = \OC::$server->getConfig()->getUserValue($this->id, 'core', 'lang'); } /** diff --git a/lib/Model/UserGroupClass.php b/lib/Model/UserGroupClass.php index d2b515f2..3855c973 100644 --- a/lib/Model/UserGroupClass.php +++ b/lib/Model/UserGroupClass.php @@ -28,7 +28,6 @@ class UserGroupClass implements \JsonSerializable { public const TYPE_PUBLIC = 'public'; public const TYPE_EXTERNAL = 'external'; - /** @var IL10N */ private $l10n; /** @var string */ @@ -55,11 +54,11 @@ class UserGroupClass implements \JsonSerializable { /** @var string */ protected $icon = ''; - /** @var string */ - protected $isNoUser = ''; + /** @var boolean */ + protected $isNoUser = true; - /** @var string */ - protected $categories = ''; + /** @var string[] */ + protected $categories = []; /** * User constructor. @@ -80,7 +79,6 @@ class UserGroupClass implements \JsonSerializable { $this->language = $language; $this->icon = 'icon-share'; $this->l10n = \OC::$server->getL10N('polls'); - $this->isNoUser = true; } /** |