mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-03-19 10:08:16 +01:00
Working on possiable fix for LDAP apps problems
This commit is contained in:
parent
abe3cc3baf
commit
5ef7bdf190
@ -172,9 +172,10 @@
|
||||
|
||||
$i = 0;
|
||||
$sorted_apps = $phpgw_info["apps"];
|
||||
@asort($sorted_apps);
|
||||
@reset($sorted_apps);
|
||||
while ($permission = each($sorted_apps)) {
|
||||
echo "TEST: " . gettype($phpgw_info);
|
||||
// @asort($sorted_apps);
|
||||
// @reset($sorted_apps);
|
||||
while ($permission = each($phpgw_info["apps"])) {
|
||||
if ($permission[1]["enabled"]) {
|
||||
$perm_display[$i][0] = $permission[0];
|
||||
$perm_display[$i][1] = $permission[1]["title"];
|
||||
|
@ -219,8 +219,13 @@
|
||||
|
||||
$db2 = $phpgw->db;
|
||||
|
||||
$db2->query("select app_name,app_enabled from applications where app_enabled != 0 order by app_order",__LINE__,__FILE__);
|
||||
$db2->query("select * from applications where app_enabled != '0'",__LINE__,__FILE__);
|
||||
while ($db2->next_record()) {
|
||||
$name = $db2->f("app_name");
|
||||
$title = $db2->f("app_title");
|
||||
$status = $db2->f("app_enabled");
|
||||
$phpgw_info["apps"][$name] = array("title" => $title, "enabled" => True, "status" => $status);
|
||||
|
||||
$enabled_apps[$db2->f("app_name")] = 1;
|
||||
$app_status[$db2->f("app_name")] = $db2->f("app_status");
|
||||
}
|
||||
@ -297,10 +302,14 @@
|
||||
return $accounts;
|
||||
}
|
||||
|
||||
function accounts_const()
|
||||
function accounts_const($line,$file)
|
||||
{
|
||||
global $phpgw, $phpgw_info;
|
||||
|
||||
//echo "accounts_const called<br>line: $line<br>$file";
|
||||
|
||||
$phpgw->accounts->phpgw_fillarray();
|
||||
$phpgw->preferences->read_preferences();
|
||||
$this->groups = $this->read_groups($phpgw_info["user"]["userid"]);
|
||||
$this->apps = $this->read_apps($phpgw_info["user"]["userid"]);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user