Browse Source

Migrate to SITE_DOMAIN constant from (NON)SSL_SITE_URL

undefined
spaghetti 8 years ago
committed by Tomochin
parent
commit
e3d9eabd0c
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      design/privateheader.php
  2. +1
    -1
      design/publicheader.php

+ 2
- 2
design/privateheader.php View File

@@ -1,7 +1,7 @@
<? <?


define('FOOTER_FILE', SERVER_ROOT.'/design/privatefooter.php'); define('FOOTER_FILE', SERVER_ROOT.'/design/privatefooter.php');
$HTTPS = ($_SERVER['SERVER_PORT'] == 443) ? 'ssl_' : '';
$HTTPS = true;
$UseTooltipster = !isset(G::$LoggedUser['Tooltipster']) || G::$LoggedUser['Tooltipster']; $UseTooltipster = !isset(G::$LoggedUser['Tooltipster']) || G::$LoggedUser['Tooltipster'];


?> ?>
@@ -75,7 +75,7 @@ if ($Mobile) { ?>
$StyleURLInfo = parse_url(G::$LoggedUser['StyleURL']); $StyleURLInfo = parse_url(G::$LoggedUser['StyleURL']);
if (substr(G::$LoggedUser['StyleURL'], -4) == '.css' if (substr(G::$LoggedUser['StyleURL'], -4) == '.css'
&& empty($StyleURLInfo['query']) && empty($StyleURLInfo['fragment']) && empty($StyleURLInfo['query']) && empty($StyleURLInfo['fragment'])
&& in_array($StyleURLInfo['host'], array(NONSSL_SITE_URL, SSL_SITE_URL))
&& ($StyleURLInfo['host'] == SITE_DOMAIN)
&& file_exists(SERVER_ROOT.$StyleURLInfo['path'])) { && file_exists(SERVER_ROOT.$StyleURLInfo['path'])) {
$StyleURL = G::$LoggedUser['StyleURL'].'?v='.filemtime(SERVER_ROOT.$StyleURLInfo['path']); $StyleURL = G::$LoggedUser['StyleURL'].'?v='.filemtime(SERVER_ROOT.$StyleURLInfo['path']);
} else { } else {


+ 1
- 1
design/publicheader.php View File

@@ -1,5 +1,5 @@
<? <?
global $LoggedUser, $SSL;
global $LoggedUser;
define('FOOTER_FILE',SERVER_ROOT.'/design/publicfooter.php'); define('FOOTER_FILE',SERVER_ROOT.'/design/publicfooter.php');
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">


Loading…
Cancel
Save