diff --git a/lam/index.html b/lam/index.html
new file mode 100644
index 00000000..6c0ec572
--- /dev/null
+++ b/lam/index.html
@@ -0,0 +1,8 @@
+
+
+LDAP Account Manager
+
+
+';
+
+
\ No newline at end of file
diff --git a/lam/lib/account.inc b/lam/lib/account.inc
index f4c58c10..ded2f68d 100644
--- a/lam/lib/account.inc
+++ b/lam/lib/account.inc
@@ -80,6 +80,7 @@ function registervars() { // This function registers all needes session-varibale
session_save_path('../sess');
@session_start();
if ( !session_is_registered("type2")) session_register("type2"); // $type2 stores the kind of account (User|GRoup|Host)
+ if ( !session_is_registered("shelllist")) session_register("shelllist"); // $shelllist contains all shells defined in /etc/shells
if ( !session_is_registered("modify")) session_register("modify"); // if an existing account should be modified modify is true
if ( !session_is_registered("account")) session_register("account"); // The new Accout properties are stored here
if ( !session_is_registered("account_temp")) session_register("account_temp"); // Tempoprary account properties. If values are OK they will be moved to var account
@@ -89,6 +90,11 @@ function registervars() { // This function registers all needes session-varibale
if (!is_object($account_old)) $account = new account();
}
+function getshells() { // Return a list of all shells listed in /etc/shells
+ $shells = file('/etc/shells');
+ foreach ($shells as $shell) chop($shell);
+ return $shells;
+ }
function checkglobal() { // This functions checks all global account parameters
// Check if username has been entered
diff --git a/lam/templates/.htaccess b/lam/templates/.htaccess
deleted file mode 100644
index 3a428827..00000000
--- a/lam/templates/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
diff --git a/lam/templates/account.php b/lam/templates/account.php
index a2aa6631..9aa4c797 100644
--- a/lam/templates/account.php
+++ b/lam/templates/account.php
@@ -36,6 +36,7 @@ if ( $type ) { // Type is true if account.php was called from Users/Group/Hosts-
$_SESSION['account_old'] = ""; // Delete $_SESSION['account_old'] because values are now invalid
$_SESSION['account_temp'] = ""; // Delete $_SESSION['account_temp'] because values are now invalid
$_SESSION['modify'] = 0; // Set modify back to false
+ $_SESSION['shelllist'] = getshells(); // Write List of all valid shells in variable
}
if ( $DN ) { // $DN is true if an entry should be modified and account.php was called from Users/Group/Host-List
@@ -179,7 +180,7 @@ switch ($select) {
if ($next && ($error=="0")) $select = 'final';
break;
case 'final':
- if ($back && ($error=="0")) $select = 'quota';
+ if ($back && ($error=="0"))
switch ($_SESSION['type2']) {
case 'user': $select = 'personal'; break;
case 'group': $select = 'quota'; break;
@@ -254,6 +255,7 @@ switch ($select) {
echo '';
switch ( $_SESSION['type2'] ) {
case 'user':
+ $profilelist = getUserProfiles();
echo '
';
echo _('Username');
echo '
@@ -308,21 +310,14 @@ switch ($select) {
echo '
';
echo _('Login Shell');
echo '
';
echo _('To disable login use /bin/false.');
- echo '