Merge branch '3-2-5' into 'master'

3.2.5

See merge request mike-koch/Mods-for-HESK!85

api/BusinessLogic/Emails/BasicEmailSender.php

@@ -10,7 +10,8 @@ use PHPMailer;
 class BasicEmailSender extends \BaseClass implements EmailSender {
 
     function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings, $sendAsHtml) {
-        if (preg_match("/\n|\r|\t|%0A|%0D|%08|%09/", $emailBuilder->to . $emailBuilder->subject)) {
+        $toEmails = implode(',', $emailBuilder->to);
+        if (preg_match("/\n|\r|\t|%0A|%0D|%08|%09/", $toEmails . $emailBuilder->subject)) {
             return false;
         }
 

api/autoload.php

@@ -23,4 +23,17 @@ require_once(__DIR__ . '/../inc/custom_fields.inc.php');
 // Load the ApplicationContext
 $builder = new \DI\ContainerBuilder();
 
-$applicationContext = $builder->build();
+$applicationContext = $builder->build();
+
+// Fix for getallheaders() on PHP-FPM and nginx
+if (!function_exists('getallheaders')) {
+    function getallheaders() {
+        $headers = array();
+        foreach ($_SERVER as $name => $value) {
+            if (substr($name, 0, 5) == 'HTTP_') {
+                $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
+            }
+        }
+        return $headers;
+    }
+}

build.php

@@ -1,4 +1,4 @@
 <?php
 
 // Define the current build
-define('MODS_FOR_HESK_BUILD', 46);
+define('MODS_FOR_HESK_BUILD', 49);

install/index.php

@@ -100,7 +100,7 @@ if (HESK_NEW_VERSION != $hesk_settings['hesk_version']) {
             </div>
             <?php if ($installMismatch): ?>
             <div class="text-center">
-                <h4>You need to be running HESK 2.7.3 to install Mods for HESK. You currently have HESK <?php echo $hesk_settings['hesk_version']; ?>.</h4>
+                <h4>You need to be running HESK <?php echo HESK_NEW_VERSION; ?> to install Mods for HESK. You currently have HESK <?php echo $hesk_settings['hesk_version']; ?>.</h4>
             </div>
             <?php else: // BEGIN INSTALL SCREENS ?>
             <div data-step="intro" class="login-box-msg">

install/migrations/core.php

@@ -218,5 +218,6 @@ function getAllMigrations() {
         161 => new UpdateMigration('3.2.2', '3.2.1', 161),
         162 => new UpdateMigration('3.2.3', '3.2.2', 162),
         163 => new UpdateMigration('3.2.4', '3.2.3', 163),
+        164 => new UpdateMigration('3.2.5', '3.2.4', 164),
     );
 }