diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc index 885ba170..2c206f77 100644 --- a/lam/lib/lists.inc +++ b/lam/lib/lists.inc @@ -161,8 +161,8 @@ class lamList { $this->entries = $this->listSort($this->entries); } // show form - echo ("
type . "&norefresh=true\" method=\"post\">\n"); echo "
"; + echo ("type . "&norefresh=true\" method=\"post\">\n"); // draw account list if accounts were found if (sizeof($this->entries) > 0) { // buttons @@ -701,9 +701,9 @@ class lamList { /** * Prints the HTML footer. */ - protected function listPrintFooter() { - echo ("
\n"); - echo "\n"; + protected function listPrintFooter() { + echo ("\n"); + include '../main_footer.php'; } /** diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index 424f2284..8a6aeabb 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -910,8 +910,8 @@ function parseHtml($module, $input, $values, $restricted, &$tabindex, $scope) { } echo "\n"; } + echo "\n"; } - echo "\n"; return $ret; } @@ -1227,8 +1227,7 @@ class accountContainer { call_user_func_array("StatusMessage", $result[$i]); } if ($stopProcessing) { - echo "\n"; - echo "\n"; + $this->printPageFooter(); return; } } @@ -1439,8 +1438,7 @@ class accountContainer { */ private function printPageFooter() { echo "\n"; - echo "\n"; - echo "\n"; + include '../main_footer.php'; } /** @@ -1501,7 +1499,7 @@ class accountContainer { private function printModuleTabs() { // $x is used to count up tabindex $x=1; - echo '
'; + echo '
'; echo '
+ + diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php index bfaf8cdb..0edebcff 100644 --- a/lam/templates/main_header.php +++ b/lam/templates/main_header.php @@ -74,7 +74,7 @@ while ($jsEntry = $jsDir->read()) {
-
+
    0)) { // show links for upload and LDIF export echo "

    " . _("LAM has checked your input and is now ready to create the accounts.") . "

    \n"; echo "

     

    \n"; - echo "

    \n"; echo "\n"; echo "\n"; echo "
    \n"; echo "" . _("Upload accounts to LDAP") . ""; @@ -202,7 +201,6 @@ if ($_FILES['inputfile'] && ($_FILES['inputfile']['size'] > 0)) { echo "" . _("Show LDIF file") . ""; echo "
    \n"; - echo "

    \n"; } } } @@ -212,8 +210,6 @@ else { echo '
    ' . _('Back') . ''; } -echo "\n"; -echo "\n"; - +include 'main_footer.php'; ?> \ No newline at end of file diff --git a/lam/templates/massDoUpload.php b/lam/templates/massDoUpload.php index b7215c49..b35aa966 100644 --- a/lam/templates/massDoUpload.php +++ b/lam/templates/massDoUpload.php @@ -117,12 +117,11 @@ if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_po echo "\n"; - echo ""; + include 'main_footer.php'; } // all accounts have been created else { $_SESSION['cache']->refresh_cache(true); - echo "\n\n"; echo "

    " . _("LDAP upload has finished") . "

    \n"; if (sizeof($_SESSION['mass_errors']) > 0) { echo "

    " . _("There were errors while uploading:") . "

    \n"; @@ -130,7 +129,7 @@ else { call_user_func_array('StatusMessage', $_SESSION['mass_errors'][$i]); } } - echo ""; + include 'main_footer.php'; } diff --git a/lam/templates/masscreate.php b/lam/templates/masscreate.php index 50a72558..e7097911 100644 --- a/lam/templates/masscreate.php +++ b/lam/templates/masscreate.php @@ -197,9 +197,7 @@ echo "\n"; echo "\n"; -echo "\n"; -echo "\n"; - +include 'main_footer.php'; /** * Displays the acount type specific main page of the upload. @@ -369,8 +367,7 @@ function showMainPage($scope, $selectedModules) { echo "" . _("Download sample CSV file") . "\n"; echo "

    \n"; - echo "\n"; - echo "\n"; + include 'main_footer.php'; die; } diff --git a/lam/templates/ou_edit.php b/lam/templates/ou_edit.php index 3b3ead2f..45656a72 100644 --- a/lam/templates/ou_edit.php +++ b/lam/templates/ou_edit.php @@ -112,7 +112,7 @@ if (isset($_POST['createOU']) || isset($_POST['deleteOU'])) { "\n" . "\n" . ""; - echo "\n"; + include 'main_footer.php'; exit(); } else { @@ -196,5 +196,5 @@ function display_main($message, $error) { echo ("
    \n"); echo ("\n"); - echo ("\n"); + include 'main_footer.php'; } diff --git a/lam/templates/pdfedit/pdfdelete.php b/lam/templates/pdfedit/pdfdelete.php index 551ab1a8..bae51b87 100644 --- a/lam/templates/pdfedit/pdfdelete.php +++ b/lam/templates/pdfedit/pdfdelete.php @@ -92,4 +92,5 @@ echo ("\n") echo ("\n"); echo (""); echo (""); -echo ("

    \n"); +echo ("

    \n"); +include '../main_footer.php'; diff --git a/lam/templates/pdfedit/pdfmain.php b/lam/templates/pdfedit/pdfmain.php index 65f1b981..a6e53868 100644 --- a/lam/templates/pdfedit/pdfmain.php +++ b/lam/templates/pdfedit/pdfmain.php @@ -185,5 +185,6 @@ include '../main_header.php';
    - - + diff --git a/lam/templates/pdfedit/pdfpage.php b/lam/templates/pdfedit/pdfpage.php index 32d47832..6656d02e 100644 --- a/lam/templates/pdfedit/pdfpage.php +++ b/lam/templates/pdfedit/pdfpage.php @@ -697,10 +697,10 @@ foreach($_SESSION['currentPDFStructure'] as $key => $entry) {


    - -\n"); echo ("\n"); echo (""); echo (""); -echo ("

    \n"); +echo ("

    \n"); +include '../main_footer.php'; diff --git a/lam/templates/profedit/profilemain.php b/lam/templates/profedit/profilemain.php index 68fb719a..85704ca8 100644 --- a/lam/templates/profedit/profilemain.php +++ b/lam/templates/profedit/profilemain.php @@ -176,7 +176,6 @@ echo "\n"; echo "
    \n"; echo "\n"; -echo "\n"; -echo "\n"; +include '../main_footer.php'; ?> diff --git a/lam/templates/profedit/profilepage.php b/lam/templates/profedit/profilepage.php index 1bd54a12..2022bebb 100644 --- a/lam/templates/profedit/profilepage.php +++ b/lam/templates/profedit/profilepage.php @@ -117,6 +117,7 @@ if (isset($_POST['save'])) { // print header include '../main_header.php'; +echo "
    \n"; // print error messages if any if (sizeof($errors) > 0) { @@ -260,6 +261,7 @@ echo ("\n"; echo "



    \n"; -echo ("\n"); +echo ("\n"); +include '../main_footer.php'; ?> diff --git a/lam/templates/schema/schema.php b/lam/templates/schema/schema.php index 7ea2ef88..ccdd93b0 100644 --- a/lam/templates/schema/schema.php +++ b/lam/templates/schema/schema.php @@ -431,10 +431,10 @@ if( $view == 'syntaxes' ) { - - - - - diff --git a/lam/templates/serverInfo.php b/lam/templates/serverInfo.php index 2754d77b..c07ed054 100644 --- a/lam/templates/serverInfo.php +++ b/lam/templates/serverInfo.php @@ -125,8 +125,6 @@ if ($vendorversion != '') { echo "
    \n"; - -echo "\n"; -echo "\n"; +include 'main_footer.php'; ?> diff --git a/lam/templates/tests/index.php b/lam/templates/tests/index.php index 7d26b162..31e92261 100644 --- a/lam/templates/tests/index.php +++ b/lam/templates/tests/index.php @@ -56,8 +56,6 @@ echo "" . _("Check if the LDAP schema fits the requi echo "\n"; - -echo "\n"; -echo "\n"; +include '../main_footer.php'; ?> diff --git a/lam/templates/tests/lamdaemonTest.php b/lam/templates/tests/lamdaemonTest.php index 417e192b..71dcd420 100644 --- a/lam/templates/tests/lamdaemonTest.php +++ b/lam/templates/tests/lamdaemonTest.php @@ -106,9 +106,7 @@ else { } -echo "\n"; -echo "\n"; - +include '../main_footer.php'; /** @@ -133,11 +131,11 @@ function lamTestLamdaemon($command, $stopTest, $handle, $testText) { $lamdaemonOk = true; } if ($lamdaemonOk) { - echo "" . $okImage . ""; + echo "" . $okImage . "  "; echo "" . _("Lamdaemon successfully run.") . ""; } else { - echo "" . $failImage . "  \n"; + echo "" . $failImage . "  \n"; echo "\n"; if (!(strpos($output, 'ERROR,') === 0) && !(strpos($output, 'WARN,') === 0)) { // error messages from console (e.g. sudo) @@ -168,7 +166,7 @@ function lamRunLamdaemonTestSuite($serverName, $serverTitle, $testQuota) { $okImage = "\"\"\n"; $failImage = "\"\"\n"; - echo "\n"; + echo "
    \n"; flush(); $stopTest = false; @@ -182,12 +180,12 @@ function lamRunLamdaemonTestSuite($serverName, $serverTitle, $testQuota) { echo ""; } elseif (($_SESSION['config']->get_scriptPath() == null) || (strlen($_SESSION['config']->get_scriptPath()) < 10)) { - echo "\n"; + echo "\n"; echo ""; $stopTest = true; } else { - echo "\n"; + echo "\n"; echo ""; } echo "\n"; @@ -208,11 +206,11 @@ function lamRunLamdaemonTestSuite($serverName, $serverTitle, $testQuota) { } } if ($unixOk) { - echo "\n"; + echo "\n"; echo ""; } else { - echo "\n"; + echo "\n"; echo ""; $stopTest = true; } @@ -233,11 +231,11 @@ function lamRunLamdaemonTestSuite($serverName, $serverTitle, $testQuota) { } } if ($sshOk) { - echo ""; + echo ""; echo ""; } else { - echo "\n"; + echo "\n"; echo ""; $stopTest = true; } diff --git a/lam/templates/tests/schemaTest.php b/lam/templates/tests/schemaTest.php index 6f30e719..1a77bf56 100644 --- a/lam/templates/tests/schemaTest.php +++ b/lam/templates/tests/schemaTest.php @@ -54,7 +54,7 @@ $classes = get_cached_schema('objectclasses'); if (!is_array($classes)) { StatusMessage('ERROR', _('Unable to retrieve schema!'), _('You do not have the required access rights or the LDAP schema is not published by your server.')); - echo "\n"; + include '../main_footer.php'; die(); } @@ -85,8 +85,7 @@ for ($t = 0; $t < sizeof($types); $t++) { echo "
    " . _("No lamdaemon server set, please update your LAM configuration settings.") . "" . $failImage . "  " . $failImage . "  " . _("No lamdaemon path set, please update your LAM configuration settings.") . "" . $okImage . "  " . $okImage . "  " . sprintf(_("Using %s as lamdaemon remote server."), $serverName) . "
    " . $okImage . "" . $okImage . "  " . sprintf(_("Using %s to connect to remote server."), $userName) . "" . $failImage . "  " . $failImage . "  " . sprintf(_("Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"), $credentials[0]) . "" . $okImage . "" . $okImage . "  " . _("SSH connection could be established.") . "" . $failImage . "  " . $failImage . "  " . _("Unable to connect to remote server!") . "
    \n
    "; } -echo "\n"; -echo "\n"; +include '../main_footer.php'; /** * Checks if the object classes and attributes for this module are available. diff --git a/lam/templates/tools.php b/lam/templates/tools.php index 6b6f67e3..0e1c6c05 100644 --- a/lam/templates/tools.php +++ b/lam/templates/tools.php @@ -89,7 +89,6 @@ for ($i = 0; $i < sizeof($tools); $i++) { echo "\n"; -echo "\n"; -echo "\n"; +include 'main_footer.php'; ?> diff --git a/lam/templates/tree/treeViewContainer.php b/lam/templates/tree/treeViewContainer.php index c1022fe0..95393cf9 100644 --- a/lam/templates/tree/treeViewContainer.php +++ b/lam/templates/tree/treeViewContainer.php @@ -58,6 +58,8 @@ jQuery('#tab_tree').addClass('ui-tabs-selected'); jQuery('#tab_tree').addClass('ui-state-active'); -
- - +
+ +