From 3785c9e221fcb6ca3bb749c38f6401b2b4361257 Mon Sep 17 00:00:00 2001
From: jerome mouneyrac <jerome@moodle.com>
Date: Mon, 18 Jan 2010 07:41:53 +0000
Subject: [PATCH] webservice MDL-21351 token error message more explicit

---
 lang/en_utf8/webservice.php | 6 +++++-
 webservice/lib.php          | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lang/en_utf8/webservice.php b/lang/en_utf8/webservice.php
index 9fdc63c55d8..c356bc10a2c 100644
--- a/lang/en_utf8/webservice.php
+++ b/lang/en_utf8/webservice.php
@@ -1,7 +1,7 @@
 <?php
 
 $string['accessexception'] = 'Access control exception';
-$string['activatehttps'] = 'connect with HTTPS to see the token';
+$string['activatehttps'] = '******************';
 $string['addfunction'] = 'Add function';
 $string['addfunctionhelp'] = 'Select the function to add to the service.';
 $string['addrequiredcapability'] = 'Assign/Unassign the required capability';
@@ -10,6 +10,7 @@ $string['actwebserviceshhdr'] = 'Active web service protocols';
 $string['apiexplorer'] = 'API explorer';
 $string['apiexplorernotavalaible'] = 'API explorer not available yet.';
 $string['arguments'] = 'Arguments';
+$string['authmethod'] = 'Authentication method';
 $string['configwebserviceplugins'] = 'For security reasons enable only protocols that are used.';
 $string['context'] = 'Context';
 $string['createtoken'] = 'Create token';
@@ -31,6 +32,9 @@ $string['function'] = 'Function';
 $string['functions'] = 'Functions';
 $string['generalstructure'] = 'General structure';
 $string['httpswarning'] = 'Token strings are only displayed if your connection is secured (https)';
+$string['invalidiptoken'] = 'Invalid token - your IP is not supported';
+$string['invalidtimedtoken'] = 'Invalid token - token expired';
+$string['invalidtoken'] = 'Invalid token - token not found';
 $string['iprestriction'] = 'IP restriction';
 $string['manageprotocols'] = 'Manage protocols';
 $string['managetokens'] = 'Manage tokens';
diff --git a/webservice/lib.php b/webservice/lib.php
index 418f646b22d..0e8b2bc4bd5 100644
--- a/webservice/lib.php
+++ b/webservice/lib.php
@@ -157,15 +157,15 @@ abstract class webservice_server implements webservice_server_interface {
         } else {
             if (!$token = $DB->get_record('external_tokens', array('token'=>$this->token, 'tokentype'=>EXTERNAL_TOKEN_PERMANENT))) {
                 // TODO: MDL-12886 log failed login attempts
-                throw new webservice_access_exception('Invalid token');
+                throw new webservice_access_exception(get_string('invalidtoken', 'webservice'));
             }
 
             if ($token->validuntil and $token->validuntil < time()) {
-                throw new webservice_access_exception('Invalid token');
+                throw new webservice_access_exception(get_string('invalidtimedtoken', 'webservice'));
             }
 
             if ($token->iprestriction and !address_in_subnet(getremoteaddr(), $token->iprestriction)) {
-                throw new webservice_access_exception('Invalid token');
+                throw new webservice_access_exception(get_string('invalidiptoken', 'webservice'));
             }
 
             $this->restricted_context = get_context_instance_by_id($token->contextid);