diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php
index 4af4ba6d..1bafacf0 100644
--- a/lam/templates/config/conflogin.php
+++ b/lam/templates/config/conflogin.php
@@ -58,8 +58,7 @@ session_unregister('samba3');
session_unregister('domainSID');
session_unregister('filename');
-echo ("");
-echo ("");
+echo $_SESSION['header'];
?>
diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php
index 6222e73e..1b9239b8 100644
--- a/lam/templates/config/confmain.php
+++ b/lam/templates/config/confmain.php
@@ -101,8 +101,7 @@ if (!(($conf->get_Passwd()) == $passwd)) {
exit;
}
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
echo ("\n");
echo ("\n");
diff --git a/lam/templates/config/confsave.php b/lam/templates/config/confsave.php
index 65d36bd3..f3c4255d 100644
--- a/lam/templates/config/confsave.php
+++ b/lam/templates/config/confsave.php
@@ -68,8 +68,7 @@ if ($passwd != $conf->get_Passwd()) {
exit;
}
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
echo "listusers\n";
echo "\n";
diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php
index 55335726..b0c23ed8 100644
--- a/lam/templates/config/profmanage.php
+++ b/lam/templates/config/profmanage.php
@@ -32,8 +32,7 @@ session_save_path("../../sess");
setlanguage();
-echo ("");
-echo ("");
+echo $_SESSION['header'];
?>
diff --git a/lam/templates/domain.php b/lam/templates/domain.php
index 26315f35..4f744c7f 100644
--- a/lam/templates/domain.php
+++ b/lam/templates/domain.php
@@ -31,9 +31,6 @@ session_save_path("../sess");
setlanguage();
-echo ("\n");
-echo ("\n");
-
// add/edit domain
if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) {
@@ -59,6 +56,7 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) {
$domain_suffix = $_SESSION['config']->get_domainSuffix();
}
// display page
+ echo $_SESSION['header'];
echo "\n";
echo "\n";
echo "Domain Management\n";
diff --git a/lam/templates/initsuff.php b/lam/templates/initsuff.php
index 12d7bff9..0eb61d86 100644
--- a/lam/templates/initsuff.php
+++ b/lam/templates/initsuff.php
@@ -88,8 +88,7 @@ $new_suff = $_GET['suffs'];
$new_suff = str_replace("\\'", "", $new_suff);
$new_suff = explode(";", $new_suff);
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
echo "initsuff\n";
echo "\n";
echo "\n";
diff --git a/lam/templates/lists/listdomains.php b/lam/templates/lists/listdomains.php
index f9a4671a..2f839e41 100644
--- a/lam/templates/lists/listdomains.php
+++ b/lam/templates/lists/listdomains.php
@@ -60,8 +60,7 @@ if ($_POST['new_domain'] || $_POST['del_domain']){
exit;
}
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
echo "listdomains\n";
echo "\n";
echo "\n";
diff --git a/lam/templates/lists/listgroups.php b/lam/templates/lists/listgroups.php
index b4246f9c..9267fc74 100644
--- a/lam/templates/lists/listgroups.php
+++ b/lam/templates/lists/listgroups.php
@@ -60,8 +60,7 @@ if ($_POST['new_group'] || $_POST['del_group']){
exit;
}
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
echo "listgroups\n";
echo "\n";
echo "\n";
diff --git a/lam/templates/lists/listhosts.php b/lam/templates/lists/listhosts.php
index faa5294d..5870e29b 100644
--- a/lam/templates/lists/listhosts.php
+++ b/lam/templates/lists/listhosts.php
@@ -60,8 +60,7 @@ if ($_POST['new_host'] || $_POST['del_host']){
exit;
}
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
echo "listhosts\n";
echo "\n";
echo "\n";
diff --git a/lam/templates/lists/listusers.php b/lam/templates/lists/listusers.php
index 46fbaa57..6633412d 100644
--- a/lam/templates/lists/listusers.php
+++ b/lam/templates/lists/listusers.php
@@ -36,10 +36,6 @@ setlanguage();
// copy HTTP-GET variables to HTTP-POST
$_POST = $_POST + $_GET;
-// insert header for html file
-echo "\n";
-echo "\n";
-
$usr_units = $_SESSION['usr_units'];
session_register('usr_units');
@@ -60,7 +56,7 @@ if ($_POST['new_user'] || $_POST['del_user']){
exit;
}
-
+echo $_SESSION['header'];
echo "listusers\n";
echo "\n";
diff --git a/lam/templates/lists/userlink.php b/lam/templates/lists/userlink.php
index a3565a34..5be2950f 100644
--- a/lam/templates/lists/userlink.php
+++ b/lam/templates/lists/userlink.php
@@ -46,8 +46,7 @@ if ($dn) {
}
else {
// print error message if user was not found
- echo ("\n");
- echo ("\n");
+ echo $_SESSION['header'];
echo "userlink\n";
echo "\n";
echo "\n";
diff --git a/lam/templates/logout.php b/lam/templates/logout.php
index b21fa731..e0851624 100644
--- a/lam/templates/logout.php
+++ b/lam/templates/logout.php
@@ -42,8 +42,7 @@ session_destroy();
// print logout message
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
?>
diff --git a/lam/templates/main.php b/lam/templates/main.php
index 2e6d91f1..635a9deb 100644
--- a/lam/templates/main.php
+++ b/lam/templates/main.php
@@ -52,8 +52,7 @@ if ($conf->Suff_map && ($conf->Suff_map != "")) {
if (!$res) $new_suffs[] = $conf->Suff_map;
}
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
echo ("\n");
echo ("\n");
echo ("LDAP Account Manager\n");
diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php
index 21d2df70..69239b7e 100644
--- a/lam/templates/main_header.php
+++ b/lam/templates/main_header.php
@@ -30,8 +30,7 @@ session_save_path("../sess");
setlanguage();
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
?>
diff --git a/lam/templates/ou_edit.php b/lam/templates/ou_edit.php
index 895c5cdb..8c1ac3d6 100644
--- a/lam/templates/ou_edit.php
+++ b/lam/templates/ou_edit.php
@@ -231,8 +231,7 @@ if ($_POST['submit']) {
}
// print header
- echo ("\n");
- echo ("\n");
+ echo $_SESSION['header'];
echo ("\n");
echo ("\n");
echo ("OU-Editor\n");
@@ -264,8 +263,7 @@ function display_main() {
$hst_units = $_SESSION['ldap']->search_units($_SESSION["config"]->get_HostSuffix());
// display main page
- echo ("\n");
- echo ("\n");
+ echo $_SESSION['header'];
echo ("\n");
echo ("\n");
echo ("OU-Editor\n");
diff --git a/lam/templates/profedit/profilecreate.php b/lam/templates/profedit/profilecreate.php
index 84de80c7..fa3e02b1 100644
--- a/lam/templates/profedit/profilecreate.php
+++ b/lam/templates/profedit/profilecreate.php
@@ -46,8 +46,7 @@ if (!$_SESSION['ldap'] || !$_SESSION['ldap']->server()) {
}
// print header
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
echo ("\n\n\n
\n");
// save user profile
diff --git a/lam/templates/profedit/profiledelete.php b/lam/templates/profedit/profiledelete.php
index b87d22bc..447ea269 100644
--- a/lam/templates/profedit/profiledelete.php
+++ b/lam/templates/profedit/profiledelete.php
@@ -37,12 +37,11 @@ if (!$_SESSION['ldap'] || !$_SESSION['ldap']->server()) {
}
// print standard header
-echo ("\n");
-echo ("\n");
-echo ("");
+echo $_SESSION['header'];
+echo ("\n");
echo ("" . _("Delete User Profile") . "\n");
echo "\n";
-echo ("\n\n
");
+echo ("\n\n
\n");
// check if admin has submited delete operation
if ($_POST['submit']) {
diff --git a/lam/templates/profedit/profilehost.php b/lam/templates/profedit/profilehost.php
index 2ca55ec9..9393689e 100644
--- a/lam/templates/profedit/profilehost.php
+++ b/lam/templates/profedit/profilehost.php
@@ -38,8 +38,7 @@ if (!$_SESSION['ldap'] || !$_SESSION['ldap']->server()) {
}
// print header
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
echo ("\n\n\n
\n");
$acct = new Account();
diff --git a/lam/templates/profedit/profilemain.php b/lam/templates/profedit/profilemain.php
index 8fa0db03..44c23f55 100644
--- a/lam/templates/profedit/profilemain.php
+++ b/lam/templates/profedit/profilemain.php
@@ -86,8 +86,7 @@ for ($i = 0; $i < sizeof($hstprof); $i++) {
$hostprofiles = $hostprofiles . "\n";
}
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
?>
diff --git a/lam/templates/profedit/profileuser.php b/lam/templates/profedit/profileuser.php
index b140b713..2be478f0 100644
--- a/lam/templates/profedit/profileuser.php
+++ b/lam/templates/profedit/profileuser.php
@@ -38,8 +38,7 @@ if (!$_SESSION['ldap'] || !$_SESSION['ldap']->server()) {
}
// print header
-echo ("\n");
-echo ("\n");
+echo $_SESSION['header'];
echo ("\n\n\n
\n");
$acct = new Account();