From 39d0a234a02b9678799b80ea97ee53e8d4bfc6ff Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 20 May 2005 16:14:00 +0000 Subject: [PATCH] Updates with smaller bugfixing git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@308 594d385d-05f5-0310-b6e9-bd551577e9d8 --- TODO | 2 -- plugins/admin/systems/chooser.tpl | 2 +- plugins/admin/systems/class_terminalGeneric.inc | 1 + plugins/admin/systems/class_terminalService.inc | 1 + plugins/admin/systems/class_terminalStartup.inc | 6 +++++- plugins/admin/systems/class_workstationGeneric.inc | 1 + plugins/gofax/reports/class_faxreport.inc | 9 ++++----- plugins/personal/connectivity/class_proxyAccount.inc | 2 ++ 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/TODO b/TODO index 4f1c575b4..5a1b11351 100644 --- a/TODO +++ b/TODO @@ -7,8 +7,6 @@ Things to fix before 2.4: * Make it "barrierefrei" -* FAX report -> search_result undefined - Target for 2.5: =============== diff --git a/plugins/admin/systems/chooser.tpl b/plugins/admin/systems/chooser.tpl index df5b0099f..3e8bf95f9 100644 --- a/plugins/admin/systems/chooser.tpl +++ b/plugins/admin/systems/chooser.tpl @@ -7,7 +7,7 @@ {t}Linux thin client template{/t}
{t}Linux workstation template{/t}
{t}Linux Server{/t}
-{t}Windows workstation{/t}
+ {t}Network printer{/t}
{t}Phone{/t}
{t}Other network component{/t}
diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc index 4beb928d1..5d2b4395e 100644 --- a/plugins/admin/systems/class_terminalGeneric.inc +++ b/plugins/admin/systems/class_terminalGeneric.inc @@ -161,6 +161,7 @@ class termgeneric extends plugin /* Show main page */ $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl"); + $smarty->assign("actionACL", chkacl($this->acl, 'action')); return($smarty->fetch (get_template_path('terminal.tpl', TRUE))); } diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc index df357d666..043846474 100644 --- a/plugins/admin/systems/class_terminalService.inc +++ b/plugins/admin/systems/class_terminalService.inc @@ -196,6 +196,7 @@ class termservice extends plugin } $hl.= "\n"; $smarty->assign ("hardware_list", $hl); + $smarty->assign ("gotoXMonitor", $this->gotoXMonitor); /* Show main page */ return($smarty->fetch (get_template_path('service.tpl', TRUE))); diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc index c014b3c8f..ebd734a0b 100644 --- a/plugins/admin/systems/class_terminalStartup.inc +++ b/plugins/admin/systems/class_terminalStartup.inc @@ -151,7 +151,11 @@ class termstartup extends plugin } else { $smarty->assign("debugbootup", ""); } - $smarty->assign("gotoKernelParameters", chkacl($this->acl, "gotoKernelParameters")); + + /* ACL's */ + foreach (array("gotoKernelParameters", "gotoModules", "gotoFilesystem") as $value){ + $smarty->assign($value."ACL", chkacl($this->acl, "$value")); + } /* Show main page */ return($smarty->fetch (get_template_path('startup.tpl', TRUE))); diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc index b712323cc..c1305e4f0 100644 --- a/plugins/admin/systems/class_workstationGeneric.inc +++ b/plugins/admin/systems/class_workstationGeneric.inc @@ -167,6 +167,7 @@ class workgeneric extends plugin } $smarty->assign("ipHostNumber", $this->ipHostNumber); $smarty->assign("macAddress", $this->macAddress); + $smarty->assign("actionACL", chkacl($this->acl, 'action')); /* Show main page */ $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl"); diff --git a/plugins/gofax/reports/class_faxreport.inc b/plugins/gofax/reports/class_faxreport.inc index 921a4feb8..654aabada 100644 --- a/plugins/gofax/reports/class_faxreport.inc +++ b/plugins/gofax/reports/class_faxreport.inc @@ -45,14 +45,14 @@ class faxreport extends plugin $this->search_base= $sb; /* Get global filter config */ - if (!is_global("faxfilter")){ + if (!is_global("faxreportfilter")){ $ui= get_userinfo(); $base= get_base_from_people($ui->dn); $faxfilter= array("year" => date("Y"), "month" => date("m"), "search_base" => $base, "search_for" => "*"); - register_global("faxfilter", $faxfilter); + register_global("faxreportfilter", $faxfilter); } } @@ -60,14 +60,14 @@ class faxreport extends plugin { /* Get template engine */ $smarty= get_smarty(); - $faxfilter= get_global("faxfilter"); + $faxfilter= get_global("faxreportfilter"); foreach( array("year", "month", "search_for", "search_base") as $type){ if (isset($_POST[$type])){ $faxfilter[$type]= $_POST[$type]; } $this->$type= $faxfilter[$type]; } - register_global("faxfilter", $faxfilter); + register_global("faxreportfilter", $faxfilter); /* Adapt sorting */ if (isset($_GET['sort'])){ @@ -286,7 +286,6 @@ class faxreport extends plugin $smarty->assign("search_result", $output); $smarty->assign("range_selector", range_selector(count($this->report_list), $this->start, 20)); }else{ - #! hickert // avoiding PHP error "Undefined index: search_result" $smarty->assign("search_result", ""); } diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc index 9422d83e3..727082d23 100644 --- a/plugins/personal/connectivity/class_proxyAccount.inc +++ b/plugins/personal/connectivity/class_proxyAccount.inc @@ -80,6 +80,8 @@ class proxyAccount extends plugin /* Prepare correct state */ if (!$this->is_account){ $smarty->assign("pstate", "disabled"); + } else { + $smarty->assign("pstate", ""); } /* Show main page */ -- 2.30.2