Commit 45fdb532 authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review

Merge "Fixing duplicate lang string (Bug #1393622)"

parents f10e7e72 8c890a3e
...@@ -169,7 +169,7 @@ $string['sauthtype'] = 'AuthType'; ...@@ -169,7 +169,7 @@ $string['sauthtype'] = 'AuthType';
$string['enterparameters'] = 'Enter Function Parameters'; $string['enterparameters'] = 'Enter Function Parameters';
$string['testclientinstructions'] = 'This is the interactive test client facility for Web Services. This enables you to select a function and then execute it live against the current system. Please be aware that ANY function you eecute will run for real.'; $string['testclientinstructions'] = 'This is the interactive test client facility for Web Services. This enables you to select a function and then execute it live against the current system. Please be aware that ANY function you eecute will run for real.';
$string['executed'] = 'Function call executed'; $string['executed'] = 'Function call executed';
$string['invaliduser'] = 'Invalid wsusername/wspassword supplied'; $string['invaliduserpass'] = 'Invalid wsusername/wspassword supplied for "%s"';
$string['invalidtoken'] = 'Invalid wstoken supplied'; $string['invalidtoken'] = 'Invalid wstoken supplied';
//oauth server registry //oauth server registry
......
...@@ -320,7 +320,7 @@ function testclient_submit(Pieform $form, $values) { ...@@ -320,7 +320,7 @@ function testclient_submit(Pieform $form, $values) {
$auth = new AuthWebservice($auth_instance->id); $auth = new AuthWebservice($auth_instance->id);
if (!$auth->authenticate_user_account($dbuser, $values['wspassword'], 'webservice')) { if (!$auth->authenticate_user_account($dbuser, $values['wspassword'], 'webservice')) {
// log failed login attempts // log failed login attempts
$SESSION->add_error_msg(get_string('invaliduser', 'auth.webservice', $values['wsusername'])); $SESSION->add_error_msg(get_string('invaliduserpass', 'auth.webservice', $values['wsusername']));
redirect('/webservice/testclient.php?' . implode('&', $params)); redirect('/webservice/testclient.php?' . implode('&', $params));
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment