From 90baf187247ec13e70221a6eee9d71d8146c217a Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Mon, 3 Aug 2015 14:23:46 +0100
Subject: [PATCH] Backport all fixes from the master to 1.1

---
 app/Http/Routes/StatusPageRoutes.php          | 19 -------
 app/Http/Routes/SubscribeRoutes.php           | 49 +++++++++++++++++++
 app/Models/Subscriber.php                     |  3 +-
 app/Presenters/ComponentPresenter.php         |  5 +-
 ...6_AlterTableSubscribersRemoveDeletedAt.php | 41 ++++++++++++++++
 resources/lang/en/forms.php                   |  7 ++-
 resources/views/dashboard/team/add.blade.php  |  9 ++++
 7 files changed, 109 insertions(+), 24 deletions(-)
 create mode 100644 app/Http/Routes/SubscribeRoutes.php
 create mode 100644 database/migrations/2015_08_02_120436_AlterTableSubscribersRemoveDeletedAt.php

diff --git a/app/Http/Routes/StatusPageRoutes.php b/app/Http/Routes/StatusPageRoutes.php
index 94b70af3..f0a78317 100644
--- a/app/Http/Routes/StatusPageRoutes.php
+++ b/app/Http/Routes/StatusPageRoutes.php
@@ -31,25 +31,6 @@ class StatusPageRoutes
 
             $router->get('/atom/{component_group?}', 'AtomController@feedAction');
             $router->get('/rss/{component_group?}', 'RssController@feedAction');
-
-            $router->group(['middleware' => 'app.subscribers'], function ($router) {
-                $router->get('subscribe', [
-                    'as'   => 'subscribe-page',
-                    'uses' => 'SubscribeController@showSubscribe',
-                ]);
-                $router->post('subscribe', [
-                    'as'   => 'subscribe',
-                    'uses' => 'SubscribeController@postSubscribe',
-                ]);
-                $router->get('subscribe/verify/{code}', [
-                    'as'   => 'subscribe-verify',
-                    'uses' => 'SubscribeController@getVerify',
-                ]);
-                $router->get('unsubscribe/{code}', [
-                    'as'   => 'unsubscribe',
-                    'uses' => 'SubscribeController@getUnsubscribe',
-                ]);
-            });
         });
     }
 }
diff --git a/app/Http/Routes/SubscribeRoutes.php b/app/Http/Routes/SubscribeRoutes.php
new file mode 100644
index 00000000..501e3c4d
--- /dev/null
+++ b/app/Http/Routes/SubscribeRoutes.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.
+ */
+
+namespace CachetHQ\Cachet\Http\Routes;
+
+use Illuminate\Contracts\Routing\Registrar;
+
+class SubscribeRoutes
+{
+    /**
+     * Define the subscribe routes.
+     *
+     * @param \Illuminate\Contracts\Routing\Registrar $router
+     */
+    public function map(Registrar $router)
+    {
+        $router->group(['middleware'     => 'app.hasSetting', 'setting' => 'app_name'], function ($router) {
+            $router->group(['middleware' => 'app.subscribers'], function ($router) {
+                $router->get('subscribe', [
+                    'as'   => 'subscribe-page',
+                    'uses' => 'SubscribeController@showSubscribe',
+                ]);
+
+                $router->post('subscribe', [
+                    'as'   => 'subscribe',
+                    'uses' => 'SubscribeController@postSubscribe',
+                ]);
+
+                $router->get('subscribe/verify/{code}', [
+                    'as'   => 'subscribe-verify',
+                    'uses' => 'SubscribeController@getVerify',
+                ]);
+
+                $router->get('unsubscribe/{code}', [
+                    'as'   => 'unsubscribe',
+                    'uses' => 'SubscribeController@getUnsubscribe',
+                ]);
+            });
+        });
+    }
+}
diff --git a/app/Models/Subscriber.php b/app/Models/Subscriber.php
index 21bd8d14..5587a57d 100644
--- a/app/Models/Subscriber.php
+++ b/app/Models/Subscriber.php
@@ -13,13 +13,12 @@ namespace CachetHQ\Cachet\Models;
 
 use CachetHQ\Cachet\Presenters\SubscriberPresenter;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use McCool\LaravelAutoPresenter\HasPresenter;
 use Watson\Validating\ValidatingTrait;
 
 class Subscriber extends Model implements HasPresenter
 {
-    use SoftDeletes, ValidatingTrait;
+    use ValidatingTrait;
 
     /**
      * The validation rules.
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index 8b192d7d..7a68c10b 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -25,8 +25,9 @@ class ComponentPresenter extends AbstractPresenter
     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(),
+            'status_name' => $this->wrappedObject->humanStatus,
         ]);
     }
 }
diff --git a/database/migrations/2015_08_02_120436_AlterTableSubscribersRemoveDeletedAt.php b/database/migrations/2015_08_02_120436_AlterTableSubscribersRemoveDeletedAt.php
new file mode 100644
index 00000000..ffb6e5b1
--- /dev/null
+++ b/database/migrations/2015_08_02_120436_AlterTableSubscribersRemoveDeletedAt.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 AlterTableSubscribersRemoveDeletedAt extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('subscribers', function (Blueprint $table) {
+            $table->dropColumn('deleted_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('subscribers', function (Blueprint $table) {
+            $table->softDeletes();
+        });
+    }
+}
diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index 946aa7ec..33ea7c07 100755
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -127,7 +127,12 @@ return [
         'password'       => 'Password',
         'api-token'      => 'API Token',
         'api-token-help' => 'Regenerating your API token will prevent existing applications from accessing Cachet.',
-        '2fa'            => [
+        'user_level'     => 'User Level',
+        'levels'         => [
+            'admin' => 'Admin',
+            'user'  => 'User',
+        ],
+        '2fa' => [
             'help' => 'Enabling two factor authentication increases security of your account. You will need to download <a href="https://support.google.com/accounts/answer/1066447?hl=en">Google Authenticator</a> or a similar app on to your mobile device. When you login you will be asked to provide a token generated by the app.',
         ],
     ],
diff --git a/resources/views/dashboard/team/add.blade.php b/resources/views/dashboard/team/add.blade.php
index 41edfb1d..9122b498 100644
--- a/resources/views/dashboard/team/add.blade.php
+++ b/resources/views/dashboard/team/add.blade.php
@@ -28,6 +28,15 @@
                             <label>{{ trans('forms.user.password') }}</label>
                             <input type="password" class="form-control" name="password" value="">
                         </div>
+                        @if($loggedUser->isAdmin)
+                        <div class="form-group">
+                            <label>{{ trans('forms.user.user_level') }}</label>
+                            <select name="level" class="form-control">
+                                <option value="2" selected>{{ trans('forms.user.levels.user') }}</option>
+                                <option value="1">{{ trans('forms.user.levels.admin') }}</option>
+                            </select>
+                        </div>
+                        @endif
                     </fieldset>
 
                     <div class="form-group">