Released 2.3.6

Updated dependencies

.bowerrc

@@ -1,4 +0,0 @@
-{
-    "directory": "vendor/bower_components",
-    "interactive": false
-}

.github/ISSUE_TEMPLATE

@@ -1,16 +1,8 @@
-Before submitting your issue, please make sure that you've checked all of the checkboxes below.
+Before submitting your issue, please make sure that you've checked the checkboxes below.
 
-- [ ] You're running the [latest release](https://github.com/CachetHQ/Cachet/releases/latest) version of Cachet.
-- [ ] Ensure that you're running at least PHP 5.5.9, you can check this by running `php -v`
-- [ ] You've ran `rm -rf bootstrap/cache/*` from the root of your Cachet installation.
-
-To help us better understand your issue, please answer the following — cheers!
-
-### Your setup
-
-- *What version of Cachet?*
-- *What database driver? MySQL? Postgres? SQLite?*
-- *What version of PHP?*
+- [ ] I am running the [latest release](https://github.com/CachetHQ/Cachet/releases/latest) version of Cachet.
+- [ ] I am running at least PHP 5.5.9. *You can check this by running `php -v`.*
+- [ ] I have ran `rm -rf bootstrap/cache/*`.
 
 ### Expected behaviour
 
@@ -23,3 +15,6 @@ To help us better understand your issue, please answer the following — cheers!
 ### Steps to reproduce
 
 *If your issue requires any specific steps to reproduce, please outline them here.*
+
+1. First step
+2. Second step

.travis.yml

@@ -9,13 +9,6 @@ php:
 
 sudo: false
 
-install:
-  - travis_retry composer install --no-interaction --no-scripts --prefer-source
+install: travis_retry composer install --no-interaction --no-scripts --prefer-source
 
-script:
-  - if [ "$TRAVIS_PHP_VERSION" != "5.6" ] || [ "$TRAVIS_PULL_REQUEST" != false ]; then vendor/bin/phpunit; fi
-  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi
-
-after_script:
-  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
+script: vendor/bin/phpunit

README.md

@@ -2,15 +2,18 @@
 
 [![StyleCI](https://styleci.io/repos/26730195/shield)](https://styleci.io/repos/26730195/)
 [![Build Status](https://img.shields.io/travis/CachetHQ/Cachet/master.svg?style=flat-square)](https://travis-ci.org/CachetHQ/Cachet)
-[![Quality Score](https://img.shields.io/scrutinizer/g/CachetHQ/Cachet.svg?style=flat-square)](https://scrutinizer-ci.com/g/CachetHQ/Cachet)
 [![Software License](https://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat-square)](LICENSE)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.png)](http://translate.cachethq.io/project/cachet)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.svg)](http://translate.cachethq.io/project/cachet)
 [![Packagist](https://img.shields.io/packagist/v/cachethq/cachet.svg?style=flat-square)](https://packagist.org/packages/cachethq/cachet)
 
 ![Screenshot](https://cachethq.io/img/main-interface.jpg)
 
 Cachet is a beautiful and powerful open source status page system, a free replacement to services such as StatusPage.io, Status.io and others.
 
+## Supporting Cachet
+
+Cachet is a BSD-3-licensed open source project. If you'd like to support future development, check out the [Cachet Patreon campaign](https://patreon.com/jbrooksuk).
+
 ## Features
 
 - List your services components
@@ -52,10 +55,9 @@ You'll need to install Node.js, Bower and Gulp.
 
 To get started you can do the following:
 
-1. Install Node.js, Bower and Gulp.
-2. Install the assets; `bower install`
-3. Modify the SCSS files in `./resources/assets/sass/`
-4. Run `gulp`
+1. Install Node.js and our dev dependencies.
+2. Modify the SCSS files in `./resources/assets/sass/`
+3. Run `gulp`
 
 If you're making a lot of changes, you'll find that running `gulp watch` will really help you out!
 
@@ -66,7 +68,6 @@ Built using [Laravel](https://laravel.com), Cachet is very easy to jump into. Ha
 These extra dependencies are required to develop Cachet:
 
 - Node.js
-- Bower
 - Gulp
 - Git
 
@@ -106,11 +107,3 @@ If you discover a security vulnerability within Cachet, please send an e-mail to
 We offer a paid installation service, which starts at $99 but is subject to change, dependant on your setup and infrastructure.
 
 To find out more, email us at support@alt-three.com
-
-## Donations
-
-Cachet is open source, we don't have any licensing models and don't run ads on the [website](https://cachethq.io).
-
-If you'd like to donate towards further development of Cachet you can do so via Paypal.
-
-[![Donate](https://www.paypalobjects.com/en_GB/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D4M5LVULVPPKL)

VERSION

@@ -1 +1 @@
-2.2.5-dev
+2.3.6

app/Bus/Commands/Metric/AddMetricCommand.php

@@ -69,6 +69,20 @@ final class AddMetricCommand
      */
     public $default_view;
 
+    /**
+     * The threshold to buffer the metric points in.
+     *
+     * @var int
+     */
+    public $threshold;
+
+    /**
+     * The order of which to place the metric in.
+     *
+     * @var int
+     */
+    public $order;
+
     /**
      * The validation rules.
      *
@@ -84,6 +98,8 @@ final class AddMetricCommand
         'display_chart' => 'int',
         'places'        => 'int|between:0,4',
         'default_view'  => 'int|between:0,3',
+        'threshold'     => 'numeric|between:0,10',
+        'order'         => 'int',
     ];
 
     /**
@@ -97,10 +113,12 @@ final class AddMetricCommand
      * @param int    $display_chart
      * @param int    $places
      * @param int    $default_view
+     * @param int    $threshold
+     * @param int    $order
      *
      * @return void
      */
-    public function __construct($name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view)
+    public function __construct($name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view, $threshold, $order = 0)
     {
         $this->name = $name;
         $this->suffix = $suffix;
@@ -110,5 +128,7 @@ final class AddMetricCommand
         $this->display_chart = $display_chart;
         $this->places = $places;
         $this->default_view = $default_view;
+        $this->threshold = $threshold;
+        $this->order = $order;
     }
 }

app/Bus/Commands/Metric/AddMetricPointCommand.php

@@ -42,7 +42,7 @@ final class AddMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'int',
+        'value'      => 'numeric',
         'created_at' => 'string',
     ];
 

app/Bus/Commands/Metric/UpdateMetricCommand.php

@@ -78,6 +78,20 @@ final class UpdateMetricCommand
      */
     public $default_view;
 
+    /**
+     * The threshold to buffer the metric points in.
+     *
+     * @var int
+     */
+    public $threshold;
+
+    /**
+     * The order of which to place the metric in.
+     *
+     * @var int|null
+     */
+    public $order;
+
     /**
      * The validation rules.
      *
@@ -93,6 +107,8 @@ final class UpdateMetricCommand
         'display_chart' => 'int',
         'places'        => 'numeric|between:0,4',
         'default_view'  => 'numeric|between:0,4',
+        'threshold'     => 'numeric|between:0,10',
+        'order'         => 'int',
     ];
 
     /**
@@ -107,10 +123,12 @@ final class UpdateMetricCommand
      * @param int                            $display_chart
      * @param int                            $places
      * @param int                            $default_view
+     * @param int                            $threshold
+     * @param int|null                       $order
      *
      * @return void
      */
-    public function __construct(Metric $metric, $name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view)
+    public function __construct(Metric $metric, $name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view, $threshold, $order = null)
     {
         $this->metric = $metric;
         $this->name = $name;
@@ -121,5 +139,7 @@ final class UpdateMetricCommand
         $this->display_chart = $display_chart;
         $this->places = $places;
         $this->default_view = $default_view;
+        $this->threshold = $threshold;
+        $this->order = $order;
     }
 }

app/Bus/Commands/Metric/UpdateMetricPointCommand.php

@@ -14,6 +14,11 @@ namespace CachetHQ\Cachet\Bus\Commands\Metric;
 use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Cachet\Models\MetricPoint;
 
+/**
+ * This is the update metric point command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 final class UpdateMetricPointCommand
 {
     /**
@@ -33,7 +38,7 @@ final class UpdateMetricPointCommand
     /**
      * The metric point value.
      *
-     * @var int
+     * @var float
      */
     public $value;
 
@@ -50,7 +55,7 @@ final class UpdateMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'int',
+        'value'      => 'numeric',
         'created_at' => 'string',
     ];
 
@@ -59,7 +64,7 @@ final class UpdateMetricPointCommand
      *
      * @param \CachetHQ\Cachet\Models\MetricPoint $point
      * @param \CachetHQ\Cachet\Models\Metric      $metric
-     * @param int                                 $value
+     * @param float                               $value
      * @param string                              $created_at
      *
      * @return void

app/Bus/Commands/Subscriber/SubscribeSubscriberCommand.php

@@ -33,7 +33,7 @@ final class SubscribeSubscriberCommand
     public $verified;
 
     /**
-     * The subscriptions that we want to add.
+     * The list of subscriptions to set the subscriber up with.
      *
      * @var array|null
      */
@@ -53,7 +53,7 @@ final class SubscribeSubscriberCommand
      *
      * @param string     $email
      * @param bool       $verified
-     * @param null|array $subscriptions
+     * @param array|null $subscriptions
      *
      * @return void
      */

app/Bus/Commands/Subscriber/UpdateSubscriberSubscriptionCommand.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Commands\Subscriber;
+
+use CachetHQ\Cachet\Models\Subscriber;
+
+/**
+ * This is the subscribe subscriber command.
+ *
+ * @author Joseph Cohen <joe@alt-three.com>
+ */
+final class UpdateSubscriberSubscriptionCommand
+{
+    /**
+     * The subscriber email.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    public $subscriber;
+
+    /**
+     * The subscriptions that we want to add.
+     *
+     * @var array|null
+     */
+    public $subscriptions;
+
+    /**
+     * Create a new subscribe subscriber command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     * @param null|array                         $subscriptions
+     *
+     * @return void
+     */
+    public function __construct($subscriber, $subscriptions = null)
+    {
+        $this->subscriber = $subscriber;
+        $this->subscriptions = $subscriptions;
+    }
+}

app/Bus/Exceptions/Subscriber/AlreadySubscribedException.php

@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\Bus\Exceptions\Subscriber;
-
-use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
-use Exception;
-
-/**
- * This is the already subscribed exception class.
- *
- * @author Graham Campbell <graham@alt-three.com>
- * @author James Brooks <james@alt-three.com>
- */
-class AlreadySubscribedException extends Exception implements ExceptionInterface
-{
-    //
-}

app/Bus/Handlers/Commands/Metric/AddMetricCommandHandler.php

@@ -35,6 +35,8 @@ class AddMetricCommandHandler
             'display_chart' => $command->display_chart,
             'places'        => $command->places,
             'default_view'  => $command->default_view,
+            'threshold'     => $command->threshold,
+            'order'         => $command->order,
         ]);
 
         event(new MetricWasAddedEvent($metric));

app/Bus/Handlers/Commands/Metric/AddMetricPointCommandHandler.php

@@ -15,6 +15,7 @@ use CachetHQ\Cachet\Bus\Commands\Metric\AddMetricPointCommand;
 use CachetHQ\Cachet\Bus\Events\Metric\MetricPointWasAddedEvent;
 use CachetHQ\Cachet\Dates\DateFactory;
 use CachetHQ\Cachet\Models\MetricPoint;
+use Carbon\Carbon;
 
 class AddMetricPointCommandHandler
 {
@@ -49,19 +50,35 @@ class AddMetricPointCommandHandler
         $metric = $command->metric;
         $createdAt = $command->created_at;
 
-        $data = [
-            'metric_id' => $metric->id,
-            'value'     => $command->value,
-        ];
+        // Do we have an existing point with the same value?
+        $point = $this->findOrCreatePoint($command);
 
-        if ($createdAt) {
-            $data['created_at'] = $this->dates->create('U', $createdAt)->format('Y-m-d H:i:s');
+        $point->increment('counter', 1);
+
+        event(new MetricPointWasAddedEvent($point));
+
+        return $point;
+    }
+
+    protected function findOrCreatePoint(AddMetricPointCommand $command)
+    {
+        $buffer = Carbon::now()->subMinutes($command->metric->threshold);
+        $point = MetricPoint::where('metric_id', $command->metric->id)->where('value', $command->value)->where('created_at', '>=', $buffer)->first();
+
+        if ($point) {
+            return $point;
         }
 
-        $metricPoint = MetricPoint::create($data);
+        $data = [
+            'metric_id' => $command->metric->id,
+            'value'     => $command->value,
+            'counter'   => 0,
+        ];
 
-        event(new MetricPointWasAddedEvent($metricPoint));
+        if ($command->created_at) {
+            $data['created_at'] = $this->dates->create('U', $command->created_at)->format('Y-m-d H:i:s');
+        }
 
-        return $metricPoint;
+        return MetricPoint::create($data);
     }
 }

app/Bus/Handlers/Commands/Metric/UpdateMetricCommandHandler.php

@@ -53,6 +53,8 @@ class UpdateMetricCommandHandler
             'display_chart' => $command->display_chart,
             'places'        => $command->places,
             'default_view'  => $command->default_view,
+            'threshold'     => $command->threshold,
+            'order'         => $command->order,
         ];
 
         return array_filter($params, function ($val) {

app/Bus/Handlers/Commands/Metric/UpdateMetricPointCommandHandler.php

@@ -51,7 +51,7 @@ class UpdateMetricPointCommandHandler
 
         $data = [
             'metric_id' => $metric->id,
-            'value'     => $command->value,
+            'value'     => (float) $command->value,
         ];
 
         if ($createdAt) {

app/Bus/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php

@@ -14,8 +14,7 @@ namespace CachetHQ\Cachet\Bus\Handlers\Commands\Subscriber;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand;
 use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasSubscribedEvent;
-use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUpdatedSubscriptionsEvent;
-use CachetHQ\Cachet\Bus\Exceptions\Subscriber\AlreadySubscribedException;
+use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Cachet\Models\Subscription;
 
@@ -23,6 +22,8 @@ use CachetHQ\Cachet\Models\Subscription;
  * This is the subscribe subscriber command handler.
  *
  * @author James Brooks <james@alt-three.com>
+ * @author Joe Cohen <joe@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 class SubscribeSubscriberCommandHandler
 {
@@ -31,35 +32,34 @@ class SubscribeSubscriberCommandHandler
      *
      * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand $command
      *
-     * @throws \CachetHQ\Cachet\Exceptions\AlreadySubscribedException
-     *
      * @return \CachetHQ\Cachet\Models\Subscriber
      */
     public function handle(SubscribeSubscriberCommand $command)
     {
-        if (Subscriber::where('email', $command->email)->first() && $command->subscriptions === null) {
-            throw new AlreadySubscribedException("Cannot subscribe {$command->email} because they're already subscribed.");
+        if ($subscriber = Subscriber::where('email', $command->email)->first()) {
+            return $subscriber;
         }
 
         $subscriber = Subscriber::firstOrCreate(['email' => $command->email]);
 
+        // Decide what to subscribe the subscriber to.
         if ($subscriptions = $command->subscriptions) {
-            foreach ($subscriptions as $subscription => $subscriptionValue) {
-                Subscription::firstOrCreate([
-                    'subscriber_id' => $subscriber->id,
-                    $subscription   => $subscriptionValue,
-                ]);
-            }
+            $subscriptions = Component::whereIn('id', $subscriptions);
+        } else {
+            $subscriptions = Component::all();
         }
 
-        if ($subscriber->is_verified === false) {
-            if ($command->verified) {
-                dispatch(new VerifySubscriberCommand($subscriber));
-            } else {
-                event(new SubscriberHasSubscribedEvent($subscriber));
-            }
+        foreach ($subscriptions as $component) {
+            Subscription::create([
+                'subscriber_id' => $subscriber->id,
+                'component_id'  => $component->id,
+            ]);
+        }
+
+        if ($command->verified) {
+            dispatch(new VerifySubscriberCommand($subscriber));
         } else {
-            event(new SubscriberHasUpdatedSubscriptionsEvent($subscriber));
+            event(new SubscriberHasSubscribedEvent($subscriber));
         }
 
         return $subscriber;

app/Bus/Handlers/Commands/Subscriber/UpdateSubscriberSubscriptionCommandHandler.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Subscriber;
+
+use CachetHQ\Cachet\Bus\Commands\Subscriber\UpdateSubscriberSubscriptionCommand;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUpdatedSubscriptionsEvent;
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Subscriber;
+use CachetHQ\Cachet\Models\Subscription;
+
+/**
+ * This is the subscribe subscriber command handler.
+ *
+ * @author Joseph Cohen <joe@alt-three.com>
+ */
+class UpdateSubscriberSubscriptionCommandHandler
+{
+    /**
+     * Handle the subscribe subscriber command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\UpdateSubscriberSubscriptionCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Subscriber
+     */
+    public function handle(UpdateSubscriberSubscriptionCommand $command)
+    {
+        $subscriber = $command->subscriber;
+        $subscriptions = $command->subscriptions ?: [];
+
+        $components = Component::all();
+
+        $updateSubscriptions = $components->filter(function ($item) use ($subscriptions) {
+            return in_array($item->id, $subscriptions);
+        });
+
+        $subscriber->global = ($updateSubscriptions->count() === $components->count());
+
+        $subscriber->subscriptions()->delete();
+
+        if (!$updateSubscriptions->isEmpty()) {
+            foreach ($updateSubscriptions as $subscription) {
+                Subscription::firstOrCreate([
+                    'subscriber_id' => $subscriber->id,
+                    'component_id'  => $subscription->id,
+                ]);
+            }
+        }
+
+        $subscriber->save();
+
+        event(new SubscriberHasUpdatedSubscriptionsEvent($subscriber));
+
+        return $subscriber;
+    }
+}

app/Bus/Handlers/Events/Component/CleanupComponentSubscriptionsHandler.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Handlers\Events\Component;
+
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasRemovedEvent;
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Subscription;
+
+/**
+ * This is the cleanup component subscriptions handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class CleanupComponentSubscriptionsHandler
+{
+    /**
+     * Handle the event.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\Component\ComponentWasRemovedEvent $event
+     *
+     * @return void
+     */
+    public function handle(ComponentWasRemovedEvent $event)
+    {
+        $component = $event->component;
+        $subscription = Subscription::forComponent($component->id);
+
+        // Cleanup the subscriptions.
+        $subscription->delete();
+    }
+}

app/Bus/Handlers/Events/Component/SendComponentUpdateEmailNotificationHandler.php

@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Bus\Handlers\Events\Component;
 
 use CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent;
 use CachetHQ\Cachet\Models\Component;
-use CachetHQ\Cachet\Models\Subscription;
+use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Contracts\Mail\MailQueue;
 use Illuminate\Mail\Message;
 use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
@@ -27,16 +27,25 @@ class SendComponentUpdateEmailNotificationHandler
      */
     protected $mailer;
 
+    /**
+     * The subscriber instance.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    protected $subscriber;
+
     /**
      * Create a new send incident email notification handler.
      *
-     * @param \Illuminate\Contracts\Mail\Mailer $mailer
+     * @param \Illuminate\Contracts\Mail\Mailer  $mailer
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
      *
      * @return void
      */
-    public function __construct(MailQueue $mailer)
+    public function __construct(MailQueue $mailer, Subscriber $subscriber)
     {
         $this->mailer = $mailer;
+        $this->subscriber = $subscriber;
     }
 
     /**
@@ -48,7 +57,42 @@ class SendComponentUpdateEmailNotificationHandler
      */
     public function handle(ComponentWasUpdatedEvent $event)
     {
-        $component = AutoPresenter::decorate($event->component);
+        $component = $event->component;
+
+        // First notify all global subscribers.
+        $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get();
+
+        foreach ($globalSubscribers as $subscriber) {
+            $this->notify($component, $subscriber);
+        }
+
+        $notified = $globalSubscribers->pluck('id')->all();
+
+        // Notify the remaining component specific subscribers.
+        $componentSubscribers = $this->subscriber
+            ->isVerified()
+            ->forComponent($component->id)
+            ->get()
+            ->reject(function ($subscriber) use ($notified) {
+                return in_array($subscriber->id, $notified);
+            });
+
+        foreach ($componentSubscribers as $subscriber) {
+            $this->notify($component, $subscriber);
+        }
+    }
+
+    /**
+     * Send notification to subscriber.
+     *
+     * @param \CachetHQ\Cachet\Models\Component  $component
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function notify(Component $component, Subscriber $subscriber)
+    {
+        $component = AutoPresenter::decorate($component);
 
         $mail = [
             'subject'                => trans('cachet.subscriber.email.component.subject'),
@@ -56,18 +100,14 @@ class SendComponentUpdateEmailNotificationHandler
             'component_human_status' => $component->human_status,
         ];
 
-        foreach (Subscription::isVerifiedForComponent($component->id)->with('subscriber')->get() as $subscription) {
-            $subscriber = $subscription->subscriber;
-            $mail['email'] = $subscriber->email;
-            $mail['manage_link'] = route('subscribe.manage', ['code' => $subscriber->verify_code]);
-            $mail['unsubscribe_link'] = route('subscribe.unsubscribe', ['code' => $subscriber->verify_code, 'subscription' => $subscription->id]);
+        $mail['email'] = $subscriber->email;
+        $mail['manage_link'] = route('subscribe.manage', ['code' => $subscriber->verify_code]);
 
-            $this->mailer->queue([
-                'html' => 'emails.components.update-html',
-                'text' => 'emails.components.update-text',
-            ], $mail, function (Message $message) use ($mail) {
-                $message->to($mail['email'])->subject($mail['subject']);
-            });
-        }
+        $this->mailer->queue([
+            'html' => 'emails.components.update-html',
+            'text' => 'emails.components.update-text',
+        ], $mail, function (Message $message) use ($mail) {
+            $message->to($mail['email'])->subject($mail['subject']);
+        });
     }
 }

app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php

@@ -50,7 +50,7 @@ class SendIncidentEmailNotificationHandler
     /**
      * Handle the event.
      *
-     * @param \CachetHQ\Cachet\Bus\Events\Incident\IncidentHasReportedEvent $event
+     * @param \CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent $event
      *
      * @return void
      */
@@ -60,32 +60,74 @@ class SendIncidentEmailNotificationHandler
             return false;
         }
 
+        // Only send emails for public incidents.
+        if ($event->incident->visible === 0) {
+            return;
+        }
+
+        // First notify all global subscribers.
+        $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get();
+
+        foreach ($globalSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
+        }
+
+        if (!$event->incident->component) {
+            return;
+        }
+
+        $notified = $globalSubscribers->pluck('id')->all();
+
+        // Notify the remaining component specific subscribers.
+        $componentSubscribers = $this->subscriber
+            ->isVerified()
+            ->forComponent($event->incident->component->id)
+            ->get()
+            ->reject(function ($subscriber) use ($notified) {
+                return in_array($subscriber->id, $notified);
+            });
+
+        foreach ($componentSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
+        }
+    }
+
+    /**
+     * Send notification to subscriber.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\IncidentWasReportedEvent $event
+     * @param \CachetHQ\Cachet\Models\Subscriber                   $subscriber
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function notify(IncidentWasReportedEvent $event, $subscriber)
+    {
         $incident = AutoPresenter::decorate($event->incident);
         $component = AutoPresenter::decorate($event->incident->component);
 
-        // Only send emails for public incidents.
-        if ($event->incident->visible === 1) {
-            foreach ($this->subscriber->isVerified()->get() as $subscriber) {
-                $mail = [
-                    'email'            => $subscriber->email,
-                    'subject'          => 'New incident reported.',
-                    'has_component'    => ($event->incident->component) ? true : false,
-                    'component_name'   => $component ? $component->name : null,
-                    'status'           => $incident->human_status,
-                    'html_content'     => $incident->formattedMessage,
-                    'text_content'     => $incident->message,
-                    'token'            => $subscriber->token,
-                    'manage_link'      => route('subscribe.manage', ['code' => $subscriber->verify_code]),
-                    'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
-                ];
+        $mail = [
+            'email'            => $subscriber->email,
+            'subject'          => trans('cachet.subscriber.email.incident.subject', [
+                'status' => $incident->human_status,
+                'name'   => $incident->name,
+            ]),
+            'has_component'    => ($event->incident->component) ? true : false,
+            'component_name'   => $component ? $component->name : null,
+            'name'             => $incident->name,
+            'timestamp'        => $incident->created_at_formatted,
+            'status'           => $incident->human_status,
+            'html_content'     => $incident->formattedMessage,
+            'text_content'     => $incident->message,
+            'token'            => $subscriber->token,
+            'manage_link'      => route('subscribe.manage', ['code' => $subscriber->verify_code]),
+            'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
+        ];
 
-                $this->mailer->queue([
-                    'html' => 'emails.incidents.new-html',
-                    'text' => 'emails.incidents.new-text',
-                ], $mail, function (Message $message) use ($mail) {
-                    $message->to($mail['email'])->subject($mail['subject']);
-                });
-            }
-        }
+        $this->mailer->queue([
+            'html' => 'emails.incidents.new-html',
+            'text' => 'emails.incidents.new-text',
+        ], $mail, function (Message $message) use ($mail) {
+            $message->to($mail['email'])->subject($mail['subject']);
+        });
     }
 }

app/Bus/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php

@@ -50,7 +50,7 @@ class SendMaintenanceEmailNotificationHandler
     /**
      * Handle the event.
      *
-     * @param \CachetHQ\Cachet\Bus\Events\MaintenanceHasScheduledEvent $event
+     * @param \CachetHQ\Cachet\Bus\Events\MaintenanceWasScheduledEvent $event
      *
      * @return void
      */
@@ -60,27 +60,73 @@ class SendMaintenanceEmailNotificationHandler
             return false;
         }
 
-        $data = AutoPresenter::decorate($event->incident);
+        // Only send emails for public incidents.
+        if ($event->incident->visible === 0) {
+            return;
+        }
 
-        foreach ($this->subscriber->isVerified()->get() as $subscriber) {
-            $mail = [
-                'email'            => $subscriber->email,
-                'subject'          => 'Scheduled maintenance.',
-                'status'           => $data->human_status,
-                'html_content'     => $data->formattedMessage,
-                'text_content'     => $data->message,
-                'scheduled_at'     => $data->scheduled_at_formatted,
-                'token'            => $subscriber->token,
-                'manage_link'      => route('subscribe.manage', ['code' => $subscriber->verify_code]),
-                'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
-            ];
+        // First notify all global subscribers.
+        $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get();
 
-            $this->mailer->queue([
-                'html' => 'emails.incidents.maintenance-html',
-                'text' => 'emails.incidents.maintenance-text',
-            ], $mail, function (Message $message) use ($mail) {
-                $message->to($mail['email'])->subject($mail['subject']);
+        foreach ($globalSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
+        }
+
+        if (!$event->incident->component) {
+            return;
+        }
+
+        $notified = $globalSubscribers->pluck('id')->all();
+
+        // Notify the remaining component specific subscribers.
+        $componentSubscribers = $this->subscriber
+            ->isVerified()
+            ->forComponent($event->incident->component->id)
+            ->get()
+            ->reject(function ($subscriber) use ($notified) {
+                return in_array($subscriber->id, $notified);
             });
+
+        foreach ($componentSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
         }
     }
+
+    /**
+     * Send notification to subscriber.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\MaintenanceWasScheduledEvent $event
+     * @param \CachetHQ\Cachet\Models\Subscriber                       $subscriber
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function notify(MaintenanceWasScheduledEvent $event, $subscriber)
+    {
+        $incident = AutoPresenter::decorate($event->incident);
+        $component = AutoPresenter::decorate($event->incident->component);
+
+        $mail = [
+            'email'            => $subscriber->email,
+            'subject'          => trans('cachet.subscriber.email.maintenance.subject', [
+                'name'   => $incident->name,
+            ]),
+            'has_component'    => ($event->incident->component) ? true : false,
+            'component_name'   => $component ? $component->name : null,
+            'name'             => $incident->name,
+            'timestamp'        => $incident->scheduled_at_formatted,
+            'status'           => $incident->human_status,
+            'html_content'     => $incident->formattedMessage,
+            'text_content'     => $incident->message,
+            'token'            => $subscriber->token,
+            'manage_link'      => route('subscribe.manage', ['code' => $subscriber->verify_code]),
+            'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
+        ];
+
+        $this->mailer->queue([
+            'html' => 'emails.incidents.maintenance-html',
+            'text' => 'emails.incidents.maintenance-text',
+        ], $mail, function (Message $message) use ($mail) {
+            $message->to($mail['email'])->subject($mail['subject']);
+        });
+    }
 }

app/Bus/Middleware/UseDatabaseTransactions.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * This is the use database transactions bus middleware class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class UseDatabaseTransactions
+{
+    /**
+     * Handle the current command in the pipeline.
+     *
+     * @param mixed    $command
+     * @param \Closure $next
+     *
+     * @return bool
+     */
+    public function handle($command, Closure $next)
+    {
+        return DB::transaction(function () use ($command, $next) {
+            return $next($command);
+        });
+    }
+}

app/Composers/AppComposer.php

@@ -41,16 +41,10 @@ class AppComposer
         $view->withAppUrl(Config::get('app.url'));
         $view->withAppHeader(Config::get('setting.header'));
         $view->withAppFooter(Config::get('setting.footer'));
-
-        $view->withAppName($name = Config::get('setting.app_name'));
+        $view->withAppName(Config::get('setting.app_name'));
         $view->withShowSupport($support = Config::get('setting.show_support'));
-
-        if ($support) {
-            $view->withSiteTitle(Config::get('setting.app_name').' | Cachet');
-        } else {
-            $view->withSiteTitle(Config::get('setting.app_name'));
-        }
-
+        $view->withAutomaticLocalization(Config::get('setting.automatic_localization'));
+        $view->withSiteTitle(Config::get('setting.app_name'));
         $view->withFontSubset(Config::get('langs.'.Config::get('app.locale').'.subset', 'latin'));
     }
 }

app/Composers/MetricsComposer.php

@@ -28,7 +28,7 @@ class MetricsComposer
     {
         $metrics = null;
         if ($displayMetrics = Config::get('setting.display_graphs')) {
-            $metrics = Metric::where('display_chart', 1)->orderBy('id')->get();
+            $metrics = Metric::displayable()->orderBy('order')->orderBy('id')->get();
         }
 
         $view->withDisplayMetrics($displayMetrics)

app/Composers/StatusPageComposer.php

@@ -46,7 +46,9 @@ class StatusPageComposer
             ];
         } elseif (Component::enabled()->notStatus(1)->count() === 0) {
             // If all our components are ok, do we have any non-fixed incidents?
-            $incidents = Incident::notScheduled()->orderBy('created_at', 'desc')->get();
+            $incidents = Incident::notScheduled()->orderBy('created_at', 'desc')->get()->filter(function ($incident) {
+                return $incident->status > 0;
+            });
             $incidentCount = $incidents->count();
 
             if ($incidentCount === 0 || ($incidentCount >= 1 && (int) $incidents->first()->status === 4)) {

app/Console/Commands/DemoSeederCommand.php

@@ -17,9 +17,9 @@ use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentTemplate;
 use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Cachet\Models\MetricPoint;
-use CachetHQ\Cachet\Models\Setting;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Cachet\Models\User;
+use CachetHQ\Cachet\Settings\Repository;
 use DateInterval;
 use DateTime;
 use Illuminate\Console\Command;
@@ -49,6 +49,27 @@ class DemoSeederCommand extends Command
      */
     protected $description = 'Seeds Cachet with demo data.';
 
+    /**
+     * The settings repository.
+     *
+     * @var \CachetHQ\Cache\Settings\Repository
+     */
+    protected $settings;
+
+    /**
+     * Create a new demo seeder command instance.
+     *
+     * @param \CachetHQ\Cache\Settings\Repository $settings
+     *
+     * @return void
+     */
+    public function __construct(Repository $settings)
+    {
+        parent::__construct();
+
+        $this->settings = $settings;
+    }
+
     /**
      * Execute the console command.
      *
@@ -142,6 +163,13 @@ class DemoSeederCommand extends Command
                 'order'       => 1,
                 'group_id'    => 2,
                 'link'        => 'https://styleci.io',
+            ], [
+                'name'        => 'Patreon Page',
+                'description' => 'Support future development of Cachet.',
+                'status'      => 1,
+                'order'       => 0,
+                'group_id'    => 0,
+                'link'        => 'https://patreon.com/jbrooksuk',
             ],
         ];
 
@@ -293,42 +321,45 @@ EINCIDENT;
     {
         $defaultSettings = [
             [
-                'name'  => 'app_name',
+                'key'   => 'app_name',
                 'value' => 'Cachet Demo',
             ], [
-                'name'  => 'app_domain',
+                'key'   => 'app_domain',
                 'value' => 'https://demo.cachethq.io',
             ], [
-                'name'  => 'show_support',
+                'key'   => 'show_support',
                 'value' => '1',
             ], [
-                'name'  => 'app_locale',
+                'key'   => 'app_locale',
                 'value' => 'en',
             ], [
-                'name'  => 'app_timezone',
+                'key'   => 'app_timezone',
                 'value' => 'Europe/London',
             ], [
-                'name'  => 'app_incident_days',
+                'key'   => 'app_incident_days',
                 'value' => '7',
             ], [
-                'name'  => 'app_analytics',
+                'key'   => 'app_analytics',
                 'value' => 'UA-58442674-3',
             ], [
-                'name'  => 'app_analytics_gs',
+                'key'   => 'app_analytics_gs',
                 'value' => 'GSN-712462-P',
             ], [
-                'name'  => 'display_graphs',
+                'key'   => 'display_graphs',
                 'value' => '1',
             ], [
-                'name'  => 'app_about',
+                'key'   => 'app_about',
                 'value' => 'This is the demo instance of [Cachet](https://cachethq.io?ref=demo). The open source status page system, for everyone. An [Alt Three](https://alt-three.com) product.',
+            ], [
+                'key'   => 'enable_subscribers',
+                'value' => '0',
             ],
         ];
 
-        Setting::truncate();
+        $this->settings->clear();
 
         foreach ($defaultSettings as $setting) {
-            Setting::create($setting);
+            $this->settings->set($setting['key'], $setting['value']);
         }
     }
 

app/Foundation/Exceptions/Displayers/ThrottleDisplayer.php

@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Foundation\Exceptions\Displayers;
+
+use Exception;
+use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
+
+class ThrottleDisplayer implements DisplayerInterface
+{
+    /**
+     * The request instance.
+     *
+     * @var \Illuminate\Http\Request
+     */
+    protected $request;
+
+    /**
+     * Create a new redirect displayer instance.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return void
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * Get the error response associated with the given exception.
+     *
+     * @param \Exception $exception
+     * @param string     $id
+     * @param int        $code
+     * @param string[]   $headers
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function display(Exception $exception, $id, $code, array $headers)
+    {
+        return redirect()->route('auth.login')->withError(trans('forms.login.rate-limit'));
+    }
+
+    /**
+     * Get the supported content type.
+     *
+     * @return string
+     */
+    public function contentType()
+    {
+        return 'text/html';
+    }
+
+    /**
+     * Can we display the exception?
+     *
+     * @param \Exception $original
+     * @param \Exception $transformed
+     * @param int        $code
+     *
+     * @return bool
+     */
+    public function canDisplay(Exception $original, Exception $transformed, $code)
+    {
+        return $transformed instanceof TooManyRequestsHttpException && $this->request->is('auth*');
+    }
+
+    /**
+     * Do we provide verbose information about the exception?
+     *
+     * @return bool
+     */
+    public function isVerbose()
+    {
+        return false;
+    }
+}

app/Foundation/Providers/AppServiceProvider.php

@@ -12,10 +12,21 @@
 namespace CachetHQ\Cachet\Foundation\Providers;
 
 use AltThree\Bus\Dispatcher;
+use CachetHQ\Cachet\Bus\Middleware\UseDatabaseTransactions;
 use CachetHQ\Cachet\Dates\DateFactory;
+use CachetHQ\Cachet\Integrations\Credits;
+use CachetHQ\Cachet\Integrations\Feed;
+use CachetHQ\Cachet\Integrations\Releases;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 
+/**
+ * This is the app service provider.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Joe Cohen <joe@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ */
 class AppServiceProvider extends ServiceProvider
 {
     /**
@@ -29,6 +40,8 @@ class AppServiceProvider extends ServiceProvider
             return Dispatcher::simpleMapping($command, 'CachetHQ\Cachet\Bus', 'CachetHQ\Cachet\Bus\Handlers');
         });
 
+        $dispatcher->pipeThrough([UseDatabaseTransactions::class]);
+
         Str::macro('canonicalize', function ($url) {
             return preg_replace('/([^\/])$/', '$1/', $url);
         });
@@ -42,6 +55,9 @@ class AppServiceProvider extends ServiceProvider
     public function register()
     {
         $this->registerDateFactory();
+        $this->registerCredits();
+        $this->registerFeed();
+        $this->registerReleases();
     }
 
     /**
@@ -52,10 +68,53 @@ class AppServiceProvider extends ServiceProvider
     protected function registerDateFactory()
     {
         $this->app->singleton(DateFactory::class, function ($app) {
-            $appTimezone = $app->config->get('app.timezone');
-            $cacheTimezone = $app->config->get('cachet.timezone');
+            $appTimezone = $app['config']->get('app.timezone');
+            $cacheTimezone = $app['config']->get('cachet.timezone');
 
             return new DateFactory($appTimezone, $cacheTimezone);
         });
     }
+
+    /**
+     * Register the credits class.
+     *
+     * @return void
+     */
+    protected function registerCredits()
+    {
+        $this->app->singleton(Credits::class, function ($app) {
+            $cache = $app['cache.store'];
+
+            return new Credits($cache);
+        });
+    }
+
+    /**
+     * Register the feed class.
+     *
+     * @return void
+     */
+    protected function registerFeed()
+    {
+        $this->app->singleton(Feed::class, function ($app) {
+            $cache = $app['cache.store'];
+
+            return new Feed($cache);
+        });
+    }
+
+    /**
+     * Register the releases class.
+     *
+     * @return void
+     */
+    protected function registerReleases()
+    {
+        $this->app->singleton(Releases::class, function ($app) {
+            $cache = $app['cache.store'];
+            $token = $app['config']->get('services.github.token');
+
+            return new Releases($cache, $token);
+        });
+    }
 }

app/Foundation/Providers/ComposerServiceProvider.php

@@ -34,7 +34,7 @@ class ComposerServiceProvider extends ServiceProvider
         $factory->composer('*', CurrentUserComposer::class);
         $factory->composer(['index'], MetricsComposer::class);
         $factory->composer(['index', 'single-incident', 'subscribe', 'signup'], StatusPageComposer::class);
-        $factory->composer(['index', 'single-incident', 'subscribe.*', 'signup', 'dashboard.settings.theme'], ThemeComposer::class);
+        $factory->composer(['index', 'single-incident', 'subscribe.*', 'signup', 'dashboard.settings.theme', 'emails.*'], ThemeComposer::class);
         $factory->composer('dashboard.*', DashboardComposer::class);
         $factory->composer(['setup', 'dashboard.settings.localization'], TimezoneLocaleComposer::class);
     }

app/Foundation/Providers/ConfigServiceProvider.php

@@ -11,11 +11,20 @@
 
 namespace CachetHQ\Cachet\Foundation\Providers;
 
-use CachetHQ\Cachet\Config\Repository;
 use CachetHQ\Cachet\Models\Setting as SettingModel;
+use CachetHQ\Cachet\Settings\Cache;
+use CachetHQ\Cachet\Settings\Repository;
 use Exception;
 use Illuminate\Support\ServiceProvider;
+use Jenssegers\Date\Date;
 
+/**
+ * This is the config service provider class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author Joe Cohen <joe@alt-three.com>
+ */
 class ConfigServiceProvider extends ServiceProvider
 {
     /**
@@ -25,8 +34,27 @@ class ConfigServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        $env = $this->app->environment();
+        $cli = $this->app->runningInConsole();
+        $repo = $this->app->make(Repository::class);
+        $cache = $this->app->make(Cache::class);
+        $loaded = $cli ? false : $cache->load($env);
+
+        $this->app->terminating(function () use ($repo, $cache) {
+            if ($repo->stale()) {
+                $cache->clear();
+            }
+        });
+
         try {
-            $this->app->config->set('setting', $this->app->setting->all());
+            if ($cli === false && $loaded === false) {
+                $loaded = $repo->all();
+                $cache->store($env, $loaded);
+            }
+
+            $settings = array_merge($this->app->config->get('setting'), $loaded);
+
+            $this->app->config->set('setting', $settings);
         } catch (Exception $e) {
             //
         }
@@ -35,9 +63,10 @@ class ConfigServiceProvider extends ServiceProvider
             $this->app->config->set('app.url', $appDomain);
         }
 
-        if ($appLocale = $this->app->config->get('setting.app.locale')) {
+        if ($appLocale = $this->app->config->get('setting.app_locale')) {
             $this->app->config->set('app.locale', $appLocale);
             $this->app->translator->setLocale($appLocale);
+            Date::setLocale($appLocale);
         }
 
         if ($appTimezone = $this->app->config->get('setting.app_timezone')) {
@@ -65,10 +94,12 @@ class ConfigServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton('setting', function () {
-            return new Repository(new SettingModel());
+        $this->app->singleton(Cache::class, function ($app) {
+            return new Cache($app->files, $app->bootstrapPath().'/cachet');
         });
 
-        $this->app->alias('setting', Repository::class);
+        $this->app->singleton(Repository::class, function () {
+            return new Repository(new SettingModel());
+        });
     }
 }

app/Foundation/Providers/ConsoleServiceProvider.php

@@ -11,11 +11,28 @@
 
 namespace CachetHQ\Cachet\Foundation\Providers;
 
-use CachetHQ\Cachet\GitHub\Release;
+use CachetHQ\Cachet\Subscribers\CommandSubscriber;
 use Illuminate\Support\ServiceProvider;
 
-class GitHubServiceProvider extends ServiceProvider
+/**
+ * This is the console service provider.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class ConsoleServiceProvider extends ServiceProvider
 {
+    /**
+     * Boot the service provider.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $subscriber = $this->app->make(CommandSubscriber::class);
+
+        $this->app->events->subscribe($subscriber);
+    }
+
     /**
      * Register the service provider.
      *
@@ -23,23 +40,6 @@ class GitHubServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->registerRelease();
-    }
-
-    /**
-     * Register the releases class.
-     *
-     * @return void
-     */
-    protected function registerRelease()
-    {
-        $this->app->singleton('cachet.release', function ($app) {
-            $cache = $app['cache.store'];
-            $config = $app['config'];
-
-            return new Release($cache, $config);
-        });
-
-        $this->app->alias('cachet.release', Release::class);
+        //
     }
 }

app/Foundation/Providers/EventServiceProvider.php

@@ -34,14 +34,20 @@ class EventServiceProvider extends ServiceProvider
             //
         ],
         'CachetHQ\Cachet\Bus\Events\Component\ComponentWasRemovedEvent' => [
-            //
+            'CachetHQ\Cachet\Bus\Handlers\Events\Component\CleanupComponentSubscriptionsHandler',
         ],
         'CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent' => [
             'CachetHQ\Cachet\Bus\Handlers\Events\Component\SendComponentUpdateEmailNotificationHandler',
         ],
+        'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasRemovedEvent' => [
+            //
+        ],
         'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent' => [
             'CachetHQ\Cachet\Bus\Handlers\Events\Incident\SendIncidentEmailNotificationHandler',
         ],
+        'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasUpdatedEvent' => [
+            //
+        ],
         'CachetHQ\Cachet\Bus\Events\Incident\MaintenanceWasScheduledEvent' => [
             'CachetHQ\Cachet\Bus\Handlers\Events\Incident\SendMaintenanceEmailNotificationHandler',
         ],

app/Foundation/Providers/RepositoryServiceProvider.php

@@ -16,8 +16,15 @@ use CachetHQ\Cachet\Repositories\Metric\MetricRepository;
 use CachetHQ\Cachet\Repositories\Metric\MySqlRepository as MetricMySqlRepository;
 use CachetHQ\Cachet\Repositories\Metric\PgSqlRepository as MetricPgSqlRepository;
 use CachetHQ\Cachet\Repositories\Metric\SqliteRepository as MetricSqliteRepository;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Illuminate\Contracts\Container\Container;
 use Illuminate\Support\ServiceProvider;
 
+/**
+ * This is the repository service provider.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 class RepositoryServiceProvider extends ServiceProvider
 {
     /**
@@ -37,22 +44,21 @@ class RepositoryServiceProvider extends ServiceProvider
      */
     protected function registerMetricRepository()
     {
-        $this->app->singleton('cachet.metricrepository', function ($app) {
-            $dbDriver = $app['config']->get('database.default');
+        $this->app->singleton(MetricRepository::class, function (Container $app) {
+            $config = $app->make(ConfigRepository::class);
+            $driver = $config->get('database.default');
 
-            if ($dbDriver == 'mysql') {
-                $repository = new MetricMySqlRepository();
-            } elseif ($dbDriver == 'pgsql') {
-                $repository = new MetricPgSqlRepository();
-            } elseif ($dbDriver == 'sqlite') {
-                $repository = new MetricSqliteRepository();
+            if ($driver == 'mysql') {
+                $repository = new MetricMySqlRepository($config);
+            } elseif ($driver == 'pgsql') {
+                $repository = new MetricPgSqlRepository($config);
+            } elseif ($driver == 'sqlite') {
+                $repository = new MetricSqliteRepository($config);
             }
 
             $dates = $app->make(DateFactory::class);
 
             return new MetricRepository($repository, $dates);
         });
-
-        $this->app->alias('cachet.metricrepository', MetricRepository::class);
     }
 }

app/GitHub/Release.php

@@ -1,70 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\GitHub;
-
-use GuzzleHttp\Client;
-use Illuminate\Contracts\Cache\Repository as CacheRepository;
-use Illuminate\Contracts\Config\Repository as ConfigRepository;
-
-class Release
-{
-    /**
-     * The cache repository instance.
-     *
-     * @var \Illuminate\Contracts\Cache\Repository
-     */
-    protected $cache;
-
-    /**
-     * The config repository instance.
-     *
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * Creates a new release instance.
-     *
-     * @param \Illuminate\Contracts\Cache\Repository  $cache
-     * @param \Illuminate\Contracts\Config\Repository $config
-     *
-     * @return void
-     */
-    public function __construct(CacheRepository $cache, ConfigRepository $config)
-    {
-        $this->cache = $cache;
-        $this->config = $config;
-    }
-
-    /**
-     * Returns the latest GitHub release.
-     *
-     * @return string
-     */
-    public function latest()
-    {
-        $release = $this->cache->remember('version', 720, function () {
-            $headers = ['Accept' => 'application/vnd.github.v3+json'];
-
-            // We can re-use the Emoji token here, if we have it.
-            if ($token = $this->config->get('services.github.token')) {
-                $headers['OAUTH-TOKEN'] = $token;
-            }
-
-            return json_decode((new Client())->get('https://api.github.com/repos/cachethq/cachet/releases/latest', [
-                'headers' => $headers,
-            ])->getBody(), true);
-        });
-
-        return $release['tag_name'];
-    }
-}

app/Http/Controllers/Api/ComponentGroupController.php

@@ -20,6 +20,13 @@ use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
+/**
+ * This is the component group controller.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author Joe Cohen <joe@alt-three.com>
+ */
 class ComponentGroupController extends AbstractApiController
 {
     /**
@@ -67,7 +74,7 @@ class ComponentGroupController extends AbstractApiController
             $group = dispatch(new AddComponentGroupCommand(
                 Binput::get('name'),
                 Binput::get('order', 0),
-                Binput::get('collapsed')
+                Binput::get('collapsed', 0)
             ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
@@ -89,7 +96,7 @@ class ComponentGroupController extends AbstractApiController
             $group = dispatch(new UpdateComponentGroupCommand(
                 $group,
                 Binput::get('name'),
-                Binput::get('order', 0),
+                Binput::get('order'),
                 Binput::get('collapsed')
             ));
         } catch (QueryException $e) {

app/Http/Controllers/Api/GeneralController.php

@@ -11,6 +11,13 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Api;
 
+use CachetHQ\Cachet\Integrations\Releases;
+
+/**
+ * This is the general api controller.
+ *
+ * @author James Brooks <james@bluebaytravel.co.uk>
+ */
 class GeneralController extends AbstractApiController
 {
     /**
@@ -30,6 +37,11 @@ class GeneralController extends AbstractApiController
      */
     public function version()
     {
-        return $this->item(CACHET_VERSION);
+        $latest = app(Releases::class)->latest();
+
+        return $this->setMetaData([
+            'on_latest' => version_compare(CACHET_VERSION, $latest['tag_name']) === 1,
+            'latest'    => $latest,
+        ])->item(CACHET_VERSION);
     }
 }

app/Http/Controllers/Api/MetricController.php

@@ -84,7 +84,9 @@ class MetricController extends AbstractApiController
                 Binput::get('calc_type', 0),
                 Binput::get('display_chart', true),
                 Binput::get('places', 2),
-                Binput::get('view', 1)
+                Binput::get('default_view', Binput::get('view', 1)),
+                Binput::get('threshold', 5),
+                Binput::get('order', 0)
             ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
@@ -112,7 +114,9 @@ class MetricController extends AbstractApiController
                 Binput::get('calc_type'),
                 Binput::get('display_chart'),
                 Binput::get('places'),
-                Binput::get('view')
+                Binput::get('default_view', Binput::get('view')),
+                Binput::get('threshold'),
+                Binput::get('order')
             ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();

app/Http/Controllers/Api/MetricPointController.php

@@ -48,8 +48,8 @@ class MetricPointController extends AbstractApiController
             $metricPoint = dispatch(new AddMetricPointCommand(
                 $metric,
                 Binput::get('value'),
-                Binput::get('timestamp'))
-            );
+                Binput::get('timestamp')
+            ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
         }

app/Http/Controllers/Api/SubscriberController.php

@@ -21,6 +21,12 @@ use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
+/**
+ * This is the subscriber controller class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ */
 class SubscriberController extends AbstractApiController
 {
     /**
@@ -43,7 +49,11 @@ class SubscriberController extends AbstractApiController
     public function postSubscribers()
     {
         try {
-            $subscriber = dispatch(new SubscribeSubscriberCommand(Binput::get('email'), Binput::get('verify', false), null));
+            $subscriber = dispatch(new SubscribeSubscriberCommand(
+                Binput::get('email'),
+                Binput::get('verify', false),
+                Binput::get('components', null)
+            ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
         }

app/Http/Controllers/AuthController.php

@@ -41,11 +41,11 @@ class AuthController extends Controller
      */
     public function postLogin()
     {
-        $loginData = Binput::only(['login', 'password']);
+        $loginData = Binput::only(['username', 'password']);
 
         // Login with username or email.
-        $loginKey = Str::contains($loginData['login'], '@') ? 'email' : 'username';
-        $loginData[$loginKey] = array_pull($loginData, 'login');
+        $loginKey = Str::contains($loginData['username'], '@') ? 'email' : 'username';
+        $loginData[$loginKey] = array_pull($loginData, 'username');
 
         // Validate login credentials.
         if (Auth::validate($loginData)) {

app/Http/Controllers/Dashboard/ApiController.php

@@ -11,34 +11,46 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
-use CachetHQ\Cachet\GitHub\Release;
+use CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand;
+use CachetHQ\Cachet\Bus\Commands\ComponentGroup\UpdateComponentGroupCommand;
+use CachetHQ\Cachet\Http\Controllers\Api\AbstractApiController;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\IncidentTemplate;
-use Exception;
 use GrahamCampbell\Binput\Facades\Binput;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Routing\Controller;
-use Illuminate\Support\Facades\Response;
+use Illuminate\Database\QueryException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
-class ApiController extends Controller
+class ApiController extends AbstractApiController
 {
     /**
      * Updates a component with the entered info.
      *
      * @param \CachetHQ\Cachet\Models\Component $component
      *
-     * @throws \Exception
+     * @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
      *
      * @return \CachetHQ\Cachet\Models\Component
      */
     public function postUpdateComponent(Component $component)
     {
-        if (!$component->update(Binput::except(['_token']))) {
-            throw new Exception(trans('dashboard.components.edit.failure'));
+        try {
+            dispatch(new UpdateComponentCommand(
+                $component,
+                null,
+                null,
+                Binput::get('status'),
+                null,
+                null,
+                null,
+                null
+            ));
+        } catch (QueryException $e) {
+            throw new BadRequestHttpException();
         }
 
-        return $component;
+        return $this->item($component);
     }
 
     /**
@@ -51,11 +63,23 @@ class ApiController extends Controller
         $componentData = Binput::get('ids');
 
         foreach ($componentData as $order => $componentId) {
-            // Ordering should be 1-based, data comes in 0-based
-            Component::find($componentId)->update(['order' => $order + 1]);
+            try {
+                dispatch(new UpdateComponentCommand(
+                    Component::find($componentId),
+                    null,
+                    null,
+                    null,
+                    null,
+                    $order + 1,
+                    null,
+                    null
+                ));
+            } catch (QueryException $e) {
+                throw new BadRequestHttpException();
+            }
         }
 
-        return $componentData;
+        return $this->collection(Component::query()->orderBy('order')->get());
     }
 
     /**
@@ -68,10 +92,15 @@ class ApiController extends Controller
         $groupData = Binput::get('ids');
 
         foreach ($groupData as $order => $groupId) {
-            ComponentGroup::find($groupId)->update(['order' => $order + 1]);
+            dispatch(new UpdateComponentGroupCommand(
+                ComponentGroup::find($groupId),
+                null,
+                $order + 1,
+                null
+            ));
         }
 
-        return $groupData;
+        return $this->collection(ComponentGroup::query()->orderBy('order')->get());
     }
 
     /**
@@ -91,20 +120,4 @@ class ApiController extends Controller
 
         throw new ModelNotFoundException("Incident template for $templateSlug could not be found.");
     }
-
-    /**
-     * Checks if Cachet is up to date.
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function checkVersion()
-    {
-        $latest = app(Release::class)->latest();
-
-        return Response::json([
-            'cachet_version' => CACHET_VERSION,
-            'latest_version' => $latest,
-            'is_latest'      => version_compare(CACHET_VERSION, $latest) === 1,
-        ]);
-    }
 }

app/Http/Controllers/Dashboard/DashboardController.php

@@ -11,11 +11,14 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
+use CachetHQ\Cachet\Integrations\Feed;
 use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
 use Jenssegers\Date\Date;
 
@@ -36,16 +39,36 @@ class DashboardController extends Controller
     protected $timeZone;
 
     /**
-     * Creates a new dashboard controller.
+     * The feed integration.
+     *
+     * @var \CachetHQ\Cachet\Integrations\Feed
+     */
+    protected $feed;
+
+    /**
+     * Creates a new dashboard controller instance.
+     *
+     * @param \CachetHQ\Cachet\Integrations\Feed $feed
      *
      * @return void
      */
-    public function __construct()
+    public function __construct(Feed $feed)
     {
+        $this->feed = $feed;
         $this->startDate = new Date();
         $this->dateTimeZone = Config::get('cachet.timezone');
     }
 
+    /**
+     * Redirect /admin to /dashboard.
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function redirectAdmin()
+    {
+        return Redirect::route('dashboard.index');
+    }
+
     /**
      * Shows the dashboard view.
      *
@@ -56,12 +79,23 @@ class DashboardController extends Controller
         $components = Component::orderBy('order')->get();
         $incidents = $this->getIncidents();
         $subscribers = $this->getSubscribers();
+        $usedComponentGroups = Component::enabled()->where('group_id', '>', 0)->groupBy('group_id')->pluck('group_id');
+        $componentGroups = ComponentGroup::whereIn('id', $usedComponentGroups)->orderBy('order')->get();
+        $ungroupedComponents = Component::enabled()->where('group_id', 0)->orderBy('order')->orderBy('created_at')->get();
+
+        $entries = null;
+        if ($feed = $this->feed->latest()) {
+            $entries = array_slice($feed->channel->item, 0, 5);
+        }
 
         return View::make('dashboard.index')
             ->withPageTitle(trans('dashboard.dashboard'))
             ->withComponents($components)
             ->withIncidents($incidents)
-            ->withSubscribers($subscribers);
+            ->withSubscribers($subscribers)
+            ->withEntries($entries)
+            ->withComponentGroups($componentGroups)
+            ->withUngroupedComponents($ungroupedComponents);
     }
 
     /**

app/Http/Controllers/Dashboard/MetricController.php

@@ -31,7 +31,7 @@ class MetricController extends Controller
      */
     public function showMetrics()
     {
-        $metrics = Metric::orderBy('created_at', 'desc')->get();
+        $metrics = Metric::orderBy('order')->orderBy('id')->get();
 
         return View::make('dashboard.metrics.index')
             ->withPageTitle(trans('dashboard.metrics.metrics').' - '.trans('dashboard.dashboard'))
@@ -79,7 +79,8 @@ class MetricController extends Controller
                 $metricData['calc_type'],
                 $metricData['display_chart'],
                 $metricData['places'],
-                $metricData['default_view']
+                $metricData['default_view'],
+                $metricData['threshold']
             ));
         } catch (ValidationException $e) {
             return Redirect::route('dashboard.metrics.add')
@@ -151,7 +152,8 @@ class MetricController extends Controller
                 Binput::get('calc_type', null, false),
                 Binput::get('display_chart', null, false),
                 Binput::get('places', null, false),
-                Binput::get('default_view', null, false)
+                Binput::get('default_view', null, false),
+                Binput::get('threshold', null, false)
             ));
         } catch (ValidationException $e) {
             return Redirect::route('dashboard.metrics.edit', ['id' => $metric->id])

app/Http/Controllers/Dashboard/SettingsController.php

@@ -11,7 +11,9 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
+use CachetHQ\Cachet\Integrations\Credits;
 use CachetHQ\Cachet\Models\User;
+use CachetHQ\Cachet\Settings\Repository;
 use Exception;
 use GrahamCampbell\Binput\Facades\Binput;
 use Illuminate\Routing\Controller;
@@ -81,6 +83,12 @@ class SettingsController extends Controller
                 'icon'   => 'ion-stats-bars',
                 'active' => false,
             ],
+            'credits' => [
+                'title'  => trans('dashboard.settings.credits.credits'),
+                'url'    => route('dashboard.settings.credits'),
+                'icon'   => 'ion-ios-list',
+                'active' => false,
+            ],
             'about' => [
                 'title'  => CACHET_VERSION,
                 'url'    => 'javascript: void(0);',
@@ -211,6 +219,30 @@ class SettingsController extends Controller
             ->withSubMenu($this->subMenu);
     }
 
+    /**
+     * Show the credits view.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function showCreditsView()
+    {
+        $this->subMenu['credits']['active'] = true;
+
+        $credits = app(Credits::class)->latest();
+
+        $backers = $credits['backers'];
+        $contributors = $credits['contributors'];
+
+        shuffle($backers);
+        shuffle($contributors);
+
+        return View::make('dashboard.settings.credits')
+            ->withPageTitle(trans('dashboard.settings.credits.credits').' - '.trans('dashboard.dashboard'))
+            ->withBackers($backers)
+            ->withContributors($contributors)
+            ->withSubMenu($this->subMenu);
+    }
+
     /**
      * Updates the status page settings.
      *
@@ -218,9 +250,7 @@ class SettingsController extends Controller
      */
     public function postSettings()
     {
-        $redirectUrl = Session::get('redirect_to', route('dashboard.settings.setup'));
-
-        $setting = app('setting');
+        $setting = app(Repository::class);
 
         if (Binput::get('remove_banner') === '1') {
             $setting->set('app_banner', null);
@@ -245,29 +275,7 @@ class SettingsController extends Controller
         }
 
         if (Binput::hasFile('app_banner')) {
-            $file = Binput::file('app_banner');
-
-            // Image Validation.
-            // Image size in bytes.
-            $maxSize = $file->getMaxFilesize();
-
-            if ($file->getSize() > $maxSize) {
-                return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.app-setup.too-big', ['size' => $maxSize]));
-            }
-
-            if (!$file->isValid() || $file->getError()) {
-                return Redirect::to($redirectUrl)->withErrors($file->getErrorMessage());
-            }
-
-            if (!Str::startsWith($file->getMimeType(), 'image/')) {
-                return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.app-setup.images-only'));
-            }
-
-            // Store the banner.
-            $setting->set('app_banner', base64_encode(file_get_contents($file->getRealPath())));
-
-            // Store the banner type.
-            $setting->set('app_banner_type', $file->getMimeType());
+            $this->handleUpdateBanner($setting);
         }
 
         $excludedParams = [
@@ -287,13 +295,47 @@ class SettingsController extends Controller
                 $setting->set($settingName, $settingValue);
             }
         } catch (Exception $e) {
-            return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.edit.failure'));
+            return Redirect::back()->withErrors(trans('dashboard.settings.edit.failure'));
         }
 
         if (Binput::has('app_locale')) {
             Lang::setLocale(Binput::get('app_locale'));
         }
 
-        return Redirect::to($redirectUrl)->withSuccess(trans('dashboard.settings.edit.success'));
+        return Redirect::back()->withSuccess(trans('dashboard.settings.edit.success'));
+    }
+
+    /**
+     * Handle updating of the banner image.
+     *
+     * @param \CachetHQ\Cachet\Settings\Repository $setting
+     *
+     * @return void
+     */
+    protected function handleUpdateBanner(Repository $setting)
+    {
+        $file = Binput::file('app_banner');
+
+        // Image Validation.
+        // Image size in bytes.
+        $maxSize = $file->getMaxFilesize();
+
+        if ($file->getSize() > $maxSize) {
+            return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.app-setup.too-big', ['size' => $maxSize]));
+        }
+
+        if (!$file->isValid() || $file->getError()) {
+            return Redirect::to($redirectUrl)->withErrors($file->getErrorMessage());
+        }
+
+        if (!Str::startsWith($file->getMimeType(), 'image/')) {
+            return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.app-setup.images-only'));
+        }
+
+        // Store the banner.
+        $setting->set('app_banner', base64_encode(file_get_contents($file->getRealPath())));
+
+        // Store the banner type.
+        $setting->set('app_banner_type', $file->getMimeType());
     }
 }

app/Http/Controllers/Dashboard/SubscriberController.php

@@ -53,7 +53,11 @@ class SubscriberController extends Controller
     public function createSubscriberAction()
     {
         try {
-            dispatch(new SubscribeSubscriberCommand(Binput::get('email')));
+            $subscribers = preg_split("/\r\n|\n|\r/", Binput::get('email'));
+
+            foreach ($subscribers as $subscriber) {
+                dispatch(new SubscribeSubscriberCommand($subscriber));
+            }
         } catch (ValidationException $e) {
             return Redirect::route('dashboard.subscribers.add')
                 ->withInput(Binput::all())

app/Http/Controllers/SetupController.php

@@ -12,6 +12,7 @@
 namespace CachetHQ\Cachet\Http\Controllers;
 
 use CachetHQ\Cachet\Models\User;
+use CachetHQ\Cachet\Settings\Repository;
 use Dotenv\Dotenv;
 use Dotenv\Exception\InvalidPathException;
 use GrahamCampbell\Binput\Facades\Binput;
@@ -41,6 +42,22 @@ class SetupController extends Controller
         'redis'     => 'Redis',
     ];
 
+    /**
+     * Array of cache drivers.
+     *
+     * @var string[]
+     */
+    protected $mailDrivers = [
+        'smtp'      => 'SMTP',
+        'mail'      => 'Mail',
+        'sendmail'  => 'Sendmail',
+        'mailgun'   => 'Mailgun',
+        'mandrill'  => 'Mandrill',
+        // 'ses'       => 'Amazon SES', this will be available only if aws/aws-sdk-php is installed
+        'sparkpost' => 'SparkPost',
+        'log'       => 'Log (Testing)',
+    ];
+
     /**
      * Array of step1 rules.
      *
@@ -72,6 +89,7 @@ class SetupController extends Controller
         $this->rulesStep1 = [
             'env.cache_driver'   => 'required|in:'.implode(',', array_keys($this->cacheDrivers)),
             'env.session_driver' => 'required|in:'.implode(',', array_keys($this->cacheDrivers)),
+            'env.mail_driver'    => 'required|in:'.implode(',', array_keys($this->mailDrivers)),
         ];
 
         $this->rulesStep2 = [
@@ -96,11 +114,6 @@ class SetupController extends Controller
      */
     public function getIndex()
     {
-        // If we've copied the .env.example file, then we should try and reset it.
-        if (strlen(Config::get('app.key')) !== 32) {
-            $this->keyGenerate();
-        }
-
         $supportedLanguages = Request::getLanguages();
         $userLanguage = Config::get('app.locale');
 
@@ -116,6 +129,7 @@ class SetupController extends Controller
         return View::make('setup')
             ->withPageTitle(trans('setup.setup'))
             ->withCacheDrivers($this->cacheDrivers)
+            ->withMailDrivers($this->mailDrivers)
             ->withUserLanguage($userLanguage)
             ->withAppUrl(Request::root());
     }
@@ -131,6 +145,14 @@ class SetupController extends Controller
 
         $v = Validator::make($postData, $this->rulesStep1);
 
+        $v->sometimes('env.mail_host', 'required', function ($input) {
+            return $input->mail_driver === 'smtp';
+        });
+
+        $v->sometimes(['env.mail_address', 'env.mail_username', 'env.mail_password'], 'required', function ($input) {
+            return $input->mail_driver !== 'log';
+        });
+
         if ($v->passes()) {
             return Response::json(['status' => 1]);
         }
@@ -180,7 +202,7 @@ class SetupController extends Controller
 
             Auth::login($user);
 
-            $setting = app('setting');
+            $setting = app(Repository::class);
 
             $settings = array_pull($postData, 'settings');
 
@@ -228,33 +250,14 @@ class SetupController extends Controller
         try {
             (new Dotenv($dir, $file))->load();
 
+            $envKey = strtoupper($key);
+            $envValue = env($envKey) ?: 'null';
+
             file_put_contents($path, str_replace(
-                env(strtoupper($key)), $value, file_get_contents($path)
+                $envKey.'='.$envValue, $envKey.'='.$value, file_get_contents($path)
             ));
         } catch (InvalidPathException $e) {
             //
         }
     }
-
-    /**
-     * Generate the app.key value.
-     *
-     * @return void
-     */
-    protected function keyGenerate()
-    {
-        $key = str_random(32);
-
-        $dir = app()->environmentPath();
-        $file = app()->environmentFile();
-        $path = "{$dir}/{$file}";
-
-        (new Dotenv($dir, $file))->load();
-
-        file_put_contents($path, str_replace(
-            Config::get('app.key'), $key, file_get_contents($path)
-        ));
-
-        Config::set('app.key', $key);
-    }
 }

app/Http/Controllers/SignupController.php

@@ -47,7 +47,7 @@ class SignupController extends Controller
         return View::make('signup')
             ->withCode($invite->code)
             ->withUsername(Binput::old('username'))
-            ->withEmail(Binput::old('emai', $invite->email));
+            ->withEmail(Binput::old('email', $invite->email));
     }
 
     /**

app/Http/Controllers/SubscribeController.php

@@ -15,8 +15,9 @@ use AltThree\Validator\ValidationException;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriptionCommand;
+use CachetHQ\Cachet\Bus\Commands\Subscriber\UpdateSubscriberSubscriptionCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand;
-use CachetHQ\Cachet\Bus\Exceptions\Subscriber\AlreadySubscribedException;
+use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Cachet\Models\Subscription;
 use GrahamCampbell\Binput\Facades\Binput;
@@ -57,20 +58,22 @@ class SubscribeController extends Controller
         $subscriptions = Binput::get('subscriptions');
 
         try {
-            dispatch(new SubscribeSubscriberCommand($email, false, $subscriptions));
-        } catch (AlreadySubscribedException $e) {
-            return Redirect::route('subscribe.subscribe')
-                ->withTitle(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))
-                ->withErrors(trans('cachet.subscriber.email.already-subscribed', ['email' => $email]));
+            $verified = false;
+
+            $subscription = dispatch(new SubscribeSubscriberCommand($email, $verified));
         } catch (ValidationException $e) {
-            return Redirect::route('subscribe.subscribe')
+            return Redirect::route('status-page')
                 ->withInput(Binput::all())
-                ->withTitle(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))
+                ->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))
                 ->withErrors($e->getMessageBag());
         }
 
-        return Redirect::route('status-page')
-            ->withSuccess(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.subscribed')));
+        $message = $subscription->is_verified ?
+            trans('cachet.subscriber.email.already-subscribed', ['email' => $email]) :
+            trans('cachet.subscriber.email.subscribed');
+
+        return Redirect::route('subscribe.manage', $subscription->verify_code)
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), $message));
     }
 
     /**
@@ -86,16 +89,18 @@ class SubscribeController extends Controller
             throw new NotFoundHttpException();
         }
 
-        $subscriber = Subscriber::where('verify_code', '=', $code)->first();
+        $subscriber = Subscriber::where('verify_code', $code)->first();
 
-        if (!$subscriber || $subscriber->is_verified) {
+        if (!$subscriber) {
             throw new BadRequestHttpException();
         }
 
-        dispatch(new VerifySubscriberCommand($subscriber));
+        if (!$subscriber->is_verified) {
+            dispatch(new VerifySubscriberCommand($subscriber));
+        }
 
         return Redirect::route('status-page')
-            ->withSuccess(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.verified')));
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.verified')));
     }
 
     /**
@@ -125,7 +130,7 @@ class SubscribeController extends Controller
         }
 
         return Redirect::route('status-page')
-            ->withSuccess(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.unsubscribed')));
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.unsubscribed')));
     }
 
     /**
@@ -143,10 +148,47 @@ class SubscribeController extends Controller
 
         $subscriber = Subscriber::where('verify_code', '=', $code)->first();
 
-        if (!$subscriber || !$subscriber->is_verified) {
+        if (!$subscriber) {
             throw new BadRequestHttpException();
         }
 
-        return View::make('subscribe.manage')->withSubscriber($subscriber);
+        return View::make('subscribe.manage')
+            ->withComponents(Component::all())
+            ->withSubscriber($subscriber)
+            ->withSubscriptions($subscriber->subscriptions->pluck('component_id')->all());
+    }
+
+    /**
+     * Updates the subscription manager for a subscriber.
+     *
+     * @param string|null $code
+     *
+     * @return \Illuminate\View\View
+     */
+    public function postManage($code = null)
+    {
+        if ($code === null) {
+            throw new NotFoundHttpException();
+        }
+
+        $subscriber = Subscriber::where('verify_code', '=', $code)->first();
+
+        if (!$subscriber) {
+            throw new BadRequestHttpException();
+        }
+
+        try {
+            dispatch(new UpdateSubscriberSubscriptionCommand($subscriber, Binput::get('subscriptions')));
+        } catch (ValidationException $e) {
+            dd($e->getMessageBag());
+
+            return Redirect::route('subscribe.manage', $subscriber->verify_code)
+                ->withInput(Binput::all())
+                ->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))
+                ->withErrors($e->getMessageBag());
+        }
+
+        return Redirect::route('subscribe.manage', $subscriber->verify_code)
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.subscribed')));
     }
 }

app/Http/Kernel.php

@@ -59,6 +59,6 @@ class Kernel extends HttpKernel
         'ready'       => 'CachetHQ\Cachet\Http\Middleware\ReadyForUse',
         'setup'       => 'CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted',
         'subscribers' => 'CachetHQ\Cachet\Http\Middleware\SubscribersConfigured',
-        'throttle'    => 'Illuminate\Routing\Middleware\ThrottleRequests',
+        'throttle'    => 'AltThree\Throttle\ThrottlingMiddleware',
     ];
 }

app/Http/Middleware/Localize.php

@@ -55,6 +55,10 @@ class Localize
      */
     public function handle(Request $request, Closure $next)
     {
+        if (!(bool) $this->config->get('setting.automatic_localization')) {
+            return $next($request);
+        }
+
         $supportedLanguages = $request->getLanguages();
         $userLanguage = $this->config->get('app.locale');
 

app/Http/Middleware/Timezone.php

@@ -25,7 +25,7 @@ class Timezone
     protected $config;
 
     /**
-     * Creates a new release instance.
+     * Creates a new timezone middleware instance.
      *
      * @param \Illuminate\Contracts\Config\Repository $config
      *

app/Http/Routes/DashboardRoutes.php

@@ -29,206 +29,213 @@ class DashboardRoutes
      */
     public function map(Registrar $router)
     {
-        $router->group(['middleware' => ['web', 'auth'], 'prefix' => 'dashboard', 'namespace' => 'Dashboard', 'as' => 'dashboard.'], function (Registrar $router) {
-            $router->get('/', [
-                'as'   => 'index',
-                'uses' => 'DashboardController@showDashboard',
-            ]);
+        $router->group(['middleware' => ['web', 'auth'], 'namespace' => 'Dashboard'], function (Registrar $router) {
+            $router->get('admin', 'DashboardController@redirectAdmin');
 
-            $router->group(['as' => 'components.', 'prefix' => 'components'], function (Registrar $router) {
+            $router->group(['prefix' => 'dashboard', 'as' => 'dashboard.'], function (Registrar $router) {
                 $router->get('/', [
                     'as'   => 'index',
-                    'uses' => 'ComponentController@showComponents',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'ComponentController@showAddComponent',
-                ]);
-                $router->post('add', 'ComponentController@createComponentAction');
-                $router->get('groups', [
-                    'as'   => 'groups',
-                    'uses' => 'ComponentController@showComponentGroups',
-                ]);
-                $router->get('groups/add', [
-                    'as'   => 'groups.add',
-                    'uses' => 'ComponentController@showAddComponentGroup',
-                ]);
-                $router->get('groups/edit/{component_group}', [
-                    'as'   => 'groups.edit',
-                    'uses' => 'ComponentController@showEditComponentGroup',
-                ]);
-                $router->post('groups/edit/{component_group}', 'ComponentController@updateComponentGroupAction');
-                $router->delete('groups/{component_group}/delete', 'ComponentController@deleteComponentGroupAction');
-                $router->post('groups/add', 'ComponentController@postAddComponentGroup');
-                $router->get('{component}/edit', [
-                    'as'   => 'edit',
-                    'uses' => 'ComponentController@showEditComponent',
-                ]);
-                $router->delete('{component}/delete', 'ComponentController@deleteComponentAction');
-                $router->post('{component}/edit', 'ComponentController@updateComponentAction');
-            });
-
-            $router->group(['as' => 'incidents.', 'prefix' => 'incidents'], function (Registrar $router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'IncidentController@showIncidents',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'IncidentController@showAddIncident',
-                ]);
-                $router->post('add', 'IncidentController@createIncidentAction');
-                $router->delete('{incident}/delete', [
-                    'as'   => 'delete',
-                    'uses' => 'IncidentController@deleteIncidentAction',
-                ]);
-                $router->get('{incident}/edit', [
-                    'as'   => 'edit',
-                    'uses' => 'IncidentController@showEditIncidentAction',
-                ]);
-                $router->post('{incident}/edit', 'IncidentController@editIncidentAction');
-            });
-
-            $router->group(['as' => 'schedule.', 'prefix' => 'schedule'], function (Registrar $router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'ScheduleController@showIndex',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'ScheduleController@showAddSchedule',
-                ]);
-                $router->post('add', 'ScheduleController@addScheduleAction');
-                $router->get('{incident}/edit', [
-                    'as'   => 'edit',
-                    'uses' => 'ScheduleController@showEditSchedule',
-                ]);
-                $router->post('{incident}/edit', 'ScheduleController@editScheduleAction');
-                $router->delete('{incident}/delete', [
-                    'as'   => 'delete',
-                    'uses' => 'ScheduleController@deleteScheduleAction',
-                ]);
-            });
-
-            $router->group(['as' => 'templates.', 'prefix' => 'templates'], function (Registrar $router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'IncidentController@showTemplates',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'IncidentController@showAddIncidentTemplate',
-                ]);
-                $router->post('add', 'IncidentController@createIncidentTemplateAction');
-                $router->get('{incident_template}/edit', [
-                    'as'   => 'edit',
-                    'uses' => 'IncidentController@showEditTemplateAction',
-                ]);
-                $router->post('{incident_template}/edit', 'IncidentController@editTemplateAction');
-                $router->delete('{incident_template}/delete', 'IncidentController@deleteTemplateAction');
-            });
-
-            $router->group(['as'     => 'subscribers.', 'prefix' => 'subscribers'], function (Registrar $router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'SubscriberController@showSubscribers',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'SubscriberController@showAddSubscriber',
-                ]);
-                $router->post('add', 'SubscriberController@createSubscriberAction');
-                $router->delete('{subscriber}/delete', 'SubscriberController@deleteSubscriberAction');
-            });
-
-            $router->group(['as'  => 'metrics.', 'prefix' => 'metrics'], function (Registrar $router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'MetricController@showMetrics',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'MetricController@showAddMetric',
-                ]);
-                $router->post('add', 'MetricController@createMetricAction');
-                $router->delete('{metric}/delete', 'MetricController@deleteMetricAction');
-                $router->get('{metric}/edit', [
-                    'as'   => 'edit',
-                    'uses' => 'MetricController@showEditMetricAction',
-                ]);
-                $router->post('{metric}/edit', 'MetricController@editMetricAction');
-            });
-
-            $router->group(['as' => 'team.', 'prefix' => 'team'], function (Registrar $router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'TeamController@showTeamView',
+                    'uses' => 'DashboardController@showDashboard',
                 ]);
 
-                $router->group(['middleware' => 'admin'], function (Registrar $router) {
+                $router->group(['as' => 'components.', 'prefix' => 'components'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'ComponentController@showComponents',
+                    ]);
                     $router->get('add', [
                         'as'   => 'add',
-                        'uses' => 'TeamController@showAddTeamMemberView',
+                        'uses' => 'ComponentController@showAddComponent',
                     ]);
-                    $router->get('invite', [
-                        'as'   => 'invite',
-                        'uses' => 'TeamController@showInviteTeamMemberView',
+                    $router->post('add', 'ComponentController@createComponentAction');
+                    $router->get('groups', [
+                        'as'   => 'groups',
+                        'uses' => 'ComponentController@showComponentGroups',
                     ]);
-                    $router->get('{user}', ['as' => 'edit', 'uses' => 'TeamController@showTeamMemberView']);
-                    $router->post('add', 'TeamController@postAddUser');
-                    $router->post('invite', 'TeamController@postInviteUser');
-                    $router->post('{user}', 'TeamController@postUpdateUser');
-                    $router->delete('{user}/delete', 'TeamController@deleteUser');
+                    $router->get('groups/add', [
+                        'as'   => 'groups.add',
+                        'uses' => 'ComponentController@showAddComponentGroup',
+                    ]);
+                    $router->get('groups/edit/{component_group}', [
+                        'as'   => 'groups.edit',
+                        'uses' => 'ComponentController@showEditComponentGroup',
+                    ]);
+                    $router->post('groups/edit/{component_group}', 'ComponentController@updateComponentGroupAction');
+                    $router->delete('groups/{component_group}/delete', 'ComponentController@deleteComponentGroupAction');
+                    $router->post('groups/add', 'ComponentController@postAddComponentGroup');
+                    $router->get('{component}/edit', [
+                        'as'   => 'edit',
+                        'uses' => 'ComponentController@showEditComponent',
+                    ]);
+                    $router->delete('{component}/delete', 'ComponentController@deleteComponentAction');
+                    $router->post('{component}/edit', 'ComponentController@updateComponentAction');
                 });
-            });
 
-            $router->group(['as' => 'settings.', 'prefix' => 'settings'], function (Registrar $router) {
-                $router->get('setup', [
-                    'as'   => 'setup',
-                    'uses' => 'SettingsController@showSetupView',
-                ]);
-                $router->get('analytics', [
-                    'as'   => 'analytics',
-                    'uses' => 'SettingsController@showAnalyticsView',
-                ]);
-                $router->get('localization', [
-                    'as'   => 'localization',
-                    'uses' => 'SettingsController@showLocalizationView',
-                ]);
-                $router->get('security', [
-                    'as'   => 'security',
-                    'uses' => 'SettingsController@showSecurityView',
-                ]);
-                $router->get('theme', [
-                    'as'   => 'theme',
-                    'uses' => 'SettingsController@showThemeView',
-                ]);
-                $router->get('stylesheet', [
-                    'as'   => 'stylesheet',
-                    'uses' => 'SettingsController@showStylesheetView',
-                ]);
-                $router->get('customization', [
-                    'as'   => 'customization',
-                    'uses' => 'SettingsController@showCustomizationView',
-                ]);
-                $router->post('/', 'SettingsController@postSettings');
-            });
+                $router->group(['as' => 'incidents.', 'prefix' => 'incidents'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'IncidentController@showIncidents',
+                    ]);
+                    $router->get('add', [
+                        'as'   => 'add',
+                        'uses' => 'IncidentController@showAddIncident',
+                    ]);
+                    $router->post('add', 'IncidentController@createIncidentAction');
+                    $router->delete('{incident}/delete', [
+                        'as'   => 'delete',
+                        'uses' => 'IncidentController@deleteIncidentAction',
+                    ]);
+                    $router->get('{incident}/edit', [
+                        'as'   => 'edit',
+                        'uses' => 'IncidentController@showEditIncidentAction',
+                    ]);
+                    $router->post('{incident}/edit', 'IncidentController@editIncidentAction');
+                });
 
