Merge pull request #1476 from KodeStar/2.x

Load in configs values if class has been lost

app/Http/Controllers/ItemController.php

@@ -267,10 +267,9 @@ class ItemController extends Controller
                 ],
             ];
 
-            
             $file = $request->input('icon');
             $path_parts = pathinfo($file);
-            if (!array_key_exists('extension', $path_parts)) {
+            if (!isset($path_parts['extension'])) {
                 throw ValidationException::withMessages(['file' => 'Icon URL must have a valid file extension.']);
             }
             $extension = $path_parts['extension'];
@@ -313,11 +312,7 @@ class ItemController extends Controller
             $storedConfigObject = json_decode($storedItem->getAttribute('description'));
 
             $configObject = json_decode($config);
-            if ($storedConfigObject && property_exists($storedConfigObject, 'password')) {
-                $configObject->password = $storedConfigObject->password;
-            } else {
-                $configObject->password = null;
-            }
+            $configObject->password = $storedConfigObject->password;
 
             $config = json_encode($configObject);
         }
@@ -434,31 +429,20 @@ class ItemController extends Controller
             return null;
         }
 
+        $output['config'] = null;
+        $output['custom'] = null;
+
         $app = Application::single($appid);
-
-        if (!$app) {
-            return response()->json(['error' => 'Application not found.'], 404);
-        }
-
         $output = (array)$app;
 
         $appdetails = Application::getApp($appid);
 
-        if (!$appdetails) {
-            return response()->json(['error' => 'Application details not found.'], 404);
-        }
-
         if ((bool)$app->enhanced === true) {
             $item = $itemId ? Item::find($itemId) : Item::where('appid', $appid)->first();
-
-            if ($item) {
-                $output['custom'] = className($appdetails->name) . '.config';
-                $output['appvalue'] = $item->description;
-            } else {
-                // Ensure the app is installed if not found
-                $output['custom'] = className($appdetails->name) . '.config';
-                $output['appvalue'] = null;
-            }
+            // if(!isset($app->config)) { // class based config
+            $output['custom'] = className($appdetails->name) . '.config';
+            $output['appvalue'] = $item->description;
+            // }
         }
 
         $output['colour'] = ($app->tile_background == 'light') ? '#fafbfc' : '#161b1f';
@@ -466,12 +450,14 @@ class ItemController extends Controller
         if (strpos($app->icon, '://') !== false) {
             $output['iconview'] = $app->icon;
         } elseif (strpos($app->icon, 'icons/') !== false) {
+            // Private apps have the icon locally
             $output['iconview'] = URL::to('/') . '/storage/' . $app->icon;
             $output['icon'] = str_replace('icons/', '', $output['icon']);
         } else {
             $output['iconview'] = config('app.appsource') . 'icons/' . $app->icon;
         }
 
+
         return json_encode($output);
     }
 

app/Http/Controllers/SearchController.php

@@ -18,8 +18,10 @@ class SearchController extends Controller
         $requestprovider = $request->input('provider');
         $query = $request->input('q');
 
-        // Sanitize the query to prevent XSS
-        $query = htmlspecialchars($query, ENT_QUOTES, 'UTF-8'); 
+        // Validate the presence and non-emptiness of the query parameter
+        if (!$query || trim($query) === '') {
+            abort(400, 'Missing or empty query parameter');
+        }
 
         $provider = Search::providerDetails($requestprovider);
 
@@ -27,11 +29,6 @@ class SearchController extends Controller
             abort(404, 'Invalid provider');
         }
 
-        // If the query is empty, redirect to the provider's base URL
-        if (!$query || trim($query) === '') {
-            return redirect($provider->url);
-        }
-
         if ($provider->type == 'standard') {
             return redirect($provider->url.'?'.$provider->query.'='.urlencode($query));
         } elseif ($provider->type == 'external') {
@@ -39,6 +36,5 @@ class SearchController extends Controller
             return $class->getResults($query, $provider);
         }
 
-        abort(404, 'Provider type not supported');
-    }
+        abort(404, 'Provider type not supported');}
 }

app/Http/Controllers/SettingsController.php

@@ -45,7 +45,6 @@ class SettingsController extends Controller
         if (! is_null($setting)) {
             return view('settings.edit')->with([
                 'setting' => $setting,
-                'value' => $setting->value,
             ]);
         } else {
             $route = route('settings.list', []);

app/Search.php

@@ -121,7 +121,7 @@ abstract class Search
                     $output .= '<option value="'.$key.'"'.$selected.'>'.$searchprovider['name'].'</option>';
                 }
                 $output .= '</select>';
-                $output .= '<input type="text" name="q" value="'.e(Input::get('q') ?? '').'" class="homesearch" autofocus placeholder="'.__('app.settings.search').'..." />';
+                $output .= '<input type="text" name="q" value="'.(Input::get('q') ?? '').'" class="homesearch" autofocus placeholder="'.__('app.settings.search').'..." />';
                 $output .= '<button type="submit">'.ucwords(__('app.settings.search')).'</button>';
                 $output .= '</div>';
                 $output .= '</form>';

