mirror of
https://github.com/e107inc/e107.git
synced 2025-07-25 00:41:52 +02:00
Issue #5458 Make sure configured siteurl preference contains 'http'.
This commit is contained in:
@@ -362,7 +362,7 @@ $text = "
|
||||
<td><label for='siteurl'>".PRFLAN_3."</label>
|
||||
".($pref['siteurl'] == SITEURL ? "" : $frm->help(PRFLAN_159.": <strong>".SITEURL."</strong>"))."</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>
|
||||
</tr>
|
||||
<tr>
|
||||
|
@@ -5534,11 +5534,18 @@ class e107
|
||||
*/
|
||||
public function set_urls_deferred()
|
||||
{
|
||||
$siteurl = self::getPref('siteurl');
|
||||
|
||||
if(self::isCli())
|
||||
{
|
||||
define('SITEURL', self::getPref('siteurl'));
|
||||
define('SITEURL', $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
|
||||
{
|
||||
define('SITEURLBASE', $this->HTTP_SCHEME.'://'. filter_var($_SERVER['HTTP_HOST'], FILTER_SANITIZE_URL));
|
||||
|
Reference in New Issue
Block a user