forks/baikal
1
0
Fork 0
Code Releases Activity

Fixed incorrect protocol (http/https) detection

Browse source
This commit is contained in:
Jérôme Schneider 2012-07-05 22:51:00 +02:00
parent 1e4ae8ef8d
commit fc7c241e26
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CoreVersions/0.2.0/Frameworks/Flake/Framework.php
View file

@ -108,6 +108,10 @@ class Framework extends \Flake\Core\Framework {
# Define path to Baïkal SQLite file # Define path to Baïkal SQLite file
define("PROJECT_SQLITE_FILE", PROJECT_PATH_SPECIFIC . "db/.ht.db.sqlite"); define("PROJECT_SQLITE_FILE", PROJECT_PATH_SPECIFIC . "db/.ht.db.sqlite");
# Activate Flake class loader
require_once(FLAKE_PATH_ROOT . 'Core/ClassLoader.php');
\Flake\Core\ClassLoader::register();
# Asserting DB file exists # Asserting DB file exists
if(!file_exists(PROJECT_SQLITE_FILE)) { if(!file_exists(PROJECT_SQLITE_FILE)) {
die("<h3>DB file does not exist. To create it, please copy '<span style='font-family: monospace; background: yellow;'>Core/Resources/db.empty.sqlite</span>' to '<span style='font-family: monospace;background: yellow;'>Specific/db/.ht.db.sqlite</span>'</h3>"); die("<h3>DB file does not exist. To create it, please copy '<span style='font-family: monospace; background: yellow;'>Core/Resources/db.empty.sqlite</span>' to '<span style='font-family: monospace;background: yellow;'>Specific/db/.ht.db.sqlite</span>'</h3>");
@ -129,19 +133,15 @@ class Framework extends \Flake\Core\Framework {
$sScript = substr($_SERVER["SCRIPT_FILENAME"], strlen($_SERVER["DOCUMENT_ROOT"])); $sScript = substr($_SERVER["SCRIPT_FILENAME"], strlen($_SERVER["DOCUMENT_ROOT"]));
$sDirName = self::appendSlash(dirname($sScript)); $sDirName = self::appendSlash(dirname($sScript));
$sBaseUrl = self::appendSlash(substr($sDirName, 0, -1 * strlen(PROJECT_CONTEXT_BASEURI))); $sBaseUrl = self::appendSlash(substr($sDirName, 0, -1 * strlen(PROJECT_CONTEXT_BASEURI)));
$aParts = explode("/", $_SERVER["SERVER_PROTOCOL"]); $sProtocol = \Flake\Util\Tools::getCurrentProtocol();
$sProtocol = strtolower(array_shift($aParts));
define("PROJECT_BASEURI", $sBaseUrl); define("PROJECT_BASEURI", $sBaseUrl);
define("PROJECT_URI", $sProtocol . "://" . self::rmEndSlash($_SERVER["HTTP_HOST"]) . $sBaseUrl); define("PROJECT_URI", $sProtocol . "://" . self::rmEndSlash($_SERVER["HTTP_HOST"]) . $sBaseUrl);
unset($sScript); unset($sDirName); unset($sBaseUrl); unset($sProtocol); unset($aParts); unset($sScript); unset($sDirName); unset($sBaseUrl); unset($sProtocol);
################################################################################################# #################################################################################################
require_once(FLAKE_PATH_ROOT . 'Util/Twig/lib/Twig/Autoloader.php'); require_once(FLAKE_PATH_ROOT . 'Util/Twig/lib/Twig/Autoloader.php');
\Twig_Autoloader::register(); \Twig_Autoloader::register();
require_once(FLAKE_PATH_ROOT . 'Core/ClassLoader.php');
\Flake\Core\ClassLoader::register();
# Include Flake Framework config # Include Flake Framework config
require_once(FLAKE_PATH_ROOT . "config.php"); require_once(FLAKE_PATH_ROOT . "config.php");

8
CoreVersions/0.2.0/Frameworks/Flake/Util/Tools.php
View file

@ -44,6 +44,14 @@ class Tools extends \Flake\Core\FLObject {
return $sUrl; return $sUrl;
} }
public static function getCurrentProtocol() {
if((!empty($GLOBALS["_SERVER"]["HTTPS"]) && $GLOBALS["_SERVER"]['HTTPS'] !== 'off') || intval($_SERVER['SERVER_PORT']) === 443) {
return "https";
}
return "http";
}
public static function getUrlTokens() { public static function getUrlTokens() {
$sUrl = self::stripBeginSlash(self::getCurrentUrl()); $sUrl = self::stripBeginSlash(self::getCurrentUrl());