-            $router->group(['prefix' => 'user'], function (Registrar $router) {
-                $router->get('/', [
-                    'as'   => 'user',
-                    'uses' => 'UserController@showUser',
-                ]);
-                $router->post('/', 'UserController@postUser');
-                $router->get('{user}/api/regen', 'UserController@regenerateApiKey');
-            });
+                $router->group(['as' => 'schedule.', 'prefix' => 'schedule'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'ScheduleController@showIndex',
+                    ]);
+                    $router->get('add', [
+                        'as'   => 'add',
+                        'uses' => 'ScheduleController@showAddSchedule',
+                    ]);
+                    $router->post('add', 'ScheduleController@addScheduleAction');
+                    $router->get('{incident}/edit', [
+                        'as'   => 'edit',
+                        'uses' => 'ScheduleController@showEditSchedule',
+                    ]);
+                    $router->post('{incident}/edit', 'ScheduleController@editScheduleAction');
+                    $router->delete('{incident}/delete', [
+                        'as'   => 'delete',
+                        'uses' => 'ScheduleController@deleteScheduleAction',
+                    ]);
+                });
 
-            $router->group(['prefix' => 'api'], function (Registrar $router) {
-                $router->get('incidents/templates', 'ApiController@getIncidentTemplate');
-                $router->post('components/groups/order', 'ApiController@postUpdateComponentGroupOrder');
-                $router->post('components/order', 'ApiController@postUpdateComponentOrder');
-                $router->post('components/{component}', 'ApiController@postUpdateComponent');
-                $router->get('system/version', 'ApiController@checkVersion');
+                $router->group(['as' => 'templates.', 'prefix' => 'templates'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'IncidentController@showTemplates',
+                    ]);
+                    $router->get('add', [
+                        'as'   => 'add',
+                        'uses' => 'IncidentController@showAddIncidentTemplate',
+                    ]);
+                    $router->post('add', 'IncidentController@createIncidentTemplateAction');
+                    $router->get('{incident_template}/edit', [
+                        'as'   => 'edit',
+                        'uses' => 'IncidentController@showEditTemplateAction',
+                    ]);
+                    $router->post('{incident_template}/edit', 'IncidentController@editTemplateAction');
+                    $router->delete('{incident_template}/delete', 'IncidentController@deleteTemplateAction');
+                });
+
+                $router->group(['as'     => 'subscribers.', 'prefix' => 'subscribers'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'SubscriberController@showSubscribers',
+                    ]);
+                    $router->get('add', [
+                        'as'   => 'add',
+                        'uses' => 'SubscriberController@showAddSubscriber',
+                    ]);
+                    $router->post('add', 'SubscriberController@createSubscriberAction');
+                    $router->delete('{subscriber}/delete', 'SubscriberController@deleteSubscriberAction');
+                });
+
+                $router->group(['as'  => 'metrics.', 'prefix' => 'metrics'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'MetricController@showMetrics',
+                    ]);
+                    $router->get('add', [
+                        'as'   => 'add',
+                        'uses' => 'MetricController@showAddMetric',
+                    ]);
+                    $router->post('add', 'MetricController@createMetricAction');
+                    $router->delete('{metric}/delete', 'MetricController@deleteMetricAction');
+                    $router->get('{metric}/edit', [
+                        'as'   => 'edit',
+                        'uses' => 'MetricController@showEditMetricAction',
+                    ]);
+                    $router->post('{metric}/edit', 'MetricController@editMetricAction');
+                });
+
+                $router->group(['as' => 'team.', 'prefix' => 'team'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'TeamController@showTeamView',
+                    ]);
+
+                    $router->group(['middleware' => 'admin'], function (Registrar $router) {
+                        $router->get('add', [
+                            'as'   => 'add',
+                            'uses' => 'TeamController@showAddTeamMemberView',
+                        ]);
+                        $router->get('invite', [
+                            'as'   => 'invite',
+                            'uses' => 'TeamController@showInviteTeamMemberView',
+                        ]);
+                        $router->get('{user}', ['as' => 'edit', 'uses' => 'TeamController@showTeamMemberView']);
+                        $router->post('add', 'TeamController@postAddUser');
+                        $router->post('invite', 'TeamController@postInviteUser');
+                        $router->post('{user}', 'TeamController@postUpdateUser');
+                        $router->delete('{user}/delete', 'TeamController@deleteUser');
+                    });
+                });
+
+                $router->group(['as' => 'settings.', 'prefix' => 'settings'], function (Registrar $router) {
+                    $router->get('setup', [
+                        'as'   => 'setup',
+                        'uses' => 'SettingsController@showSetupView',
+                    ]);
+                    $router->get('analytics', [
+                        'as'   => 'analytics',
+                        'uses' => 'SettingsController@showAnalyticsView',
+                    ]);
+                    $router->get('localization', [
+                        'as'   => 'localization',
+                        'uses' => 'SettingsController@showLocalizationView',
+                    ]);
+                    $router->get('security', [
+                        'as'   => 'security',
+                        'uses' => 'SettingsController@showSecurityView',
+                    ]);
+                    $router->get('theme', [
+                        'as'   => 'theme',
+                        'uses' => 'SettingsController@showThemeView',
+                    ]);
+                    $router->get('stylesheet', [
+                        'as'   => 'stylesheet',
+                        'uses' => 'SettingsController@showStylesheetView',
+                    ]);
+                    $router->get('customization', [
+                        'as'   => 'customization',
+                        'uses' => 'SettingsController@showCustomizationView',
+                    ]);
+                    $router->get('credits', [
+                        'as'   => 'credits',
+                        'uses' => 'SettingsController@showCreditsView',
+                    ]);
+                    $router->post('/', 'SettingsController@postSettings');
+                });
+
+                $router->group(['prefix' => 'user'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'user',
+                        'uses' => 'UserController@showUser',
+                    ]);
+                    $router->post('/', 'UserController@postUser');
+                    $router->get('{user}/api/regen', 'UserController@regenerateApiKey');
+                });
+
+                $router->group(['prefix' => 'api'], function (Registrar $router) {
+                    $router->get('incidents/templates', 'ApiController@getIncidentTemplate');
+                    $router->post('components/groups/order', 'ApiController@postUpdateComponentGroupOrder');
+                    $router->post('components/order', 'ApiController@postUpdateComponentOrder');
+                    $router->post('components/{component}', 'ApiController@postUpdateComponent');
+                });
             });
         });
     }

