extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix wrong/different case WrongUserInput --> WrongUserinput

Browse Source
This commit is contained in:
Ralf Becker 2016-05-25 21:15:06 +02:00
parent 1b32000d4d
commit 8c821ab8cb
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Auth.php
View File

@ -231,7 +231,7 @@ class Auth
* @param string $old_passwd must be cleartext * @param string $old_passwd must be cleartext
* @param string $new_passwd must be cleartext * @param string $new_passwd must be cleartext
* @param int $account_id account id of user whose passwd should be changed * @param int $account_id account id of user whose passwd should be changed
* @throws Exception\WrongUserInput if configured password strength is not meat * @throws Exception\WrongUserinput if configured password strength is not meat
* @throws Exception from backends having extra requirements * @throws Exception from backends having extra requirements
* @return boolean true if password successful changed, false otherwise * @return boolean true if password successful changed, false otherwise
*/ */
@ -239,7 +239,7 @@ class Auth
{ {
if (($err = self::crackcheck($new_passwd,null,null,null,$account_id))) if (($err = self::crackcheck($new_passwd,null,null,null,$account_id)))
{ {
throw new Exception\WrongUserInput($err); throw new Exception\WrongUserinput($err);
} }
if (($ret = $this->backend->change_password($old_passwd, $new_passwd, $account_id))) if (($ret = $this->backend->change_password($old_passwd, $new_passwd, $account_id)))
{ {

4
api/src/Categories.php
View File

@ -704,7 +704,7 @@ class Categories
if (isset($values['old_parent']) && (int)$values['old_parent'] != (int)$values['parent']) if (isset($values['old_parent']) && (int)$values['old_parent'] != (int)$values['parent'])
{ {
$ret = $this->check_consistency4update($values); $ret = $this->check_consistency4update($values);
if ($ret !== true) throw new Exception\WrongUserInput($ret); if ($ret !== true) throw new Exception\WrongUserinput($ret);
// everything seems in order -> proceed // everything seems in order -> proceed
$values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0); $values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0);
$this->adapt_level_in_subtree($values); $this->adapt_level_in_subtree($values);
@ -717,7 +717,7 @@ class Categories
if ($values['parent'] > 0) if ($values['parent'] > 0)
{ {
$ret = $this->check_consistency4update($values); $ret = $this->check_consistency4update($values);
if ($ret !== true) throw new Exception\WrongUserInput($ret); if ($ret !== true) throw new Exception\WrongUserinput($ret);
// everything seems in order -> proceed // everything seems in order -> proceed
$values['main'] = $this->id2name($values['parent'],'main'); $values['main'] = $this->id2name($values['parent'],'main');

0
api/src/Exception/WrongUserInput.php → api/src/Exception/WrongUserinput.php
View File

2
api/src/Vfs.php
View File

@ -1088,7 +1088,7 @@ class Vfs extends Vfs\StreamWrapper
if (!preg_match($use='/^([ugoa]*)([+=-]+)([rwx]+)$/',$s,$matches)) if (!preg_match($use='/^([ugoa]*)([+=-]+)([rwx]+)$/',$s,$matches))
{ {
$use = str_replace(array('/','^','$','(',')'),'',$use); $use = str_replace(array('/','^','$','(',')'),'',$use);
throw new Exception\WrongUserInput("$s is not an allowed mode, use $use !"); throw new Exception\WrongUserinput("$s is not an allowed mode, use $use !");
} }
$base = (strpos($matches[3],'r') !== false ? self::READABLE : 0) | $base = (strpos($matches[3],'r') !== false ? self::READABLE : 0) |
(strpos($matches[3],'w') !== false ? self::WRITABLE : 0) | (strpos($matches[3],'w') !== false ? self::WRITABLE : 0) |

18
setup/inc/class.setup_cmd_ldap.inc.php
View File

@ -315,7 +315,7 @@ class setup_cmd_ldap extends setup_cmd
// check if ads base does exist // check if ads base does exist
if (!@ldap_read($ads->ds, $this->ads_context, 'objectClass=*')) if (!@ldap_read($ads->ds, $this->ads_context, 'objectClass=*'))
{ {
throw new Api\Exception\WrongUserInput(lang('Ads dn "%1" NOT found!',$this->ads_context)); throw new Api\Exception\WrongUserinput(lang('Ads dn "%1" NOT found!',$this->ads_context));
} }
// connect to source ldap // connect to source ldap
@ -324,7 +324,7 @@ class setup_cmd_ldap extends setup_cmd
// check if ldap base does exist // check if ldap base does exist
if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*')) if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
{ {
throw new Api\Exception\WrongUserInput(lang('Base dn "%1" NOT found!',$this->ldap_base)); throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
} }
if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base, if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
@ -799,7 +799,7 @@ class setup_cmd_ldap extends setup_cmd
* @param string $dn =null default $this->ldap_root_dn * @param string $dn =null default $this->ldap_root_dn
* @param string $pw =null default $this->ldap_root_pw * @param string $pw =null default $this->ldap_root_pw
* @param string $host =null default $this->ldap_host, hostname, ip or ldap-url * @param string $host =null default $this->ldap_host, hostname, ip or ldap-url
* @throws Api\Exception\WrongUserInput Can not connect to ldap ... * @throws Api\Exception\WrongUserinput Can not connect to ldap ...
*/ */
private function connect($dn=null,$pw=null,$host=null) private function connect($dn=null,$pw=null,$host=null)
{ {
@ -809,7 +809,7 @@ class setup_cmd_ldap extends setup_cmd
if (!$pw) // Api\Ldap::ldapConnect use the current eGW's pw otherwise if (!$pw) // Api\Ldap::ldapConnect use the current eGW's pw otherwise
{ {
throw new Api\Exception\WrongUserInput(lang('You need to specify a password!')); throw new Api\Exception\WrongUserinput(lang('You need to specify a password!'));
} }
try { try {
@ -817,7 +817,7 @@ class setup_cmd_ldap extends setup_cmd
} }
catch (Api\Exception\NoPermission $e) { catch (Api\Exception\NoPermission $e) {
_egw_log_exception($e); _egw_log_exception($e);
throw new Api\Exception\WrongUserInput(lang('Can not connect to LDAP server on host %1 using DN %2!', throw new Api\Exception\WrongUserinput(lang('Can not connect to LDAP server on host %1 using DN %2!',
$host,$dn).($this->test_ldap->ds ? ' ('.ldap_error($this->test_ldap->ds).')' : '')); $host,$dn).($this->test_ldap->ds ? ' ('.ldap_error($this->test_ldap->ds).')' : ''));
} }
return lang('Successful connected to LDAP server on %1 using DN %2.',$this->ldap_host,$dn); return lang('Successful connected to LDAP server on %1 using DN %2.',$this->ldap_host,$dn);
@ -827,7 +827,7 @@ class setup_cmd_ldap extends setup_cmd
* Count active (not expired) users * Count active (not expired) users
* *
* @return int number of active users * @return int number of active users
* @throws Api\Exception\WrongUserInput * @throws Api\Exception\WrongUserinput
*/ */
private function users() private function users()
{ {
@ -852,7 +852,7 @@ class setup_cmd_ldap extends setup_cmd
* Check and if does not yet exist create the new database and user * Check and if does not yet exist create the new database and user
* *
* @return string with success message * @return string with success message
* @throws Api\Exception\WrongUserInput * @throws Api\Exception\WrongUserinput
*/ */
private function create() private function create()
{ {
@ -898,7 +898,7 @@ class setup_cmd_ldap extends setup_cmd
// check if base does exist // check if base does exist
if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*')) if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
{ {
throw new Api\Exception\WrongUserInput(lang('Base dn "%1" NOT found!',$this->ldap_base)); throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
} }
return lang('LDAP dn="%1" with %2 entries deleted.', return lang('LDAP dn="%1" with %2 entries deleted.',
$this->ldap_base,$this->rdelete($this->ldap_base)); $this->ldap_base,$this->rdelete($this->ldap_base));
@ -954,7 +954,7 @@ class setup_cmd_ldap extends setup_cmd
// check if base does exist // check if base does exist
if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*')) if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
{ {
throw new Api\Exception\WrongUserInput(lang('Base dn "%1" NOT found!',$this->ldap_base)); throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
} }
$object_class = $this->object_class ? $this->object_class : 'qmailUser'; $object_class = $this->object_class ? $this->object_class : 'qmailUser';
$mbox_attr = $this->mbox_attr ? $this->mbox_attr : 'mailmessagestore'; $mbox_attr = $this->mbox_attr ? $this->mbox_attr : 'mailmessagestore';