Merge pull request #266 from cydrobolt/fix/compat-5.5.92.1.1

Compatibility patch for 2.1.0

8 files changed, 15 insertions, 11 deletions

diff --git a/.env.setup b/.env.setup
index 0ec450d..7e7ac0e 100644
--- a/.env.setup
+++ b/.env.setup
@@ -1,6 +1,6 @@
 APP_ENV=local
 APP_DEBUG=true
-APP_KEY=@,c"VPx[@KuTgVd}FUxovZua/e-fqz]=
+APP_KEY=,faO^ofvGeJ8|Z.q{mWp=^i}Cmzj+k&K
 
 APP_LOCALE=en
 APP_FALLBACK_LOCALE=en
@@ -16,7 +16,7 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=file
 
-VERSION=2.1.0
+VERSION=2.1.1
 VERSION_RELMONTH=December
-VERSION_RELDAY=6
+VERSION_RELDAY=9
 VERSION_RELYEAR=2016
diff --git a/app/Factories/UserFactory.php b/app/Factories/UserFactory.php
index 59c9ffd..e3977b3 100644
--- a/app/Factories/UserFactory.php
+++ b/app/Factories/UserFactory.php
@@ -7,7 +7,11 @@ use App\Helpers\CryptoHelper;
 use App\Helpers\UserHelper;
 
 class UserFactory {
-    public static function createUser($username, $email, $password, $active=0, $ip='127.0.0.1', $api_key=false, $api_active=0, $role=UserHelper::USER_ROLES['default']) {
+    public static function createUser($username, $email, $password, $active=0, $ip='127.0.0.1', $api_key=false, $api_active=0, $role=false) {
+        if (!$role) {
+            $role = UserHelper::$USER_ROLES['default'];
+        }
+
         $hashed_password = Hash::make($password);
         $recovery_key = CryptoHelper::generateRandomHex(50);
 
diff --git a/app/Helpers/UserHelper.php b/app/Helpers/UserHelper.php
index 1be5ab1..70efe1b 100644
--- a/app/Helpers/UserHelper.php
+++ b/app/Helpers/UserHelper.php
@@ -6,7 +6,7 @@ use App\Helpers\CryptoHelper;
 use Hash;
 
 class UserHelper {
-    const USER_ROLES = [
+    public static $USER_ROLES = [
         'admin'    => 'admin',
         'default'  => '',
     ];
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 687dfd5..1902bab 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -31,8 +31,8 @@ class AdminController extends Controller {
 
         return view('admin', [
             'role' => $role,
-            'admin_role' => UserHelper::USER_ROLES['admin'],
-            'user_roles' => UserHelper::USER_ROLES,
+            'admin_role' => UserHelper::$USER_ROLES['admin'],
+            'user_roles' => UserHelper::$USER_ROLES,
             'api_key' => $user->api_key,
             'api_active' => $user->api_active,
             'api_quota' => $user->api_quota,
diff --git a/app/Http/Controllers/AdminPaginationController.php b/app/Http/Controllers/AdminPaginationController.php
index 5972363..9add38d 100644
--- a/app/Http/Controllers/AdminPaginationController.php
+++ b/app/Http/Controllers/AdminPaginationController.php
@@ -59,7 +59,7 @@ class AdminPaginationController extends Controller {
                 }
                 $select_role .= '>';
 
-                foreach (UserHelper::USER_ROLES as $role_text => $role_val) {
+                foreach (UserHelper::$USER_ROLES as $role_text => $role_val) {
                     // Iterate over each available role and output option
                     $select_role .= '<option value="' . e($role_val) . '"';
 
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index d2c96df..c02adec 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -98,7 +98,7 @@ class SetupController extends Controller {
         $acct_username = $request->input('acct:username');
         $acct_email = $request->input('acct:email');
         $acct_password = $request->input('acct:password');
-        $acct_group = UserHelper::USER_ROLES['admin'];
+        $acct_group = UserHelper::$USER_ROLES['admin'];
 
         // if true, only logged in users can shorten
         $st_shorten_permission = $request->input('setting:shorten_permission');
@@ -215,7 +215,7 @@ class SetupController extends Controller {
             return redirect(route('setup'))->with('error', 'Could not create database. Perhaps some credentials were incorrect?');
         }
 
-        $user = UserFactory::createUser($setup_finish_args->acct_username, $setup_finish_args->acct_email, $setup_finish_args->acct_password, 1, $request->ip(), false, 0, UserHelper::USER_ROLES['admin']);
+        $user = UserFactory::createUser($setup_finish_args->acct_username, $setup_finish_args->acct_email, $setup_finish_args->acct_password, 1, $request->ip(), false, 0, UserHelper::$USER_ROLES['admin']);
 
         return view('setup_thanks')->with('success', 'Set up completed! Thanks for using Polr!');
     }
diff --git a/public/css/admin.css b/public/css/admin.css
index 2601d11..b3e4d1e 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -47,5 +47,5 @@ input.api-quota {
 }
 
 a.new-user-add {
-    padding-left: 0.5em
+    margin-left: 0.5em
 }
diff --git a/public/img/setup.jpg b/public/img/setup.jpg
index 1f0c076..8849bd6 100644
--- a/public/img/setup.jpg
+++ b/public/img/setup.jpg