diff --git a/lam/lib/account.inc b/lam/lib/account.inc index b60f127a..8da43a09 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -1393,7 +1393,7 @@ function modifyhost($values,$values_old) { // Will modify the LDAP-Account if ($values->general_gecos != $values_old->general_gecos) $attr['displayName'] = $values->general_gecos; // sambaAccount_may if ($values->smb_pwdcanchange != $values_old->smb_pwdcanchange) $attr['sambaPwdCanChange'] = $values->smb_pwdcanchange; // sambaAccount_may if ($values->smb_pwdmustchange != $values_old->smb_pwdmustchange) $attr['sambaPwdMustChange'] = $values->smb_pwdmustchange; // sambaAccount_may - $attr['acctFlags'] = smbflag($values); // sambaAccount_may + $attr['sambaAcctFlags'] = smbflag($values); // sambaAccount_may if (($values->smb_domain!='') && ($values->smb_domain!=$values_old->smb_domain)) $attr['sambaDomainName'] = $values->smb_domain; // sambaAccount_may if (($values->smb_domain=='') && ($values->smb_domain!=$values_old->smb_domain)) $attr_rem['sambaDomainName'] = $values_old->smb_domain; // sambaAccount_may } diff --git a/lam/templates/account.php b/lam/templates/account.php index adca7ff2..a321db8b 100644 --- a/lam/templates/account.php +++ b/lam/templates/account.php @@ -309,15 +309,15 @@ if ($_POST['save']) $select_local='save'; if ($select_local != 'pdf') { // Write HTML-Header and part of Table - echo "\n"; + echo "\n"; echo ""; echo _("Create new Account"); - echo "\n - \n - \n - \n - "; + echo "\n". + "\n". + "\n". + "\n". + ""; } switch ($select_local) { @@ -335,6 +335,7 @@ switch ($select_local) { echo "\n"; break; case 'group' : + if (session_is_registered("type2")) session_unregister("type2"); echo "\n"; break; @@ -414,28 +415,28 @@ switch ($select_local) { // Select which part of page will be loaded echo ''; echo _('Username*'); echo "\n". - ' - - '._('Help').' - '."\n".''; + ''. + ''. + ''._('Help').''. + ''."\n".''; echo _('UID Number'); - echo ''."\n".' - - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Surname*'); - echo ''."\n".' - - - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''. + ''._('Help').''. + ''."\n".''; echo _('Given name*'); - echo ''."\n".' - - '."\n".' - '._('Help').' - '."\n".''."\n".''; + echo ''."\n".''. + ''. + ''."\n".''. + ''._('Help').''. + ''."\n".''."\n".''; echo _('Primary Group*'); echo ''."\n".' - '._('Help').' - '."\n".''; + echo ''. + ''._('Help').''. + ''."\n".''; echo _('Additional Groupmembership'); echo ''."\n".''."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Home Directory*'); - echo ''."\n".' - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Gecos'); - echo ''."\n".' - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Login Shell*'); echo ''."\n".''."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Suffix'); echo ''._('Help').' - '; + echo ''._('Help').''. + ''; echo _('Values with * are required'); echo ' - - '."\n".''; + echo ''. + ''. + ''."\n".''; break; case 'group': // load list of profiles @@ -503,22 +504,22 @@ switch ($select_local) { // Select which part of page will be loaded // Create HTML-page echo ''; echo _('Groupname*'); - echo ''."\n".' - - - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''. + ''._('Help').''. + ''."\n".''; echo _('GID Number'); - echo ''."\n".' - - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Gecos'); - echo ''."\n".' - '."\n".' - '._('Help').' - '; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''; echo _('Suffix'); echo ''._('Help').' - '; + echo ''._('Help').''. + ''; echo _('Values with * are required'); echo ''."\n".' - - '."\n".''; + echo ''. + ''. + ''."\n".''; break; case 'host': // load list of profiles @@ -543,26 +544,26 @@ switch ($select_local) { // Select which part of page will be loaded // Create HTML-page echo ''; echo _('Hostname*'); - echo ''."\n".' - - - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''. + ''._('Help').''. + ''."\n".''; echo _('UID Number'); - echo ''."\n".' - - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Primary Group*'); echo ''."\n".' - '._('Help').' - '."\n".''; + echo ''. + ''._('Help').''. + ''."\n".''; echo _('Additional Groupmembership'); echo ''."\n".''."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Gecos'); - echo ' - '."\n".' - '._('Help').' - '; + echo ''. + ''."\n".''. + ''._('Help').''. + ''; echo _('Suffix'); echo ''._('Help').' - '; + echo ''._('Help').''. + ''; echo _('Values with * are required'); echo ''."\n".' - - '."\n".''; + echo ''. + ''. + ''."\n".''; break; } - echo ''."\n".' - - '."\n"; + echo ''."\n".''. + ''. + ''."\n"; break; case 'unix': // Unix Password Settings @@ -620,38 +621,37 @@ switch ($select_local) { // Select which part of page will be loaded case 'user' : echo ''; echo _('Password'); - echo ''."\n".' - - '."\n".' - - '; + echo ''."\n".''. + ''. + ''."\n".''. + ''; echo _('Use no Password.'); echo ''."\n".'unix_password_no) echo ' checked '; - echo '>'."\n".' - '._('Help').' - '."\n".''; + echo '>'."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Password Warn'); - echo ''."\n".' - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Password Expire'); - echo ''."\n".' - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Maximum Passwordage'); - echo ''."\n".' - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Minimum Passwordage'); - echo ''."\n".' - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Expire Date'); echo ''."\n".''."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Account deactivated'); echo ''."\n".'unix_deactivated) echo ' checked '; - echo '>'."\n".' - '._('Help').' - '; + echo '>'."\n".''. + ''._('Help').''. + ''; echo _('Values with * are required'); echo ''."\n".''; break; @@ -694,11 +694,11 @@ switch ($select_local) { // Select which part of page will be loaded echo ''; break; } - echo ' - - '."\n".''."\n".' - - '."\n"; + echo ''. + ''. + ''."\n".''."\n".''. + ''. + ''."\n"; break; case 'samba': // Samba Settings @@ -718,15 +718,15 @@ switch ($select_local) { // Select which part of page will be loaded $mustchangedate = getdate($_SESSION['account']->smb_pwdmustchange); $_SESSION['account']->smb_flagsW = 0; echo ''; - echo ' - - - - - '; + echo ''. + ''. + ''. + ''. + ''. + ''; echo _('Samba Password'); - echo ''."\n".' - '."\n".''."\n".''. + ''."\n".'smb_useunixpwd) echo ' checked '; echo '>'; echo _('Use Unix-Password'); @@ -734,15 +734,15 @@ switch ($select_local) { // Select which part of page will be loaded echo _('Use no Password.'); echo ''."\n".'smb_password_no) echo ' checked '; - echo '>'."\n".' - '._('Help').' - '."\n".''; + echo '>'."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Password doesn\'t expire.'); echo ''."\n".'smb_flagsX) echo ' checked '; - echo '>'."\n".' - '._('Help').' - '."\n".''; + echo '>'."\n".''. + ''._('Help').''. + ''."\n".''; echo _('User can change Password'); echo ''."\n".''."\n".''; - echo ''._('Help').' - '."\n".''; + echo ''._('Help').''. + ''."\n".''; echo _('User must change Password'); echo ''."\n".''."\n".''; - echo ''._('Help').' - '."\n".''; + echo ''._('Help').''. + ''."\n".''; echo _('Accout is deactivated'); echo ''."\n".'smb_flagsD) echo ' checked '; - echo '>'."\n".' - '._('Help').' - '."\n".''; + echo '>'."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Home Drive'); echo ''."\n".''."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Script Path'); - echo ''."\n".' - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Profile Path'); - echo ''."\n".' - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('User Workstations'); - echo ''."\n".' - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('smb Home'); - echo ''."\n".' - '."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Domain'); - echo ''."\n".' - '."\n".' - '._('Help').' - '."\n"; + echo ''."\n".''. + ''."\n".''. + ''._('Help').''. + ''."\n"; break; case 'group': echo ''; @@ -851,15 +851,15 @@ switch ($select_local) { // Select which part of page will be loaded echo _('Domain Admins'); echo "\n"; } - echo ''."\n".' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''._('Help').''. + ''."\n".''; echo _('Windows Groupname'); - echo ' - - - '._('Help').' - '."\n"; + echo ''. + ''. + ''. + ''._('Help').''. + ''."\n"; break; case 'host': // set smb_flgasW true because account is host @@ -868,9 +868,9 @@ switch ($select_local) { // Select which part of page will be loaded echo _('Password doesn\'t expire.'); echo ''."\n".'smb_flagsX) echo ' checked '; - echo '> - '._('Help').' - '."\n".''; + echo '>'. + ''._('Help').''. + ''."\n".''; echo _('Host can change Password'); echo ''."\n".''."\n".''; - echo ''._('Help').' - '."\n".''; + echo ''._('Help').''. + ''."\n".''; echo _('Host must change Password'); echo ''."\n".''."\n".''; - echo ''._('Help').' - '."\n".''; + echo ''._('Help').''. + ''."\n".''; echo _('Accout is deactivated'); echo ''."\n".'smb_flagsD) echo ' checked '; - echo '> - '._('Help').' - '."\n".''; + echo '>'. + ''._('Help').''. + ''."\n".''; echo ''."\n".''; echo _('Domain'); - echo ''."\n".' - - '._('Help').' - '."\n"; + echo ''."\n".''. + ''. + ''._('Help').''. + ''."\n"; break; } echo ''; echo _('hard block limit'); echo ''."\n".''; echo _('grace block period'); echo ''."\n".''; echo _('used inodes'); echo ''."\n".''; echo _('soft inode limit'); echo ''."\n".''; echo _('hard inode limit'); echo ''."\n".''; echo _('grace inode period'); echo ''."\n"; - echo ''._('Help').''."\n".''._('Help').''."\n".' - '._('Help').''."\n".''._('Help').''."\n".' - '._('Help').''."\n".''._('Help').''."\n".' - '._('Help').''."\n".''._('Help').''."\n".' - '._('Help').''."\n"; + echo ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n"; $i=0; while ($_SESSION['account']->quota[$i][0]) { echo ''.$_SESSION['account']->quota[$i][0].''.$_SESSION['account']->quota[$i][1].''; // used blocks @@ -952,11 +952,11 @@ switch ($select_local) { // Select which part of page will be loaded echo ''.$_SESSION['account']->quota[$i][8].''; // inodes grace period $i++; } - echo ' - - - - '."\n"; + echo ''. + ''. + ''. + ''. + ''."\n"; break; case 'personal': // Personal Settings @@ -964,63 +964,63 @@ switch ($select_local) { // Select which part of page will be loaded echo _('Personal Properties'); echo ''."\n".''; echo _('Title'); - echo ''."\n".' - '; - echo $_SESSION['account']->general_surname . ' ' . $_SESSION['account']->general_givenname . ' - '._('Help').' - '."\n".''; + echo ''."\n".''. + ' '; + echo $_SESSION['account']->general_surname . ' ' . $_SESSION['account']->general_givenname . ''. + ''._('Help').''. + ''."\n".''; echo _('Employee Type'); - echo ''."\n".' - - - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''. + ''._('Help').''. + ''."\n".''; echo _('Street'); - echo ''."\n".' - - - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''. + ''._('Help').''. + ''."\n".''; echo _('Postal code'); - echo ''."\n".' - - - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''. + ''._('Help').''. + ''."\n".''; echo _('Postal address'); - echo ''."\n".' - - - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''. + ''._('Help').''. + ''."\n".''; echo _('Telephone Number'); - echo ''."\n".' - - - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''. + ''._('Help').''. + ''."\n".''; echo _('Mobile Phonenumber'); - echo ''."\n".' - - - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''. + ''._('Help').''. + ''."\n".''; echo _('Facsimile Number'); - echo ''."\n".' - - - '._('Help').' - '."\n".''; + echo ''."\n".''. + ''. + ''. + ''._('Help').''. + ''."\n".''; echo _('eMail Address'); - echo ''."\n".' - - - '._('Help').' - '."\n".' - - '."\n".' - - '."\n"; + echo ''."\n".''. + ''. + ''. + ''._('Help').''. + ''."\n".''. + ''. + ''."\n".''. + ''. + ''."\n"; break; case 'final': // Final Settings @@ -1066,19 +1066,19 @@ switch ($select_local) { // Select which part of page will be loaded } break; } - echo ' - - '."\n".' - '."\n".' - '. + ''."\n".''. + ''."\n".''. + ''._('Help').' - '."\n".' - '._('Help').''. + ''."\n".''. + ' - '."\n"; + echo '">'. + ''."\n"; break; case 'finish': // Final Settings @@ -1094,11 +1094,11 @@ switch ($select_local) { // Select which part of page will be loaded else echo _(' has been created. '); if (!$_SESSION['account_old']) { echo ''; } - echo ''."\n".' - - '."\n".' - - '."\n"; + echo ''."\n".''. + ''. + ''."\n".''. + ''. + ''."\n"; break; case 'group' : echo ''; @@ -1109,9 +1109,9 @@ switch ($select_local) { // Select which part of page will be loaded echo ''."\n".''; if (!$_SESSION['account_old']) { echo' '; } - echo ' - - '."\n"; + echo ''. + ''. + ''."\n"; break; case 'host' : echo ''; @@ -1122,9 +1122,9 @@ switch ($select_local) { // Select which part of page will be loaded echo ''."\n".''; if (!$_SESSION['account_old']) { echo ''; } - echo ''."\n".' - - '."\n"; + echo ''."\n".''. + ''. + ''."\n"; break; } break; diff --git a/lam/templates/delete.php b/lam/templates/delete.php index c02726ab..1658df52 100644 --- a/lam/templates/delete.php +++ b/lam/templates/delete.php @@ -28,20 +28,20 @@ include_once('../lib/config.inc'); session_save_path('../sess'); @session_start(); -echo ''."\n"; +echo ''."\n"; echo ''; echo _('Delete Account'); -echo ''."\n".' - '."\n".' - '."\n".' - '."\n".' - '."\n".' - '."\n".' - '."\n".' -
'."\n".' - '."\n".' -
'; +echo ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n".''."\n".''."\n".''."\n".''."\n".'
'; if ($_GET['type']) { $DN2 = explode(";", str_replace("\'", '',$_GET['DN'])); @@ -63,13 +63,13 @@ if ($_GET['type']) { echo '
'; if (($_GET['type']== user) && $_SESSION['config']->scriptServer) { echo _('Delete also Homedirectories'); - echo ' -
'; + echo ''. + '
'; } - echo '
- - '. + ''. + ''; } diff --git a/lam/templates/masscreate.php b/lam/templates/masscreate.php index 68df708b..5c31a094 100644 --- a/lam/templates/masscreate.php +++ b/lam/templates/masscreate.php @@ -49,15 +49,15 @@ if (!$select && $_SESSION['pointer']) $select='create'; if ($select!='pdf') { // Write HTML-Header and part of Table - echo ''; + echo ''; echo ''; echo _('Create new Accounts'); - echo ' - - - - '; + echo ''. + ''. + ''. + ''. + ''; } switch ($select) { @@ -76,10 +76,10 @@ switch ($select) { } if ($select!='pdf') { - echo ' - '; - echo ' - '; + echo ''. + ''; + echo '
'. + ''; } switch ($select) { @@ -119,12 +119,12 @@ switch ($select) { } else echo ''; } - echo ' - '. + ''; break; case 'list': @@ -201,8 +201,8 @@ switch ($select) { $_SESSION['accounts'][$row]->general_surname.''; } if (!$nowarn) { echo ''; } - echo '
'._('Help').' -
- '; + echo ''._('Help').''. + '
'. + ''; echo _('Select file:'); - echo '
'; + echo '
'; echo '
'. $_SESSION['accounts'][$row]->general_givenname.''. $_SESSION['accounts'][$row]->general_username.''. - $_SESSION['accounts'][$row]->general_group.' - '._('Show Details.').''; + $_SESSION['accounts'][$row]->general_group.''. + ''._('Show Details.').''; for ($i=$row+1; $igeneral_username == $_SESSION['accounts'][$i]->general_username) { // Found user with same name // Set Info @@ -269,8 +269,8 @@ switch ($select) { echo '
'; if (!$noerrors) { echo '
'. _('There are some errors!!') . '
'. _('There are some warnings.') . '

-
'; + echo '

'. + ''; } + if (!$stay) { echo ''; } else { echo '
'; echo ''; echo ''; if ($noerrors) { echo ''; } @@ -302,8 +302,8 @@ switch ($select) { } else $stay=false; } - if (!$stay) { echo '
- '._('Please wait until all users are created if no error is shown.').'
'. + ''._('Please wait until all users are created if no error is shown.').'
'; echo _('All Users have been created'); diff --git a/lam/templates/massdetail.php b/lam/templates/massdetail.php index 042dcc11..9c370250 100644 --- a/lam/templates/massdetail.php +++ b/lam/templates/massdetail.php @@ -29,19 +29,19 @@ include_once('../lib/config.inc'); // File with configure-functions session_save_path('../sess'); @session_start(); -echo ' - '; +echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"'. + '"http://www.w3.org/TR/html4/loose.dtd">'. + '<html><head><title>'; echo _('Create new Accounts'); -echo ' - - - - - - - - '; +echo ''. + ''. + ''. + ''. + ''. + ''. + ''. + '
'. + ''; if ($_GET) { $row = $_GET['row']; @@ -97,83 +97,83 @@ switch ($select) { case 'detail': echo ''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".'\n'."\n".''."\n".'\n'."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".'
'; + echo ''."\n".'
'; echo '';
'; echo _('Surname*'); - echo ' - - - '._('Help').' -
'; + echo ''. + ''. + ''. + ''._('Help').''. + '
'; echo _('Given name*'); - echo ' - - - '._('Help').' -
'; + echo ''. + ''. + ''. + ''._('Help').''. + '
'; echo _('Username*'); echo "". - ' - - '._('Help').' -
'; + ''. + ''. + ''._('Help').''. + '
'; echo _('Primary Group*'); echo "". - ' - - '._('Help').' -
'; + ''. + ''. + ''._('Help').''. + '
'; echo _('Title'); - echo ' - '; - echo $_SESSION['account']->general_surname . ' ' . $_SESSION['account']->general_givenname . ' - '._('Help').' -
'; + echo ''. + ' '; + echo $_SESSION['account']->general_surname . ' ' . $_SESSION['account']->general_givenname . ''. + ''._('Help').''. + '
'; echo _('Employee Type'); - echo ' - - - '._('Help').' -
'; + echo ''. + ''. + ''. + ''._('Help').''. + '
'; echo _('Street'); - echo ' - - - '._('Help').' -
'; + echo ''. + ''. + ''. + ''._('Help').''. + '
'; echo _('Postal code'); - echo ' - - - '._('Help').' -
'; + echo ''. + ''. + ''. + ''._('Help').''. + '
'; echo _('Postal address'); - echo ' - - - '._('Help').' -
'; + echo ''. + ''. + ''. + ''._('Help').''. + '
'; echo _('Telephone Number'); - echo ' - - - '._('Help').' -
'; + echo ''. + ''. + ''. + ''._('Help').''. + '
'; echo _('Mobile Phonenumber'); - echo ' - - - '._('Help').' -
'; + echo ''. + ''. + ''. + ''._('Help').''. + '
'; echo _('Facsimile Number'); - echo ' - - - '._('Help').' -
'; + echo ''. + ''. + ''. + ''._('Help').''. + '
'; echo _('eMail Address'); - echo ' - - - '._('Help').' -
'. + ''. + ''. + ''._('Help').''. + '
'; echo '