extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

around and around we go

Browse Source
This commit is contained in:
seek3r 2001-01-27 04:23:32 +00:00
parent e9c319813d
commit a000b3d00d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,11 +29,10 @@
var $group_apps = Array(); var $group_apps = Array();
function applications($var = ""){ function applications($var = ""){
global $phpgw, $phpgw_info; global $phpgw, $phpgw_info;
if ($var != ""){ if ($var != ""){
$this->users_enabled_apps(); $this->users_enabled_apps();
} }
} }
function users_enabled_apps() function users_enabled_apps()
@ -43,7 +42,6 @@
if (gettype($phpgw_info["apps"]) != "array") { if (gettype($phpgw_info["apps"]) != "array") {
$this->read_installed_apps(); $this->read_installed_apps();
} }
reset ($phpgw_info["apps"]);
while (list($app) = each($phpgw_info["apps"])) { while (list($app) = each($phpgw_info["apps"])) {
if ($phpgw->acl->check("run",1,$app)) { if ($phpgw->acl->check("run",1,$app)) {
$phpgw_info["user"]["apps"][$app] = array("title" => $phpgw_info["apps"][$app]["title"], "name" => $app, "enabled" => True, "status" => $phpgw_info["apps"][$app]["status"]); $phpgw_info["user"]["apps"][$app] = array("title" => $phpgw_info["apps"][$app]["title"], "name" => $app, "enabled" => True, "status" => $phpgw_info["apps"][$app]["status"]);
@ -53,7 +51,7 @@
function read_installed_apps(){ function read_installed_apps(){
global $phpgw, $phpgw_info; global $phpgw, $phpgw_info;
$phpgw->db->query("select * from applications where app_enabled != '0' order by app_order",__LINE__,__FILE__); $phpgw->db->query("select * from applications where app_enabled != '0' order by app_order asc",__LINE__,__FILE__);
if($phpgw->db->num_rows()) { if($phpgw->db->num_rows()) {
while ($phpgw->db->next_record()) { while ($phpgw->db->next_record()) {
// echo "<br>TEST: " . $phpgw->db->f("app_order") . " - " . $phpgw->db->f("app_name"); // echo "<br>TEST: " . $phpgw->db->f("app_order") . " - " . $phpgw->db->f("app_name");

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

@ -113,9 +113,9 @@
if (empty($phpgw_info["server"]["account_repository"])){$phpgw_info["server"]["account_repository"] = $phpgw_info["server"]["auth_type"];} if (empty($phpgw_info["server"]["account_repository"])){$phpgw_info["server"]["account_repository"] = $phpgw_info["server"]["auth_type"];}
$this->accounts = CreateObject("phpgwapi.accounts"); $this->accounts = CreateObject("phpgwapi.accounts");
$this->preferences = CreateObject("phpgwapi.preferences"); $this->preferences = CreateObject("phpgwapi.preferences");
$this->applications = CreateObject("phpgwapi.applications");
$this->session = CreateObject("phpgwapi.sessions"); $this->session = CreateObject("phpgwapi.sessions");
$this->acl = CreateObject("phpgwapi.acl"); $this->acl = CreateObject("phpgwapi.acl");
$this->applications = CreateObject("phpgwapi.applications");
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]);