Skip to content

Commit

Permalink
4.0.6-alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
alexweissman committed Feb 22, 2017
2 parents 3a3b852 + c98e6be commit dddc17a
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## v4.0.6-Alpha
- Fix throttling issue #656
- Other miscellaneous fixes

## v4.0.5-Alpha
- Allow nulling out of throttle rules (to disable)
- Disable Google Analytics by default (but enabled in production)
Expand Down
2 changes: 1 addition & 1 deletion app/defines.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace UserFrosting;

// Some standard defines
define('UserFrosting\VERSION', '4.0.5-alpha');
define('UserFrosting\VERSION', '4.0.6-alpha');
define('UserFrosting\DS', '/');
define('UserFrosting\PHP_MIN_VERSION', '5.6');
define('UserFrosting\DEBUG_CONFIG', false);
Expand Down
3 changes: 1 addition & 2 deletions app/sprinkles/account/locale/en_US/messages.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@
"LOCALE.ACCOUNT" => "The language and locale to use for your account",

"LOGIN" => [
"@TRANSLATION" => "Login",

"@TRANSLATION" => "Login",
"ALREADY_COMPLETE" => "You are already logged in!",
"SOCIAL" => "Or login with",
"REQUIRED" => "Sorry, you must be logged in to access this resource."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{# Overrides blocks in head of base template #}
{% block page_title %}{{translate('SIGNIN_OR_REGISTER')}}{% endblock %}

{% block page_description %}{{translate('LOGIN.DESCRIPTION', {'site_name': site.title })}}{% endblock %}
{% block page_description %}{{translate('PAGE.LOGIN.DESCRIPTION', {'site_name': site.title })}}{% endblock %}

{% block body_attributes %}
class="hold-transition login-page"
Expand Down
4 changes: 2 additions & 2 deletions app/sprinkles/core/src/Throttle/Throttler.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ public function getDelay($type, $requestData = [])
->get();

// Filter out only events that match the required JSON data
$events = $events->filter(function ($key, $item) use ($requestData) {
$events = $events->filter(function ($item, $key) use ($requestData) {
$data = json_decode($item->request_data);

// If a field is not specified in the logged data, or it doesn't match the value we're searching for,
// then filter out this event from the collection.
foreach ($requestData as $name => $value) {
if (!isset($data[$name]) || $data[$name] != $value) {
if (!isset($data->$name) || ($data->$name != $value)) {
return false;
}
}
Expand Down
8 changes: 4 additions & 4 deletions webserver-configs/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ server {
root /usr/share/nginx/project/public;
server_name example.com;
## End - Server Info

## SSL configuration
## It is STRONGLY RECOMMENDED that you use SSL for all traffic to your UF site.
## It is STRONGLY RECOMMENDED that you use SSL for all traffic to your UF site.
## Otherwise, you are potentially leaking your users' sensitive info, including passwords!
## See https://letsencrypt.org/ to find out how to get a free, trusted SSL cert for your site.
#
#listen 443 ssl spdy; # we listen ssl first with spdy second. if browser support spdy it will attempt to upgrade immediately on handshake
#listen [::]:443 ssl spdy;
#listen [::]:443 ssl spdy;
## Certificate paths (example for letsencrypt)
#ssl_certificate /etc/letsencrypt/live/<cert name>/fullchain.pem;
#ssl_certificate_key /etc/letsencrypt/live/<cert name>/privkey.pem;
Expand Down Expand Up @@ -81,7 +81,7 @@ server {
}

## we can cache some static files
location ~* \.[^png|gif|jpg|jpeg|ico|css|js|woff|ttf|otf|woff2|eot]$ {
location ~* \.(png|gif|jpg|jpeg|ico|css|js|woff|ttf|otf|woff2|eot)$ {
include /etc/nginx/mime.types;
expires max;
}
Expand Down

0 comments on commit dddc17a

Please sign in to comment.