Merge branch 'hotfix-0.3.1.19'

Author: Netrilix

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## v0.3.1.19
+
+- Fix some minor error screen layout issues
+- Make User::fresh() compatible with Eloquent\Model v5.2.40+
+- Update composer require to allow for Fortress 1.x bugfixes
+- Allow database port definitions in config-userfrosting.php
+- Fix fatal error when evaluateCondition is called before the router populates current route information
+
 ## v0.3.1.18
 
 - Add check for logging being enabled but log file not existing yet

userfrosting/composer.json

@@ -21,7 +21,7 @@
         "twig/twig" : "~1.0",
         "slim/slim" : "2.*",
         "slim/views" : "0.1.3",
-        "userfrosting/fortress" : "1.0",
+        "userfrosting/fortress" : "1.*",
         "wikimedia/composer-merge-plugin": "~1"
     },
     "extra": {

userfrosting/config-userfrosting-example.php

@@ -41,6 +41,7 @@
             ],
             'db'            =>  [
                 'db_host'  => 'localhost',
+                'db_port'  => '', // Leave blank to use the default port for your database driver (eg. 3306 for MySQL)
                 'db_name'  => 'userfrosting',
                 'db_user'  => 'admin',
                 'db_pass'  => 'password',
@@ -90,6 +91,7 @@
             ],
             'db'            =>  [
                 'db_host'  => 'localhost',
+                'db_port'  => '', // Leave blank to use the default port for your database driver (eg. 3306 for MySQL)
                 'db_name'  => 'userfrosting',
                 'db_user'  => 'admin',
                 'db_pass'  => 'password',

userfrosting/initialize.php

@@ -40,7 +40,7 @@
 
 $dbx = $app->config('db');
 
-$capsule->addConnection([
+$connection_array = [
     'driver'    => 'mysql',
     'host'      => $dbx['db_host'],
     'database'  => $dbx['db_name'],
@@ -49,7 +49,15 @@
     'charset'   => 'utf8',
     'collation' => 'utf8_unicode_ci',
     'prefix'    => ''
-]);
+];
+
+// This is for backwards compatibility. Pre-0.3.1.19 configuration files won't have $dbx['db_port'] defined at all.
+if (isset($dbx['db_port']))
+{
+    $connection_array['port'] = $dbx['db_port'];
+}
+
+$capsule->addConnection($connection_array);
 
 // Register as global connection
 $capsule->setAsGlobal();
@@ -147,7 +155,7 @@
         'guest_theme' => 'default',
         'minify_css' => '0',
         'minify_js' => '0',
-        'version' => '0.3.1.18',
+        'version' => '0.3.1.19',
         'author' => 'Alex Weissman',
         'show_terms_on_register' => '1',
         'site_location' => 'The State of Indiana'

userfrosting/models/auth/AccessConditionExpression.php

@@ -67,7 +67,7 @@ public function evaluateCondition($condition, $params){
         $params['self'] = $this->_app->user->export();
 
         $route = $this->_app->router()->getCurrentRoute();
-        $params['route'] = $route->getParams();
+        $params['route'] = (is_null($route) ? [] : $route->getParams());
 
         /* Traverse the parse tree, and execute all function calls as methods of class AccessCondition.
            Replace the function node with the return value of the method.

userfrosting/models/database/User.php

@@ -89,7 +89,7 @@ public static function isLoggedIn(){
      *
      * @see http://stackoverflow.com/a/27748794/2970321
      */
-    public function fresh(array $options = []){
+    public function fresh($options = []){
         // TODO: Update table and column info, in case it has changed?
         $user = parent::fresh($options);
         $user->getGroupIds();

userfrosting/templates/themes/default/errors/404.twig

@@ -13,7 +13,7 @@
 {% block content %}
     <div class="container text-center">
         <h1>Error 404</h1>
-        <img src="{{site.uri.image}}/fry.png">
+        <img class="img-fluid m-b-1 m-x-auto" src="{{site.uri.image}}/fry.png">
         <br><br>
         <p class="lead">Either way, click <a href="{{site.uri.public}}">here</a> to return to the front page.</p>
     </div> <!-- /container -->

userfrosting/templates/themes/default/errors/bad-config.twig

@@ -13,7 +13,7 @@
 {% block content %}
     <div class="container text-center">
         <h1>Your server doesn't seem to be configured properly.</h1>
-        <img src="{{site.uri.image}}/eniac.png">
+        <img class="img-fluid m-b-1 m-x-auto" src="{{site.uri.image}}/eniac.png">
         <br><br>
         <p class="lead">Specifically, it looks like you are using Apache but don't have the <code>mod_rewrite</code> module enabled.  Please see the <a href="http://www.userfrosting.com/troubleshooting/#blank-page">troubleshooting guide</a> to get this sorted out.</p>
     </div> <!-- /container -->

userfrosting/templates/themes/default/errors/compromised.twig

@@ -13,8 +13,8 @@
 {% block content %}
     <div class="container text-center">
         <h1>Your account may have been compromised!</h1>
-        <img src="{{site.uri.image}}/compromised.jpg">
+        <img class="img-fluid m-b-1 m-x-auto" src="{{site.uri.image}}/compromised.jpg">
         <br><br>
-        <p class="lead">Someone may have used your login information to acccess this page.  For your safety, all sessions were logged out. Please <a href="{{site.uri.public}}/account/login">log in</a> and check your account for suspicious activity.  You may also wish to change your password.</p>
+        <p class="lead">Someone may have used your login information to access this page.  For your safety, all sessions were logged out. Please <a href="{{site.uri.public}}/account/login">log in</a> and check your account for suspicious activity.  You may also wish to change your password.</p>
     </div> <!-- /container -->
 {% endblock %}

userfrosting/templates/themes/default/errors/database.twig

@@ -13,7 +13,7 @@
 {% block content %}
     <div class="container text-center">
         <h1>We can't seem to connect to the database.</h1>
-        <img class="img-fluid" src="{{site.uri.image}}/database.png">
+        <img class="img-fluid m-b-1 m-x-auto" src="{{site.uri.image}}/database.png">
         <br><br>
         <p class="lead">Have you tried hacking into the mainframe?  Seriously though, check your PHP error log to figure out what's up.  You probably just need to enter your database credentials in <code>userfrosting/config-userfrosting.php</code>.  If you are sure that your credentials are fine, try simply reloading the page.</p>
     </div> <!-- /container -->