mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-26 01:11:28 +02:00
Code Issues Releases Wiki Activity

Issue #5458 Make sure configured siteurl preference contains 'http'.

Browse Source
This commit is contained in:
camer0n
2025-03-30 09:09:52 -07:00
parent 16eaf7b59a
commit 4a5025992f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/prefs.php
View File

@@ -362,7 +362,7 @@ $text = "
<td><label for='siteurl'>".PRFLAN_3."</label> <td><label for='siteurl'>".PRFLAN_3."</label>
".($pref['siteurl'] == SITEURL ? "" : $frm->help(PRFLAN_159.": <strong>".SITEURL."</strong>"))."</td> ".($pref['siteurl'] == SITEURL ? "" : $frm->help(PRFLAN_159.": <strong>".SITEURL."</strong>"))."</td>
<td> <td>
".$frm->text('siteurl', $pref['siteurl'], 150, 'size=xxlarge')." ".$frm->text('siteurl', $pref['siteurl'], 150, ['size'=>'xxlarge', 'required'=>1, 'pattern' => '^http.*', 'placeholder'=>'eg. '.SITEURL])."
</td> </td>
</tr> </tr>
<tr> <tr>

9
e107_handlers/e107_class.php
View File

@@ -5534,11 +5534,18 @@ class e107
*/ */
public function set_urls_deferred() public function set_urls_deferred()
{ {
$siteurl = self::getPref('siteurl');
if(self::isCli()) if(self::isCli())
{ {
define('SITEURL', self::getPref('siteurl')); define('SITEURL', $siteurl);
define('SITEURLBASE', rtrim(SITEURL,'/')); define('SITEURLBASE', rtrim(SITEURL,'/'));
} }
elseif(strpos($siteurl,'http')!== false && strpos($siteurl, $_SERVER['HTTP_HOST'])===false)
{
die('Site Configuration Issue Detected. Please contact your webmaster.');
error_log('The configured siteurl in your preferences does not match the HTTP_HOST: '.$_SERVER['HTTP_HOST']);
}
else else
{ {
define('SITEURLBASE', $this->HTTP_SCHEME.'://'. filter_var($_SERVER['HTTP_HOST'], FILTER_SANITIZE_URL)); define('SITEURLBASE', $this->HTTP_SCHEME.'://'. filter_var($_SERVER['HTTP_HOST'], FILTER_SANITIZE_URL));