From 8c821ab8cb6291537af25fc32615a38bdca6fd74 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 25 May 2016 21:15:06 +0200 Subject: [PATCH] fix wrong/different case WrongUserInput --> WrongUserinput --- api/src/Auth.php | 4 ++-- api/src/Categories.php | 4 ++-- .../{WrongUserInput.php => WrongUserinput.php} | 0 api/src/Vfs.php | 2 +- setup/inc/class.setup_cmd_ldap.inc.php | 18 +++++++++--------- 5 files changed, 14 insertions(+), 14 deletions(-) rename api/src/Exception/{WrongUserInput.php => WrongUserinput.php} (100%) diff --git a/api/src/Auth.php b/api/src/Auth.php index 1ac600ec16..d5fb4819c8 100644 --- a/api/src/Auth.php +++ b/api/src/Auth.php @@ -231,7 +231,7 @@ class Auth * @param string $old_passwd must be cleartext * @param string $new_passwd must be cleartext * @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 * @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))) { - throw new Exception\WrongUserInput($err); + throw new Exception\WrongUserinput($err); } if (($ret = $this->backend->change_password($old_passwd, $new_passwd, $account_id))) { diff --git a/api/src/Categories.php b/api/src/Categories.php index 42242ac6c6..cc2257b8bc 100644 --- a/api/src/Categories.php +++ b/api/src/Categories.php @@ -704,7 +704,7 @@ class Categories if (isset($values['old_parent']) && (int)$values['old_parent'] != (int)$values['parent']) { $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 $values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0); $this->adapt_level_in_subtree($values); @@ -717,7 +717,7 @@ class Categories if ($values['parent'] > 0) { $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 $values['main'] = $this->id2name($values['parent'],'main'); diff --git a/api/src/Exception/WrongUserInput.php b/api/src/Exception/WrongUserinput.php similarity index 100% rename from api/src/Exception/WrongUserInput.php rename to api/src/Exception/WrongUserinput.php diff --git a/api/src/Vfs.php b/api/src/Vfs.php index 988bb93a89..44ce055213 100644 --- a/api/src/Vfs.php +++ b/api/src/Vfs.php @@ -1088,7 +1088,7 @@ class Vfs extends Vfs\StreamWrapper if (!preg_match($use='/^([ugoa]*)([+=-]+)([rwx]+)$/',$s,$matches)) { $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) | (strpos($matches[3],'w') !== false ? self::WRITABLE : 0) | diff --git a/setup/inc/class.setup_cmd_ldap.inc.php b/setup/inc/class.setup_cmd_ldap.inc.php index a3f5c5a857..257943dbb7 100644 --- a/setup/inc/class.setup_cmd_ldap.inc.php +++ b/setup/inc/class.setup_cmd_ldap.inc.php @@ -315,7 +315,7 @@ class setup_cmd_ldap extends setup_cmd // check if ads base does exist 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 @@ -324,7 +324,7 @@ class setup_cmd_ldap extends setup_cmd // check if ldap base does exist 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, @@ -799,7 +799,7 @@ class setup_cmd_ldap extends setup_cmd * @param string $dn =null default $this->ldap_root_dn * @param string $pw =null default $this->ldap_root_pw * @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) { @@ -809,7 +809,7 @@ class setup_cmd_ldap extends setup_cmd 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 { @@ -817,7 +817,7 @@ class setup_cmd_ldap extends setup_cmd } catch (Api\Exception\NoPermission $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).')' : '')); } 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 * * @return int number of active users - * @throws Api\Exception\WrongUserInput + * @throws Api\Exception\WrongUserinput */ 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 * * @return string with success message - * @throws Api\Exception\WrongUserInput + * @throws Api\Exception\WrongUserinput */ private function create() { @@ -898,7 +898,7 @@ class setup_cmd_ldap extends setup_cmd // check if base does exist 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.', $this->ldap_base,$this->rdelete($this->ldap_base)); @@ -954,7 +954,7 @@ class setup_cmd_ldap extends setup_cmd // check if base does exist 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'; $mbox_attr = $this->mbox_attr ? $this->mbox_attr : 'mailmessagestore';