Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=9b44b3a037f23b28af82f4023fee7d8481ee6671
commit 9b44b3a037f23b28af82f4023fee7d8481ee6671 Author: PacMiam <[email protected]> Date: Fri Apr 4 10:59:26 2014 +0200 * Change the way to get fwng_root and fix wrong path in craftyslide.css diff --git a/frugalware/lib/config.inc.php b/frugalware/lib/config.inc.php index c9c6933..6bdcb0a 100644 --- a/frugalware/lib/config.inc.php +++ b/frugalware/lib/config.inc.php @@ -11,8 +11,21 @@ $sqlpass = "85Tdjf{Od"; $sqldb = "frugalware2"; # FWNG SETTINGS -// $http_mode = ($_SERVER['HTTPS'] == "on" ? 'https' : 'http'); -$fwng_root = "https://" . $_SERVER["SERVER_NAME"] . "/"; +$serverName = $_SERVER["SERVER_NAME"]; +$check_www = explode(".", $serverName); + +// frugalware.org +if ($check_www[0] != "www") + // Check if https is available + $http_mode = ($_SERVER['HTTPS'] == "on" ? 'https:' : 'http:'); + +// www.frugalware.org +else + // This server name is special because it can cause a mixed content error + // We can't check if https is available, so we use relative path + $http_mode = ""; + +$fwng_root = $http_mode . "//" . $serverName . "/"; $adodb_path = "/usr/share/php"; $trans_path="/home/ftp/pub/other/translations/"; diff --git a/frugalware/static/css/craftyslide.css b/frugalware/static/css/craftyslide.css index 3050348..47bc53d 100644 --- a/frugalware/static/css/craftyslide.css +++ b/frugalware/static/css/craftyslide.css @@ -28,7 +28,7 @@ Craftyslide CSS Styles } #slideshow ul li img { - cursor: url("../images/icons/magnify.png"), -moz-zoom-in; + cursor: url("../../images/icons/magnify.png"), -moz-zoom-in; } #pagination { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
