diff --git a/app/Providers/ViewServiceProvider.php b/app/Providers/ViewServiceProvider.php new file mode 100644 index 0000000000..720b0e6161 --- /dev/null +++ b/app/Providers/ViewServiceProvider.php @@ -0,0 +1,45 @@ +. + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2018 Tony Murray + * @author Tony Murray + */ + +namespace App\Providers; + +class ViewServiceProvider extends \Illuminate\View\ViewServiceProvider +{ + public function register() + { + if (class_exists('Wpb\String_Blade_Compiler\ViewServiceProvider')) { + $this->app->register('Wpb\String_Blade_Compiler\ViewServiceProvider'); + } else { + $this->app->register('Illuminate\View\ViewServiceProvider'); + } + } + + public function boot() + { + if (!class_exists('Wpb\String_Blade_Compiler\ViewServiceProvider')) { + \Toastr::error('Dependencies missing, check validate'); + } + } +} diff --git a/config/app.php b/config/app.php index 1527825ce5..efc02aa3e4 100644 --- a/config/app.php +++ b/config/app.php @@ -161,7 +161,6 @@ return [ Illuminate\Session\SessionServiceProvider::class, Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class, - Wpb\String_Blade_Compiler\ViewServiceProvider::class, /* * Package Service Providers... @@ -177,6 +176,7 @@ return [ App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, App\Providers\ComposerServiceProvider::class, + App\Providers\ViewServiceProvider::class, /* * Vendor Service Providers... diff --git a/html/legacy_index.php b/html/legacy_index.php index d373a6fafa..2186c00a3a 100644 --- a/html/legacy_index.php +++ b/html/legacy_index.php @@ -303,17 +303,17 @@ foreach (dbFetchRows('SELECT `notifications`.* FROM `notifications` WHERE NOT ex } if (is_array($msg_box)) { - echo(" + "; + foreach ($msg_box as $message) { - $message['type'] = mres($message['type']); - $message['message'] = mres($message['message']); - $message['title'] = mres($message['title']); - echo "toastr.".$message['type']."('".$message['message']."','".$message['title']."');\n"; + Toastr::add($message['type'], $message['message'], $message['title']); } - echo(""); + + echo Toastr::render(); } if ($no_refresh !== true && $config['page_refresh'] != 0) {