@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | - 'providers' => [ |
|
| 4 | + 'providers' => [ |
|
| 5 | 5 | 0 => 'App\\Plugins\\Ccavanue\\ServiceProvider', |
| 6 | 6 | 1 => 'App\\Plugins\\Ping\\ServiceProvider', |
| 7 | 7 | 2 => 'App\\Plugins\\Twilio\\ServiceProvider', |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | 29 => 'App\\Providers\\EventServiceProvider', |
| 35 | 35 | 30 => 'App\\Providers\\RouteServiceProvider', |
| 36 | 36 | 31 => 'Illuminate\\Broadcasting\\BroadcastServiceProvider', |
| 37 | - ], |
|
| 38 | - 'eager' => [ |
|
| 37 | + ], |
|
| 38 | + 'eager' => [ |
|
| 39 | 39 | 0 => 'App\\Plugins\\Ccavanue\\ServiceProvider', |
| 40 | 40 | 1 => 'App\\Plugins\\Ping\\ServiceProvider', |
| 41 | 41 | 2 => 'App\\Plugins\\Twilio\\ServiceProvider', |
@@ -54,8 +54,8 @@ discard block |
||
| 54 | 54 | 15 => 'App\\Providers\\AppServiceProvider', |
| 55 | 55 | 16 => 'App\\Providers\\EventServiceProvider', |
| 56 | 56 | 17 => 'App\\Providers\\RouteServiceProvider', |
| 57 | - ], |
|
| 58 | - 'deferred' => [ |
|
| 57 | + ], |
|
| 58 | + 'deferred' => [ |
|
| 59 | 59 | 'Illuminate\\Bus\\Dispatcher' => 'Illuminate\\Bus\\BusServiceProvider', |
| 60 | 60 | 'Illuminate\\Contracts\\Bus\\Dispatcher' => 'Illuminate\\Bus\\BusServiceProvider', |
| 61 | 61 | 'Illuminate\\Contracts\\Bus\\QueueingDispatcher' => 'Illuminate\\Bus\\BusServiceProvider', |
@@ -122,8 +122,8 @@ discard block |
||
| 122 | 122 | 'Illuminate\\Broadcasting\\BroadcastManager' => 'Illuminate\\Broadcasting\\BroadcastServiceProvider', |
| 123 | 123 | 'Illuminate\\Contracts\\Broadcasting\\Factory' => 'Illuminate\\Broadcasting\\BroadcastServiceProvider', |
| 124 | 124 | 'Illuminate\\Contracts\\Broadcasting\\Broadcaster' => 'Illuminate\\Broadcasting\\BroadcastServiceProvider', |
| 125 | - ], |
|
| 126 | - 'when' => [ |
|
| 125 | + ], |
|
| 126 | + 'when' => [ |
|
| 127 | 127 | 'Illuminate\\Bus\\BusServiceProvider' => [ |
| 128 | 128 | ], |
| 129 | 129 | 'Illuminate\\Cache\\CacheServiceProvider' => [ |
@@ -152,5 +152,5 @@ discard block |
||
| 152 | 152 | ], |
| 153 | 153 | 'Illuminate\\Broadcasting\\BroadcastServiceProvider' => [ |
| 154 | 154 | ], |
| 155 | - ], |
|
| 155 | + ], |
|
| 156 | 156 | ]; |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | if(\Auth::user()->active==1){ |
| 48 | - return $next($request); |
|
| 48 | + return $next($request); |
|
| 49 | 49 | }else{ |
| 50 | 50 | \Auth::logout(); |
| 51 | 51 | return redirect('home')->with('fails','Activate Your Account'); |
@@ -180,7 +180,7 @@ |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | public function postSettings(Request $request){ |
| 183 | - $this->validate($request, [ |
|
| 183 | + $this->validate($request, [ |
|
| 184 | 184 | "username"=>"required", |
| 185 | 185 | "password"=>"required" |
| 186 | 186 | ]); |
@@ -2,6 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - 'view' => 'breadcrumbs::bootstrap3', |
|
| 5 | + 'view' => 'breadcrumbs::bootstrap3', |
|
| 6 | 6 | |
| 7 | 7 | ]; |
@@ -4,19 +4,19 @@ |
||
| 4 | 4 | |
| 5 | 5 | class View { |
| 6 | 6 | |
| 7 | - protected $factory; |
|
| 7 | + protected $factory; |
|
| 8 | 8 | |
| 9 | - public function __construct(ViewFactory $factory) |
|
| 10 | - { |
|
| 11 | - $this->factory = $factory; |
|
| 12 | - } |
|
| 9 | + public function __construct(ViewFactory $factory) |
|
| 10 | + { |
|
| 11 | + $this->factory = $factory; |
|
| 12 | + } |
|
| 13 | 13 | |
| 14 | - public function render($view, $breadcrumbs) |
|
| 15 | - { |
|
| 16 | - if (!$view) |
|
| 17 | - throw new Exception('Breadcrumbs view not specified (check the view in config/breadcrumbs.php, and ensure DaveJamesMiller\Breadcrumbs\ServiceProvider is loaded before any dependants in config/app.php)'); |
|
| 14 | + public function render($view, $breadcrumbs) |
|
| 15 | + { |
|
| 16 | + if (!$view) |
|
| 17 | + throw new Exception('Breadcrumbs view not specified (check the view in config/breadcrumbs.php, and ensure DaveJamesMiller\Breadcrumbs\ServiceProvider is loaded before any dependants in config/app.php)'); |
|
| 18 | 18 | |
| 19 | - return $this->factory->make($view, compact('breadcrumbs'))->render(); |
|
| 20 | - } |
|
| 19 | + return $this->factory->make($view, compact('breadcrumbs'))->render(); |
|
| 20 | + } |
|
| 21 | 21 | |
| 22 | 22 | } |
@@ -4,44 +4,44 @@ |
||
| 4 | 4 | |
| 5 | 5 | class CurrentRoute { |
| 6 | 6 | |
| 7 | - protected $route; |
|
| 8 | - protected $router; |
|
| 7 | + protected $route; |
|
| 8 | + protected $router; |
|
| 9 | 9 | |
| 10 | - public function __construct(Router $router) |
|
| 11 | - { |
|
| 12 | - $this->router = $router; |
|
| 13 | - } |
|
| 10 | + public function __construct(Router $router) |
|
| 11 | + { |
|
| 12 | + $this->router = $router; |
|
| 13 | + } |
|
| 14 | 14 | |
| 15 | - public function get() |
|
| 16 | - { |
|
| 17 | - if ($this->route) |
|
| 18 | - return $this->route; |
|
| 15 | + public function get() |
|
| 16 | + { |
|
| 17 | + if ($this->route) |
|
| 18 | + return $this->route; |
|
| 19 | 19 | |
| 20 | - $route = $this->router->current(); |
|
| 20 | + $route = $this->router->current(); |
|
| 21 | 21 | |
| 22 | - if (is_null($route)) |
|
| 23 | - return ['', []]; |
|
| 22 | + if (is_null($route)) |
|
| 23 | + return ['', []]; |
|
| 24 | 24 | |
| 25 | - $name = $route->getName(); |
|
| 25 | + $name = $route->getName(); |
|
| 26 | 26 | |
| 27 | - if (is_null($name)) { |
|
| 28 | - $uri = head($route->methods()) . ' /' . $route->uri(); |
|
| 29 | - throw new Exception("The current route ($uri) is not named - please check routes.php for an \"as\" parameter"); |
|
| 30 | - } |
|
| 27 | + if (is_null($name)) { |
|
| 28 | + $uri = head($route->methods()) . ' /' . $route->uri(); |
|
| 29 | + throw new Exception("The current route ($uri) is not named - please check routes.php for an \"as\" parameter"); |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | - $params = array_values($route->parameters()); |
|
| 32 | + $params = array_values($route->parameters()); |
|
| 33 | 33 | |
| 34 | - return [$name, $params]; |
|
| 35 | - } |
|
| 34 | + return [$name, $params]; |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - public function set($name, $params) |
|
| 38 | - { |
|
| 39 | - $this->route = [$name, $params]; |
|
| 40 | - } |
|
| 37 | + public function set($name, $params) |
|
| 38 | + { |
|
| 39 | + $this->route = [$name, $params]; |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - public function clear() |
|
| 43 | - { |
|
| 44 | - $this->route = null; |
|
| 45 | - } |
|
| 42 | + public function clear() |
|
| 43 | + { |
|
| 44 | + $this->route = null; |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | 47 | } |
@@ -2,62 +2,62 @@ |
||
| 2 | 2 | |
| 3 | 3 | class Generator { |
| 4 | 4 | |
| 5 | - protected $breadcrumbs = []; |
|
| 6 | - protected $callbacks = []; |
|
| 7 | - |
|
| 8 | - public function generate(array $callbacks, $name, $params) |
|
| 9 | - { |
|
| 10 | - $this->breadcrumbs = []; |
|
| 11 | - $this->callbacks = $callbacks; |
|
| 12 | - |
|
| 13 | - $this->call($name, $params); |
|
| 14 | - return $this->toArray(); |
|
| 15 | - } |
|
| 16 | - |
|
| 17 | - protected function call($name, $params) |
|
| 18 | - { |
|
| 19 | - if (!isset($this->callbacks[$name])) |
|
| 20 | - throw new Exception("Breadcrumb not found with name \"{$name}\""); |
|
| 21 | - |
|
| 22 | - array_unshift($params, $this); |
|
| 23 | - |
|
| 24 | - call_user_func_array($this->callbacks[$name], $params); |
|
| 25 | - } |
|
| 26 | - |
|
| 27 | - public function parent($name) |
|
| 28 | - { |
|
| 29 | - $params = array_slice(func_get_args(), 1); |
|
| 30 | - |
|
| 31 | - $this->call($name, $params); |
|
| 32 | - } |
|
| 33 | - |
|
| 34 | - public function parentArray($name, $params = []) |
|
| 35 | - { |
|
| 36 | - $this->call($name, $params); |
|
| 37 | - } |
|
| 38 | - |
|
| 39 | - public function push($title, $url = null, array $data = []) |
|
| 40 | - { |
|
| 41 | - $this->breadcrumbs[] = (object) array_merge($data, [ |
|
| 42 | - 'title' => $title, |
|
| 43 | - 'url' => $url, |
|
| 44 | - // These will be altered later where necessary: |
|
| 45 | - 'first' => false, |
|
| 46 | - 'last' => false, |
|
| 47 | - ]); |
|
| 48 | - } |
|
| 49 | - |
|
| 50 | - public function toArray() |
|
| 51 | - { |
|
| 52 | - $breadcrumbs = $this->breadcrumbs; |
|
| 53 | - |
|
| 54 | - // Add first & last indicators |
|
| 55 | - if ($breadcrumbs) { |
|
| 56 | - $breadcrumbs[0]->first = true; |
|
| 57 | - $breadcrumbs[count($breadcrumbs) - 1]->last = true; |
|
| 58 | - } |
|
| 59 | - |
|
| 60 | - return $breadcrumbs; |
|
| 61 | - } |
|
| 5 | + protected $breadcrumbs = []; |
|
| 6 | + protected $callbacks = []; |
|
| 7 | + |
|
| 8 | + public function generate(array $callbacks, $name, $params) |
|
| 9 | + { |
|
| 10 | + $this->breadcrumbs = []; |
|
| 11 | + $this->callbacks = $callbacks; |
|
| 12 | + |
|
| 13 | + $this->call($name, $params); |
|
| 14 | + return $this->toArray(); |
|
| 15 | + } |
|
| 16 | + |
|
| 17 | + protected function call($name, $params) |
|
| 18 | + { |
|
| 19 | + if (!isset($this->callbacks[$name])) |
|
| 20 | + throw new Exception("Breadcrumb not found with name \"{$name}\""); |
|
| 21 | + |
|
| 22 | + array_unshift($params, $this); |
|
| 23 | + |
|
| 24 | + call_user_func_array($this->callbacks[$name], $params); |
|
| 25 | + } |
|
| 26 | + |
|
| 27 | + public function parent($name) |
|
| 28 | + { |
|
| 29 | + $params = array_slice(func_get_args(), 1); |
|
| 30 | + |
|
| 31 | + $this->call($name, $params); |
|
| 32 | + } |
|
| 33 | + |
|
| 34 | + public function parentArray($name, $params = []) |
|
| 35 | + { |
|
| 36 | + $this->call($name, $params); |
|
| 37 | + } |
|
| 38 | + |
|
| 39 | + public function push($title, $url = null, array $data = []) |
|
| 40 | + { |
|
| 41 | + $this->breadcrumbs[] = (object) array_merge($data, [ |
|
| 42 | + 'title' => $title, |
|
| 43 | + 'url' => $url, |
|
| 44 | + // These will be altered later where necessary: |
|
| 45 | + 'first' => false, |
|
| 46 | + 'last' => false, |
|
| 47 | + ]); |
|
| 48 | + } |
|
| 49 | + |
|
| 50 | + public function toArray() |
|
| 51 | + { |
|
| 52 | + $breadcrumbs = $this->breadcrumbs; |
|
| 53 | + |
|
| 54 | + // Add first & last indicators |
|
| 55 | + if ($breadcrumbs) { |
|
| 56 | + $breadcrumbs[0]->first = true; |
|
| 57 | + $breadcrumbs[count($breadcrumbs) - 1]->last = true; |
|
| 58 | + } |
|
| 59 | + |
|
| 60 | + return $breadcrumbs; |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | 63 | } |
@@ -4,74 +4,74 @@ |
||
| 4 | 4 | |
| 5 | 5 | class ServiceProvider extends BaseServiceProvider { |
| 6 | 6 | |
| 7 | - /** |
|
| 8 | - * Indicates if loading of the provider is deferred. |
|
| 9 | - * |
|
| 10 | - * @var bool |
|
| 11 | - */ |
|
| 12 | - // Can't enable this because there appears to be a bug in Laravel where a |
|
| 13 | - // non-deferred service provider can't use a deferred one because the boot |
|
| 14 | - // method is not called - see DependantServiceProviderTest. |
|
| 15 | - // protected $defer = true; |
|
| 7 | + /** |
|
| 8 | + * Indicates if loading of the provider is deferred. |
|
| 9 | + * |
|
| 10 | + * @var bool |
|
| 11 | + */ |
|
| 12 | + // Can't enable this because there appears to be a bug in Laravel where a |
|
| 13 | + // non-deferred service provider can't use a deferred one because the boot |
|
| 14 | + // method is not called - see DependantServiceProviderTest. |
|
| 15 | + // protected $defer = true; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * Get the services provided by the provider. |
|
| 19 | - * |
|
| 20 | - * @return array |
|
| 21 | - */ |
|
| 22 | - public function provides() |
|
| 23 | - { |
|
| 24 | - return ['breadcrumbs']; |
|
| 25 | - } |
|
| 17 | + /** |
|
| 18 | + * Get the services provided by the provider. |
|
| 19 | + * |
|
| 20 | + * @return array |
|
| 21 | + */ |
|
| 22 | + public function provides() |
|
| 23 | + { |
|
| 24 | + return ['breadcrumbs']; |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * Register the service provider. |
|
| 29 | - * |
|
| 30 | - * @return void |
|
| 31 | - */ |
|
| 32 | - public function register() |
|
| 33 | - { |
|
| 34 | - $this->app['breadcrumbs'] = $this->app->share(function($app) |
|
| 35 | - { |
|
| 36 | - $breadcrumbs = $this->app->make('DaveJamesMiller\Breadcrumbs\Manager'); |
|
| 27 | + /** |
|
| 28 | + * Register the service provider. |
|
| 29 | + * |
|
| 30 | + * @return void |
|
| 31 | + */ |
|
| 32 | + public function register() |
|
| 33 | + { |
|
| 34 | + $this->app['breadcrumbs'] = $this->app->share(function($app) |
|
| 35 | + { |
|
| 36 | + $breadcrumbs = $this->app->make('DaveJamesMiller\Breadcrumbs\Manager'); |
|
| 37 | 37 | |
| 38 | - $viewPath = __DIR__ . '/../views/'; |
|
| 38 | + $viewPath = __DIR__ . '/../views/'; |
|
| 39 | 39 | |
| 40 | - $this->loadViewsFrom($viewPath, 'breadcrumbs'); |
|
| 41 | - $this->loadViewsFrom($viewPath, 'laravel-breadcrumbs'); // Backwards-compatibility with 2.x |
|
| 40 | + $this->loadViewsFrom($viewPath, 'breadcrumbs'); |
|
| 41 | + $this->loadViewsFrom($viewPath, 'laravel-breadcrumbs'); // Backwards-compatibility with 2.x |
|
| 42 | 42 | |
| 43 | - $breadcrumbs->setView($app['config']['breadcrumbs.view']); |
|
| 43 | + $breadcrumbs->setView($app['config']['breadcrumbs.view']); |
|
| 44 | 44 | |
| 45 | - return $breadcrumbs; |
|
| 46 | - }); |
|
| 47 | - } |
|
| 45 | + return $breadcrumbs; |
|
| 46 | + }); |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * Bootstrap the application events. |
|
| 51 | - * |
|
| 52 | - * @return void |
|
| 53 | - */ |
|
| 54 | - public function boot() |
|
| 55 | - { |
|
| 56 | - $configFile = __DIR__ . '/../config/breadcrumbs.php'; |
|
| 49 | + /** |
|
| 50 | + * Bootstrap the application events. |
|
| 51 | + * |
|
| 52 | + * @return void |
|
| 53 | + */ |
|
| 54 | + public function boot() |
|
| 55 | + { |
|
| 56 | + $configFile = __DIR__ . '/../config/breadcrumbs.php'; |
|
| 57 | 57 | |
| 58 | - $this->mergeConfigFrom($configFile, 'breadcrumbs'); |
|
| 58 | + $this->mergeConfigFrom($configFile, 'breadcrumbs'); |
|
| 59 | 59 | |
| 60 | - $this->publishes([ |
|
| 61 | - $configFile => config_path('breadcrumbs.php') |
|
| 62 | - ]); |
|
| 60 | + $this->publishes([ |
|
| 61 | + $configFile => config_path('breadcrumbs.php') |
|
| 62 | + ]); |
|
| 63 | 63 | |
| 64 | - $this->registerBreadcrumbs(); |
|
| 65 | - } |
|
| 64 | + $this->registerBreadcrumbs(); |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - // This method can be overridden in a child class |
|
| 68 | - public function registerBreadcrumbs() |
|
| 69 | - { |
|
| 70 | - // Load the app breadcrumbs if they're in app/Http/breadcrumbs.php |
|
| 71 | - if (file_exists($file = $this->app['path'].'/Http/breadcrumbs.php')) |
|
| 72 | - { |
|
| 73 | - require $file; |
|
| 74 | - } |
|
| 75 | - } |
|
| 67 | + // This method can be overridden in a child class |
|
| 68 | + public function registerBreadcrumbs() |
|
| 69 | + { |
|
| 70 | + // Load the app breadcrumbs if they're in app/Http/breadcrumbs.php |
|
| 71 | + if (file_exists($file = $this->app['path'].'/Http/breadcrumbs.php')) |
|
| 72 | + { |
|
| 73 | + require $file; |
|
| 74 | + } |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | 77 | } |
@@ -4,15 +4,15 @@ |
||
| 4 | 4 | |
| 5 | 5 | class Facade extends BaseFacade { |
| 6 | 6 | |
| 7 | - /** |
|
| 8 | - * Get the registered name of the component. |
|
| 9 | - * |
|
| 10 | - * @return string |
|
| 11 | - */ |
|
| 12 | - protected static function getFacadeAccessor() |
|
| 13 | - { |
|
| 14 | - // App::make('breadcrumbs') |
|
| 15 | - return 'breadcrumbs'; |
|
| 16 | - } |
|
| 7 | + /** |
|
| 8 | + * Get the registered name of the component. |
|
| 9 | + * |
|
| 10 | + * @return string |
|
| 11 | + */ |
|
| 12 | + protected static function getFacadeAccessor() |
|
| 13 | + { |
|
| 14 | + // App::make('breadcrumbs') |
|
| 15 | + return 'breadcrumbs'; |
|
| 16 | + } |
|
| 17 | 17 | |
| 18 | 18 | } |