Edit option default for anon/auto API key generation; this does not b…

…reak old configs
cydrobolt · May 13, 2016 · 3dc4285 · 3dc4285
1 parent ff1f726
commit 3dc4285
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php
@@ -13,9 +13,8 @@ protected static function getApiUserInfo(Request $request) {
 
         if (!$api_key) {
             // no API key provided -- check whether anonymous API is on
-            // TODO: throttle requests from anonymous API
 
-            if (env('SETTING_ANON_API') == 'on') {
+            if (env('SETTING_ANON_API')) {
                 $username = 'ANONIP-' . $request->ip();
             }
             else {

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -97,7 +97,8 @@ public function performSignup(Request $request) {
 
         $api_active = false;
         $api_key = null;
-        if (env('SETTING_AUTO_API') == 'on') {
+
+        if (env('SETTING_AUTO_API')) {
             // if automatic API key assignment is on
             $api_active = 1;
             $api_key = CryptoHelper::generateRandomHex(env('_API_KEY_LENGTH'));

diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
@@ -113,14 +113,14 @@
 
             <p>Anonymous API:</p>
             <select name='setting:anon_api' class='form-control'>
-                <option selected value='off'>Off -- only registered users can use API</option>
-                <option value='on'>On -- empty key API requests are allowed</option>
+                <option selected value='false'>Off -- only registered users can use API</option>
+                <option value='true'>On -- empty key API requests are allowed</option>
             </select>
 
             <p>Automatic API Assignment:</p>
             <select name='setting:auto_api_key' class='form-control'>
-                <option selected value='off'>Off -- admins must manually enable API for each user</option>
-                <option value='on'>On -- each user receives an API key</option>
+                <option selected value='false'>Off -- admins must manually enable API for each user</option>
+                <option value='true'>On -- each user receives an API key</option>
             </select>
 
             <h4>Other Settings</h4>