From 03dd2f5603931efe757735d6939d7248ff52df04 Mon Sep 17 00:00:00 2001
From: jerome mouneyrac <jerome@moodle.com>
Date: Tue, 25 May 2010 03:14:11 +0000
Subject: [PATCH] webservice MDL-20805 do not force "display token values only
 for https connection"

---
 lang/en/webservice.php | 2 --
 lib/adminlib.php       | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/lang/en/webservice.php b/lang/en/webservice.php
index 30671b27167..7aaa4609605 100644
--- a/lang/en/webservice.php
+++ b/lang/en/webservice.php
@@ -25,7 +25,6 @@
 
 $string['accessexception'] = 'Access control exception';
 $string['accessnotallowed'] = 'Access to web service not allowed';
-$string['activatehttps'] = '******************';
 $string['actwebserviceshhdr'] = 'Active web service protocols';
 $string['addaservice'] = 'Add service';
 $string['addcapabilitytousers'] = 'Check users capability';
@@ -87,7 +86,6 @@ $string['failedtolog'] = 'Failed to log';
 $string['function'] = 'Function';
 $string['functions'] = 'Functions';
 $string['generalstructure'] = 'General structure';
-$string['httpswarning'] = 'Token strings are only displayed if your connection is secured (https)';
 $string['checkusercapability'] = 'Check user capability';
 $string['checkusercapabilitydescription'] = 'To use the web services, a user needs to have a capability matching the web service protocols (\'webservice/rest:use\', \'webservice/soap:use\', ...). <br/>Advice: one way to set this up is to create a new \'Web Service\' system role with protocol capabilities defined. Then you assign this system role to the web service user.';
 $string['information'] = 'Information';
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 36684631cbe..35b54027bad 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -6910,10 +6910,6 @@ class admin_setting_managewebservicetokens extends admin_setting {
                 $delete = "<a href=\"".$tokenpageurl."&amp;action=delete&amp;tokenid=".$token->id."\">";
                 $delete .= get_string('delete')."</a>";
 
-                if (empty($_SERVER['HTTPS'])) {
-                    $token->token = get_string('activatehttps', 'webservice');
-                }
-
                 $validuntil = '';
                 if (!empty($token->validuntil)) {
                     $validuntil = date("F j, Y"); //TODO: language support (look for moodle function)
@@ -6932,7 +6928,6 @@ class admin_setting_managewebservicetokens extends admin_setting {
             }
 
             $return .= html_writer::table($table);
-            $return .= get_string('httpswarning', 'webservice');
         } else {
             $return .= get_string('notoken', 'webservice');
         }