mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 00:29:38 +01:00
I think this fixes it
This commit is contained in:
parent
a000b3d00d
commit
caa97ad127
@ -38,8 +38,8 @@
|
|||||||
}
|
}
|
||||||
$phpgw_info["user"]["preferences"] = $phpgw->preferences->get_preferences();
|
$phpgw_info["user"]["preferences"] = $phpgw->preferences->get_preferences();
|
||||||
$this->groups = $this->read_groups($phpgw_info["user"]["userid"]);
|
$this->groups = $this->read_groups($phpgw_info["user"]["userid"]);
|
||||||
$apps = CreateObject('phpgwapi.applications',intval($phpgw_info["user"]["account_id"]));
|
$apps = CreateObject('phpgwapi.applications');
|
||||||
//$phpgw_info["user"]["apps"] = $apps->apps_enabled();
|
$phpgw_info["user"]["apps"] = $apps->users_enabled_apps();
|
||||||
}
|
}
|
||||||
|
|
||||||
// use this if you make any changes to phpgw_info, including preferences, config table changes, etc
|
// use this if you make any changes to phpgw_info, including preferences, config table changes, etc
|
||||||
|
@ -28,13 +28,6 @@
|
|||||||
var $user_apps = Array();
|
var $user_apps = Array();
|
||||||
var $group_apps = Array();
|
var $group_apps = Array();
|
||||||
|
|
||||||
function applications($var = ""){
|
|
||||||
global $phpgw, $phpgw_info;
|
|
||||||
if ($var != ""){
|
|
||||||
$this->users_enabled_apps();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function users_enabled_apps()
|
function users_enabled_apps()
|
||||||
{
|
{
|
||||||
global $phpgw, $phpgw_info;
|
global $phpgw, $phpgw_info;
|
||||||
|
@ -119,7 +119,7 @@
|
|||||||
if ($phpgw_info["flags"]["currentapp"] == "login") {
|
if ($phpgw_info["flags"]["currentapp"] == "login") {
|
||||||
$log = explode("@",$login);
|
$log = explode("@",$login);
|
||||||
$this->preferences = CreateObject("phpgwapi.preferences", $log[0]);
|
$this->preferences = CreateObject("phpgwapi.preferences", $log[0]);
|
||||||
$this->applications = CreateObject("phpgwapi.applications", $log[0]);
|
$this->applications = CreateObject("phpgwapi.applications");
|
||||||
}else{
|
}else{
|
||||||
if (! $this->session->verify()) {
|
if (! $this->session->verify()) {
|
||||||
$this->db->query("select config_value from config where config_name='webserver_url'",__LINE__,__FILE__);
|
$this->db->query("select config_value from config where config_name='webserver_url'",__LINE__,__FILE__);
|
||||||
@ -128,7 +128,8 @@
|
|||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
$this->preferences = CreateObject("phpgwapi.preferences", intval($phpgw_info["user"]["account_id"]));
|
$this->preferences = CreateObject("phpgwapi.preferences", intval($phpgw_info["user"]["account_id"]));
|
||||||
$this->applications = CreateObject("phpgwapi.applications", intval($phpgw_info["user"]["account_id"]));
|
$this->applications = CreateObject("phpgwapi.applications");
|
||||||
|
$this->applications->users_enabled_apps();
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->translation = CreateObject("phpgwapi.translation");
|
$this->translation = CreateObject("phpgwapi.translation");
|
||||||
|
Loading…
Reference in New Issue
Block a user