app/Services/CustomFormBuilder.php

@@ -21,20 +21,6 @@ class CustomFormBuilder
         );
     }
 
-    public function hidden($name, $value = null, $options = [])
-    {
-        return new HtmlString(
-            $this->html->input('hidden', $name, $value)->attributes($options)
-        );
-    }
-
-    public function checkbox($name, $value = null, $checked = false, $options = [])
-    {
-        return new HtmlString(
-            $this->html->checkbox($name, $value, $checked)->attributes($options)
-        );
-    }
-
     public function select($name, $list = [], $selected = null, $options = [])
     {
         return new HtmlString(

app/Setting.php

@@ -150,41 +150,41 @@ class Setting extends Model
         switch ($this->type) {
             case 'image':
                 $value = '';
-                if (isset($this->value) && !empty($this->value)) {
-                    $value .= '<a class="setting-view-image" href="' .
-                        asset('storage/' . $this->value) .
-                        '" title="' .
-                        __('app.settings.view') .
-                        '" target="_blank"><img src="' .
-                        asset('storage/' .
-                            $this->value) .
+                if (isset($this->value) && ! empty($this->value)) {
+                    $value .= '<a class="setting-view-image" href="'.
+                        asset('storage/'.$this->value).
+                        '" title="'.
+                        __('app.settings.view').
+                        '" target="_blank"><img src="'.
+                        asset('storage/'.
+                            $this->value).
                         '" /></a>';
                 }
                 $value .= '<input type="file" name="value" class="form-control" />';
-                if (isset($this->value) && !empty($this->value)) {
-                    $value .= '<a class="settinglink" href="' .
-                        route('settings.clear', $this->id) .
-                        '" title="' .
-                        __('app.settings.remove') .
-                        '">' .
-                        __('app.settings.reset') .
+                if (isset($this->value) && ! empty($this->value)) {
+                    $value .= '<a class="settinglink" href="'.
+                        route('settings.clear', $this->id).
+                        '" title="'.
+                        __('app.settings.remove').
+                        '">'.
+                        __('app.settings.reset').
                         '</a>';
                 }
-    
+
                 break;
             case 'boolean':
                 $checked = false;
-                if (isset($this->value) && (bool)$this->value === true) {
+                if (isset($this->value) && (bool) $this->value === true) {
                     $checked = true;
                 }
                 $set_checked = ($checked) ? ' checked="checked"' : '';
                 $value = '
                 <input type="hidden" name="value" value="0" />
                 <label class="switch">
-                    <input type="checkbox" name="value" value="1"' . $set_checked . ' />
+                    <input type="checkbox" name="value" value="1"'.$set_checked.' />
                     <span class="slider round"></span>
                 </label>';
-    
+
                 break;
             case 'select':
                 $options = json_decode($this->options);
@@ -193,21 +193,21 @@ class Setting extends Model
                 }
                 $value = '<select name="value" class="form-control">';
                 foreach ($options as $key => $opt) {
-                    $value .= '<option value="' . $key . '" ' . (($this->value == $key) ? 'selected' : '') . '>' . __($opt) . '</option>';
+                    $value .= '<option value="'.$key.'" '.(($this->value == $key) ? 'selected' : '').'>'.__($opt).'</option>';
                 }
                 $value .= '</select>';
                 break;
             case 'textarea':
-                $value = '<textarea name="value" class="form-control" cols="44" rows="15">' . htmlspecialchars($this->value, ENT_QUOTES, 'UTF-8') . '</textarea>';
+                $value = '<textarea name="value" class="form-control" cols="44" rows="15"></textarea>';
                 break;
             default:
-                $value = '<input type="text" name="value" class="form-control" value="' . htmlspecialchars($this->value, ENT_QUOTES, 'UTF-8') . '" />';
+                $value = '<input type="text" name="value" class="form-control" />';
                 break;
         }
-    
+
         return $value;
     }
-    
+
     public function group(): BelongsTo
     {
         return $this->belongsTo(\App\SettingGroup::class, 'group_id');

config/app.php

@@ -5,7 +5,7 @@ use Illuminate\Support\Facades\Facade;
 
 return [
 
-    'version' => '2.7.4',
+    'version' => '2.7.2',
 
     'appsource' => env('APP_SOURCE', 'https://appslist.heimdall.site/'),
 

tests/Feature/SearchTest.php

@@ -32,4 +32,22 @@ class SearchTest extends TestCase
         $response->assertStatus(404); // Assert that the response status is 404
     }
 
+    public function test_search_page_without_query_parameter(): void
+    {
+        $provider = 'google'; // Example provider
+
+        $response = $this->get(route('search', ['provider' => $provider]));
+
+        $response->assertStatus(400); // Assert that the response status is 400 (Bad Request)
+    }
+
+    public function test_search_page_with_empty_query(): void
+    {
+        $provider = 'google'; // Example provider
+        $query = ''; // Empty search term
+
+        $response = $this->get(route('search', ['provider' => $provider, 'q' => $query]));
+
+        $response->assertStatus(400); // Assert that the response status is 400 (Bad Request)
+    }
 }