nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-01 16:11:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

$session: document ->username, actually implement ->fullname

Browse Source
This commit is contained in:
Florian Schlichting 2016-12-31 15:02:31 +01:00
parent fc78600e64
commit bd9d5eacf2
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inc/HTTPAuthSession.php
View File

@ -19,12 +19,24 @@ class HTTPAuthSession {
* @access private * @access private
*/ */
/**
* Username
* @var username string
*/
public $username;
/** /**
* User ID number * User ID number
* @var user_no int * @var user_no int
*/ */
public $user_no; public $user_no;
/**
* Principal ID
* @var principal_id int
*/
public $principal_id;
/** /**
* User e-mail * User e-mail
* @var email string * @var email string
@ -38,7 +50,8 @@ class HTTPAuthSession {
public $fullname; public $fullname;
/** /**
* Group rights * Group rights (not implemented)
* @todo
* @var groups array * @var groups array
*/ */
public $groups; public $groups;
@ -371,6 +384,7 @@ class HTTPAuthSession {
$this->user_no = $principal->user_no(); $this->user_no = $principal->user_no();
$this->principal_id = $principal->principal_id(); $this->principal_id = $principal->principal_id();
$this->email = $principal->email(); $this->email = $principal->email();
$this->fullname = $principal->fullname();
$this->dav_name = $principal->dav_name(); $this->dav_name = $principal->dav_name();
$this->principal = $principal; $this->principal = $principal;

18
inc/PublicSession.php
View File

@ -19,35 +19,41 @@ class PublicSession {
* @access private * @access private
*/ */
/**
* Username
* @var username string
*/
public $username;
/** /**
* User ID number * User ID number
* @var user_no int * @var user_no int
*/ */
var $user_no; public $user_no;
/** /**
* Principal ID * Principal ID
* @var principal_id int * @var principal_id int
*/ */
var $principal_id; public $principal_id;
/** /**
* User e-mail * User e-mail
* @var email string * @var email string
*/ */
var $email; public $email;
/** /**
* User full name * User full name
* @var fullname string * @var fullname string
*/ */
var $fullname; public $fullname;
/** /**
* Group rights * Group rights
* @var groups array * @var groups array
*/ */
var $groups; public $groups;
/**#@-*/ /**#@-*/
/** /**
@ -67,6 +73,7 @@ class PublicSession {
$this->user_no = $principal->user_no(); $this->user_no = $principal->user_no();
$this->principal_id = $principal->principal_id(); $this->principal_id = $principal->principal_id();
$this->email = $principal->email(); $this->email = $principal->email();
$this->fullname = $principal->fullname();
$this->dav_name = $principal->dav_name(); $this->dav_name = $principal->dav_name();
$this->principal = $principal; $this->principal = $principal;
@ -74,7 +81,6 @@ class PublicSession {
awl_set_locale($this->locale); awl_set_locale($this->locale);
} }
$this->groups = ( isset($c->public_groups) ? $c->public_groups : array() ); $this->groups = ( isset($c->public_groups) ? $c->public_groups : array() );
$this->roles = array( 'Public' => true ); $this->roles = array( 'Public' => true );
$this->logged_in = false; $this->logged_in = false;