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

spell checking

This commit is contained in:
Roland Gruber 2020-03-04 12:07:56 +01:00
parent 51ed41f4fa
commit 0230241b15
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2008 Thomas Manninger Copyright (C) 2008 Thomas Manninger
2008 - 2019 Roland Gruber 2008 - 2020 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -372,7 +372,7 @@ class ddns extends baseModule {
else { else {
// Account edit // Account edit
if (!$this->check_if_ddns_is_enable()) { if (!$this->check_if_ddns_is_enable()) {
$return->add(new htmlOutputText(_("DDNS ist not activated. You can activate it in the DHCP settings (DDNS).")), 12); $return->add(new htmlOutputText(_("DDNS is not activated. You can activate it in the DHCP settings (DDNS).")), 12);
} }
else { else {
// DNS server // DNS server

28
lam/lib/modules/fixed_ip.inc
View File

@ -6,7 +6,7 @@ use \LAM\PDF\PDFTableRow;
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2008 Thomas Manninger Copyright (C) 2008 Thomas Manninger
2008 - 2019 Roland Gruber 2008 - 2020 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -129,7 +129,7 @@ class fixed_ip extends baseModule {
* This function fills the error message array with messages. * This function fills the error message array with messages.
*/ */
public function load_Messages() { public function load_Messages() {
$this->messages['errors'][0] = array('ERROR', _('One or more errors occured. The invalid fields are marked.'), ''); $this->messages['errors'][0] = array('ERROR', _('One or more errors occurred. The invalid fields are marked.'), '');
} }
/** /**
@ -147,12 +147,12 @@ class fixed_ip extends baseModule {
} }
/** /**
* Checks if IPs are not overlaped. * Checks if IPs are not overlapped.
* *
* @param ip IP address * @param ip IP address
* @return not overlaped * @return bool not overlapped
**/ **/
public function isNotOverlapedIp($ip) { private function isNotOverlappedIp($ip) {
if (in_array($ip, $this->overlapd)) { if (in_array($ip, $this->overlapd)) {
return false; return false;
} }
@ -162,11 +162,9 @@ class fixed_ip extends baseModule {
} }
/** /**
* * Reset the overlapped_range() function
* Reset the overlapd_range() function
*
**/ **/
public function reset_overlapd_ip() { private function reset_overlapped_ip() {
$this->overlapd = array(); $this->overlapd = array();
} }
@ -292,7 +290,7 @@ class fixed_ip extends baseModule {
} }
$this->processed = true; $this->processed = true;
$this->reset_overlapd_ip(); $this->reset_overlapped_ip();
if ($this->getAccountContainer()->getAccountModule('dhcp_settings')->attributes['cn'][0]!="") { if ($this->getAccountContainer()->getAccountModule('dhcp_settings')->attributes['cn'][0]!="") {
@ -330,7 +328,7 @@ class fixed_ip extends baseModule {
$_POST['ip_'.$id] = trim($_POST['ip_'.$id]); $_POST['ip_'.$id] = trim($_POST['ip_'.$id]);
} }
if ((!empty($_POST['ip_'.$id]) && !(check_ip($_POST['ip_'.$id]))) if ((!empty($_POST['ip_'.$id]) && !(check_ip($_POST['ip_'.$id])))
|| (!empty($_POST['ip_'.$id]) && !$this->isNotOverlapedIp($_POST['ip_'.$id]))) { || (!empty($_POST['ip_'.$id]) && !$this->isNotOverlappedIp($_POST['ip_'.$id]))) {
$error = true; $error = true;
$this->fixed_ip[$id]['ip'] = $_POST['ip_'.$id]; $this->fixed_ip[$id]['ip'] = $_POST['ip_'.$id];
} }
@ -421,7 +419,7 @@ class fixed_ip extends baseModule {
$titles = array(_('IP address'), _('PC name'), _('MAC address'), _('Description'), _('Active'), ' '); $titles = array(_('IP address'), _('PC name'), _('MAC address'), _('Description'), _('Active'), ' ');
$data = array(); $data = array();
// Reset oberlaped ips // Reset oberlaped ips
$this->reset_overlapd_ip(); $this->reset_overlapped_ip();
// If $ranges is not a array, then create one: // If $ranges is not a array, then create one:
if (!is_array($this->fixed_ip)) { if (!is_array($this->fixed_ip)) {
@ -459,7 +457,7 @@ class fixed_ip extends baseModule {
$messages[] = new htmlStatusMessage('ERROR', _("Invalid MAC address."), htmlspecialchars($this->fixed_ip[$id]['mac'])); $messages[] = new htmlStatusMessage('ERROR', _("Invalid MAC address."), htmlspecialchars($this->fixed_ip[$id]['mac']));
} }
// descripton // description
if ($this->processed && !get_preg($this->fixed_ip[$id]['description'], 'ascii')) { if ($this->processed && !get_preg($this->fixed_ip[$id]['description'], 'ascii')) {
$messages[] = new htmlStatusMessage('ERROR', _("Invalid description."), htmlspecialchars($this->fixed_ip[$id]['description'])); $messages[] = new htmlStatusMessage('ERROR', _("Invalid description."), htmlspecialchars($this->fixed_ip[$id]['description']));
} }
@ -474,7 +472,7 @@ class fixed_ip extends baseModule {
$this->getAccountContainer()->getAccountModule('dhcp_settings')->getDHCPOption('subnet-mask'))) { $this->getAccountContainer()->getAccountModule('dhcp_settings')->getDHCPOption('subnet-mask'))) {
$messages[] = new htmlStatusMessage('ERROR', _("The IP address does not match the subnet."), htmlspecialchars($this->fixed_ip[$id]['ip'])); $messages[] = new htmlStatusMessage('ERROR', _("The IP address does not match the subnet."), htmlspecialchars($this->fixed_ip[$id]['ip']));
} }
elseif (!$this->isNotOverlapedIp($this->fixed_ip[$id]['ip'])) { elseif (!$this->isNotOverlappedIp($this->fixed_ip[$id]['ip'])) {
$messages[] = new htmlStatusMessage('ERROR', _("The IP address is already in use."), htmlspecialchars($this->fixed_ip[$id]['ip'])); $messages[] = new htmlStatusMessage('ERROR', _("The IP address is already in use."), htmlspecialchars($this->fixed_ip[$id]['ip']));
} }
} }
@ -703,7 +701,7 @@ class fixed_ip extends baseModule {
if (!is_array($this->fixed_ip)) { if (!is_array($this->fixed_ip)) {
$this->fixed_ip = array(); $this->fixed_ip = array();
} }
// Which entrys are new: // Which entries are new:
foreach($this->fixed_ip AS $id => $arr) { foreach($this->fixed_ip AS $id => $arr) {
$in_arr = false; $in_arr = false;
foreach($this->orig_ips AS $idB => $arr) { foreach($this->orig_ips AS $idB => $arr) {

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

@ -2532,7 +2532,7 @@ class inetOrgPerson extends baseModule implements passwordService {
* *
* If the input data is invalid the return value is an array that contains arrays * If the input data is invalid the return value is an array that contains arrays
* to build StatusMessages (message type, message head, message text). If no errors * to build StatusMessages (message type, message head, message text). If no errors
* occured the function returns an empty array. * occurred the function returns an empty array.
* *
* @param array $options hash array (option name => value) that contains the input. The option values are all arrays containing one or more elements. * @param array $options hash array (option name => value) that contains the input. The option values are all arrays containing one or more elements.
* @param selfServiceProfile $profile self service profile * @param selfServiceProfile $profile self service profile

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

@ -6,7 +6,7 @@ use \LAM\TYPES\TypeManager;
/* /*
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2013 - 2019 Roland Gruber Copyright (C) 2013 - 2020 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -1022,7 +1022,7 @@ class pykotaUser extends baseModule {
* <br> * <br>
* If the input data is invalid the return value is an array that contains arrays * If the input data is invalid the return value is an array that contains arrays
* to build StatusMessages (message type, message head, message text). If no errors * to build StatusMessages (message type, message head, message text). If no errors
* occured the function returns an empty array. * occurred the function returns an empty array.
* *
* @param array $options hash array (option name => value) that contains the input. The option values are all arrays containing one or more elements. * @param array $options hash array (option name => value) that contains the input. The option values are all arrays containing one or more elements.
* @param selfServiceProfile $profile self service profile * @param selfServiceProfile $profile self service profile