WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

typos

This commit is contained in:
Roland Gruber 2020-02-24 20:08:28 +01:00
parent 799d9b24fc
commit eae8f36dab
43 changed files with 90 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lam/HISTORY
View File

@ -313,7 +313,7 @@ March 2020 7.1
- LAM Pro:
-> Password self reset and user self registration support to set a header text
-> Sudo roles: support latest schema
-> Bind DLZ: automatic PTR management (disabled by default) and better formating of e.g. TTL values
-> Bind DLZ: automatic PTR management (disabled by default) and better formatting of e.g. TTL values
18.03.2014 4.5
@ -505,7 +505,7 @@ March 2020 7.1
-> support to read user name from uid attribute
-> added quota management
- Personal: added additional options for account profiles
- Mail aliases: sort receipients (RFE 3170336)
- Mail aliases: sort recipients (RFE 3170336)
- Asterisk: support all attributes (can be disabled in configuration)
- Samba 3/Shadow: allow to sync expiration date (RFE 3147751)
- LAM Pro:
@ -632,7 +632,7 @@ March 2020 7.1
21.01.2009 2.5.0
- LAM Pro:
-> supports rfc2307bis schema for Unix groups (RFE 2111694)
-> added alias manangement (object classes alias + uidObject) (RFE 1912779)
-> added alias management (object classes alias + uidObject) (RFE 1912779)
- Shadow: module is now optional when creating new accounts
- Kolab:
-> account extension is now optional
@ -958,7 +958,7 @@ March 2020 7.1
-> dynamic configuration options (based on modules)
- all pages in UTF-8
- added developer documentation
- PHPDoc formated comments
- PHPDoc formatted comments
- new plugin for managing MAC addresses (RFE 926017)
- new plugin for managing NIS mail aliases (RFE 1050036)
- new plugin for managing mail routing with inetLocalMailRecipient (RFE 1092137)
@ -1020,7 +1020,7 @@ March 2020 7.1
if magic_quotes_gpc in php.ini is was set to "Off", several pages did not work
some smaller bugs in mass upload
Samba hash values for hosts were not correct
Unix passwords could be disabled but not reenabled
Unix passwords could be disabled but not re-enabled
fixed problem with eval() in status.inc (894433)
@ -1043,7 +1043,7 @@ March 2020 7.1
- better error handling at login
- support spaces in DNs
- PDF text for users
- create missing OUs recursivly
- create missing OUs recursively
- fixed bugs:
SMD5 passwords were wrong
primaryGroupSID wrong if SID has no relation to Algorithmic RID Base

2
lam/docs/devel/account_pages.htm
View File

@ -25,7 +25,7 @@ calles the <span style="font-weight: bold;">continue_main()</span>
function of the <span style="font-weight: bold;">accountContainer</span>
object which prints all HTML output.<br>
<br>
Managing of user input etc. is completly made by the <span
Managing of user input etc. is completely made by the <span
style="font-weight: bold;">accountContainer</span>.<br>
<br>
</body>

2
lam/docs/devel/type_list.htm
View File

@ -115,7 +115,7 @@ If you want to change more than just the labels, take a look at <span
style="font-weight: bold;">lib/types/user.inc</span>. When a list is
displayed then the <span style="font-weight: bold;">showPage()</span>
function is called. You can overwrite this function to display a
completly new list or just one of the other functions.<br>
completely new list or just one of the other functions.<br>
<br>
<table style="width: 100%; text-align: left;" class="mod-code"
border="0" cellpadding="2" cellspacing="2">

2
lam/help/help.inc
View File

