From acddfb773a38b7a167a27fdf95e596e983a8d5b8 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 29 Nov 2003 12:54:00 +0000 Subject: [PATCH] updated to new $_SESSION['header'] --- lam/lib/config.inc | 4 +--- lam/templates/config/conflogin.php | 2 -- lam/templates/config/confmain.php | 2 -- lam/templates/config/confsave.php | 2 -- lam/templates/config/profmanage.php | 2 -- lam/templates/domain.php | 27 +++++++++--------------- lam/templates/initsuff.php | 5 ++--- lam/templates/lists/listdomains.php | 4 +--- lam/templates/lists/listgroups.php | 4 +--- lam/templates/lists/listhosts.php | 4 +--- lam/templates/lists/listusers.php | 4 +--- lam/templates/lists/userlink.php | 4 +--- lam/templates/logout.php | 2 -- lam/templates/main.php | 2 -- lam/templates/main_header.php | 4 ---- lam/templates/ou_edit.php | 6 ------ lam/templates/profedit/profilecreate.php | 4 +--- lam/templates/profedit/profiledelete.php | 5 +---- lam/templates/profedit/profilegroup.php | 4 +--- lam/templates/profedit/profilehost.php | 4 +--- lam/templates/profedit/profilemain.php | 4 ---- lam/templates/profedit/profileuser.php | 4 +--- 22 files changed, 23 insertions(+), 80 deletions(-) diff --git a/lam/lib/config.inc b/lam/lib/config.inc index 7591e138..6a4d5e2f 100644 --- a/lam/lib/config.inc +++ b/lam/lib/config.inc @@ -61,10 +61,8 @@ function getConfigProfiles() { // $page is the URL of the target page function metaRefresh($page) { echo $_SESSION['header']; - echo "\n"; - echo "\n"; - echo "\n"; echo "\n"; + echo "\n"; echo "\n"; echo "\n"; // print link if refresh does not work diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php index 27d6e126..5b03048b 100644 --- a/lam/templates/config/conflogin.php +++ b/lam/templates/config/conflogin.php @@ -68,8 +68,6 @@ echo $_SESSION['header']; ?> - -

diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php index c7931cfe..fe014b3b 100644 --- a/lam/templates/config/confmain.php +++ b/lam/templates/config/confmain.php @@ -98,8 +98,6 @@ echo $_SESSION['header']; echo ("" . _("LDAP Account Manager Configuration") . "\n"); echo ("\n"); -echo "\n"; -echo "\n"; echo ("\n"); echo ("\n"); echo ("

". diff --git a/lam/templates/config/confsave.php b/lam/templates/config/confsave.php index b6496053..e3977a61 100644 --- a/lam/templates/config/confsave.php +++ b/lam/templates/config/confsave.php @@ -73,8 +73,6 @@ echo $_SESSION['header']; echo "listusers\n"; echo "\n"; -echo "\n"; -echo "\n"; echo "\n"; echo ("

". diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php index 9d6d55b2..ca499241 100644 --- a/lam/templates/config/profmanage.php +++ b/lam/templates/config/profmanage.php @@ -42,8 +42,6 @@ echo $_SESSION['header']; ?> - -

diff --git a/lam/templates/domain.php b/lam/templates/domain.php index 4db48729..0da31820 100644 --- a/lam/templates/domain.php +++ b/lam/templates/domain.php @@ -59,12 +59,8 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) { } // display page echo $_SESSION['header']; - echo "\n"; - echo "\n"; echo "Domain Management\n"; echo "\n"; - echo "\n"; - echo "\n"; echo "\n"; echo "\n"; // print message, if needed @@ -86,7 +82,7 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) { } else echo "\n"; echo "\n"; - echo ("" . _("Help") . "\n"); + echo ("" . _("Help") . "\n"); echo "\n"; echo "\n"; echo "  \n"; @@ -102,7 +98,7 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) { } else echo "\n"; echo "\n"; - echo ("" . _("Help") . "\n"); + echo ("" . _("Help") . "\n"); echo "\n"; echo "\n"; echo "  \n"; @@ -113,7 +109,7 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) { echo "\n"; echo "nextRID . "\">\n"; echo "\n"; - echo ("" . _("Help") . "\n"); + echo ("" . _("Help") . "\n"); echo "\n"; // next user RID echo "\n"; @@ -121,7 +117,7 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) { echo "\n"; echo "nextUserRID . "\">\n"; echo "\n"; - echo ("" . _("Help") . "\n"); + echo ("" . _("Help") . "\n"); echo "\n"; // next group RID echo "\n"; @@ -129,7 +125,7 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) { echo "\n"; echo "nextGroupRID . "\">\n"; echo "\n"; - echo ("" . _("Help") . "\n"); + echo ("" . _("Help") . "\n"); echo "\n"; echo "\n"; echo "  \n"; @@ -141,7 +137,7 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) { if ($_GET['action'] == "edit") echo $domain->RIDbase . "\n"; else echo "RIDbase . "\">\n"; echo "\n"; - echo ("" . _("Help") . "\n"); + echo ("" . _("Help") . "\n"); echo "\n"; echo "\n"; echo "  \n"; @@ -159,7 +155,7 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) { } echo ""; echo "\n"; - echo ("" . _("Help") . "\n"); + echo ("" . _("Help") . "\n"); echo "\n"; echo "\n"; echo "  \n"; @@ -192,8 +188,7 @@ elseif ($_GET['action'] == "delete") { $DNs = str_replace("\\'", "", $_GET['DN']); $DNs = explode(";", $DNs); // display page - echo "\n"; - echo "\n"; + echo $_SESSION['header']; echo "Domain Management\n"; echo "\n"; echo "\n"; @@ -219,8 +214,7 @@ elseif ($_GET['action'] == "delete") { // save domain elseif ($_POST['sub_save']) { - echo "\n"; - echo "\n"; + echo $_SESSION['header']; echo "Domain Management\n"; echo "\n"; echo "\n"; @@ -297,8 +291,7 @@ elseif ($_POST['sub_back']) { elseif ($_POST['sub_delete']) { $DNs = explode(";", $_POST['delDN']); // display page - echo "\n"; - echo "\n"; + echo $_SESSION['header']; echo "Domain Management\n"; echo "\n"; echo "\n"; diff --git a/lam/templates/initsuff.php b/lam/templates/initsuff.php index 9f3a4292..6096f36d 100644 --- a/lam/templates/initsuff.php +++ b/lam/templates/initsuff.php @@ -125,8 +125,7 @@ if ($_POST['add_suff'] || $_POST['cancel']) { } } echo $_SESSION['header']; - echo "\n"; - echo "initsuff\n"; + echo "initsuff\n"; echo "\n"; echo "\n\n"; // print error/success messages @@ -177,7 +176,7 @@ $new_suff = str_replace("\\'", "", $new_suff); $new_suff = explode(";", $new_suff); echo $_SESSION['header']; -echo "initsuff\n"; +echo "initsuff\n"; echo "\n"; echo "\n"; echo "

 

\n"; diff --git a/lam/templates/lists/listdomains.php b/lam/templates/lists/listdomains.php index af456f69..2511ad9d 100644 --- a/lam/templates/lists/listdomains.php +++ b/lam/templates/lists/listdomains.php @@ -59,10 +59,8 @@ if ($_POST['new_domain'] || $_POST['del_domain']){ } echo $_SESSION['header']; -echo "listdomains\n"; +echo "listdomains\n"; echo "\n"; -echo "\n"; -echo "\n"; echo "\n"; echo "\n"; diff --git a/lam/templates/lists/listgroups.php b/lam/templates/lists/listgroups.php index 0c9e1363..5ad17c0d 100644 --- a/lam/templates/lists/listgroups.php +++ b/lam/templates/lists/listgroups.php @@ -85,10 +85,8 @@ if ($_POST['new_group'] || $_POST['del_group'] || $_POST['pdf_group'] || $_POST[ } echo $_SESSION['header']; -echo "listgroups\n"; +echo "listgroups\n"; echo "\n"; -echo "\n"; -echo "\n"; echo "\n"; echo "\n"; diff --git a/lam/templates/lists/listhosts.php b/lam/templates/lists/listhosts.php index d1db5cc1..1698833a 100644 --- a/lam/templates/lists/listhosts.php +++ b/lam/templates/lists/listhosts.php @@ -79,10 +79,8 @@ if ($_POST['new_host'] || $_POST['del_host'] || $_POST['pdf_host'] || $_POST['pd } echo $_SESSION['header']; -echo "listhosts\n"; +echo "listhosts\n"; echo "\n"; -echo "\n"; -echo "\n"; echo "\n"; echo "\n"; diff --git a/lam/templates/lists/listusers.php b/lam/templates/lists/listusers.php index 3dc70b14..2bd466e4 100644 --- a/lam/templates/lists/listusers.php +++ b/lam/templates/lists/listusers.php @@ -113,10 +113,8 @@ if ($_POST['new_user'] || $_POST['del_user'] || $_POST['pdf_user'] || $_POST['pd echo $_SESSION['header']; -echo "listusers\n"; +echo "listusers\n"; echo "\n"; -echo "\n"; -echo "\n"; echo "\n"; echo "\n"; diff --git a/lam/templates/lists/userlink.php b/lam/templates/lists/userlink.php index 9ddb3494..cb83ca1a 100644 --- a/lam/templates/lists/userlink.php +++ b/lam/templates/lists/userlink.php @@ -47,10 +47,8 @@ if ($dn) { else { // print error message if user was not found echo $_SESSION['header']; - echo "userlink\n"; + echo "userlink\n"; echo "\n"; - echo "\n"; - echo "\n"; echo "\n"; StatusMessage("ERROR", "", _("This user was not found!") . " (" . $user . ")"); echo "

 

"; diff --git a/lam/templates/logout.php b/lam/templates/logout.php index 068f97b7..560f7cbc 100644 --- a/lam/templates/logout.php +++ b/lam/templates/logout.php @@ -48,8 +48,6 @@ unset($_SESSION); // print logout message ?> - - <?php echo _("Logout"); ?> diff --git a/lam/templates/main.php b/lam/templates/main.php index f85eeacb..319ad4cd 100644 --- a/lam/templates/main.php +++ b/lam/templates/main.php @@ -52,8 +52,6 @@ if ($_SESSION['config']->is_samba3()) { } echo $_SESSION['header']; -echo ("\n"); -echo ("\n"); echo ("LDAP Account Manager\n"); echo (""); echo ("\n"); diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php index c6916ff0..607b0ac6 100644 --- a/lam/templates/main_header.php +++ b/lam/templates/main_header.php @@ -31,12 +31,8 @@ session_save_path("../sess"); setlanguage(); echo $_SESSION['header']; - ?> - - - diff --git a/lam/templates/ou_edit.php b/lam/templates/ou_edit.php index a44cf4ca..4b11b3e7 100644 --- a/lam/templates/ou_edit.php +++ b/lam/templates/ou_edit.php @@ -297,8 +297,6 @@ if ($_POST['submit']) { // print header echo $_SESSION['header']; - echo ("\n"); - echo ("\n"); echo ("OU-Editor\n"); echo ("\n"); echo ("\n"); @@ -330,12 +328,8 @@ function display_main() { // display main page echo $_SESSION['header']; - echo ("\n"); - echo ("\n"); echo ("OU-Editor\n"); echo ("\n"); - echo "\n"; - echo "\n"; echo ("\n"); echo ("\n"); echo ("
\n"); diff --git a/lam/templates/profedit/profilecreate.php b/lam/templates/profedit/profilecreate.php index ce945e56..30c30cff 100644 --- a/lam/templates/profedit/profilecreate.php +++ b/lam/templates/profedit/profilecreate.php @@ -50,9 +50,7 @@ if (!$_SESSION['ldap'] || !$_SESSION['ldap']->server()) { // print header echo $_SESSION['header']; -echo "\n\n\n"; -echo "\n"; -echo "\n"; +echo "\n\n"; echo "\n\n
\n"; // save user profile diff --git a/lam/templates/profedit/profiledelete.php b/lam/templates/profedit/profiledelete.php index a198a792..9a2c82c4 100644 --- a/lam/templates/profedit/profiledelete.php +++ b/lam/templates/profedit/profiledelete.php @@ -41,11 +41,8 @@ if (!$_SESSION['ldap'] || !$_SESSION['ldap']->server()) { // print standard header echo $_SESSION['header']; -echo ("\n"); -echo ("" . _("Delete User Profile") . "\n"); +echo ("" . _("Delete User Profile") . "\n"); echo "\n"; -echo "\n"; -echo "\n"; echo ("\n\n


\n"); // check if admin has submited delete operation diff --git a/lam/templates/profedit/profilegroup.php b/lam/templates/profedit/profilegroup.php index 4c1b8547..26803d32 100644 --- a/lam/templates/profedit/profilegroup.php +++ b/lam/templates/profedit/profilegroup.php @@ -49,9 +49,7 @@ if ($_SESSION['config']->get_scriptPath()) { // print header echo $_SESSION['header']; -echo "\n\n\n"; -echo "\n"; -echo "\n"; +echo "\n\n"; echo "
\n"; $acct = new Account(); diff --git a/lam/templates/profedit/profilehost.php b/lam/templates/profedit/profilehost.php index 2c7df321..f0c34e46 100644 --- a/lam/templates/profedit/profilehost.php +++ b/lam/templates/profedit/profilehost.php @@ -42,9 +42,7 @@ if (!$_SESSION['ldap'] || !$_SESSION['ldap']->server()) { // print header echo $_SESSION['header']; -echo "\n\n\n"; -echo "\n"; -echo "\n"; +echo "\n\n"; echo "
\n"; $acct = new Account(); diff --git a/lam/templates/profedit/profilemain.php b/lam/templates/profedit/profilemain.php index 39bc43d2..ff51da1c 100644 --- a/lam/templates/profedit/profilemain.php +++ b/lam/templates/profedit/profilemain.php @@ -115,12 +115,8 @@ for ($i = 0; $i < sizeof($hstprof); $i++) { echo $_SESSION['header']; ?> - - LDAP Account Manager - -

diff --git a/lam/templates/profedit/profileuser.php b/lam/templates/profedit/profileuser.php index 3180e437..6e11cdba 100644 --- a/lam/templates/profedit/profileuser.php +++ b/lam/templates/profedit/profileuser.php @@ -49,9 +49,7 @@ if ($_SESSION['config']->get_scriptPath()) { // print header echo $_SESSION['header']; -echo "\n\n\n"; -echo "\n"; -echo "\n"; +echo "\n\n"; echo "
\n"; $acct = new Account();