Merge branch '1.5'

Author: Guite

composer.lock

@@ -142,8 +142,13 @@ public function checkForUpdates()
             } else {
                 $this->releases = $newVersionInfo;
                 $this->checked = true;
-                $this->updateversion = $this->releases[0]['tag_name'];
-                //updateversion - get latest version from releases - move all git releases/updatechecker management to separate class
+                foreach ($this->releases as $release) {
+                    if (true === $release['prerelease']) {
+                        continue;
+                    }
+                    $this->updateversion = $release['tag_name'];
+                    break;
+                }
             }
         }
 

src/system/AdminModule/Helper/UpdateCheckHelper.php

@@ -41,6 +41,10 @@ public function persistAndFlush(UserEntity $user)
 
     public function removeAndFlush(UserEntity $user)
     {
+        foreach ($user->getAttributes() as $attribute) {
+            // this should be unnecessary because cascade = all but MySQL 5.7 not working with that
+            $this->_em->remove($attribute);
+        }
         $this->_em->remove($user);
         $this->_em->flush($user);
     }

src/system/UsersModule/Entity/Repository/UserRepository.php

@@ -79,19 +79,19 @@ public function loginAllowed(UserEntity $user)
             case UsersConstant::ACTIVATED_ACTIVE:
                 return true;
             case UsersConstant::ACTIVATED_INACTIVE:
-                $this->session->getFlashBag()->add('error', $this->translator->__('Your account has been disabled. Please contact a site administrator for more information.'));
+                $this->session->getFlashBag()->add('error', $this->translator->__('Login Denied: Your account has been disabled. Please contact a site administrator for more information.'));
 
                 return false;
             case UsersConstant::ACTIVATED_PENDING_DELETE:
-                $this->session->getFlashBag()->add('error', $this->translator->__('Your account has been disabled and is scheduled for removal. Please contact a site administrator for more information.'));
+                $this->session->getFlashBag()->add('error', $this->translator->__('Login Denied: Your account has been disabled and is scheduled for removal. Please contact a site administrator for more information.'));
 
                 return false;
             case UsersConstant::ACTIVATED_PENDING_REG:
-                $this->session->getFlashBag()->add('error', $this->translator->__('Your request to register with this site is still waiting for approval from a site administrator.'));
+                $this->session->getFlashBag()->add('error', $this->translator->__('Login Denied: Your request to register with this site is pending or awaiting verification.'));
 
                 return false;
             default:
-                $this->session->getFlashBag()->add('error', $this->translator->__('Nope'));
+                $this->session->getFlashBag()->add('error', $this->translator->__('Login Denied!'));
 
                 return false;
         }

src/system/UsersModule/Helper/AccessHelper.php

@@ -54,9 +54,7 @@ public function __construct(SessionInterface $session, MailHelper $mailHelper)
     public function sendRegistrationEmail(GenericEvent $event)
     {
         $userEntity = $event->getSubject();
-        if ($userEntity->getActivated() == UsersConstant::ACTIVATED_PENDING_REG) {
-            $notificationErrors = $this->mailHelper->createAndSendRegistrationMail($userEntity);
-        } else {
+        if ($userEntity->getActivated() != UsersConstant::ACTIVATED_PENDING_REG) {
             $notificationErrors = $this->mailHelper->createAndSendUserMail($userEntity);
         }
         if (!empty($notificationErrors)) {

src/system/UsersModule/Listener/RegistrationEventsListener.php

@@ -14,14 +14,14 @@
 
 {% if createdpassword is not empty %}<p>{{ __('(This is the only time you will receive your password. Please keep it in a safe place.)') }}</p>{% endif %}
 
-{% if not reginfo.isApproved %}
+{% if not reginfo.approved %}
     <p>{{ __('Thank you for your application for a new account. Your application has been forwarded to the site administrator for review. Please expect a message once the review process is complete.') }}</p>
 {% elseif not createdByAdmin %}
     <p>{{ __('Your account application has been approved. Thank you for your patience during the new account application review process.') }}</p>
 {% elseif createdByAdmin %}
     <p>{{ __('The web site administrator has created this new account for you.') }}</p>
 {% endif %}
 
-{% if reginfo.isApproved %}
+{% if reginfo.approved %}
     <p>{{ __('You may now log into the web site.') }}</p>
 {% endif %}

src/system/UsersModule/Resources/views/Email/welcome.html.twig

@@ -12,14 +12,14 @@
 
 {% if createdpassword is not empty %}{{ __('(This is the only time you will receive your password. Please keep it in a safe place.)') }}{% endif %}
 
-{% if not reginfo.isApproved %}
+{% if not reginfo.approved %}
 {{ __('Thank you for your application for a new account. Your application has been forwarded to the site administrator for review. Please expect a message once the review process is complete.') }}
 {% elseif not createdByAdmin %}
 {{ __('Your account application has been approved. Thank you for your patience during the new account application review process.') }}
 {% elseif createdByAdmin %}
 {{ __('The web site administrator has created this new account for you.') }}
 {% endif %}
 
-{% if reginfo.isApproved %}
+{% if reginfo.approved %}
 {{ __('You may now log into the web site.') }}
 {% endif %}