Skip to content

Commit 049d38a

Browse files
committed
Secure ini, refer to Ini from mail parser
1 parent 622d19a commit 049d38a

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/Mail/MailParser.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php namespace October\Rain\Mail;
22

3+
use October\Rain\Support\Facades\Ini;
4+
35
/**
46
* This class parses Mail templates.
57
* Returns the structured file information.
@@ -47,18 +49,18 @@ public static function parse($content)
4749
];
4850

4951
if ($count >= 4) {
50-
$result['settings'] = parse_ini_string($sections[0], true);
52+
$result['settings'] = Ini::parse($sections[0]);
5153
$result['text'] = $sections[1];
5254
$result['html'] = $sections[2];
5355
$result['css'] = $sections[3];
5456
}
5557
elseif ($count >= 3) {
56-
$result['settings'] = parse_ini_string($sections[0], true);
58+
$result['settings'] = Ini::parse($sections[0]);
5759
$result['text'] = $sections[1];
5860
$result['html'] = $sections[2];
5961
}
6062
elseif ($count === 2) {
61-
$result['settings'] = parse_ini_string($sections[0], true);
63+
$result['settings'] = Ini::parse($sections[0]);
6264
$result['html'] = $sections[1];
6365
}
6466
elseif ($count === 1) {

src/Parse/Ini.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Ini
2020
public function parse($contents)
2121
{
2222
$contents = $this->parsePreProcess($contents);
23-
$contents = parse_ini_string($contents, true);
23+
$contents = parse_ini_string($contents, true, INI_SCANNER_RAW);
2424
$contents = $this->parsePostProcess($contents);
2525
return $contents;
2626
}

0 commit comments

Comments
 (0)