Fixed several main.inc's

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

diff --git a/plugins/addons/addressbook/main.inc b/plugins/addons/addressbook/main.inc
index a8ffc9f486ba0c3a83f65ad7bdfa14653e1acc45..ce73c04fa7297fa2b5e0ec54874f9e3442ad7717 100644 (file)
--- a/plugins/addons/addressbook/main.inc
+++ b/plugins/addons/addressbook/main.inc
@@ -19,9 +19,6 @@
 */
 
 if (!$remove_lock){
-       /* Page header*/
-       $display= print_header(get_template_path('images/addressbook.png'), _("Address book"));
-
        /* Create phonelist object on demand */
        if (!isset($_SESSION['addressbook']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['addressbook']= new addressbook ($config);
@@ -33,9 +30,12 @@ if (!$remove_lock){
     $addressbook->acl= get_module_permission($acl, "addressbook", $ui->dn);
        
        /* Execute formular */
-       $display.= $addressbook->execute ();
+       $display= $addressbook->execute ();
        $display.= "<input type=\"hidden\" name=\"ignore\">\n";
 
+       /* Page header*/
+       $display= print_header(get_template_path('images/addressbook.png'), _("Address book")).$display;
+
        /* Store changes  in session */
        $_SESSION['addressbook']= $addressbook;
 }

diff --git a/plugins/addons/godfs/main.inc b/plugins/addons/godfs/main.inc
index 0d9f69b39d204eca6c80da92b71a919acb4f11da..56fc3c0e4537a38e3d196d30ae161aee4b51f2ea 100644 (file)
--- a/plugins/addons/godfs/main.inc
+++ b/plugins/addons/godfs/main.inc
@@ -15,6 +15,12 @@
      $dfsManagment = $_SESSION['dfsManagment'];
      $output = $dfsManagment->execute();
 
+     # do we have to reset
+     if (isset($_GET['reset']) && $_GET['reset'] == 1) {
+       del_lock ($ui->dn);
+       sess_del('dfsManagment');
+     }
+ 
      # create page header
      if (isset($_SESSION['objectinfo'])) {
        $display = print_header(get_template_path('images/dfs.png'), 
@@ -26,16 +32,9 @@
        $display = print_header(get_template_path('images/dfs.png'),
                                 _("Distributed File System Administration"));
      }
+
+     $display.= $output;
     
-     # create the page
-     $display .= $output;
-     
-     # do we have to reset
-     if (isset($_GET['reset']) && $_GET['reset'] == 1) {
-       del_lock ($ui->dn);
-       sess_del('dfsManagment');
-     }
- 
      # show page
      $_SESSION['dfsManagment'] = $dfsManagment;
   }

diff --git a/plugins/addons/ldapmanager/main.inc b/plugins/addons/ldapmanager/main.inc
index ac00e86fed87593f5950c47d1c7ed3b498a64c82..9c529f2a286dab711dd6e0f20e12786d77eac9a8 100644 (file)
--- a/plugins/addons/ldapmanager/main.inc
+++ b/plugins/addons/ldapmanager/main.inc
@@ -19,9 +19,6 @@
 */
 
 if (!$remove_lock){
-       /* Page header*/
-       $display= print_header(get_template_path('images/ldif.png'), _("LDAP manager"));
-
        /* Create phonelist object on demand */
        if (!isset($_SESSION['ldif']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['ldif']= new ldif ($config);
@@ -35,10 +32,13 @@ if (!$remove_lock){
     $ldif->acl= get_module_permission($acl, "ldapmanager", $ui->dn);
        
        /* Execute formular */
-       $display.= $ldif->execute ();
+       $display= $ldif->execute ();
 
        $display.= "<input type=\"hidden\" name=\"ignore\">\n";
 
+       /* Page header*/
+       $display= print_header(get_template_path('images/ldif.png'), _("LDAP manager")).$display;
+
        /* Store changes  in session */
        $_SESSION['ldif']= $ldif;
 }

diff --git a/plugins/addons/logview/main.inc b/plugins/addons/logview/main.inc
index b37dcb17bbfa0771710e072c7d036309d796722f..8a96e01e1239041c568fa774755ed5b538fde4d2 100644 (file)
--- a/plugins/addons/logview/main.inc
+++ b/plugins/addons/logview/main.inc
@@ -19,9 +19,6 @@
 */
 
 if (!$remove_lock){
-       /* Page header*/
-       $display= print_header(get_template_path('images/logview.png'), _("System log view"));
-
        /* Create logview object on demand */
        if (!isset($_SESSION['logview']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['logview']= new logview ($config);
@@ -29,9 +26,12 @@ if (!$remove_lock){
        $logview= $_SESSION['logview'];
 
        /* Execute formular */
-       $display.= $logview->execute ();
+       $display= $logview->execute ();
        $display.= "<input type=\"hidden\" name=\"ignore\">\n";
 
+       /* Page header*/
+       $display= print_header(get_template_path('images/logview.png'), _("System log view")).$display;
+
        /* Store changes  in session */
        $_SESSION['logview']= $logview;
 }

diff --git a/plugins/addons/mailqueue/main.inc b/plugins/addons/mailqueue/main.inc
index c1214ee2c37c19480f3f1eb3467d226e8d945da3..401812db760f6a6331cd27b194a9aa4bc5a35e35 100644 (file)
--- a/plugins/addons/mailqueue/main.inc
+++ b/plugins/addons/mailqueue/main.inc
@@ -19,9 +19,6 @@
 */
 
 if (!$remove_lock){
-       /* Page header*/
-       $display= print_header(get_template_path('images/mailqueue.png'), _("Mail queue"));
-
        /* Create mailqueue object on demand */
        if (!isset($_SESSION['mailqueue']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['mailqueue']= new mailqueue ($config);
@@ -34,9 +31,12 @@ if (!$remove_lock){
 
        /* Execute formular */
        $mailqueue->save_object();
-       $display.= $mailqueue->execute ();
+       $display= $mailqueue->execute ();
        $display.= "<input type=\"hidden\" name=\"ignore\">\n";
 
+       /* Page header*/
+       $display= print_header(get_template_path('images/mailqueue.png'), _("Mail queue")).$display;
+
        /* Store changes  in session */
        $_SESSION['mailqueue']= $mailqueue;
 }

diff --git a/plugins/admin/fai/main.inc b/plugins/admin/fai/main.inc
index 72c8cd7e41c11673c420cee8634bbb591bf7f760..6616f8e5b762e8c352dfc4f1496c4d4deb55d7c2 100644 (file)
--- a/plugins/admin/fai/main.inc
+++ b/plugins/admin/fai/main.inc
@@ -34,13 +34,6 @@ if ($remove_lock){
        $FAI->save_object();
        $output= $FAI->execute();
 
-       /* Page header*/
-       if (isset($_SESSION['objectinfo'])){
-               $display= print_header(get_template_path('images/fai.png'), _("Fully Automatic Installation"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
-       } else {
-               $display= print_header(get_template_path('images/fai.png'), _("Fully Automatic Installation"));
-       }
-
        /* Reset requested? */
        if (isset($_GET['reset']) && $_GET['reset'] == 1){
                del_lock ($ui->dn);
@@ -49,7 +42,15 @@ if ($remove_lock){
 
        /* Show and save dialog */
        $FAI->save_object();
+
+       /* Page header*/
+       if (isset($_SESSION['objectinfo'])){
+               $display= print_header(get_template_path('images/fai.png'), _("Fully Automatic Installation"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
+       } else {
+               $display= print_header(get_template_path('images/fai.png'), _("Fully Automatic Installation"));
+       }
        $display.= $output;
+
        $_SESSION['FAI']= $FAI;
 }
 

diff --git a/plugins/gofax/blocklists/main.inc b/plugins/gofax/blocklists/main.inc
index 7202169d3a454e55e4626c6e787346ff8217cafe..3e8b13dbddf4e22e0b2376c75b9eefd205f5345c 100644 (file)
--- a/plugins/gofax/blocklists/main.inc
+++ b/plugins/gofax/blocklists/main.inc
@@ -15,21 +15,20 @@ if ($remove_lock){
        $blocklist->save_object();
        $output= $blocklist->execute();
 
-       /* Page header*/
-       if (isset($_SESSION['objectinfo'])){
-               $display= print_header(get_template_path('images/blocklists.png'), _("Blocklist management"), "<img alt=\"\"align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
-       } else {
-               $display= print_header(get_template_path('images/blocklists.png'), _("Blocklist management"));
-       }
-
        /* Reset requested? */
        if (isset($_GET['reset']) && $_GET['reset'] == 1){
                del_lock ($ui->dn);
                sess_del ('blocklist');
        }
 
-       /* Show and save dialog */
+       /* Page header*/
+       if (isset($_SESSION['objectinfo'])){
+               $display= print_header(get_template_path('images/blocklists.png'), _("Blocklist management"), "<img alt=\"\"align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
+       } else {
+               $display= print_header(get_template_path('images/blocklists.png'), _("Blocklist management"));
+       }
        $display.= $output;
+
        $_SESSION['blocklist']= $blocklist;
 }
 ?>