From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 17 May 2006 06:16:52 +0000 (+0000)
Subject: Fixed fax log error message
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c16296c4a2f869bdd05981f2839d65d8165ac603;p=gosa.git

Fixed fax log error message


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

diff --git a/TODO b/TODO
index af8180ff9..6224ac028 100644
--- a/TODO
+++ b/TODO
@@ -3,12 +3,6 @@ Target for 2.4.1:
 
 * Explaination of several FIXME's. Group removal, etc.
 
-* saveFilter added, please use!
-
-* generatePasteIcon added, please use!
-
-* Added functions normalizePreg and normalizeLdap. Please use where needed!
-
 * Add online help (english/german)
   Document how to generate it, generate it and check it in
 
@@ -27,12 +21,12 @@ Target for 2.4.1:
 * Change FAIstate when triggering actions
   (install, sysinfo, softupdate)
 
+* Add another tab to ogroups when workstations are included
+  (generic settings include ntp, syslog, mode and action)
+
+* Fix DNS plugin
 
-Now:
-* evaluate what effects a ldap->cat(..., $this->attributes)
-  will have to other plugins in class_plugin.inc
-* Changing NTP-Servers -> start tab! Actions?
-* Fix DNS plugin. Add some more checks 
+* Move from "default" to translated "inherited" (TC, WS and Servers)
 
 
 Target for 2.5:
diff --git a/plugins/admin/ogroups/termgroup.tpl b/plugins/admin/ogroups/termgroup.tpl
index 6cbc7cc50..22c11de18 100644
--- a/plugins/admin/ogroups/termgroup.tpl
+++ b/plugins/admin/ogroups/termgroup.tpl
@@ -4,7 +4,7 @@
 <table summary="">
  <tr>
   <td>
-   <select size="1" name="saction" {$actionACL} title="{t}Select action to execute for this   group of terminals{/t}">
+   <select size="1" name="saction" {$actionACL} title="{t}Select action to execute for this group of terminals{/t}">
     <option></option>
     {html_options options=$actions}
    </select>
diff --git a/plugins/gofax/faxreports/main.inc b/plugins/gofax/faxreports/main.inc
index 24beb48aa..701ea89d2 100644
--- a/plugins/gofax/faxreports/main.inc
+++ b/plugins/gofax/faxreports/main.inc
@@ -1,9 +1,6 @@
 <?php
 
 if (!$remove_lock){
-	/* Page header*/
-	$display= print_header(get_template_path('images/reports.png'), _("FAX reports"));
-
 	/* Create faxreport object on demand */
 	if (!isset($_SESSION['faxreport']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
 		$_SESSION['faxreport']= new faxreport ($config, $ui);
@@ -15,8 +12,9 @@ if (!$remove_lock){
 	$faxreport->acl= get_module_permission($acl, "faxreport", $ui->dn);
 
 	/* Execute formular */
-	$display.= $faxreport->execute ();
+	$display= $faxreport->execute ();
 	$display.= "<input type=\"hidden\" name=\"ignore\">\n";
+	$display= print_header(get_template_path('images/reports.png'), _("FAX reports")).$display;
 
 	/* Store changes  in session */
 	$_SESSION['faxreport']= $faxreport;