@ -154,7 +154,7 @@ $helpArray = array (
"238" => array ("Headline" => _("Session timeout"),
"Text" => _("This is the time (in minutes) of inactivity after which a user is automatically logged off.")),
"239" => array ("Headline" => _("Log level"),
"Text" => _("Please select your prefered log level. Messages with a lower level will not be logged.")),
"Text" => _("Please select your preferred log level. Messages with a lower level will not be logged.")),
"240" => array ("Headline" => _("Log destination"),
"Text" => _("Here you can select where LAM should save its log messages. System logging will go to Syslog on Unix systems and event log on Windows. You can also select an extra file.")),
"241" => array ("Headline" => _("Allowed hosts"),

2
lam/lib/3rdParty/composer/pear-pear.horde.org/Horde_Mail/Horde/Mail/Transport.php vendored
View File

@ -80,7 +80,7 @@ abstract class Horde_Mail_Transport
/**
* Send a message.
*
* @param mixed $recipients Either a comma-seperated list of recipients
* @param mixed $recipients Either a comma-separated list of recipients
* (RFC822 compliant), or an array of
* recipients, each RFC822 valid. This may
* contain recipients not specified in the

2
lam/lib/3rdParty/tcpdf/include/barcodes/qrcode.php vendored
View File

@ -1686,7 +1686,7 @@ class QRcode {
/**
* Append data to an input object.
* The data is copied and appended to the input object.
* @param $items (arrray) input items
* @param $items (array) input items
* @param $mode (int) encoding mode.
* @param $size (int) size of data (byte).
* @param $data (array) array of input data.

13
lam/lib/account.inc
View File

@ -216,7 +216,7 @@ function getSupportedHashTypes() {
}
/**
* Calculates a password salt of the given legth.
* Calculates a password salt of the given length.
*
* @param int $len salt length
* @return String the salt string
@ -356,11 +356,12 @@ function generateRandomPassword($length = 12) {
}
/**
* Checks if the given password mathes the crypto hash.
* Checks if the given password matches the crypto hash.
*
* @param String type hash type (must be one of getSupportedHashTypes())
* @param unknown_type $hash password hash value
* @param unknown_type $password plain text password to check
* @param string $hash password hash value
* @param string $password plain text password to check
* @return bool hash matches
* @see getSupportedHashTypes()
*/
function checkPasswordHash($type, $hash, $password) {
@ -1115,7 +1116,7 @@ function compareDN(&$a, &$b) {
* Formats an LDAP time string (e.g. from createTimestamp).
*
* @param String $time LDAP time value
* @return String formated time
* @return String formatted time
*/
function formatLDAPTimestamp($time) {
$dateTime = parseLDAPTimestamp($time);
@ -1577,7 +1578,7 @@ function getFormattedTime($format) {
* E.g. 70 seconds will return 1m10s.
*
* @param int $numSeconds number of seconds
* @return String formated number
* @return String formatted number
*/
function formatSecondsToShortFormat($numSeconds) {
if (empty($numSeconds)) {

18
lam/lib/baseModule.inc
View File

@ -566,7 +566,7 @@ abstract class baseModule {
switch ($check['type']) {
// check by regular expression (from account.inc)
case "ext_preg":
// ignore empty fileds
// ignore empty fields
if (!empty($options[$identifier][0])
&& !get_preg($options[$identifier][0], $check['regex'])) {
$errors[] = $check['error_message'];
@ -574,7 +574,7 @@ abstract class baseModule {
break;
// check by regular expression (case insensitive)
case 'regex_i':
// ignore empty fileds
// ignore empty fields
if (!empty($options[$identifier][0])
&& !preg_match('/' . $check['regex'] . '/i', $options[$identifier][0])) {
$errors[] = $check['error_message'];
@ -582,7 +582,7 @@ abstract class baseModule {
break;
// check by regular expression (case sensitive)
case 'regex':
// ignore empty fileds
// ignore empty fields
if (!empty($options[$identifier][0])
&& !preg_match('/' . $check['regex'] . '/', $options[$identifier][0])) {
$errors[] = $check['error_message'];
@ -715,7 +715,7 @@ abstract class baseModule {
switch ($this->meta['config_checks'][$scopes[$s]][$identifiers[$i]]['type']) {
// check by regular expression (from account.inc)
case "ext_preg":
// ignore empty fileds
// ignore empty fields
if ($options[$identifiers[$i]][0] == '') {
break;
}
@ -725,7 +725,7 @@ abstract class baseModule {
break;
// check by regular expression (case insensitive)
case "regex_i":
// ignore empty fileds
// ignore empty fields
if ($options[$identifiers[$i]][0] == '') {
break;
}
@ -735,7 +735,7 @@ abstract class baseModule {
break;
// check by regular expression (case sensitive)
case "regex":
// ignore empty fileds
// ignore empty fields
if ($options[$identifiers[$i]][0] == '') {
break;
}
@ -1022,9 +1022,9 @@ abstract class baseModule {
* The result is an hashtable with the following keys:<br>
* <ul>
* <li><b>Headline (required)</b><br>
* The headline of this help entry. Can consist of any alpha-numeric characters. No HTML/CSS elements are allowed.</li>
* The headline of this help entry. Can consist of any alphanumeric characters. No HTML/CSS elements are allowed.</li>
* <li><b>Text (required)</b><br>
* The text of the help entry which may contain any alpha-numeric characters.</li>
* The text of the help entry which may contain any alphanumeric characters.</li>
* <li><b>SeeAlso (optional)</b><br>
* A reference to anonther related web site. It must be an array containing a field called "text" with the link text
* that should be displayed and a field called "link" which is the link target.</li>
@ -2227,7 +2227,7 @@ abstract class baseModule {
}
/**
* Returns a list of wildcards that can be replaced in input fileds.
* Returns a list of wildcards that can be replaced in input fields.
* E.g. "$firstname" is replaced with "givenName" attribute value.
*
* @return array replacements as wildcard => value

6
lam/lib/config.inc
View File

@ -862,7 +862,7 @@ class LAMConfig {
}
if (!in_array("Admins", $saved)) {
array_push($file_array, "\n\n# list of users who are allowed to use LDAP Account Manager\n" .
"# names have to be seperated by semicolons\n" .
"# names have to be separated by semicolons\n" .
"# e.g. admins: cn=admin,dc=yourdomain,dc=org;cn=root,dc=yourdomain,dc=org\n" . "Admins: " . $this->Admins . "\n");
}
if (!in_array("treesuffix", $saved)) {
@ -1234,7 +1234,7 @@ class LAMConfig {
}
/**
* Returns all admin users seperated by semicolons
* Returns all admin users separated by semicolons
*
* @return string the admin string
*/
@ -1245,7 +1245,7 @@ class LAMConfig {
/**
* Sets the admin string
*
* @param string $value new admin string that contains all admin users seperated by semicolons
* @param string $value new admin string that contains all admin users separated by semicolons
* @return boolean true if $value has correct format
*/
public function set_Adminstring($value) {

2
lam/lib/export.inc
View File

@ -233,7 +233,7 @@ class Exporter {
}
/**
* Escapes a CSV value and adds quotes arround it.
* Escapes a CSV value and adds quotes around it.
*
* @param string $value CSV value
* @return string escaped and quoted value

6
lam/lib/html.inc
View File

@ -2556,7 +2556,7 @@ class htmlInputTextarea extends htmlElement {
private $rowCount;
/** enabled or disabled */
private $isEnabled = true;
/** specifies if LAM should display this field whith a WYSIWYG editor */
/** specifies if LAM should display this field with a WYSIWYG editor */
protected $richEdit = false;
/**
@ -2618,7 +2618,7 @@ class htmlInputTextarea extends htmlElement {
}
/**
* Specifies if the textarea should be displayed whith a WYSIWYG editor.
* Specifies if the textarea should be displayed with a WYSIWYG editor.
* <br>This requires that the page which displays the textarea also includes the ckeditor JS.
* <br>Rich editing is disabled by default.
*
@ -3451,7 +3451,7 @@ class htmlLink extends htmlElement {
}
/**
* Generates a link arround a htmlElement.
* Generates a link around a htmlElement.
*
* @package metaHTML
*/

2
lam/lib/lists.inc
View File

@ -601,7 +601,7 @@ class lamList {
* @return htmlElement content
*/
protected function getTableCellContent(&$entry, &$attribute) {
// print all attribute entries seperated by "; "
// print all attribute entries separated by "; "
if (isset($entry[$attribute]) && sizeof($entry[$attribute]) > 0) {
if (is_array($entry[$attribute])) {
if (($attribute == 'entryexpiretimestamp') && !empty($entry[$attribute][0])) {

2
lam/lib/modules.inc
View File

@ -2351,7 +2351,7 @@ interface passwordService {
* @param array $modules list of modules for which the password should be changed
* @param boolean $forcePasswordChange force the user to change his password at next login
* @return array list of error messages if any as parameter array for StatusMessage
* e.g. return arrray(array('ERROR', 'Password change failed.'))
* e.g. return array(array('ERROR', 'Password change failed.'))
*/
public function passwordChangeRequested($password, $modules, $forcePasswordChange);

2
lam/lib/modules/asteriskAccount.inc
View File

@ -1127,7 +1127,7 @@ class asteriskAccount extends baseModule implements passwordService {
* @param $modules list of modules for which the password should be changed
* @param boolean $forcePasswordChange force the user to change his password at next login
* @return array list of error messages if any as parameter array for StatusMessage
* e.g. return arrray(array('ERROR', 'Password change failed.'))
* e.g. return array(array('ERROR', 'Password change failed.'))
* @see passwordService::passwordChangeRequested
*/
public function passwordChangeRequested($password, $modules, $forcePasswordChange) {

4
lam/lib/modules/asteriskExtension.inc
View File

@ -564,7 +564,7 @@ class asteriskExtension extends baseModule {
if (isset($_POST['add_rule'])) {
$this->addRuleFlag = true;
}
//process fileds that are individual for each row
//process fields that are individual for each row
$extrow_errors = $this->processExtensionRows($extensionName, $extensionContext);
if (isset($extrow_errors) && count($extrow_errors) > 0) {
@ -643,7 +643,7 @@ class asteriskExtension extends baseModule {
}
/**
* Fills the fileds of a single extension row.
* Fills the fields of a single extension row.
* In Asterisk it would only be an extension name,a priority,an application, but LDAP spicific
* add to processing context field.
*

2
lam/lib/modules/asteriskVoicemail.inc
View File

@ -480,7 +480,7 @@ class asteriskVoicemail extends baseModule implements passwordService {
* @param $modules list of modules for which the password should be changed
* @param boolean $forcePasswordChange force the user to change his password at next login
* @return array list of error messages if any as parameter array for StatusMessage
* e.g. return arrray(array('ERROR', 'Password change failed.'))
* e.g. return array(array('ERROR', 'Password change failed.'))
* @see passwordService::passwordChangeRequested
*/
public function passwordChangeRequested($password, $modules, $forcePasswordChange) {

6
lam/lib/modules/inetOrgPerson.inc
View File

@ -707,11 +707,11 @@ class inetOrgPerson extends baseModule implements passwordService {
),
'businessCategory' => array(
"Headline" => _("Business category"), 'attr' => 'businessCategory',
"Text" => _("Business category (e.g. Administration, IT-Services, Manangement, ...)")
"Text" => _("Business category (e.g. Administration, IT-Services, Management, ...)")
),
'businessCategoryList' => array(
"Headline" => _("Business category"), 'attr' => 'businessCategory',
"Text" => _("Business category (e.g. Administration, IT-Services, Manangement, ...)") . '. ' . _("Multiple values are separated by semicolon.")
"Text" => _("Business category (e.g. Administration, IT-Services, Management, ...)") . '. ' . _("Multiple values are separated by semicolon.")
),
'l' => array(
"Headline" => _("Location"), 'attr' => 'l',
@ -3916,7 +3916,7 @@ class inetOrgPerson extends baseModule implements passwordService {
* @param $modules list of modules for which the password should be changed
* @param boolean $forcePasswordChange force the user to change his password at next login
* @return array list of error messages if any as parameter array for StatusMessage
* e.g. return arrray(array('ERROR', 'Password change failed.'))
* e.g. return array(array('ERROR', 'Password change failed.'))
* @see passwordService::passwordChangeRequested
*/
public function passwordChangeRequested($password, $modules, $forcePasswordChange) {

4
lam/lib/modules/posixAccount.inc
View File

@ -343,7 +343,7 @@ class posixAccount extends baseModule implements passwordService {
),
'uidNumber' => array(
"Headline" => _("UID number"), 'attr' => 'uidNumber',
"Text" => _("If empty UID number will be generated automaticly.")
"Text" => _("If empty UID number will be generated automatically.")
),
'group_upload' => array(
"Headline" => _("Primary group"),
@ -3402,7 +3402,7 @@ class posixAccount extends baseModule implements passwordService {
* @param $modules list of modules for which the password should be changed
* @param boolean $forcePasswordChange force the user to change his password at next login
* @return array list of error messages if any as parameter array for StatusMessage
* e.g. return arrray(array('ERROR', 'Password change failed.'))
* e.g. return array(array('ERROR', 'Password change failed.'))
* @see passwordService::passwordChangeRequested
*/
public function passwordChangeRequested($password, $modules, $forcePasswordChange) {

6
lam/lib/modules/posixGroup.inc
View File

@ -416,7 +416,7 @@ class posixGroup extends baseModule implements passwordService {
$return['help'] = array(
'gidNumber' => array(
"Headline" => _("GID number"), 'attr' => 'gidNumber',
"Text" => _("If empty GID number will be generated automaticly depending on your configuration settings.")
"Text" => _("If empty GID number will be generated automatically depending on your configuration settings.")
),
'description' => array(
"Headline" => _("Description"), 'attr' => 'description',
@ -682,7 +682,7 @@ class posixGroup extends baseModule implements passwordService {
/**
* This functin will be called when the module will be loaded
* This function will be called when the module will be loaded
*
* @param String $base the name of the {@link accountContainer} object ($_SESSION[$base])
*/
@ -1271,7 +1271,7 @@ class posixGroup extends baseModule implements passwordService {
* @param $modules list of modules for which the password should be changed
* @param boolean $forcePasswordChange force the user to change his password at next login
* @return array list of error messages if any as parameter array for StatusMessage
* e.g. return arrray(array('ERROR', 'Password change failed.'))
* e.g. return array(array('ERROR', 'Password change failed.'))
* @see passwordService::passwordChangeRequested
*/
public function passwordChangeRequested($password, $modules, $forcePasswordChange) {

2
lam/lib/modules/quota.inc
View File

@ -46,7 +46,7 @@ class quota extends baseModule {
/** prefix for lamdaemon results */
private static $QUOTA_PREFIX = 'QUOTA_ENTRY ';
/** this functin fills the error message array with messages
/** this function fills the error message array with messages
**/
function load_Messages() {
// error messages for input checks

2
lam/lib/modules/sambaGroupMapping.inc
View File

@ -567,7 +567,7 @@ class sambaGroupMapping extends baseModule {
}
}
/** this functin fills the error message array with messages
/** this function fills the error message array with messages
**/
function load_Messages() {
$this->messages['sambaSID'][0] = array('ERROR', _('There can be only one group of this type.')); // third parameter must be set dynamically

4
lam/lib/modules/sambaSamAccount.inc
View File

@ -87,7 +87,7 @@ class sambaSamAccount extends baseModule implements passwordService {
$this->autoAddObjectClasses = false;
}
/** this functin fills the error message array with messages
/** this function fills the error message array with messages
**/
function load_Messages() {
// error messages for input checks
@ -2553,7 +2553,7 @@ class sambaSamAccount extends baseModule implements passwordService {
* @param $modules list of modules for which the password should be changed
* @param boolean $forcePasswordChange force the user to change his password at next login
* @return array list of error messages if any as parameter array for StatusMessage
* e.g. return arrray(array('ERROR', 'Password change failed.'))
* e.g. return array(array('ERROR', 'Password change failed.'))
* @see passwordService::passwordChangeRequested
*/
public function passwordChangeRequested($password, $modules, $forcePasswordChange) {

2
lam/lib/modules/shadowAccount.inc
View File

@ -708,7 +708,7 @@ class shadowAccount extends baseModule implements passwordService {
* @param $modules list of modules for which the password should be changed
* @param boolean $forcePasswordChange force the user to change his password at next login
* @return array list of error messages if any as parameter array for StatusMessage
* e.g. return arrray(array('ERROR', 'Password change failed.'))
* e.g. return array(array('ERROR', 'Password change failed.'))
* @see passwordService::passwordChangeRequested
*/
public function passwordChangeRequested($password, $modules, $forcePasswordChange) {

6
lam/lib/modules/windowsUser.inc
View File

@ -318,11 +318,11 @@ class windowsUser extends baseModule implements passwordService {
),
'businessCategory' => array(
"Headline" => _("Business category"), 'attr' => 'businessCategory',
"Text" => _("Business category (e.g. Administration, IT-Services, Manangement, ...)")
"Text" => _("Business category (e.g. Administration, IT-Services, Management, ...)")
),
'businessCategoryList' => array(
"Headline" => _("Business category"), 'attr' => 'businessCategory',
"Text" => _("Business category (e.g. Administration, IT-Services, Manangement, ...)") . '. ' . _("Multiple values are separated by semicolon.")
"Text" => _("Business category (e.g. Administration, IT-Services, Management, ...)") . '. ' . _("Multiple values are separated by semicolon.")
),
'department' => array(
"Headline" => _("Department"), 'attr' => 'department',
@ -3254,7 +3254,7 @@ class windowsUser extends baseModule implements passwordService {
* @param array $modules list of modules for which the password should be changed
* @param boolean $forcePasswordChange force the user to change his password at next login
* @return array list of error messages if any as parameter array for StatusMessage
* e.g. return arrray(array('ERROR', 'Password change failed.'))
* e.g. return array(array('ERROR', 'Password change failed.'))
*/
public function passwordChangeRequested($password, $modules, $forcePasswordChange) {
if (!in_array(get_class($this), $modules)) {

2
lam/lib/status.inc
View File

@ -31,7 +31,7 @@
* This function prints a short status message. It can be used to print INFO,
* WARN and ERROR messages at the moment.
*
* The headline and text may be formated with special tags:
* The headline and text may be formatted with special tags:
* <br>
* <br><b>{bold}, {endbold}:</b> All text between these tags is printed bold.
* <br><b>{color=#123456}, {endcolor}:</b> All text between these tags is printed in the given color.

4
lam/lib/tools.inc
View File

@ -112,10 +112,10 @@ interface LAMTool {
function getImageLink();
/**
* Returns the prefered position of this tool on the tools page.
* Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
* @return int prefered position
* @return int preferred position
*/
function getPosition();

6
lam/lib/tools/fileUpload.inc
View File

@ -51,7 +51,7 @@ class toolFileUpload implements \LAMTool {
* @return string description
*/
function getDescription() {
return _("Creates accounts by uploading a CSV formated file.");
return _("Creates accounts by uploading a CSV formatted file.");
}
/**
@ -91,10 +91,10 @@ class toolFileUpload implements \LAMTool {
}
/**
* Returns the prefered position of this tool on the tools page.
* Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
* @return int prefered position
* @return int preferred position
*/
function getPosition() {
return 300;

4
lam/lib/tools/importexport.inc
View File

@ -90,10 +90,10 @@ class ImportExport implements \LAMTool {
}
/**
* Returns the prefered position of this tool on the tools page.
* Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
* @return int prefered position
* @return int preferred position
*/
function getPosition() {
return 450;

4
lam/lib/tools/multiEdit.inc
View File

@ -91,10 +91,10 @@ class toolMultiEdit implements \LAMTool {
}
/**
* Returns the prefered position of this tool on the tools page.
* Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
* @return int prefered position
* @return int preferred position
*/
function getPosition() {
return 400;

4
lam/lib/tools/ouEditor.inc
View File

@ -91,10 +91,10 @@ class toolOUEditor implements \LAMTool {
}
/**
* Returns the prefered position of this tool on the tools page.
* Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
* @return int prefered position
* @return int preferred position
*/
function getPosition() {
return 500;

4
lam/lib/tools/pdfEdit.inc
View File

@ -91,10 +91,10 @@ class toolPDFEditor implements \LAMTool {
}
/**
* Returns the prefered position of this tool on the tools page.
* Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
* @return int prefered position
* @return int preferred position
*/
function getPosition() {
return 200;

4
lam/lib/tools/profileEditor.inc
View File

@ -91,10 +91,10 @@ class toolProfileEditor implements \LAMTool {
}
/**
* Returns the prefered position of this tool on the tools page.
* Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
* @return int prefered position
* @return int preferred position
*/
function getPosition() {
return 100;

4
lam/lib/tools/schemaBrowser.inc
View File

@ -91,10 +91,10 @@ class toolSchemaBrowser implements \LAMTool {
}
/**
* Returns the prefered position of this tool on the tools page.
* Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
* @return int prefered position
* @return int preferred position
*/
function getPosition() {
return 600;

4
lam/lib/tools/serverInfo.inc
View File

@ -91,10 +91,10 @@ class toolServerInformation implements \LAMTool {
}
/**
* Returns the prefered position of this tool on the tools page.
* Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
* @return int prefered position
* @return int preferred position
*/
function getPosition() {
return 700;

4
lam/lib/tools/tests.inc
View File

@ -91,10 +91,10 @@ class toolTests implements \LAMTool {
}
/**
* Returns the prefered position of this tool on the tools page.
* Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
* @return int prefered position
* @return int preferred position
*/
function getPosition() {
return 1000;

4
lam/lib/tools/webauthn.inc
View File

@ -92,10 +92,10 @@ class toolWebauthn implements \LAMTool {
}
/**
* Returns the prefered position of this tool on the tools page.
* Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
* @return int prefered position
* @return int preferred position
*/
function getPosition() {
return 800;

4
lam/lib/types/group.inc
View File

@ -280,7 +280,7 @@ class lamGroupList extends lamList {
*/
function listGetParams() {
parent::listGetParams();
// generate list primary group memebers
// generate list primary group members
// after parent::listGetParams is $this->refresh set to correct value
if ($this->include_primary && !$this->refresh && ($this->refresh_primary || (sizeof($this->primary_hash) == 0))) {
$this->groupRefreshPrimary();
@ -294,7 +294,7 @@ class lamGroupList extends lamList {
protected function getTableCellContent(&$entry, &$attribute) {
$countAttributes = array('memberuid_count', 'member_count', 'uniqueMember_count', 'owner_count', 'roleOccupant_count');
if ($attribute == "memberuid") {
// $gid is used for linking primary group memebers
// $gid is used for linking primary group members
$gid = -1;
$use_primary = false;
if ($this->include_primary == "on") {

2
lam/templates/account/edit.php
View File

@ -48,7 +48,7 @@ include_once(__DIR__ . '/../../lib/modules.inc');
startSecureSession();
enforceUserIsLoggedIn();
// Redirect to startpage if user is not loged in
// Redirect to startpage if user is not logged in
if (!isLoggedIn()) {
metaRefresh("../login.php");
exit;

2
lam/templates/config/mainmanage.php
View File

@ -516,7 +516,7 @@ printHeaderContents(_("Edit general settings"), '../..');
* Formats an LDAP time string (e.g. from createTimestamp).
*
* @param String $time LDAP time value
* @return String formated time
* @return String formatted time
*/
function formatSSLTimestamp($time) {
if (!empty($time)) {

2
lam/templates/delete.php
View File

@ -61,7 +61,7 @@ if (!checkIfWriteAccessIsAllowed()) {
die();
}
// Redirect to startpage if user is not loged in
// Redirect to startpage if user is not logged in
if (!isLoggedIn()) {
metaRefresh("login.php");
exit;

4
lam/templates/upload/massBuildAccounts.php
View File

@ -54,7 +54,7 @@ checkIfToolIsActive('toolFileUpload');
// die if no write access
if (!checkIfWriteAccessIsAllowed()) die();
// Redirect to startpage if user is not loged in
// Redirect to startpage if user is not logged in
if (!isLoggedIn()) {
metaRefresh("../login.php");
exit;
@ -116,7 +116,7 @@ $container = new htmlResponsiveRow();
$selectedModules = explode(',', $_POST['selectedModules']);
if ($_FILES['inputfile'] && ($_FILES['inputfile']['size'] > 0)) {
// check if input file is well formated
// check if input file is well formatted
$data = array(); // input values without first row
$ids = array(); // <column name> => <column number for $data>
// get input fields from modules

2
lam/templates/upload/massDoUpload.php
View File

@ -52,7 +52,7 @@ checkIfToolIsActive('toolFileUpload');
// die if no write access
if (!checkIfWriteAccessIsAllowed()) die();
// Redirect to startpage if user is not loged in
// Redirect to startpage if user is not logged in
if (!isLoggedIn()) {
metaRefresh("../login.php");
exit;

4
lam/templates/upload/masscreate.php
View File

@ -71,7 +71,7 @@ if (!checkIfWriteAccessIsAllowed()) die();
checkIfToolIsActive('toolFileUpload');
// Redirect to startpage if user is not loged in
// Redirect to startpage if user is not logged in
if (!isLoggedIn()) {
metaRefresh("../login.php");
exit;
@ -272,7 +272,7 @@ function showMainPage(\LAM\TYPES\ConfiguredType $type, $selectedModules) {
$row->add(new htmlTitle(_("File upload")), 12);
// instructions
$row->add(new htmlOutputText(_("Please provide a CSV formated file with your account data. The cells in the first row must be filled with the column identifiers. The following rows represent one account for each row.")), 12);
$row->add(new htmlOutputText(_("Please provide a CSV formatted file with your account data. The cells in the first row must be filled with the column identifiers. The following rows represent one account for each row.")), 12);
$row->add(new htmlOutputText(_("Check your input carefully. LAM will only do some basic checks on the upload data.")), 12);
$row->addVerticalSpacer('1rem');
$row->add(new htmlOutputText(_("Hint: Format all cells as text in your spreadsheet program and turn off auto correction.")), 12);