app/Http/Routes/SetupRoutes.php

@@ -17,6 +17,7 @@ use Illuminate\Contracts\Routing\Registrar;
  * This is the setup routes class.
  *
  * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 class SetupRoutes
 {
@@ -30,7 +31,10 @@ class SetupRoutes
     public function map(Registrar $router)
     {
         $router->group(['middleware' => ['web', 'setup']], function (Registrar $router) {
-            $router->controller('setup', 'SetupController');
+            $router->get('setup', 'SetupController@getIndex');
+            $router->post('setup/step1', 'SetupController@postStep1');
+            $router->post('setup/step2', 'SetupController@postStep2');
+            $router->post('setup/step3', 'SetupController@postStep3');
         });
     }
 }

app/Http/Routes/SubscribeRoutes.php

@@ -44,6 +44,11 @@ class SubscribeRoutes
                 'uses' => 'SubscribeController@showManage',
             ]);
 
+            $router->post('subscribe/manage/{code}', [
+                'as'   => 'manage',
+                'uses' => 'SubscribeController@postManage',
+            ]);
+
             $router->get('subscribe/verify/{code}', [
                 'as'   => 'verify',
                 'uses' => 'SubscribeController@getVerify',

app/Integrations/Credits.php

@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Integrations;
+
+use Exception;
+use GuzzleHttp\Client;
+use Illuminate\Contracts\Cache\Repository;
+
+class Credits
+{
+    /**
+     * The default url.
+     *
+     * @var string
+     */
+    const URL = 'https://cachethq.io/credits';
+
+    /**
+     * The failed status indicator.
+     *
+     * @var int
+     */
+    const FAILED = 1;
+
+    /**
+     * The cache repository instance.
+     *
+     * @var \Illuminate\Contracts\Cache\Repository
+     */
+    protected $cache;
+
+    /**
+     * The url to use.
+     *
+     * @var string|null
+     */
+    protected $url;
+
+    /**
+     * Creates a new credits instance.
+     *
+     * @param \Illuminate\Contracts\Cache\Repository $cache
+     * @param string|null                            $url
+     *
+     * @return void
+     */
+    public function __construct(Repository $cache, $url = null)
+    {
+        $this->cache = $cache;
+        $this->url = $url ?: static::URL;
+    }
+
+    /**
+     * Returns the latest credits.
+     *
+     * @return array|null
+     */
+    public function latest()
+    {
+        $result = $this->cache->remember('credits', 2880, function () {
+            try {
+                return json_decode((new Client())->get($this->url, [
+                    'headers' => ['Accept' => 'application/json', 'User-Agent' => defined('CACHET_VERSION') ? 'cachet/'.constant('CACHET_VERSION') : 'cachet'],
+                ])->getBody(), true);
+            } catch (Exception $e) {
+                return self::FAILED;
+            }
+        });
+
+        return $result === self::FAILED ? null : $result;
+    }
+}

app/Integrations/Feed.php

@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Integrations;
+
+use Exception;
+use GuzzleHttp\Client;
+use Illuminate\Contracts\Cache\Repository;
+
+/**
+ * This is the feed class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class Feed
+{
+    /**
+     * The default url.
+     *
+     * @var string
+     */
+    const URL = 'https://blog.alt-three.com/tag/cachet/rss';
+
+    /**
+     * The failed status indicator.
+     *
+     * @var int
+     */
+    const FAILED = 1;
+
+    /**
+     * The cache repository instance.
+     *
+     * @var \Illuminate\Contracts\Cache\Repository
+     */
+    protected $cache;
+
+    /**
+     * The url to use.
+     *
+     * @var string|null
+     */
+    protected $url;
+
+    /**
+     * Creates a new feed instance.
+     *
+     * @param \Illuminate\Contracts\Cache\Repository $cache
+     * @param string|null                            $url
+     *
+     * @return void
+     */
+    public function __construct(Repository $cache, $url = null)
+    {
+        $this->cache = $cache;
+        $this->url = $url ?: static::URL;
+    }
+
+    /**
+     * Returns the latest entries.
+     *
+     * @return array|null
+     */
+    public function latest()
+    {
+        $result = $this->cache->remember('feeds', 720, function () {
+            try {
+                $xml = simplexml_load_string((new Client())->get($this->url, [
+                    'headers' => ['Accept' => 'application/rss+xml', 'User-Agent' => defined('CACHET_VERSION') ? 'cachet/'.constant('CACHET_VERSION') : 'cachet'],
+                ])->getBody()->getContents(), null, LIBXML_NOCDATA);
+
+                return json_decode(json_encode($xml));
+            } catch (Exception $e) {
+                return self::FAILED;
+            }
+        });
+
+        return $result === self::FAILED ? null : $result;
+    }
+}

app/Integrations/Releases.php

@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Integrations;
+
+use GuzzleHttp\Client;
+use Illuminate\Contracts\Cache\Repository;
+
+class Releases
+{
+    /**
+     * The default url.
+     *
+     * @var string
+     */
+    const URL = 'https://api.github.com/repos/cachethq/cachet/releases/latest';
+
+    /**
+     * The failed status indicator.
+     *
+     * @var int
+     */
+    const FAILED = 1;
+
+    /**
+     * The cache repository instance.
+     *
+     * @var \Illuminate\Contracts\Cache\Repository
+     */
+    protected $cache;
+
+    /**
+     * The github authentication token.
+     *
+     * @var string|null
+     */
+    protected $token;
+
+    /**
+     * The url to use.
+     *
+     * @var string|null
+     */
+    protected $url;
+
+    /**
+     * Creates a new releases instance.
+     *
+     * @param \Illuminate\Contracts\Cache\Repository $cache
+     * @param string|null                            $token
+     * @param string|null                            $url
+     *
+     * @return void
+     */
+    public function __construct(Repository $cache, $token = null, $url = null)
+    {
+        $this->cache = $cache;
+        $this->token = $token;
+        $this->url = $url ?: static::URL;
+    }
+
+    /**
+     * Returns the latest release.
+     *
+     * @return string
+     */
+    public function latest()
+    {
+        $release = $this->cache->remember('release.latest', 720, function () {
+            $headers = ['Accept' => 'application/vnd.github.v3+json', 'User-Agent' => defined('CACHET_VERSION') ? 'cachet/'.constant('CACHET_VERSION') : 'cachet'];
+
+            if ($this->token) {
+                $headers['OAUTH-TOKEN'] = $this->token;
+            }
+
+            return json_decode((new Client())->get($this->url, [
+                'headers' => $headers,
+            ])->getBody(), true);
+        });
+
+        return [
+            'tag_name' => $release['tag_name'],
+            'prelease' => $release['prerelease'],
+            'draft'    => $release['draft'],
+        ];
+    }
+}

app/Models/ComponentGroup.php

@@ -99,7 +99,7 @@ class ComponentGroup extends Model implements HasPresenter
      */
     public function components()
     {
-        return $this->hasMany(Component::class, 'group_id', 'id');
+        return $this->hasMany(Component::class, 'group_id', 'id')->orderBy('order');
     }
 
     /**

app/Models/Incident.php

@@ -16,6 +16,7 @@ use CachetHQ\Cachet\Models\Traits\SearchableTrait;
 use CachetHQ\Cachet\Models\Traits\SortableTrait;
 use CachetHQ\Cachet\Presenters\IncidentPresenter;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use McCool\LaravelAutoPresenter\HasPresenter;
@@ -71,6 +72,7 @@ class Incident extends Model implements HasPresenter
      */
     protected $searchable = [
         'id',
+        'component_id',
         'name',
         'status',
         'visible',
@@ -96,7 +98,7 @@ class Incident extends Model implements HasPresenter
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVisible($query)
+    public function scopeVisible(Builder $query)
     {
         return $query->where('visible', 1);
     }
@@ -108,9 +110,9 @@ class Incident extends Model implements HasPresenter
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeScheduled($query)
+    public function scopeScheduled(Builder $query)
     {
-        return $query->where('status', 0)->where('scheduled_at', '>=', Carbon::now());
+        return $query->where('status', 0)->where('scheduled_at', '>=', Carbon::now()->toDateTimeString());
     }
 
     /**
@@ -120,10 +122,12 @@ class Incident extends Model implements HasPresenter
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeNotScheduled($query)
+    public function scopeNotScheduled(Builder $query)
     {
-        return $query->where(function ($query) {
-            return $query->whereNull('scheduled_at')->orWhere('scheduled_at', '<=', Carbon::now());
+        return $query->where('status', '>', 0)->orWhere(function ($query) {
+            $query->where('status', 0)->where(function ($query) {
+                $query->whereNull('scheduled_at')->orWhere('scheduled_at', '<=', Carbon::now()->toDateTimeString());
+            });
         });
     }
 

app/Models/Metric.php

@@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Models;
 use AltThree\Validator\ValidatingTrait;
 use CachetHQ\Cachet\Models\Traits\SortableTrait;
 use CachetHQ\Cachet\Presenters\MetricPresenter;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use McCool\LaravelAutoPresenter\HasPresenter;
 
@@ -47,6 +48,8 @@ class Metric extends Model implements HasPresenter
         'calc_type'     => 0,
         'places'        => 2,
         'default_view'  => 1,
+        'threshold'     => 5,
+        'order'         => 0,
     ];
 
     /**
@@ -61,6 +64,8 @@ class Metric extends Model implements HasPresenter
         'calc_type'     => 'int',
         'places'        => 'int',
         'default_view'  => 'int',
+        'threshold'     => 'int',
+        'order'         => 'int',
     ];
 
     /**
@@ -77,6 +82,8 @@ class Metric extends Model implements HasPresenter
         'calc_type',
         'places',
         'default_view',
+        'threshold',
+        'order',
     ];
 
     /**
@@ -91,6 +98,8 @@ class Metric extends Model implements HasPresenter
         'default_value' => 'numeric',
         'places'        => 'numeric|between:0,4',
         'default_view'  => 'numeric|between:0,3',
+        'threshold'     => 'numeric|between:0,10',
+        'threshold'     => 'int',
     ];
 
     /**
@@ -104,6 +113,7 @@ class Metric extends Model implements HasPresenter
         'display_chart',
         'default_value',
         'calc_type',
+        'order',
     ];
 
     /**
@@ -116,6 +126,18 @@ class Metric extends Model implements HasPresenter
         return $this->hasMany(MetricPoint::class, 'metric_id', 'id');
     }
 
+    /**
+     * Scope metrics to those of which are displayable.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeDisplayable(Builder $query)
+    {
+        return $query->where('display_chart', 1);
+    }
+
     /**
      * Determines whether a chart should be shown.
      *

app/Models/MetricPoint.php

@@ -20,6 +20,16 @@ class MetricPoint extends Model implements HasPresenter
 {
     use ValidatingTrait;
 
+    /**
+     * The model's attributes.
+     *
+     * @var string[]
+     */
+    protected $attributes = [
+        'value'   => 0,
+        'counter' => 1,
+    ];
+
     /**
      * The attributes that should be casted to native types.
      *
@@ -27,7 +37,8 @@ class MetricPoint extends Model implements HasPresenter
      */
     protected $casts = [
         'metric_id' => 'int',
-        'value'     => 'int',
+        'value'     => 'float',
+        'counter'   => 'int',
     ];
 
     /**
@@ -35,7 +46,12 @@ class MetricPoint extends Model implements HasPresenter
      *
      * @var string[]
      */
-    protected $fillable = ['metric_id', 'value', 'created_at'];
+    protected $fillable = [
+        'metric_id',
+        'value',
+        'counter',
+        'created_at',
+    ];
 
     /**
      * The validation rules.
@@ -53,7 +69,25 @@ class MetricPoint extends Model implements HasPresenter
      */
     public function metric()
     {
-        return $this->belongsTo(Metric::class, 'id', 'metric_id');
+        return $this->belongsTo(Metric::class);
+    }
+
+    /**
+     * Override the value attribute.
+     *
+     * @param mixed $value
+     *
+     * @return float
+     */
+    public function getActiveValueAttribute($value)
+    {
+        if ($this->metric->calc_type === Metric::CALC_SUM) {
+            return round((float) $value * $this->counter, $this->metric->places);
+        } elseif ($this->metric->calc_type === Metric::CALC_AVG) {
+            return round((float) $value * $this->counter, $this->metric->places);
+        }
+
+        return round((float) $value, $this->metric->places);
     }
 
     /**

app/Models/Subscriber.php

@@ -30,6 +30,7 @@ class Subscriber extends Model implements HasPresenter
         'email'       => 'string',
         'verify_code' => 'string',
         'verified_at' => 'date',
+        'global'      => 'bool',
     ];
 
     /**
@@ -91,6 +92,33 @@ class Subscriber extends Model implements HasPresenter
         return $query->whereNotNull('verified_at');
     }
 
+    /**
+     * Scope global subscribers.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeIsGlobal(Builder $query)
+    {
+        return $query->where('global', true);
+    }
+
+    /**
+     * Finds all verified subscriptions for a component.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param int                                   $component_id
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeForComponent(Builder $query, $component_id)
+    {
+        return $query->select('subscribers.*')
+            ->join('subscriptions', 'subscribers.id', '=', 'subscriptions.subscriber_id')
+            ->where('subscriptions.component_id', $component_id);
+    }
+
     /**
      * Determines if the subscriber is verified.
      *

app/Models/Subscription.php

@@ -107,7 +107,10 @@ class Subscription extends Model
     {
         return $query->select('subscriptions.*')
             ->join('subscribers', 'subscriptions.subscriber_id', '=', 'subscribers.id')
-            ->where('component_id', $component_id)
+            ->where(function ($query) {
+                $query->where('subscriptions.component_id', $component_id)
+                    ->orWhere('subscribers.global');
+            })
             ->whereNotNull('subscribers.verified_at');
     }
 }

app/Presenters/ComponentPresenter.php

@@ -53,7 +53,7 @@ class ComponentPresenter extends BasePresenter implements Arrayable
      */
     public function tags()
     {
-        return $this->wrappedObject->tags->lists('name', 'slug');
+        return $this->wrappedObject->tags->pluck('name', 'slug');
     }
 
     /**

app/Presenters/MetricPointPresenter.php

@@ -19,6 +19,16 @@ class MetricPointPresenter extends BasePresenter implements Arrayable
 {
     use TimestampsTrait;
 
+    /**
+     * Show the actual calculated value; as per (value * counter).
+     *
+     * @return int
+     */
+    public function calculated_value()
+    {
+        return $this->wrappedObject->value * $this->wrappedObject->counter;
+    }
+
     /**
      * Convert the presenter instance to an array.
      *
@@ -27,8 +37,9 @@ class MetricPointPresenter extends BasePresenter implements Arrayable
     public function toArray()
     {
         return array_merge($this->wrappedObject->toArray(), [
-            'created_at' => $this->created_at(),
-            'updated_at' => $this->updated_at(),
+            'created_at'       => $this->created_at(),
+            'updated_at'       => $this->updated_at(),
+            'calculated_value' => $this->calculated_value(),
         ]);
     }
 }

app/Presenters/SubscriberPresenter.php

@@ -28,17 +28,7 @@ class SubscriberPresenter extends BasePresenter implements Arrayable
      */
     public function verified_at()
     {
-        return app(DateFactory::class)->make($this->wrappedObject->verified_at)->toDateTimeString();
-    }
-
-    /**
-     * Present formatted subscribed date.
-     *
-     * @return string
-     */
-    public function subscribed_at()
-    {
-        return ucfirst(app(DateFactory::class)->make($this->wrappedObject->subscribed_at)->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s')));
+        return ucfirst(app(DateFactory::class)->make($this->wrappedObject->verified_at)->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s')));
     }
 
     /**

app/Repositories/Metric/AbstractMetricRepository.php

@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Repositories\Metric;
+
+use CachetHQ\Cachet\Models\Metric;
+use Illuminate\Contracts\Config\Repository;
+
+/**
+ * This is the abstract metric repository class.
+ *
+ * @author Jams Brooks <james@alt-three.com>
+ */
+abstract class AbstractMetricRepository
+{
+    /**
+     * The illuminate config repository.
+     *
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    protected $config;
+
+    /**
+     * The name of the metrics table.
+     *
+     * @var string
+     */
+    protected $tableName;
+
+    /**
+     * Create a new abstract metric repository instance.
+     *
+     * @param \Illuminate\Contracts\Config\Repository $config
+     *
+     * @return void
+     */
+    public function __construct(Repository $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Get the metrics table name.
+     *
+     * @return string
+     */
+    protected function getTableName()
+    {
+        $driver = $this->config->get('database.default');
+        $connection = $this->config->get('database.connections.'.$driver);
+        $prefix = $connection['prefix'];
+
+        return $prefix.'metrics';
+    }
+}

app/Repositories/Metric/MetricRepository.php

@@ -105,7 +105,7 @@ class MetricRepository
 
         $points = [];
 
-        $pointKey = $dateTime->format('jS M');
+        $pointKey = $dateTime->format('D jS M');
 
         for ($i = 0; $i <= 7; $i++) {
             $points[$pointKey] = $this->repository->getPointsForDayInWeek($metric, $i);

app/Repositories/Metric/MySqlRepository.php

@@ -16,7 +16,12 @@ use DateInterval;
 use Illuminate\Support\Facades\DB;
 use Jenssegers\Date\Date;
 
-class MySqlRepository implements MetricInterface
+/**
+ * This is the mysql repository class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class MySqlRepository extends AbstractMetricRepository implements MetricInterface
 {
     /**
      * Returns metrics for the last hour.
@@ -32,14 +37,21 @@ class MySqlRepository implements MetricInterface
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'))->sub(new DateInterval('PT'.$minute.'M'));
         $timeInterval = $dateTime->format('YmdHi');
 
-        $points = $metric->points()
-                    ->whereRaw('DATE_FORMAT(created_at, "%Y%m%d%H%i") = '.$timeInterval)
-                    ->groupBy(DB::raw('HOUR(created_at), MINUTE(created_at)'));
-
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $value = $points->sum('value');
+            $queryType = 'SUM(mp.`value` * mp.`counter`) AS `value`';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $value = $points->avg('value');
+            $queryType = 'AVG(mp.`value` * mp.`counter`) AS `value`';
+        }
+
+        $value = 0;
+
+        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN metric_points mp ON m.id = mp.metric_id WHERE m.id = :metricId AND DATE_FORMAT(mp.`created_at`, '%Y%m%d%H%i') = :timeInterval GROUP BY HOUR(mp.`created_at`), MINUTE(mp.`created_at`)", [
+            'metricId'     => $metric->id,
+            'timeInterval' => $timeInterval,
+        ]);
+
+        if (isset($points[0]) && !($value = $points[0]->value)) {
+            $value = 0;
         }
 
         if ($value === 0 && $metric->default_value != $value) {
@@ -62,14 +74,21 @@ class MySqlRepository implements MetricInterface
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'));
         $hourInterval = $dateTime->format('YmdH');
 
-        $points = $metric->points()
-                    ->whereRaw('DATE_FORMAT(created_at, "%Y%m%d%H") = '.$hourInterval)
-                    ->groupBy(DB::raw('HOUR(created_at)'));
-
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $value = $points->sum('value');
+            $queryType = 'SUM(mp.`value` * mp.`counter`) AS `value`';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $value = $points->avg('value');
+            $queryType = 'AVG(mp.`value` * mp.`counter`) AS `value`';
+        }
+
+        $value = 0;
+
+        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN metric_points mp ON m.id = mp.metric_id WHERE m.id = :metricId AND DATE_FORMAT(mp.`created_at`, '%Y%m%d%H') = :hourInterval GROUP BY HOUR(mp.`created_at`)", [
+            'metricId'     => $metric->id,
+            'hourInterval' => $hourInterval,
+        ]);
+
+        if (isset($points[0]) && !($value = $points[0]->value)) {
+            $value = 0;
         }
 
         if ($value === 0 && $metric->default_value != $value) {
@@ -90,15 +109,21 @@ class MySqlRepository implements MetricInterface
     {
         $dateTime = (new Date())->sub(new DateInterval('P'.$day.'D'));
 
-        $points = $metric->points()
-                    ->whereRaw('created_at BETWEEN DATE_SUB(created_at, INTERVAL 1 WEEK) AND NOW()')
-                    ->whereRaw('DATE_FORMAT(created_at, "%Y%m%d") = '.$dateTime->format('Ymd'))
-                    ->groupBy(DB::raw('DATE_FORMAT(created_at, "%Y%m%d")'));
-
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $value = $points->sum('value');
+            $queryType = 'SUM(mp.`value` * mp.`counter`) AS `value`';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $value = $points->avg('value');
+            $queryType = 'AVG(mp.`value` * mp.`counter`) AS `value`';
+        }
+
+        $value = 0;
+
+        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN metric_points mp ON m.id = mp.metric_id WHERE m.id = :metricId AND mp.`created_at` BETWEEN DATE_SUB(mp.`created_at`, INTERVAL 1 WEEK) AND DATE_ADD(NOW(), INTERVAL 1 DAY) AND DATE_FORMAT(mp.`created_at`, '%Y%m%d') = :timeInterval GROUP BY DATE_FORMAT(mp.`created_at`, '%Y%m%d')", [
+            'metricId'     => $metric->id,
+            'timeInterval' => $dateTime->format('Ymd'),
+        ]);
+
+        if (isset($points[0]) && !($value = $points[0]->value)) {
+            $value = 0;
         }
 
         if ($value === 0 && $metric->default_value != $value) {

app/Repositories/Metric/PgSqlRepository.php

@@ -16,7 +16,12 @@ use DateInterval;
 use Illuminate\Support\Facades\DB;
 use Jenssegers\Date\Date;
 
-class PgSqlRepository implements MetricInterface
+/**
+ * This is the pgsql repository class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class PgSqlRepository extends AbstractMetricRepository implements MetricInterface
 {
     /**
      * Returns metrics for the last hour.
@@ -30,26 +35,24 @@ class PgSqlRepository implements MetricInterface
     public function getPointsLastHour(Metric $metric, $hour, $minute)
     {
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'))->sub(new DateInterval('PT'.$minute.'M'));
-        $hourInterval = $dateTime->format('YmdHi');
 
         // Default metrics calculations.
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $queryType = 'sum(metric_points.value)';
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = 'avg(metric_points.value)';
+            $queryType = 'avg(metric_points.value * metric_points.counter)';
         } else {
-            $queryType = 'sum(metric_points.value)';
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         }
 
-        $query = DB::select("select {$queryType} as aggregate FROM metrics JOIN metric_points ON metric_points.metric_id = metrics.id WHERE metrics.id = :metric_id AND to_char(metric_points.created_at, 'YYYYMMDDHH24MI') = :timestamp GROUP BY to_char(metric_points.created_at, 'HHMI')", [
-            'metric_id' => $metric->id,
-            'timestamp' => $hourInterval,
+        $value = 0;
+        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN metric_points ON metric_points.metric_id = m.id WHERE m.id = :metricId AND to_char(metric_points.created_at, 'YYYYMMDDHH24MI') = :timeInterval GROUP BY to_char(metric_points.created_at, 'HHMI')", [
+            'metricId'     => $metric->id,
+            'timeInterval' => $dateTime->format('YmdHi'),
         ]);
 
         if (isset($query[0])) {
-            $value = $query[0]->aggregate;
-        } else {
-            $value = 0;
+            $value = $query[0]->value;
         }
 
         if ($value === 0 && $metric->default_value != $value) {
@@ -70,26 +73,24 @@ class PgSqlRepository implements MetricInterface
     public function getPointsByHour(Metric $metric, $hour)
     {
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'));
-        $hourInterval = $dateTime->format('YmdH');
 
         // Default metrics calculations.
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $queryType = 'sum(metric_points.value)';
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = 'avg(metric_points.value)';
+            $queryType = 'avg(metric_points.value * metric_points.counter)';
         } else {
-            $queryType = 'sum(metric_points.value)';
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         }
 
-        $query = DB::select("select {$queryType} as aggregate FROM metrics JOIN metric_points ON metric_points.metric_id = metrics.id WHERE metric_points.metric_id = :metric_id AND to_char(metric_points.created_at, 'YYYYMMDDHH24') = :timestamp GROUP BY to_char(metric_points.created_at, 'H')", [
-            'metric_id' => $metric->id,
-            'timestamp' => $hourInterval,
+        $value = 0;
+        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN metric_points ON metric_points.metric_id = m.id WHERE metric_points.metric_id = :metricId AND to_char(metric_points.created_at, 'YYYYMMDDHH24') = :timeInterval GROUP BY to_char(metric_points.created_at, 'H')", [
+            'metricId'     => $metric->id,
+            'timeInterval' => $dateTime->format('YmdH'),
         ]);
 
         if (isset($query[0])) {
-            $value = $query[0]->aggregate;
-        } else {
-            $value = 0;
+            $value = $query[0]->value;
         }
 
         if ($value === 0 && $metric->default_value != $value) {
@@ -110,15 +111,20 @@ class PgSqlRepository implements MetricInterface
     {
         $dateTime = (new Date())->sub(new DateInterval('P'.$day.'D'));
 
-        $points = $metric->points()
-                    ->whereRaw('created_at BETWEEN (created_at - interval \'1 week\') AND now()')
-                    ->whereRaw('to_char(created_at, \'YYYYMMDD\') = \''.$dateTime->format('Ymd').'\'')
-                    ->groupBy(DB::raw('to_char(created_at, \'YYYYMMDD\')'));
-
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $value = $points->sum('value');
+            $queryType = 'sum(mp.value * mp.counter) AS value';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $value = $points->avg('value');
+            $queryType = 'avg(mp.value * mp.counter) AS value';
+        }
+
+        $value = 0;
+        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN metric_points mp ON m.id = mp.metric_id WHERE m.id = :metricId AND mp.created_at BETWEEN (mp.created_at - interval '1 week') AND (now() + interval '1 day') AND to_char(mp.created_at, 'YYYYMMDD') = :timeInterval GROUP BY to_char(mp.created_at, 'YYYYMMDD')", [
+            'metricId'     => $metric->id,
+            'timeInterval' => $dateTime->format('Ymd'),
+        ]);
+
+        if (isset($points[0]) && !($value = $points[0]->value)) {
+            $value = 0;
         }
 
         if ($value === 0 && $metric->default_value != $value) {

app/Repositories/Metric/SqliteRepository.php

@@ -16,7 +16,7 @@ use DateInterval;
 use Illuminate\Support\Facades\DB;
 use Jenssegers\Date\Date;
 
-class SqliteRepository implements MetricInterface
+class SqliteRepository extends AbstractMetricRepository implements MetricInterface
 {
     /**
      * Returns metrics for the last hour.
@@ -30,16 +30,24 @@ class SqliteRepository implements MetricInterface
     public function getPointsLastHour(Metric $metric, $hour, $minute)
     {
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'))->sub(new DateInterval('PT'.$minute.'M'));
-        $hourInterval = $dateTime->format('YmdHi');
-
-        $points = $metric->points()
-                    ->whereRaw('strftime("%Y%m%d%H%M", created_at) = "'.$hourInterval.'"')
-                    ->groupBy(DB::raw('strftime("%H%M", created_at)'));
 
+        // Default metrics calculations.
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $value = $points->sum('value');
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $value = $points->avg('value');
+            $queryType = 'avg(metric_points.value * metric_points.counter)';
+        } else {
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
+        }
+
+        $value = 0;
+        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN metric_points ON metric_points.metric_id = m.id WHERE m.id = :metricId AND strftime('%Y%m%d%H%M', metric_points.created_at) = :timeInterval GROUP BY strftime('%H%M', metric_points.created_at)", [
+            'metricId'     => $metric->id,
+            'timeInterval' => $dateTime->format('YmdHi'),
+        ]);
+
+        if (isset($query[0])) {
+            $value = $query[0]->value;
         }
 
         if ($value === 0 && $metric->default_value != $value) {
@@ -60,16 +68,24 @@ class SqliteRepository implements MetricInterface
     public function getPointsByHour(Metric $metric, $hour)
     {
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'));
-        $hourInterval = $dateTime->format('YmdH');
-
-        $points = $metric->points()
-                    ->whereRaw('strftime("%Y%m%d%H", created_at) = "'.$hourInterval.'"')
-                    ->groupBy(DB::raw('strftime("%H", created_at)'));
 
+        // Default metrics calculations.
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $value = $points->sum('value');
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $value = $points->avg('value');
+            $queryType = 'avg(metric_points.value * metric_points.counter)';
+        } else {
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
+        }
+
+        $value = 0;
+        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN metric_points ON metric_points.metric_id = m.id WHERE m.id = :metricId AND strftime('%Y%m%d%H', metric_points.created_at) = :timeInterval GROUP BY strftime('%H', metric_points.created_at)", [
+            'metricId'     => $metric->id,
+            'timeInterval' => $dateTime->format('YmdH'),
+        ]);
+
+        if (isset($query[0])) {
+            $value = $query[0]->value;
         }
 
         if ($value === 0 && $metric->default_value != $value) {
@@ -90,15 +106,23 @@ class SqliteRepository implements MetricInterface
     {
         $dateTime = (new Date())->sub(new DateInterval('P'.$day.'D'));
 
-        $points = $metric->points()
-                    ->whereRaw('created_at > date("now", "-7 day")')
-                    ->whereRaw('strftime("%Y%m%d", created_at) = "'.$dateTime->format('Ymd').'"')
-                    ->groupBy(DB::raw('strftime("%Y%m%d", created_at)'));
-
+        // Default metrics calculations.
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $value = $points->sum('value');
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $value = $points->avg('value');
+            $queryType = 'avg(metric_points.value * metric_points.counter)';
+        } else {
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
+        }
+
+        $value = 0;
+        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN metric_points ON metric_points.metric_id = m.id WHERE m.id = :metricId AND metric_points.created_at > date('now', '-7 day') AND strftime('%Y%m%d', metric_points.created_at) = :timeInterval GROUP BY strftime('%Y%m%d', metric_points.created_at)", [
+            'metricId'     => $metric->id,
+            'timeInterval' => $dateTime->format('Ymd'),
+        ]);
+
+        if (isset($query[0])) {
+            $value = $query[0]->value;
         }
 
         if ($value === 0 && $metric->default_value != $value) {

app/Settings/Cache.php

@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Settings;
+
+use Exception;
+use Illuminate\Filesystem\Filesystem;
+
+/**
+ * This is the settings cache class.
+ *
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author James Brooks <james@alt-three.com>
+ */
+class Cache
+{
+    /**
+     * The filesystem instance.
+     *
+     * @var \Illuminate\Filesystem\Filesystem
+     */
+    protected $files;
+
+    /**
+     * Is path to the setting cache.
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * Create a new settings cache instance.
+     *
+     * @param \Illuminate\Filesystem\Filesystem $files
+     * @param string                            $path
+     *
+     * @return void
+     */
+    public function __construct(Filesystem $files, $path)
+    {
+        $this->files = $files;
+        $this->path = $path;
+    }
+
+    /**
+     * Store the settings in the cache.
+     *
+     * @param string $env
+     * @param array  $data
+     *
+     * @return void
+     */
+    public function store($env, array $data)
+    {
+        $this->files->put($this->path($env), '<?php return '.var_export($data, true).';'.PHP_EOL);
+    }
+
+    /**
+     * Load the settings from the cache.
+     *
+     * @param string $env
+     *
+     * @return array|false
+     */
+    public function load($env)
+    {
+        try {
+            return $this->files->getRequire($this->path($env));
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Clear the settings cache.
+     *
+     * Note that we're careful not to remove the .gitignore file.
+     *
+     * @return void
+     */
+    public function clear()
+    {
+        $this->files->delete($this->files->allFiles($this->path));
+    }
+
+    /**
+     * Returns the settings cache path.
+     *
+     * @return string
+     */
+    protected function path($env)
+    {
+        return "{$this->path}/{$env}.php";
+    }
+}

app/Settings/Repository.php

@@ -9,10 +9,16 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Config;
+namespace CachetHQ\Cachet\Settings;
 
 use CachetHQ\Cachet\Models\Setting;
 
+/**
+ * This is the settings repository class.
+ *
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author James Brooks <james@alt-three.com>
+ */
 class Repository
 {
     /**
@@ -30,7 +36,7 @@ class Repository
     protected $stale = false;
 
     /**
-     * Create a new settings service instance.
+     * Create a new settings repository instance.
      *
      * @param \CachetHQ\Cachet\Models\Setting $model
      *
@@ -84,6 +90,18 @@ class Repository
         $this->model->where('name', $name)->delete();
     }
 
+    /**
+     * Clear all settings.
+     *
+     * @return void
+     */
+    public function clear()
+    {
+        $this->stale = true;
+
+        $this->model->query()->delete();
+    }
+
     /**
      * Is the config state stale?
      *

app/Subscribers/CommandSubscriber.php

@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Subscribers;
+
+use CachetHQ\Cachet\Settings\Cache;
+use Carbon\Carbon;
+use Exception;
+use Illuminate\Console\Command;
+use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Events\Dispatcher;
+
+/**
+ * This is the command subscriber class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ */
+class CommandSubscriber
+{
+    /**
+     * The settings cache instance.
+     *
+     * @var \CachetHQ\Cachet\Settings\Cache
+     */
+    protected $cache;
+
+    /**
+     * The config repository instance.
+     *
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    protected $config;
+
+    /**
+     * Create a new command subscriber instance.
+     *
+     * @param \CachetHQ\Cachet\Settings\Cache         $cache
+     * @param \Illuminate\Contracts\Config\Repository $config
+     *
+     * @return void
+     */
+    public function __construct(Cache $cache, Repository $config)
+    {
+        $this->cache = $cache;
+        $this->config = $config;
+    }
+
+    /**
+     * Register the listeners for the subscriber.
+     *
+     * @param \Illuminate\Contracts\Events\Dispatcher $events
+     *
+     * @return void
+     */
+    public function subscribe(Dispatcher $events)
+    {
+        $events->listen('command.installing', __CLASS__.'@fire', 5);
+        $events->listen('command.updating', __CLASS__.'@fire', 5);
+        $events->listen('command.resetting', __CLASS__.'@fire', 5);
+    }
+
+    /**
+     * Clear the settings cache, and backup the databases.
+     *
+     * @param \Illuminate\Console\Command $command
+     *
+     * @return void
+     */
+    public function fire(Command $command)
+    {
+        $command->line('Clearing settings cache...');
+
+        $this->cache->clear();
+
+        $command->line('Settings cache cleared!');
+
+        $command->line('Backing up database...');
+
+        try {
+            $command->call('db:backup', [
+                '--compression'     => 'gzip',
+                '--database'        => $this->config->get('database.default'),
+                '--destination'     => 'local',
+                '--destinationPath' => Carbon::now()->format('Y-m-d H.i.s'),
+                '--no-interaction'  => true,
+            ]);
+        } catch (Exception $e) {
+            $command->error($e->getMessage());
+            $command->line('Backup skipped!');
+        }
+
+        $command->line('Backup completed!');
+    }
+}

bootstrap/cachet/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

bower.json

@@ -1,23 +0,0 @@
-{
-  "name": "Cachet",
-  "dependencies": {
-    "animate-sass": "~0.6",
-    "autosize": "~3.0.15",
-    "bootstrap-sass": "~3.3",
-    "chartjs": "~2.0.2",
-    "eonasdan-bootstrap-datetimepicker": "~3.1",
-    "humane-js": "~3.2",
-    "ionicons": "~2.0",
-    "jquery": "~2.2",
-    "jquery-minicolors": "~2.2",
-    "jquery-serialize-object": "~2.5",
-    "jquery-sparkline": "~2.1",
-    "livestampjs": "~1.1",
-    "lodash": "~4.5.1",
-    "messenger": "~1.4",
-    "moment": "~2.11.2",
-    "Sortable": "~1.4",
-    "sweetalert": "~1.1",
-    "github-markdown-css": "^2.2.1"
-  }
-}

composer.json

@@ -20,29 +20,33 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "laravel/framework": "5.2.37",
-        "alt-three/badger": "^3.0",
-        "alt-three/bus": "^1.0",
-        "alt-three/emoji": "^3.0",
-        "alt-three/validator": "^1.4",
+        "laravel/framework": "5.2.39",
+        "alt-three/badger": "^3.1",
+        "alt-three/bus": "^1.1",
+        "alt-three/emoji": "^3.1",
+        "alt-three/throttle": "^1.0",
+        "alt-three/validator": "^1.5",
+        "aws/aws-sdk-php": "^3.7",
+        "backup-manager/laravel": "^1.1",
         "barryvdh/laravel-cors": "^0.8",
         "doctrine/dbal": "^2.5",
+        "fedeisas/laravel-mail-css-inliner": "^1.5",
         "fideloper/proxy": "^3.1",
-        "graham-campbell/binput": "^3.3",
-        "graham-campbell/core": "^4.2",
-        "graham-campbell/markdown": "^6.0",
-        "graham-campbell/exceptions": "^8.3",
-        "guzzlehttp/guzzle": "^6.2",
-        "jenssegers/date": "^3.1",
-        "mccool/laravel-auto-presenter": "^4.2",
+        "graham-campbell/binput": "^3.4",
+        "graham-campbell/core": "^5.1",
+        "graham-campbell/exceptions": "^8.6",
+        "graham-campbell/markdown": "^6.1",
+        "guzzlehttp/guzzle": "^6.2.1",
+        "jenssegers/date": "^3.2",
+        "mccool/laravel-auto-presenter": "^4.3",
         "pragmarx/google2fa": "^0.7.1",
         "rcrowe/twigbridge": "^0.9.2",
-        "roumen/feed": "^2.10.3"
+        "roumen/feed": "^2.10.4"
     },
     "require-dev": {
-        "alt-three/testbench": "^1.1",
-        "filp/whoops": "^2.0",
-        "fzaninotto/faker": "^1.5",
+        "alt-three/testbench": "^1.4",
+        "filp/whoops": "^2.1",
+        "fzaninotto/faker": "^1.6",
         "graham-campbell/testbench-core": "^1.1",
         "mockery/mockery": "0.9.5",
         "phpunit/phpunit": "4.8.21",
@@ -54,7 +58,7 @@
             "database"
         ],
         "files": [
-            "app/Http/helpers.php"
+            "app/helpers.php"
         ],
         "psr-4": {
             "CachetHQ\\Cachet\\": "app/"
@@ -94,7 +98,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2-dev"
+            "dev-master": "2.3-dev"
         }
     },
     "minimum-stability": "dev",

config/app.php

@@ -162,7 +162,9 @@ return [
          */
         'AltThree\Badger\BadgerServiceProvider',
         'AltThree\Emoji\EmojiServiceProvider',
+        'BackupManager\Laravel\Laravel5ServiceProvider',
         'Barryvdh\Cors\ServiceProvider',
+        'Fedeisas\LaravelMailCssInliner\LaravelMailCssInlinerServiceProvider',
         'Fideloper\Proxy\TrustedProxyServiceProvider',
         'GrahamCampbell\Binput\BinputServiceProvider',
         'GrahamCampbell\Exceptions\ExceptionsServiceProvider',
@@ -180,9 +182,9 @@ return [
          */
         'CachetHQ\Cachet\Foundation\Providers\AppServiceProvider',
         'CachetHQ\Cachet\Foundation\Providers\ComposerServiceProvider',
+        'CachetHQ\Cachet\Foundation\Providers\ConsoleServiceProvider',
         'CachetHQ\Cachet\Foundation\Providers\ConfigServiceProvider',
         'CachetHQ\Cachet\Foundation\Providers\EventServiceProvider',
-        'CachetHQ\Cachet\Foundation\Providers\GitHubServiceProvider',
         'CachetHQ\Cachet\Foundation\Providers\RepositoryServiceProvider',
         'CachetHQ\Cachet\Foundation\Providers\RouteServiceProvider',
 

config/backup-manager.php

@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    'local' => [
+        'type' => 'Local',
+        'root' => database_path('backups'),
+    ],
+    's3' => [
+        'type'   => 'AwsS3',
+        'key'    => '',
+        'secret' => '',
+        'region' => 'us-east-1',
+        'bucket' => '',
+        'root'   => '',
+    ],
+    'gcs' => [
+        'type'   => 'Gcs',
+        'key'    => '',
+        'secret' => '',
+        'bucket' => '',
+        'root'   => '',
+    ],
+    'rackspace' => [
+        'type'      => 'Rackspace',
+        'username'  => '',
+        'key'       => '',
+        'container' => '',
+        'zone'      => '',
+        'endpoint'  => 'https://identity.api.rackspacecloud.com/v2.0/',
+        'root'      => '',
+    ],
+    'dropbox' => [
+        'type'   => 'Dropbox',
+        'token'  => '',
+        'key'    => '',
+        'secret' => '',
+        'app'    => '',
+        'root'   => '',
+    ],
+    'ftp' => [
+        'type'     => 'Ftp',
+        'host'     => '',
+        'username' => '',
+        'password' => '',
+        'port'     => 21,
+        'passive'  => true,
+        'ssl'      => true,
+        'timeout'  => 30,
+        'root'     => '',
+    ],
+    'sftp' => [
+        'type'       => 'Sftp',
+        'host'       => '',
+        'username'   => '',
+        'password'   => '',
+        'port'       => 21,
+        'timeout'    => 10,
+        'privateKey' => '',
+        'root'       => '',
+    ],
+];

config/css-inliner.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Strip styles
+    |--------------------------------------------------------------------------
+    |
+    | Settings this to false prevents the inliner from removing the style
+    | definitions that have been inlined.
+    |
+    | Notice that media query styles are not inlined, and hence never
+    | stripped.
+    |
+    */
+
+    'strip-styles' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Remove classes
+    |--------------------------------------------------------------------------
+    |
+    | Settings this to false disables the removal of class attributes from
+    | your html elements (do not enable this if you use media queries)
+    |
+    */
+
+    'strip-classes' => true,
+
+];

config/database.php

@@ -131,6 +131,7 @@ return [
             'host'     => env('REDIS_HOST', '127.0.0.1'),
             'port'     => env('REDIS_PORT', 6379),
             'database' => env('REDIS_DATABASE', 0),
+            'password' => env('REDIS_PASSWORD', null),
         ],
 
     ],

config/exceptions.php

@@ -49,6 +49,7 @@ return [
     'displayers' => [
         'CachetHQ\Cachet\Foundation\Exceptions\Displayers\JsonValidationDisplayer',
         'CachetHQ\Cachet\Foundation\Exceptions\Displayers\RedirectDisplayer',
+        'CachetHQ\Cachet\Foundation\Exceptions\Displayers\ThrottleDisplayer',
         'GrahamCampbell\Exceptions\Displayers\DebugDisplayer',
         'GrahamCampbell\Exceptions\Displayers\HtmlDisplayer',
         'GrahamCampbell\Exceptions\Displayers\JsonDisplayer',

config/langs.php

@@ -100,11 +100,11 @@ return [
         'subset' => 'latin,latin-ext',
     ],
     'pt-BR' => [
-        'name'   => 'Portuguese',
+        'name'   => 'Portuguese, Brazilian',
         'subset' => 'latin,latin-ext',
     ],
     'pt-PT' => [
-        'name'   => 'Portuguese, Brazilian',
+        'name'   => 'Portuguese, Portugal',
         'subset' => 'latin,latin-ext',
     ],
     'ro'    => [

config/services.php

@@ -28,22 +28,22 @@ return [
     ],
 
     'mailgun' => [
-        'domain' => env('MAILGUN_DOMAIN'),
-        'secret' => env('MAILGUN_SECRET'),
+        'domain' => env('MAIL_USERNAME'),
+        'secret' => env('MAIL_PASSWORD'),
     ],
 
     'mandrill' => [
-        'secret' => env('MANDRILL_SECRET'),
+        'secret' => env('MAIL_PASSWORD'),
     ],
 
     'ses' => [
-        'key'    => env('SES_KEY'),
-        'secret' => env('SES_SECRET'),
+        'key'    => env('MAIL_USERNAME'),
+        'secret' => env('MAIL_PASSWORD'),
         'region' => 'us-east-1',
     ],
 
     'sparkpost' => [
-        'secret' => env('SPARKPOST_SECRET'),
+        'secret' => env('MAIL_PASSWORD'),
     ],
 
 ];

config/setting.php

@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Dashboard Login Link
+    |--------------------------------------------------------------------------
+    |
+    | Whether to show the dashboard link in the footer by default.
+    |
+    */
+
+    'dashboard_login_link' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Enable subscribers
+    |--------------------------------------------------------------------------
+    |
+    | Whether to allow people to subscribe to the status page.
+    |
+    */
+
+    'enable_subscribers' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Automatic Localization
+    |--------------------------------------------------------------------------
+    |
+    | Whether to automatically localize the status to the visitors default
+    | browser language settings.
+    |
+    */
+
+   'automatic_localization' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Show Support for Cachet
+    |--------------------------------------------------------------------------
+    |
+    | Whether to show the "Powered by Cachet" text in the footer.
+    |
+    */
+
+    'show_support' => true,
+
+];

config/trustedproxy.php

@@ -33,6 +33,7 @@ return [
         '103.31.4.0/22',
         '104.16.0.0/12',
         '108.162.192.0/18',
+        '131.0.72.0/22',
         '141.101.64.0/18',
         '162.158.0.0/15',
         '172.64.0.0/13',

database/backups/.gitignore

@@ -0,0 +1 @@
+*

database/factories/ModelFactory.php

@@ -61,8 +61,10 @@ $factory->define(Metric::class, function ($faker) {
         'suffix'        => $faker->word(),
         'description'   => $faker->paragraph(),
         'default_value' => 1,
+        'places'        => 2,
         'calc_type'     => $faker->boolean(),
         'display_chart' => $faker->boolean(),
+        'threshold'     => 5,
     ];
 });
 
@@ -70,6 +72,7 @@ $factory->define(MetricPoint::class, function ($faker) {
     return [
         'metric_id' => factory(Metric::class)->create()->id,
         'value'     => random_int(1, 100),
+        'counter'   => 1,
     ];
 });
 

database/migrations/2016_03_01_174858_AlterTableMetricPointsAddCounterColumn.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AlterTableMetricPointsAddCounterColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('metrics', function (Blueprint $table) {
+            $table->integer('threshold')->unsigned()->default(5)->after('default_view');
+        });
+
+        Schema::table('metric_points', function (Blueprint $table) {
+            $table->integer('counter')->unsigned()->default(1)->after('value');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('metrics', function (Blueprint $table) {
+            $table->dropColumn('threshold');
+        });
+
+        Schema::table('metric_points', function (Blueprint $table) {
+            $table->dropColumn('counter');
+        });
+    }
+}

database/migrations/2016_04_29_061916_AlterTableSubscribersAddGlobalColumn.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class AlterTableSubscribersAddGlobalColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('subscribers', function (Blueprint $table) {
+            $table->boolean('global')->after('verified_at')->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('subscribers', function (Blueprint $table) {
+            $table->dropColumn('global');
+        });
+    }
+}

database/migrations/2016_06_02_075012_AlterTableMetricsAddOrderColumn.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AlterTableMetricsAddOrderColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('metrics', function (Blueprint $table) {
+            $table->tinyInteger('order')->after('threshold')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('metrics', function (Blueprint $table) {
+            $table->dropColumn('order');
+        });
+    }
+}

database/migrations/2016_06_05_091615_create_cache_table.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateCacheTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('cache', function (Blueprint $table) {
+            $table->string('key')->unique();
+            $table->text('value');
+            $table->integer('expiration');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('cache');
+    }
+}

gulpfile.js

@@ -7,30 +7,30 @@ elixir(function (mix) {
     mix
         .sass('app.scss', 'public/dist/css/app.css')
         .styles([
-            'vendor/bower_components/jquery-minicolors/jquery.minicolors.css',
-            'vendor/bower_components/sweetalert/dist/sweetalert.css',
-            'vendor/bower_components/github-markdown-css/github-markdown.css',
+            'node_modules/jquery-minicolors/jquery.minicolors.css',
+            'node_modules/sweetalert/dist/sweetalert.css',
+            'node_modules/github-markdown-css/github-markdown.css',
             'public/dist/css/app.css'
         ], 'public/dist/css/all.css', './')
         .scripts([
-            'vendor/bower_components/jquery/dist/jquery.js',
-            'vendor/bower_components/bootstrap-sass/assets/javascripts/bootstrap.js',
-            'vendor/bower_components/moment/min/moment-with-locales.js',
-            'vendor/bower_components/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
-            'vendor/bower_components/lodash/lodash.js',
-            'vendor/bower_components/autosize/dist/autosize.js',
-            'vendor/bower_components/messenger/build/js/messenger.js',
-            'vendor/bower_components/Sortable/Sortable.js',
-            'vendor/bower_components/livestampjs/livestamp.js',
-            'vendor/bower_components/jquery-minicolors/jquery.minicolors.js',
-            'vendor/bower_components/jquery-serialize-object/jquery.serialize-object.js',
-            'vendor/bower_components/chartjs/dist/Chart.js',
-            'vendor/bower_components/jquery-sparkline/dist/jquery.sparkline.js',
-            'vendor/bower_components/sweetalert/dist/sweetalert.min.js',
+            'node_modules/jquery/dist/jquery.js',
+            'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
+            'node_modules/moment/min/moment-with-locales.js',
+            'node_modules/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
+            'node_modules/lodash/lodash.js',
+            'node_modules/autosize/dist/autosize.js',
+            'node_modules/messenger/build/js/messenger.js',
+            'node_modules/sortablejs/Sortable.js',
+            'node_modules/livestamp/livestamp.js',
+            'node_modules/jquery-minicolors/jquery.minicolors.js',
+            'node_modules/jquery-serializeobject/jquery.serializeObject.js',
+            'node_modules/chart.js/dist/Chart.js',
+            'node_modules/jquery-sparkline/jquery.sparkline.js',
+            'node_modules/sweetalert/dist/sweetalert.min.js',
             'resources/assets/js/password-strength.js',
             'resources/assets/js/app.js',
             'resources/assets/js/**/*.js'
         ], 'public/dist/js/all.js', './')
         .version(['public/dist/css/all.css', 'public/dist/js/all.js'])
-        .copy('vendor/bower_components/ionicons/fonts/', 'public/fonts/');
+        .copy('node_modules/ionicons/fonts/', 'public/fonts/');
 });

package.json

@@ -1,8 +1,25 @@
 {
-    "dependencies": {
-        "bower": "~1.7.7",
-        "gulp": "~3.9.1",
-        "laravel-elixir": "~5.0.0"
-    },
-    "private": true
+  "name": "cachet",
+  "devDependencies": {
+    "gulp": "~3.9.1",
+    "laravel-elixir": "~6.0.0-9",
+    "animate-sass": "git+https://github.com/tgdev/animate-sass.git",
+    "autosize": "^3.0.15",
+    "bootstrap-sass": "^3.3.6",
+    "chart.js": "^2.1.2",
+    "eonasdan-bootstrap-datetimepicker": "~3.1",
+    "github-markdown-css": "^2.3.0",
+    "ionicons": "~2.0",
+    "jquery-minicolors": "^2.1.10",
+    "jquery-serializeobject": "^1.0.0",
+    "jquery-sparkline": "^2.3.2",
+    "jquery": "~2.2",
+    "livestamp": "git+https://github.com/mattbradley/livestampjs.git#develop",
+    "lodash": "^4.12.0",
+    "messenger": "git+https://github.com/HubSpot/messenger.git",
+    "moment": "^2.13.0",
+    "sortablejs": "^1.4.2",
+    "sweetalert": "^1.1.3"
+  },
+  "private": true
 }