extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 04:11:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

corrected contrustor problem

Browse Source
This commit is contained in:
seek3r 2001-01-29 02:17:08 +00:00
parent 2a5777bb22
commit 80c8300172
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
phpgwapi/inc/class.applications.inc.php
View File

@ -29,18 +29,31 @@
var $account_apps = Array(); var $account_apps = Array();
var $db; var $db;
function applications($account_id = "", $account_type = "u") function applications($params)
{ {
global $phpgw, $phpgw_info; global $phpgw, $phpgw_info;
$this->db = $phpgw->db; $this->db = $phpgw->db;
if ($account_id == ""){ if (is_array($params)) {
$this->account_id = $phpgw_info["user"]["account_id"]; if (isset($app_params[1])){
}elseif (is_long($account_id)) { $this->account_type = $app_params[1];
$this->account_id = $account_id; }else{
} elseif(is_string($account_id)) { $this->account_type = "u";
$this->account_id = $phpgw->accounts->username2userid($account_id); }
if ($params[0] == ""){
$this->account_id = $phpgw_info["user"]["account_id"];
}elseif (is_long($params[0])) {
$this->account_id = $params[0];
} elseif(is_string($params[0])) {
if ($this->account_type = "u"){
$this->account_id = $phpgw->accounts->username2userid($params[0]);
}else{
$this->account_id = $phpgw->accounts->groupname2groupid($params[0]);
}
}
}else{
$this->account_id = $phpgw_info["user"]["account_id"];
$this->account_type = "u";
} }
$this->account_type = $account_type;
//echo "Account ID (Initializing applications) = ".$this->account_id."<br>\n"; //echo "Account ID (Initializing applications) = ".$this->account_id."<br>\n";
} }
@ -84,9 +97,8 @@
if ($phpgw->acl->check_specific("run",1,$app, $this->account_id, $this->account_type)) { if ($phpgw->acl->check_specific("run",1,$app, $this->account_id, $this->account_type)) {
$this->account_apps[$app] = array("title" => $phpgw_info["apps"][$app]["title"], "name" => $app, "enabled" => True, "status" => $phpgw_info["apps"][$app]["status"]); $this->account_apps[$app] = array("title" => $phpgw_info["apps"][$app]["title"], "name" => $app, "enabled" => True, "status" => $phpgw_info["apps"][$app]["status"]);
} }
return $this->account_apps;
} }
return False; return $this->account_apps;
} }
function add_app($apps) { function add_app($apps) {

3
phpgwapi/inc/class.phpgw.inc.php
View File

@ -127,7 +127,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"])); $app_params[] = intval($phpgw_info["user"]["account_id"]);
$this->applications = CreateObject("phpgwapi.applications", $app_params);
$phpgw_info["user"]["preferences"] = $this->preferences->get_saved_preferences(); $phpgw_info["user"]["preferences"] = $this->preferences->get_saved_preferences();
$phpgw_info["user"]["apps"] = $this->applications->enabled_apps(); $phpgw_info["user"]["apps"] = $this->applications->enabled_apps();
} }