Merge branch 'hotfix-0.3.1.17'

Author: Netrilix

CHANGELOG.md

@@ -1,12 +1,20 @@
 # Change Log
 
+## v0.3.1.17
+
+- Fix occasional bug when end-of-file is reached on log file before requested number of lines is reached
+- Roll back database connection checking to fix installer routines (frostbitten)
+- UI fixes for smaller screens (frostbitten)
+- Update Gitter references to Rocket.chat
+- Clarify hotfix branch procedure for contributions
+
 ## v0.3.1.16
 
-- Fixed comment reference to \Fortress\JqueryValidationAdaptor
-- CONTRIBUTING.md - Added note about proper Pull Requests
+- Fix comment reference to \Fortress\JqueryValidationAdaptor
+- CONTRIBUTING.md - Add note about proper Pull Requests
 - French language file fixes (#565) (lcharette)
-- Added HTTP status codes to 404 errors and database errors (frostbitten)
-- Changed database errors to use BaseController instead of DatabaseController (frostbitten)
+- Add HTTP status codes to 404 errors and database errors (frostbitten)
+- Change database errors to use BaseController instead of DatabaseController (frostbitten)
 
 ## v0.3.1.15
 
@@ -29,11 +37,11 @@
 ## v0.3.1.12
 
 - Add sendmail support in Notification class
-- Fixed problem with strict comparison in Handlebars templates and inconsistent data types among different database technologies
-- Overrided paths to font files for Bootstrap Glyphicons to support the UserFrosting directory structure
+- Fix problem with strict comparison in Handlebars templates and inconsistent data types among different database technologies
+- Override paths to font files for Bootstrap Glyphicons to support the UserFrosting directory structure
 - Added missing lines of Thai language (popiazaza)
-- Fixed a vulnerability where users still logged in wouldn't automatically be logged out if they were disabled
-- Added option for HTTPS in `.htaccess`, commented out by default
+- Fix a vulnerability where users still logged in wouldn't automatically be logged out if they were disabled
+- Add option for HTTPS in `.htaccess`, commented out by default
 - Minor syntax fixes in `public/js/userfrosting.js`, `widget-auth.js`, `widget-groups.js`, and `widget-users.js`
 
 ## v0.3.1.11

CONTRIBUTING.md

@@ -16,9 +16,9 @@ There are also tags for the utilities upon which UserFrosting depends, such as [
 
 In general, the Github issue tracker should only be used for bug reports and feature requests.  If you're just having trouble getting something to work, you should ask on Stack Overflow instead. Tag your question with the `userfrosting` tag, and optionally with any tags specific to the relevant underlying technologies, such as `slim`, `twig`, `eloquent`, `composer`, etc.  You should also mention the version of UserFrosting that you are using.
 
-After posting a question on Stack Overflow, please [link to it in chat](https://gitter.im/userfrosting/UserFrosting).  This will ensure that more people see it, and provide a place where we can discuss and help clarify your question.
+After posting a question on Stack Overflow, please [link to it in chat](https://chat.userfrosting.com/).  This will ensure that more people see it, and provide a place where we can discuss and help clarify your question.
 
-On Github, Gitter, and Stack Overflow, please keep in mind the following:
+On Github, UserFrosting Chat, and Stack Overflow, please keep in mind the following:
 
 1. Remember that courtesy and proper grammar go a long way. Please take the time to craft a **precise, polite issue**. We will do our best to help, but remember that this is an open-source project - none of us are getting paid a salary to develop this project, or act as your personal support hotline :wink:
 
@@ -36,7 +36,7 @@ You should also try testing your code in a local development environment, to sep
 
 ## Pull Requests
 
-When making a pull request, set your "base branch" to the latest hotfix branch being worked on. This will allow us to keep track of which version every change belongs to, which is useful when tracking down other users' issues.
+When making a pull request, set your "base branch" to the `hotfix-development` branch. Accepted pull requests will be merged into `master` in batches with a new hotfix number as needed. This will allow us to keep track of which version number every change belongs to, which is useful when tracking down other users' issues.
 
 ## ChangeLog
 

public/css/bootstrap-custom.css

@@ -1,12 +1,12 @@
- @font-face {
+@font-face {
    font-family: 'Glyphicons Halflings';
 
    src: url('fonts/glyphicons-halflings-regular.eot');
    src: url('fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('fonts/glyphicons-halflings-regular.woff') format('woff'), url('fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 
 .container-narrow {
-    width: 800px;
+    max-width: 800px;
 }
 
 .panel-heading-buttons h3 {
@@ -36,3 +36,257 @@ label.label-switch {
 form textarea {
   resize: vertical; /* user can resize vertically, but width is fixed */
 }
+
+/* Utilities from Bootstrap 4 alpha 2. https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.css */
+
+.img-fluid { 
+  display: block;
+  max-width: 100%;
+  height: auto;
+}
+
+
+.m-x-auto {
+  margin-right: auto !important;
+  margin-left: auto !important;
+}
+
+.m-a-0 {
+  margin: 0 0 !important;
+}
+
+.m-t-0 {
+  margin-top: 0 !important;
+}
+
+.m-r-0 {
+  margin-right: 0 !important;
+}
+
+.m-b-0 {
+  margin-bottom: 0 !important;
+}
+
+.m-l-0 {
+  margin-left: 0 !important;
+}
+
+.m-x-0 {
+  margin-right: 0 !important;
+  margin-left: 0 !important;
+}
+
+.m-y-0 {
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+}
+
+.m-a-1 {
+  margin: 1rem 1rem !important;
+}
+
+.m-t-1 {
+  margin-top: 1rem !important;
+}
+
+.m-r-1 {
+  margin-right: 1rem !important;
+}
+
+.m-b-1 {
+  margin-bottom: 1rem !important;
+}
+
+.m-l-1 {
+  margin-left: 1rem !important;
+}
+
+.m-x-1 {
+  margin-right: 1rem !important;
+  margin-left: 1rem !important;
+}
+
+.m-y-1 {
+  margin-top: 1rem !important;
+  margin-bottom: 1rem !important;
+}
+
+.m-a-2 {
+  margin: 1.5rem 1.5rem !important;
+}
+
+.m-t-2 {
+  margin-top: 1.5rem !important;
+}
+
+.m-r-2 {
+  margin-right: 1.5rem !important;
+}
+
+.m-b-2 {
+  margin-bottom: 1.5rem !important;
+}
+
+.m-l-2 {
+  margin-left: 1.5rem !important;
+}
+
+.m-x-2 {
+  margin-right: 1.5rem !important;
+  margin-left: 1.5rem !important;
+}
+
+.m-y-2 {
+  margin-top: 1.5rem !important;
+  margin-bottom: 1.5rem !important;
+}
+
+.m-a-3 {
+  margin: 3rem 3rem !important;
+}
+
+.m-t-3 {
+  margin-top: 3rem !important;
+}
+
+.m-r-3 {
+  margin-right: 3rem !important;
+}
+
+.m-b-3 {
+  margin-bottom: 3rem !important;
+}
+
+.m-l-3 {
+  margin-left: 3rem !important;
+}
+
+.m-x-3 {
+  margin-right: 3rem !important;
+  margin-left: 3rem !important;
+}
+
+.m-y-3 {
+  margin-top: 3rem !important;
+  margin-bottom: 3rem !important;
+}
+
+.p-a-0 {
+  padding: 0 0 !important;
+}
+
+.p-t-0 {
+  padding-top: 0 !important;
+}
+
+.p-r-0 {
+  padding-right: 0 !important;
+}
+
+.p-b-0 {
+  padding-bottom: 0 !important;
+}
+
+.p-l-0 {
+  padding-left: 0 !important;
+}
+
+.p-x-0 {
+  padding-right: 0 !important;
+  padding-left: 0 !important;
+}
+
+.p-y-0 {
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
+}
+
+.p-a-1 {
+  padding: 1rem 1rem !important;
+}
+
+.p-t-1 {
+  padding-top: 1rem !important;
+}
+
+.p-r-1 {
+  padding-right: 1rem !important;
+}
+
+.p-b-1 {
+  padding-bottom: 1rem !important;
+}
+
+.p-l-1 {
+  padding-left: 1rem !important;
+}
+
+.p-x-1 {
+  padding-right: 1rem !important;
+  padding-left: 1rem !important;
+}
+
+.p-y-1 {
+  padding-top: 1rem !important;
+  padding-bottom: 1rem !important;
+}
+
+.p-a-2 {
+  padding: 1.5rem 1.5rem !important;
+}
+
+.p-t-2 {
+  padding-top: 1.5rem !important;
+}
+
+.p-r-2 {
+  padding-right: 1.5rem !important;
+}
+
+.p-b-2 {
+  padding-bottom: 1.5rem !important;
+}
+
+.p-l-2 {
+  padding-left: 1.5rem !important;
+}
+
+.p-x-2 {
+  padding-right: 1.5rem !important;
+  padding-left: 1.5rem !important;
+}
+
+.p-y-2 {
+  padding-top: 1.5rem !important;
+  padding-bottom: 1.5rem !important;
+}
+
+.p-a-3 {
+  padding: 3rem 3rem !important;
+}
+
+.p-t-3 {
+  padding-top: 3rem !important;
+}
+
+.p-r-3 {
+  padding-right: 3rem !important;
+}
+
+.p-b-3 {
+  padding-bottom: 3rem !important;
+}
+
+.p-l-3 {
+  padding-left: 3rem !important;
+}
+
+.p-x-3 {
+  padding-right: 3rem !important;
+  padding-left: 3rem !important;
+}
+
+.p-y-3 {
+  padding-top: 3rem !important;
+  padding-bottom: 3rem !important;
+}

userfrosting/initialize.php

@@ -11,6 +11,7 @@
 
 // This if-block just checks that config-userfrosting.php exists
 if (!file_exists(__DIR__ . "/config-userfrosting.php")){
+	http_response_code(503);
     echo "<h2>We can't seem to find config-userfrosting.php!  You should rename the file config-userfrosting-example.php to config-userfrosting.php, and then fill in the configuration details for your database and server.  For more information, please see the <a href='http://www.userfrosting.com/installation/#install-userfrosting'>installation instructions</a>.</h2><br>";
     exit;
 }
@@ -146,7 +147,7 @@
         'guest_theme' => 'default',
         'minify_css' => '0',
         'minify_js' => '0',
-        'version' => '0.3.1.16',
+        'version' => '0.3.1.17',
         'author' => 'Alex Weissman',
         'show_terms_on_register' => '1',
         'site_location' => 'The State of Indiana'

userfrosting/middleware/usersession/UserSession.php

@@ -91,8 +91,10 @@ public function setup(){
             // If we can't connect to the DB, then we can't create an authenticated user.  That's ok if we're in installation mode.
             error_log("Unable to authenticate user because the database is not yet initialized, invalid, or inaccessible.  Falling back to guest user.");
             error_log($e->getTraceAsString());
-            $controller = new BaseController($this->app);
-            return $controller->pageDatabaseError();
+			
+			// How can we tell we are not in installation mode? Until then, the following code is just staged.
+            // $controller = new BaseController($this->app);
+            // return $controller->pageDatabaseError();
         }
     }
 }

userfrosting/models/database/SiteSettings.php

@@ -455,14 +455,15 @@ static public function getLog($targetLines = null, $seekLen = 4096){
                         /* If there's no file left to read, return with
                            what we have. If the amount we want to read
                            is more than we have left, just take what's left. */
-                        if ($sizeRemaining == 0){
-                            break 1;
-                        } elseif ($seekLen > $sizeRemaining){
-                            if ($sizeRemaining < 0){
-                                $sizeRemaining = 0;
+                        if ($sizeRemaining <= 0){
+                            if ($remainder != ''){
+                                $messages[] = $remainder;
                             }
-                            $seekLen = $sizeRemaining;
-                            $sizeRemaining = 0;
+                            break 1; // Everything we can read has been read.
+                        }
+                        if ($seekLen > $sizeRemaining){
+                            $seekLen = $sizeRemaining; // Read everything left now
+                            $sizeRemaining = 0; // and mark that nothing is left afterwards.
                         }
                         fseek($fileHandle, -$seekLen, SEEK_CUR); // Seek to the point we want to read from
                         $current = fread($fileHandle, $seekLen) . $remainder; // Attach the remainder from previous loop