forked from extern/egroupware
Fixed the sorting issue
This commit is contained in:
parent
f24fa93c1e
commit
716c0c7f24
@ -33,34 +33,31 @@
|
|||||||
$this->users_enabled_apps();
|
$this->users_enabled_apps();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function users_enabled_apps(){
|
|
||||||
global $phpgw, $phpgw_info;
|
function users_enabled_apps()
|
||||||
$acl_apps = $phpgw->acl->get_app_list('run', 1);
|
{
|
||||||
if ($acl_apps != False){
|
global $phpgw, $phpgw_info;
|
||||||
reset ($acl_apps);
|
$acl_apps = $phpgw->acl->get_app_list('run', 1);
|
||||||
while (list(,$value) = each($acl_apps)){
|
if ($acl_apps != False) {
|
||||||
$apps[] = $value;
|
reset ($acl_apps);
|
||||||
}
|
while (list($app) = each($phpgw_info["apps"])) {
|
||||||
}
|
if ($phpgw->acl->check("run",1,$app)) {
|
||||||
if(gettype($phpgw_info["apps"]) != "array") {
|
$phpgw_info["user"]["apps"][$app] = array("title" => $phpgw_info["apps"][$app]["title"], "name" => $app, "enabled" => True, "status" => $phpgw_info["apps"][$app]["status"]);
|
||||||
$this->read_installed_apps();
|
}
|
||||||
}
|
|
||||||
asort ($phpgw_info["apps"]);
|
|
||||||
if(count($apps)) {
|
|
||||||
for ($i=0;$i<count($apps);$i++) {
|
|
||||||
if ($phpgw_info["apps"][$apps[$i]]["enabled"] == True) {
|
|
||||||
$phpgw_info["user"]["apps"][$apps[$i]] = True;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
if (gettype($phpgw_info["apps"]) != "array") {
|
||||||
|
$this->read_installed_apps();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function read_installed_apps(){
|
function read_installed_apps(){
|
||||||
global $phpgw, $phpgw_info;
|
global $phpgw, $phpgw_info;
|
||||||
$phpgw->db->lock(array("applications"));
|
$phpgw->db->lock(array("applications"));
|
||||||
$phpgw->db->query("select * from applications where app_enabled != '0'",__LINE__,__FILE__);
|
$phpgw->db->query("select * from applications where app_enabled != '0' order by app_order",__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");
|
||||||
$name = $phpgw->db->f("app_name");
|
$name = $phpgw->db->f("app_name");
|
||||||
$title = $phpgw->db->f("app_title");
|
$title = $phpgw->db->f("app_title");
|
||||||
$status = $phpgw->db->f("app_enabled");
|
$status = $phpgw->db->f("app_enabled");
|
||||||
@ -215,4 +212,4 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
Loading…
Reference in New Issue
Block a user