diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc index 3e427dcb..f8ba2574 100644 --- a/lam/lib/lists.inc +++ b/lam/lib/lists.inc @@ -162,6 +162,7 @@ class lamList { } // show form echo ("
type . "&norefresh=true\" method=\"post\">\n"); + echo "
"; // draw account list if accounts were found if (sizeof($this->entries) > 0) { // buttons @@ -267,30 +268,34 @@ class lamList { * @param integer $count number of account entries */ protected function listDrawNavigationBar($count) { - echo("type . "nav\" width=\"100%\" border=\"0\">\n"); echo("\n"); - echo(""); - echo(""); - echo("
  "); - if ($this->page != 1) { - echo("type . "&norefresh=true&page=" . ($this->page - 1) . - "&sort=" . $this->sortColumn . "&sortdirection=" . $this->sortDirection . $this->filterText . "\">" . - "\"back\"\n"); - } - - if ($this->page < ($count / $this->maxPageEntries)) { - echo("type . "&norefresh=true&page=" . ($this->page + 1) . - "&sort=" . $this->sortColumn . "&sortdirection=" . $this->sortDirection . $this->filterText . "\">" . - "\"forward\"\n"); - } + echo("  "); echo("type . "nav-text\">"); + echo("type . "nav-text\">"); echo" "; printf($this->labels['nav'], $count); echo("type . "nav-activepage\" align=\"right\">"); - for ($i = 0; $i < ($count / $this->maxPageEntries); $i++) { + echo("type . "nav-activepage\" align=\"right\">"); + if ($this->page != 1) { + echo("type . "&norefresh=true&page=1" . + "&sort=" . $this->sortColumn . "&sortdirection=" . $this->sortDirection . $this->filterText . "\">" . + "\"\"\n"); + } + if ($this->page > 10) { + echo("type . "&norefresh=true&page=" . ($this->page - 10) . + "&sort=" . $this->sortColumn . "&sortdirection=" . $this->sortDirection . $this->filterText . "\">" . + "\"\"\n"); + } + for ($i = $this->page - 5; $i < ($this->page + 4); $i++) { + if ($i >= ($count / $this->maxPageEntries)) { + break; + } + elseif ($i < 0) { + continue; + } if ($i == $this->page - 1) { echo(" " . ($i + 1)); } @@ -299,6 +304,16 @@ class lamList { "&sort=" . $this->sortColumn . "&sortdirection=" . $this->sortDirection . $this->filterText . "\">" . ($i + 1) . "\n"); } } + if ($this->page < (($count / $this->maxPageEntries) - 10)) { + echo("type . "&norefresh=true&page=" . ($this->page + 10) . + "&sort=" . $this->sortColumn . "&sortdirection=" . $this->sortDirection . $this->filterText . "\">" . + "\"\"\n"); + } + if ($this->page < ($count / $this->maxPageEntries)) { + echo("type . "&norefresh=true&page=" . ($count / $this->maxPageEntries) . + "&sort=" . $this->sortColumn . "&sortdirection=" . $this->sortDirection . $this->filterText . "\">" . + "\"\"\n"); + } echo("
\n"); } @@ -390,7 +405,7 @@ class lamList { echo "type . "list-bright\">\n"; echo "\"select\n"; echo " " . - "" . _("Select all") . "\n"; + "" . _("Select all") . "\n"; echo "\n"; echo (""); } @@ -575,7 +590,8 @@ class lamList { echo "
\n"; echo "type . "&norefresh=true\" method=\"post\">\n"; - + echo "
"; + echo '
' . _('Create PDF file') . '
'; echo ''; echo ''; @@ -617,7 +633,7 @@ class lamList { echo ''; echo ''; echo ''; echo '
'; echo ' '; - echo ''; + echo ' ' . _('Cancel') . ''; echo '
'; @@ -693,7 +709,7 @@ class lamList { * Prints the HTML footer. */ protected function listPrintFooter() { - echo ("\n"); + echo ("
\n"); echo "\n"; } @@ -826,6 +842,7 @@ class lamList { echo '

' . _('Change list settings') . "

\n"; echo "
type . "&norefresh=true\" method=\"post\">\n"; + echo "
"; echo '

'; echo "type . "edit\" width=\"100%\">\n"; echo "type . "list\">
\n"; diff --git a/lam/lib/selfService.inc b/lam/lib/selfService.inc index 51476771..8d6672ad 100644 --- a/lam/lib/selfService.inc +++ b/lam/lib/selfService.inc @@ -305,7 +305,7 @@ class selfServiceProfile { $this->LDAPUser = ""; $this->LDAPPassword = ""; $this->searchAttribute = "uid"; - $this->pageHeader = '

LDAP Account Manager

'; + $this->pageHeader = '
 LDAP Account Manager  LDAP Account Manager

'; $this->additionalCSS = ''; $this->loginCaption = "Welcome to LAM self service. Please enter your user name and password."; $this->loginAttributeText = "User name"; diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php index db49a679..a08fb1d8 100644 --- a/lam/templates/config/conflogin.php +++ b/lam/templates/config/conflogin.php @@ -84,10 +84,17 @@ echo $_SESSION['header']; echo "//-->\n"; echo "\n"; ?> -

- LDAP Account Manager -

-


+ + + + + +
+  LDAP Account Manager  LDAP Account Manager + + configuration  +
+

@@ -154,12 +161,8 @@ echo $_SESSION['header'];
-






+



- -

- -

diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php index fafed4c4..86653cee 100644 --- a/lam/templates/config/confmain.php +++ b/lam/templates/config/confmain.php @@ -131,8 +131,16 @@ while ($jsEntry = $jsDir->read()) { if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; echo "\n"; } -echo ("

". - "\"LDAP

\n
\n

 

\n"); +?> + + + + +
+  LDAP Account Manager  LDAP Account Manager +
+
+isWritable()) { StatusMessage('WARN', 'The config file is not writable.', 'Your changes cannot be saved until you make the file writable for the webserver user.'); diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php index 7523284e..7fc205ba 100644 --- a/lam/templates/config/confmodules.php +++ b/lam/templates/config/confmodules.php @@ -109,8 +109,16 @@ while ($jsEntry = $jsDir->read()) { echo "\n"; } -echo ("

". - "\"LDAP

\n

 

\n"); +?> + + + + +
+  LDAP Account Manager  LDAP Account Manager +
+
+read()) { echo "\n"; } -echo ("

". - "\"LDAP

\n

 

\n"); +?> + + + + +
+  LDAP Account Manager  LDAP Account Manager +
+
+ -

- LDAP Account Manager -

-
+ + + + + +
+  LDAP Account Manager  LDAP Account Manager + + configuration  +


@@ -108,11 +114,7 @@ echo $_SESSION['header']; ?>
-






+



- -

- -

diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php index f597034a..6428b909 100644 --- a/lam/templates/config/mainlogin.php +++ b/lam/templates/config/mainlogin.php @@ -92,10 +92,17 @@ echo $_SESSION['header']; echo "\n"; } ?> -

- LDAP Account Manager -

-

+ + + + + +
+  LDAP Account Manager  LDAP Account Manager + + configuration  +
+
isWritable()) { @@ -147,12 +154,8 @@ echo $_SESSION['header']; -






+



- -

- -

diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php index 3700c830..425a7171 100644 --- a/lam/templates/config/mainmanage.php +++ b/lam/templates/config/mainmanage.php @@ -138,10 +138,17 @@ echo $_SESSION['header']; -

- LDAP Account Manager -

-

+ + + + + +
+  LDAP Account Manager  LDAP Account Manager + + configuration  +
+
read()) { echo "\n"; } -echo ("

". - "\"LDAP

\n

 

\n"); +?> + + + + +
+  LDAP Account Manager  LDAP Account Manager +
+
+ -

- LDAP Account Manager -

-

+ + + + + +
+  LDAP Account Manager  LDAP Account Manager + + configuration  +
+
default)) {


- -

- -

- diff --git a/lam/templates/login.php b/lam/templates/login.php index c92db33a..a23123c7 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -55,8 +55,13 @@ session_start(); session_regenerate_id(true); // save last selected login profile -if(isset($_POST['profile'])) { - setcookie("lam_default_profile", $_POST['profile'], time() + 365*60*60*24); +if(isset($_GET['useProfile'])) { + if (in_array($_GET['useProfile'], getConfigProfiles())) { + setcookie("lam_default_profile", $_GET['useProfile'], time() + 365*60*60*24); + } + else { + unset($_GET['useProfile']); + } } // init some session variables @@ -67,9 +72,9 @@ if(isset($_COOKIE["lam_default_profile"])) { $default_Profile = $_COOKIE["lam_default_profile"]; } // Reload loginpage after a profile change -if(isset($_POST['profileChange'])) { - logNewMessage(LOG_DEBUG, "Change server profile to " . $_POST['profile']); - $_SESSION['config'] = new LAMConfig($_POST['profile']); // Recreate the config object with the submited +if(isset($_GET['useProfile'])) { + logNewMessage(LOG_DEBUG, "Change server profile to " . $_GET['useProfile']); + $_SESSION['config'] = new LAMConfig($_GET['useProfile']); // Recreate the config object with the submited } // Load login page else { @@ -150,7 +155,15 @@ function display_LoginPage($config_object) { read()) { + if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; + echo "\n"; + } + + // set focus on password field echo "\n"; ?> -

- LDAP Account Manager -

- + +
- - +
- configuration  + +  LDAP Account Manager  LDAP Account Manager - " . _("Want more features? Get LAM Pro!") . ""; - } - ?> - + configuration  +
-


+ +



+ - @@ -319,41 +327,44 @@ function display_LoginPage($config_object) {
- +
- + + + + - - - +
-
+ 		+
+
+ get_ServerURL(); ?>
+ + getName(); - } ?> - - + - - " tabindex="6">
@@ -363,7 +374,16 @@ function display_LoginPage($config_object) {


- + + +
+
+ " . _("Want more features? Get LAM Pro!") . ""; + } + ?> + read()) { ?> - +
- - - +
- tools  + +  LDAP Account Manager  LDAP Account Manager - LDAP Account Manager - logout  + tools  +     + logout  +   +
+
- -
+