diff --git a/lam/help/help.inc b/lam/help/help.inc index 83c48b49..d5ab5afa 100644 --- a/lam/help/help.inc +++ b/lam/help/help.inc @@ -128,7 +128,7 @@ $helpArray = array ( can cause several problems. If username is allready used username will expanded with a number. The next free number will be used.")), "401" => array ("ext" => "FALSE", "Headline" => _("UID number"), "Text" => _("If empty UID number will be generated automaticly. Valid values are between").' '.$_SESSION['config']->get_minUID().' '._("and").' '.$_SESSION['config']->get_maxUID()."."), - "402" => array ("ext" => "FALSE", "Headline" => _("Additional Groups"), + "402" => array ("ext" => "FALSE", "Headline" => _("Additional groups"), "Text" => _("Hold the CTRL-key to (de)select multiple groups."). ' '. _("Can be left empty.")), "403" => array ("ext" => "FALSE", "Headline" => _("Home directory"), "Text" => _("$user and $group are replaced with username or primary groupname.")), @@ -251,7 +251,7 @@ $helpArray = array ( "464" => array ("ext" => "FALSE", "Headline" => _("Windows groupname"), "Text" => _("If you want to use a well known RID you can selcet a well known group.")), "466" => array ("ext" => "FALSE", "Headline" => _("Unix workstations"), - "Text" => _("Comma separated list of unix workstations the user is allowed to login. Empty means every workstation."). ' '. _("Can be left empty.")), + "Text" => _("Comma separated list of unix workstations the user is allowed to login."). ' '. _("Can be left empty.")), "467" => array ("ext" => "FALSE", "Headline" => _("Domain"), "Text" => _("Windows-Domain of group."). ' '. _("Can be left empty.")), // 600 - 699 diff --git a/lam/templates/account.php b/lam/templates/account.php index ad4f100e..c4fc55e6 100644 --- a/lam/templates/account.php +++ b/lam/templates/account.php @@ -370,9 +370,6 @@ switch ($select_local) { echo "\n"; break; } - if (isset($_SESSION['shelllist'])) unset($_SESSION['shelllist']); - if (isset($_SESSION['account'])) unset($_SESSION['account']); - if (isset($_SESSION['account_old'])) unset($_SESSION['account_old']); break; case 'load': // load profile @@ -408,7 +405,6 @@ switch ($select_local) { break; } - if ($select_local != 'pdf') { echo "\n"; echo "
\n"; @@ -894,6 +890,7 @@ switch ($select_local) { // Select which part of page will be loaded } else echo ''; } + echo ''; } else { echo ''."\n".''; @@ -954,16 +951,16 @@ switch ($select_local) { // Select which part of page will be loaded } else echo ''; } - echo ''."\n".''._('Help').''."\n"; + echo ''."\n".''._('Help').''."\n"; break; case 'host': // set smb_flgasW true because account is host + echo ''; $_SESSION['account']->smb_flagsW = 1; if ($_SESSION['account']->smb_password_no) echo ''; echo ''; - echo ''; echo _('Password'); echo ''; if ($_SESSION['account_old']) { @@ -989,6 +986,7 @@ switch ($select_local) { // Select which part of page will be loaded } else echo ''; } + echo ''; } else { echo ''."\n".''; @@ -1271,8 +1269,32 @@ switch ($select_local) { // Select which part of page will be loaded break; } break; + case 'backmain': + // unregister sessionvar and select which list should be shown + switch ( $_SESSION['account']->type ) { + case 'user' : + echo ''; + echo _('Please press here if meta-refresh didn\'t work.'); + echo "\n"; + break; + case 'group' : + echo ''; + echo _('Please press here if meta-refresh didn\'t work.'); + echo "\n"; + break; + case 'host' : + echo ''; + echo _('Please press here if meta-refresh didn\'t work.'); + echo "\n"; + break; + } + if (isset($_SESSION['shelllist'])) unset($_SESSION['shelllist']); + if (isset($_SESSION['account'])) unset($_SESSION['account']); + if (isset($_SESSION['account_old'])) unset($_SESSION['account_old']); + break; } // Print end of HTML-Page -if ($select_local != 'pdf') echo '
'; +if ($select_local != 'pdf') + echo ''; ?> diff --git a/lam/templates/masscreate.php b/lam/templates/masscreate.php index 4b33fd4a..d1d36c40 100644 --- a/lam/templates/masscreate.php +++ b/lam/templates/masscreate.php @@ -97,9 +97,9 @@ switch ($select) { echo ''; echo _('mobileTelephoneNumber,facsimileNumber,street,postalCode,postalAddress,'); echo ''; - echo _('employeeType. If PrimaryGroup is not given it\'ll used from profile.'); + echo _('employeeType. If Primary group is not given it\'ll used from profile.'); echo ''; - echo _('If PrimaryGroup doesn\'t exist it will be created.'); + echo _('If PrimaryGroup does not exist it will be created.'); echo ''; echo _('Select Profile:'); echo '