dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix install redirection

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12934 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-02-02 14:22:31 +00:00
parent 99fc3f45d9
commit ce4852e1e5
1 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.inc.php
+20 -30
View File
@@ -42,19 +42,20 @@ ini_set('upload_max_filesize', '100M');
ini_set('default_charset', 'utf-8'); ini_set('default_charset', 'utf-8');
ini_set('magic_quotes_runtime', 0); ini_set('magic_quotes_runtime', 0);
// correct Apache charset (except if it's too late /* correct Apache charset (except if it's too late */
if(!headers_sent()) if (!headers_sent())
header('Content-Type: text/html; charset=utf-8'); header('Content-Type: text/html; charset=utf-8');
/* No settings file? goto installer...*/ /* No settings file? goto installer... */
if (!file_exists(dirname(__FILE__).'/settings.inc.php')) if (!file_exists(dirname(__FILE__).'/settings.inc.php'))
{ {
$dir = ((is_dir($_SERVER['REQUEST_URI']) OR substr($_SERVER['REQUEST_URI'], -1) == '/') ? $_SERVER['REQUEST_URI'] : dirname($_SERVER['REQUEST_URI']).'/'); $dir = ((is_dir($_SERVER['REQUEST_URI']) || substr($_SERVER['REQUEST_URI'], -1) == '/') ? $_SERVER['REQUEST_URI'] : dirname($_SERVER['REQUEST_URI']).'/');
if (!file_exists(dirname(__FILE__).'/../install-dev')) if (!file_exists(dirname(__FILE__).'/../install'))
die('Error: "install" directory is missing'); die('Error: "install" directory is missing');
header('Location: install-dev/'); header('Location: install-dev/');
exit; exit;
} }
require_once(dirname(__FILE__).'/settings.inc.php'); require_once(dirname(__FILE__).'/settings.inc.php');
require_once(dirname(__FILE__).'/defines.inc.php'); require_once(dirname(__FILE__).'/defines.inc.php');
require_once(dirname(__FILE__).'/autoload.php'); require_once(dirname(__FILE__).'/autoload.php');
@@ -68,27 +69,23 @@ if (_PS_DEBUG_PROFILING_)
} }
/* Redefine REQUEST_URI if empty (on some webservers...) */ /* Redefine REQUEST_URI if empty (on some webservers...) */
if (!isset($_SERVER['REQUEST_URI']) OR empty($_SERVER['REQUEST_URI'])) if (!isset($_SERVER['REQUEST_URI']) || empty($_SERVER['REQUEST_URI']))
{ {
if (substr($_SERVER['SCRIPT_NAME'], -9) == 'index.php' && empty($_SERVER['QUERY_STRING'])) if (basename($_SERVER['SCRIPT_NAME']) == 'index.php' && empty($_SERVER['QUERY_STRING']))
$_SERVER['REQUEST_URI'] = dirname($_SERVER['SCRIPT_NAME']).'/'; $_SERVER['REQUEST_URI'] = dirname($_SERVER['SCRIPT_NAME']).'/';
else else
{ {
$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME']; $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
if (isset($_SERVER['QUERY_STRING']) AND !empty($_SERVER['QUERY_STRING'])) if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']))
$_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING']; $_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING'];
} }
} }
// Trying to redefine HTTP_HOST if empty (on some webservers...) /* Trying to redefine HTTP_HOST if empty (on some webservers...) */
if (!isset($_SERVER['HTTP_HOST']) || empty($_SERVER['HTTP_HOST'])) if (!isset($_SERVER['HTTP_HOST']) || empty($_SERVER['HTTP_HOST']))
$_SERVER['HTTP_HOST'] = @getenv('HTTP_HOST'); $_SERVER['HTTP_HOST'] = @getenv('HTTP_HOST');
/* Initialize the current Shop */
if (!defined('_PS_MAGIC_QUOTES_GPC_'))
define('_PS_MAGIC_QUOTES_GPC_', get_magic_quotes_gpc());
/* Set the current Shop */
Context::getContext()->shop = Shop::initialize(); Context::getContext()->shop = Shop::initialize();
define('_THEME_NAME_', Context::getContext()->shop->getTheme()); define('_THEME_NAME_', Context::getContext()->shop->getTheme());
define('__PS_BASE_URI__', Context::getContext()->shop->getBaseURI()); define('__PS_BASE_URI__', Context::getContext()->shop->getBaseURI());
@@ -96,16 +93,13 @@ define('__PS_BASE_URI__', Context::getContext()->shop->getBaseURI());
/* Include all defines related to base uri and theme name */ /* Include all defines related to base uri and theme name */
require_once(dirname(__FILE__).'/defines_uri.inc.php'); require_once(dirname(__FILE__).'/defines_uri.inc.php');
if (!defined('_PS_MODULE_DIR_'))
define('_PS_MODULE_DIR_', _PS_ROOT_DIR_.'/modules/');
global $_MODULES; global $_MODULES;
$_MODULES = array(); $_MODULES = array();
/* Load all configuration keys */ /* Load configuration */
Configuration::loadConfiguration(); Configuration::loadConfiguration();
/* Load all language definitions */ /* Load all languages */
Language::loadLanguages(); Language::loadLanguages();
/* Loading default country */ /* Loading default country */
@@ -159,16 +153,17 @@ else
Context::getContext()->customer = $customer; Context::getContext()->customer = $customer;
} }
// if the language stored in the cookie is not available language, use default language /* if the language stored in the cookie is not available language, use default language */
if (isset($cookie->id_lang) && $cookie->id_lang) if (isset($cookie->id_lang) && $cookie->id_lang)
$language = new Language($cookie->id_lang); $language = new Language($cookie->id_lang);
if (!isset($language) || !Validate::isLoadedObject($language)) if (!isset($language) || !Validate::isLoadedObject($language))
$language = new Language(Configuration::get('PS_LANG_DEFAULT')); $language = new Language(Configuration::get('PS_LANG_DEFAULT'));
Context::getContext()->language = $language; Context::getContext()->language = $language;
/* Define order state */ /**
// DEPRECATED : these defines are going to be deleted on 1.6 version of Prestashop * @deprecated : these defines are going to be deleted on 1.6 version of Prestashop
// USE : Configuration::get() method in order to getting the id of order state * USE : Configuration::get() method in order to getting the id of order state
*/
define('_PS_OS_CHEQUE_', Configuration::get('PS_OS_CHEQUE')); define('_PS_OS_CHEQUE_', Configuration::get('PS_OS_CHEQUE'));
define('_PS_OS_PAYMENT_', Configuration::get('PS_OS_PAYMENT')); define('_PS_OS_PAYMENT_', Configuration::get('PS_OS_PAYMENT'));
define('_PS_OS_PREPARATION_', Configuration::get('PS_OS_PREPARATION')); define('_PS_OS_PREPARATION_', Configuration::get('PS_OS_PREPARATION'));
@@ -182,11 +177,6 @@ define('_PS_OS_BANKWIRE_', Configuration::get('PS_OS_BANKWIRE'));
define('_PS_OS_PAYPAL_', Configuration::get('PS_OS_PAYPAL')); define('_PS_OS_PAYPAL_', Configuration::get('PS_OS_PAYPAL'));
define('_PS_OS_WS_PAYMENT_', Configuration::get('PS_OS_WS_PAYMENT')); define('_PS_OS_WS_PAYMENT_', Configuration::get('PS_OS_WS_PAYMENT'));
/* Smarty */ /* Get smarty */
require_once(dirname(__FILE__).'/smarty.config.inc.php'); require_once(dirname(__FILE__).'/smarty.config.inc.php');
Context::getContext()->smarty = $smarty;
Context::getContext()->smarty = $smarty;
/* Possible value are true, false, 'URL'
(for 'URL' append SMARTY_DEBUG as a parameter to the url)
default is false for production environment */
define('SMARTY_DEBUG_CONSOLE', false);