mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-03 20:49:08 +01:00
added session (temporary) preferences
This commit is contained in:
parent
5e406355f9
commit
3dc254c6ee
@ -47,6 +47,8 @@
|
|||||||
var $default = array();
|
var $default = array();
|
||||||
/*! @var forced forced prefs */
|
/*! @var forced forced prefs */
|
||||||
var $forced = array();
|
var $forced = array();
|
||||||
|
/*! @var session session / tempory prefs */
|
||||||
|
var $session = array();
|
||||||
/*! @var db */
|
/*! @var db */
|
||||||
var $db;
|
var $db;
|
||||||
|
|
||||||
@ -213,6 +215,11 @@
|
|||||||
*/
|
*/
|
||||||
function read_repository()
|
function read_repository()
|
||||||
{
|
{
|
||||||
|
$this->session = $GLOBALS['phpgw']->session->appsession('preferences','preferences');
|
||||||
|
if (!is_array($this->session))
|
||||||
|
{
|
||||||
|
$this->session = array();
|
||||||
|
}
|
||||||
$this->db->query("SELECT * FROM phpgw_preferences"
|
$this->db->query("SELECT * FROM phpgw_preferences"
|
||||||
. " WHERE preference_owner IN (-1,-2," . (int)$this->account_id . ')',__LINE__,__FILE__);
|
. " WHERE preference_owner IN (-1,-2," . (int)$this->account_id . ')',__LINE__,__FILE__);
|
||||||
|
|
||||||
@ -240,7 +247,7 @@
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->data = $this->user;
|
$this->data = array_merge_recursive($this->user,$this->session);
|
||||||
|
|
||||||
// now use defaults if needed (user-value unset or empty)
|
// now use defaults if needed (user-value unset or empty)
|
||||||
//
|
//
|
||||||
@ -321,6 +328,14 @@
|
|||||||
|
|
||||||
switch ($type)
|
switch ($type)
|
||||||
{
|
{
|
||||||
|
case 'session':
|
||||||
|
if (!isset($this->forced[$app_name][$var]) || $this->forced[$app_name][$var] === '')
|
||||||
|
{
|
||||||
|
$this->session[$app_name][$var] = $this->data[$app_name][$var] = $value;
|
||||||
|
$GLOBALS['phpgw']->sessions->appsession('preferences','preferences',$this->session);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case 'forced':
|
case 'forced':
|
||||||
$this->data[$app_name][$var] = $this->forced[$app_name][$var] = $value;
|
$this->data[$app_name][$var] = $this->forced[$app_name][$var] = $value;
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user