mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-09 01:25:22 +01:00
cleanups
This commit is contained in:
parent
1222384e5d
commit
abb21d96e4
@ -26,16 +26,16 @@
|
|||||||
{
|
{
|
||||||
var $account_id;
|
var $account_id;
|
||||||
var $account_type;
|
var $account_type;
|
||||||
var $account_apps = Array();
|
var $account_apps = Array(Array());
|
||||||
var $db;
|
var $db;
|
||||||
|
|
||||||
function applications($params)
|
function applications($params = "")
|
||||||
{
|
{
|
||||||
global $phpgw, $phpgw_info;
|
global $phpgw, $phpgw_info;
|
||||||
$this->db = $phpgw->db;
|
$this->db = $phpgw->db;
|
||||||
if (is_array($params)) {
|
if (is_array($params)) {
|
||||||
if (isset($app_params[1])){
|
if (isset($params[1])){
|
||||||
$this->account_type = $app_params[1];
|
$this->account_type = $params[1];
|
||||||
}else{
|
}else{
|
||||||
$this->account_type = "u";
|
$this->account_type = "u";
|
||||||
}
|
}
|
||||||
@ -63,14 +63,15 @@
|
|||||||
if (gettype($phpgw_info["apps"]) != "array") {
|
if (gettype($phpgw_info["apps"]) != "array") {
|
||||||
$this->read_installed_apps();
|
$this->read_installed_apps();
|
||||||
}
|
}
|
||||||
while (list($app) = each($phpgw_info["apps"])) {
|
@reset($phpgw_info["apps"]);
|
||||||
|
while ($app = each($phpgw_info["apps"])) {
|
||||||
if ($this->account_type == "g") {
|
if ($this->account_type == "g") {
|
||||||
$check = $phpgw->acl->check_specific("run",1,$app, $this->account_id, "g");
|
$check = $phpgw->acl->check_specific("run",1,$app[0], $this->account_id, "g");
|
||||||
}else{
|
}else{
|
||||||
$check = $phpgw->acl->check("run",1,$app, $this->account_id);
|
$check = $phpgw->acl->check("run",1,$app[0], $this->account_id);
|
||||||
}
|
}
|
||||||
if ($check) {
|
if ($check) {
|
||||||
$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[0]] = array("title" => $phpgw_info["apps"][$app[0]]["title"], "name" => $app[0], "enabled" => True, "status" => $phpgw_info["apps"][$app[0]]["status"]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $this->account_apps;
|
return $this->account_apps;
|
||||||
@ -82,6 +83,7 @@
|
|||||||
if (count($this->account_apps) == 0) {
|
if (count($this->account_apps) == 0) {
|
||||||
$this->enabled_apps();
|
$this->enabled_apps();
|
||||||
}
|
}
|
||||||
|
@reset($this->account_apps);
|
||||||
while (list ($key) = each ($this->account_apps)) {
|
while (list ($key) = each ($this->account_apps)) {
|
||||||
$app[] = $this->account_apps[$key]["name"];
|
$app[] = $this->account_apps[$key]["name"];
|
||||||
}
|
}
|
||||||
@ -93,21 +95,22 @@
|
|||||||
if (gettype($phpgw_info["apps"]) != "array") {
|
if (gettype($phpgw_info["apps"]) != "array") {
|
||||||
$this->read_installed_apps();
|
$this->read_installed_apps();
|
||||||
}
|
}
|
||||||
while (list($app) = each($phpgw_info["apps"])) {
|
@reset($phpgw_info["apps"]);
|
||||||
if ($phpgw->acl->check_specific("run",1,$app, $this->account_id, $this->account_type)) {
|
while ($app = each($phpgw_info["apps"])) {
|
||||||
$this->account_apps[$app] = array("title" => $phpgw_info["apps"][$app]["title"], "name" => $app, "enabled" => True, "status" => $phpgw_info["apps"][$app]["status"]);
|
if ($phpgw->acl->check_specific("run",1,$app[0], $this->account_id, $this->account_type) && $this->is_system_enabled($app[0])) {
|
||||||
|
$this->account_apps[$app[0]] = array("title" => $phpgw_info["apps"][$app[0]]["title"], "name" => $app[0], "enabled" => True, "status" => $phpgw_info["apps"][$app[0]]["status"]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $this->account_apps;
|
return $this->account_apps;
|
||||||
}
|
}
|
||||||
|
|
||||||
function add_app($apps) {
|
function add_app($apps) {
|
||||||
if(gettype($appname) == "array") {
|
if(gettype($apps) == "array") {
|
||||||
while($app = each($appname)) {
|
while($app = each($apps)) {
|
||||||
$this->account_apps[] = $app[0];
|
$this->account_apps[$app[1]] = array("title" => $phpgw_info["apps"][$app[1]]["title"], "name" => $app[1], "enabled" => True, "status" => $phpgw_info["apps"][$app[1]]["status"]);
|
||||||
}
|
}
|
||||||
} elseif(gettype($appname) == "string") {
|
} elseif(gettype($apps) == "string") {
|
||||||
$this->account_apps[] = $appname;
|
$this->account_apps[$apps] = array("title" => $phpgw_info["apps"][$apps]["title"], "name" => $apps, "enabled" => True, "status" => $phpgw_info["apps"][$apps]["status"]);
|
||||||
}
|
}
|
||||||
reset($this->account_apps);
|
reset($this->account_apps);
|
||||||
return $this->account_apps;
|
return $this->account_apps;
|
||||||
@ -121,10 +124,12 @@
|
|||||||
|
|
||||||
function save_apps(){
|
function save_apps(){
|
||||||
global $phpgw, $phpgw_info;
|
global $phpgw, $phpgw_info;
|
||||||
$phpgw->acl->delete("%", "run", $this->account_id, $this->account_type);
|
$num_rows = $phpgw->acl->delete("%%", "run", $this->account_id, $this->account_type);
|
||||||
reset($this->account_apps[$group_id]);
|
// echo "(applications) Number Rows effected : ".$num_rows."<br>\n";
|
||||||
|
reset($this->account_apps);
|
||||||
while($app = each($this->account_apps)) {
|
while($app = each($this->account_apps)) {
|
||||||
$phpgw->acl->add($app["name"],'run',$this->account_id,$this->account_type,1);
|
if(!$phpgw_info["apps"][$app[0]]["enabled"]) { continue; }
|
||||||
|
$phpgw->acl->add($app[0],'run',$this->account_id,$this->account_type,1);
|
||||||
}
|
}
|
||||||
reset($this->account_apps);
|
reset($this->account_apps);
|
||||||
return $this->account_apps;
|
return $this->account_apps;
|
||||||
@ -138,16 +143,17 @@
|
|||||||
$name = $this->db->f("app_name");
|
$name = $this->db->f("app_name");
|
||||||
$title = $this->db->f("app_title");
|
$title = $this->db->f("app_title");
|
||||||
$status = $this->db->f("app_enabled");
|
$status = $this->db->f("app_enabled");
|
||||||
$phpgw_info["apps"][$name] = array("title" => $title, "enabled" => True, "status" => $status);
|
$phpgw_info["apps"]["$name"] = array("title" => $title, "name" => $name, "enabled" => True, "status" => $status);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function is_system_enabled($appname){
|
function is_system_enabled($appname){
|
||||||
|
global $phpgw_info;
|
||||||
if(gettype($phpgw_info["apps"]) != "array") {
|
if(gettype($phpgw_info["apps"]) != "array") {
|
||||||
$this->read_installed_apps();
|
$this->read_installed_apps();
|
||||||
}
|
}
|
||||||
if ($phpgw_info["apps"][$appname]["enabled"] == True) {
|
if ($phpgw_info["apps"][$appname]["enabled"]) {
|
||||||
return True;
|
return True;
|
||||||
}else{
|
}else{
|
||||||
return False;
|
return False;
|
||||||
|
Loading…
Reference in New Issue
Block a user