Skip to content

Commit c53fefd

Browse files
committed
fix: Drop unnecessary / uninitialized form parameter
1 parent c513356 commit c53fefd

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

admin/alarms.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
}
4545

4646
if ($form->validate()) {
47-
$info = $form->getInfo($vars, $info);
47+
$info = $form->getInfo($vars);
4848
if (empty($info['alarm'])) {
4949
$info['alarm'] = strval(new Horde_Support_Uuid());
5050
}

admin/config/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ function _uploadFTP($params)
445445
$ftpform->addVariable(_("Password"), 'password', 'password', false);
446446

447447
if ($ftpform->validate($vars)) {
448-
$info = $ftpform->getInfo($vars, $info);
448+
$info = $ftpform->getInfo($vars);
449449
$upload = _uploadFTP($info);
450450
if ($upload) {
451451
$notification->push(_("Uploaded all application configuration files to the server."), 'horde.success');

admin/user.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
case 'add':
6060
$addForm->validate($vars);
6161
if ($addForm->isValid() && $vars->get('formname') == 'adduser') {
62-
$info = $addForm->getInfo($vars, $info);
62+
$info = $addForm->getInfo($vars);
6363

6464
if (empty($info['user_name']) && isset($info['extra']['user_name'])) {
6565
$info['user_name'] = $info['extra']['user_name'];

services/changepassword.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
$form->addVariable(_("Retype new password"), 'password_2', 'password', true);
3434

3535
if ($form->validate($vars)) {
36-
$info = $form->getInfo($vars, $info);
36+
$info = $form->getInfo($vars);
3737

3838
if ($registry->getAuthCredential('password') != $info['old_password']) {
3939
$notification->push(_("Old password is not correct."), 'horde.error');

services/resetpassword.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
/* Validate the form. */
6464
if ($can_validate && $form->validate($vars)) {
65-
$info = $form->getInfo($vars, $info);
65+
$info = $form->getInfo($vars);
6666

6767
/* Fetch values from prefs for selected user. */
6868
$answer = $prefs->getValue('security_answer');

signup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
$notification->push(_("User Registration is not properly configured for this site."), 'horde.error');
3232
$registry->getServiceLink('login')->redirect();
3333
}
34-
34+
$info = [];
3535
$vars = $injector->getInstance('Horde_Variables');
3636
$formsignup = new Horde_Core_Auth_Signup_Form($vars);
3737
if ($formsignup->validate()) {

src/Cli/SetupBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public function configAuth() {
251251
$this->_cli->writeln();
252252
$this->_cli->writeln($this->_cli->bold('Configuring global administrator settings'));
253253
// TODO: Move getting the factory to constructor
254-
$auth = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create($vars->app ?? 'horde');
254+
$auth = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create('horde');
255255
$atLeastOneAdminExists = false;
256256
while (!$atLeastOneAdminExists) {
257257
$adminUsers = $vars->auth__admins ? explode(', ', $vars->auth__admins) : [];

0 commit comments

Comments
 (0)