Updates with smaller bugfixing

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@308 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/TODO b/TODO
index 4f1c575b46a8df38adeb5764a86f5d00fdadb4a3..5a1b11351bd024aa4f58f1a8928bce5537132125 100644 (file)
--- 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 df5b0099f884c9d7d405e9e289244cad53846dec..3e8bf95f9b5d36d323ad24b204e743752d56593c 100644 (file)
--- a/plugins/admin/systems/chooser.tpl
+++ b/plugins/admin/systems/chooser.tpl
@@ -7,7 +7,7 @@
 <input type="radio" name="system" value="terminal" checked>{t}Linux thin client template{/t}<br>
 <input type="radio" name="system" value="workstation">{t}Linux workstation template{/t}<br>
 <input type="radio" name="system" value="server">{t}Linux Server{/t}<br>
-<input type="radio" name="system" value="machineaccount">{t}Windows workstation{/t}<br>
+<!--<input type="radio" name="system" value="machineaccount">{t}Windows workstation{/t}<br>-->
 <input type="radio" name="system" value="printer">{t}Network printer{/t}<br>
 <input type="radio" name="system" value="phone">{t}Phone{/t}<br>
 <input type="radio" name="system" value="component">{t}Other network component{/t}<br>

diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 4beb928d1408e007f1e8493e6c110d9712eb7389..5d2b4395e282f44d89e300ea4ec3da989cba4385 100644 (file)
--- 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 df357d66657d4eeb515395847d8797da17776408..043846474e144ca717e229f07ac672c10717894e 100644 (file)
--- a/plugins/admin/systems/class_terminalService.inc
+++ b/plugins/admin/systems/class_terminalService.inc
@@ -196,6 +196,7 @@ class termservice extends plugin
     }
     $hl.= "</select>\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 c014b3c8fe09ab295f1f0d258c1cc8b0a4ac31f1..ebd734a0b98d0d390638eee538b26a6221264101 100644 (file)
--- 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 b712323cc0a584fb65ed23a45b41e3ce332996d4..c1305e4f0b9678a1b1d1596a464ba12f27236976 100644 (file)
--- 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 921a4feb881fdced898a0d444fe12490ef0feaf3..654aabadaa4f98901b80d39436eeae434fcd1ea1 100644 (file)
--- 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 9422d83e3ff61ec0a18d463062ce0acbbd22ed31..727082d23c76a7f22ff42e3ee9481e04f2522426 100644 (file)
--- 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 */