topaLE
/
Heimdall
1
0
Fork 0
Code Issues 163 Pull Requests 18 Projects Releases 47 Wiki Activity
Browse Source

fixes

pull/11/head
Chris 7 years ago
parent
eb3c3b94d6
commit
09276f08fc
2 changed files with 30 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/Providers/AppServiceProvider.php
  2. 52
      app/Setting.php

4
app/Providers/AppServiceProvider.php
View File

@ -39,7 +39,9 @@ class AppServiceProvider extends ServiceProvider
if(version_compare($app_version, $db_version) == 1) { // app is higher than db, so need to run migrations etc if(version_compare($app_version, $db_version) == 1) { // app is higher than db, so need to run migrations etc
Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true)); Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true));
} }
} } else {
Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true));
}
} }
view()->share('alt_bg', $alt_bg); view()->share('alt_bg', $alt_bg);

52
app/Setting.php
View File

@ -168,32 +168,34 @@ class Setting extends Model
$output = ''; $output = '';
$homepage_search = self::fetch('homepage_search'); $homepage_search = self::fetch('homepage_search');
$search_provider = self::where('key', '=', 'search_provider')->first(); $search_provider = self::where('key', '=', 'search_provider')->first();
if((bool)$homepage_search && (bool)$search_provider) {
$options = (array)json_decode($search_provider->options);
$name = $options[$search_provider->value]; $options = (array)json_decode($search_provider->options);
if((bool)$homepage_search && (bool)$search_provider->value) { $name = $options[$search_provider->value];
switch($search_provider->value) { if((bool)$homepage_search && (bool)$search_provider->value) {
case 'google': switch($search_provider->value) {
$url = 'https://www.google.com/search'; case 'google':
$var = 'q'; $url = 'https://www.google.com/search';
break; $var = 'q';
case 'ddg': break;
$url = 'https://duckduckgo.com/'; case 'ddg':
$var = 'q'; $url = 'https://duckduckgo.com/';
break; $var = 'q';
case 'bing': break;
$url = 'https://www.bing.com/search'; case 'bing':
$var = 'q'; $url = 'https://www.bing.com/search';
break; $var = 'q';
break;
}
$output .= '<div class="searchform">';
$output .= Form::open(['url' => $url, 'method' => 'get']);
$output .= '<div class="input-container">';
$output .= Form::text($var, null, ['class' => 'homesearch', 'placeholder' => $name.' search...']);
$output .= '<button type="submit">Search</button>';
$output .= '</div>';
$output .= Form::close();
$output .= '</div>';
} }
$output .= '<div class="searchform">';
$output .= Form::open(['url' => $url, 'method' => 'get']);
$output .= '<div class="input-container">';
$output .= Form::text($var, null, ['class' => 'homesearch', 'placeholder' => $name.' search...']);
$output .= '<button type="submit">Search</button>';
$output .= '</div>';
$output .= Form::close();
$output .= '</div>';
} }
return $output; return $output;
} }

Write Preview
Loading…
Cancel
Save