Merge pull request #158 from henrywhitaker3/speedtest-error

Tweaks

app/Helpers/SettingsHelper.php

@@ -85,21 +85,43 @@ class SettingsHelper {
      */
     public static function settingIsEditable(string $key)
     {
+        $results = [];
+
         // Try exact key
         $val = exec('echo $' . $key);
 
         if($val == "") {
-            return true;
+            array_push($results, true);
+        } else {
+            array_push($results, false);
         }
 
         // Try key all caps
         $val = exec('echo $' . strtoupper($key));
 
         if($val == "") {
-            return true;
+            array_push($results, true);
+        } else {
+            array_push($results, false);
         }
 
-        return false;
+        if(env($key, false) == false) {
+            array_push($results, true);
+        } else {
+            array_push($results, false);
+        }
+
+        if(env(strtoupper($key), false) == false) {
+            array_push($results, true);
+        } else {
+            array_push($results, false);
+        }
+
+        if(in_array(false, $results)) {
+            return false;
+        }
+
+        return true;
     }
 
     /**

app/Http/Controllers/SettingsController.php

@@ -106,7 +106,7 @@ class SettingsController extends Controller
 
             if($setting == false) {
                 $setting = SettingsHelper::set($d['name'], $d['value']);
-            } else if($setting->editable == true) {
+            } else if(SettingsHelper::settingIsEditable($setting->name)) {
                 $setting = SettingsHelper::set($d['name'], $d['value']);
             } else {
                 continue;

app/Setting.php

@@ -17,11 +17,4 @@ class Setting extends Model
     ];
 
     protected $table = 'settings';
-
-    protected $attributes = [ 'editable' ];
-
-    public function getEditableAttribute()
-    {
-        return SettingsHelper::settingIsEditable($this->name);
-    }
 }

resources/js/components/Home/SettingWithModal.js

@@ -27,11 +27,13 @@ export default class SettingWithModal extends Component {
         var settings = this.state.settings;
 
         settings.forEach(e => {
-            var res = {
-                name: e.obj.name,
-                value: e.obj.value
-            };
-            data.push(res);
+            if(e.type !== 'button-get') {
+                var res = {
+                    name: e.obj.name,
+                    value: e.obj.value
+                };
+                data.push(res);
+            }
         });
 
         data = {