Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
3.2.5

See merge request mike-koch/Mods-for-HESK!85
This commit is contained in:
Mike Koch 2017-12-07 02:44:58 +00:00
commit 354bb91234
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/BusinessLogic/Emails/BasicEmailSender.php
View File

@ -10,7 +10,8 @@ use PHPMailer;
class BasicEmailSender extends \BaseClass implements EmailSender { class BasicEmailSender extends \BaseClass implements EmailSender {
function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings, $sendAsHtml) { 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; return false;
} }

13
api/autoload.php
View File

@ -24,3 +24,16 @@ require_once(__DIR__ . '/../inc/custom_fields.inc.php');
$builder = new \DI\ContainerBuilder(); $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;
}
}

2
build.php
View File

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

2
install/index.php
View File

@ -100,7 +100,7 @@ if (HESK_NEW_VERSION != $hesk_settings['hesk_version']) {
</div> </div>
<?php if ($installMismatch): ?> <?php if ($installMismatch): ?>
<div class="text-center"> <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> </div>
<?php else: // BEGIN INSTALL SCREENS ?> <?php else: // BEGIN INSTALL SCREENS ?>
<div data-step="intro" class="login-box-msg"> <div data-step="intro" class="login-box-msg">

1
install/migrations/core.php
View File

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