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

// Merge -> revision 9221

Browse Source
This commit is contained in:
rMalie
2011-10-11 12:45:12 +00:00
parent b0cc80ad01
commit eeb5b16112
77 changed files with 1987 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/index.php
-8
View File
@@ -992,9 +992,6 @@ if ($lm->getIncludeTradFilename())
<td id="endEmail" class="resultEnd">&nbsp;</td>
</tr>
</table>
<h3 class="infosBlock"><?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'); ?></h3>
<div id="boBlock" class="blockInfoEnd clearfix">
<img src="img/visu_boBlock.png" />
<h3><?php echo lang('Back Office'); ?></h3>
@@ -1326,11 +1323,6 @@ if ($lm->getIncludeTradFilename())
}
?>
<div class="infosBlock">
<?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'); ?>
</div>
<div id="foBlock" class="blockInfoEnd clearfix">
<img src="img/visu_foBlock.png" />
<h3><?php echo lang('Front Office'); ?></h3>
install-dev/langs/de.php
-1
View File
@@ -140,7 +140,6 @@ $_LANG['Update is complete!'] = 'Aktualisierung beendet!';
$_LANG['Upgrade: get the latest stable version!'] = 'Aktualisierung: Installieren Sie die neueste Version von PrestaShop';
$_LANG['Verify now!'] = 'Testen der SQL-Verbindung';
$_LANG['Verify system compatibility'] = 'Systemkompatibilität';
$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'VORSICHT: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\' und die readme-Dateien (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Vorsicht: eine manuelle Sicherung ist UNERLÄSSLICH, bevor mit der Aktualisierung der PrestaShop-Anwendung begonnen wird, um jeglichen versehentlichen Datenverlust zu verhindern';
$_LANG['Welcome'] = 'Willkommen';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Willkommen bei der Installation von PrestaShop %s';
install-dev/langs/es.php
-1
View File
@@ -138,7 +138,6 @@ $_LANG['Update is complete!'] = '¬°Actualización completa!';
$_LANG['Upgrade: get the latest stable version!'] = 'Actualización: instale la última versión de PrestaShop';
$_LANG['Verify now!'] = '¬°Pruebe ahora!';
$_LANG['Verify system compatibility'] = 'Compatibilidad sistema';
$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATENCION : para más seguridad, por favor suprima la carpeta \'/install\' y los archivos readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG)..';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = '¬°Atención: se recomienda hacer una copia de seguridad manual antes de continuar!';
$_LANG['Welcome'] = 'Bienvenido';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenido a la instalación de PrestaShop %s';
install-dev/langs/fr.php
+1 -2
View File
@@ -20,7 +20,7 @@ $_LANG['Community Forum'] = 'notre forum communautaire';
$_LANG['Configure SMTP manually (advanced users only)'] = 'Configurer l\'envoi SMTP (experts uniquement)';
$_LANG['Configure your database by filling out the following fields:'] = 'Configurez votre base de données en remplissant les champs ci-dessous :';
$_LANG['Congratulation, your online shop is now ready!'] = 'Félicitations, votre boutique est installée !';
$_LANG['Contact us!'] = 'Contactez-nous !';
$_LANG['Contact us!'] = 'Contactez-nous';
$_LANG['Create new files and folders allowed'] = 'Création de nouveaux dossiers et fichiers autorisée';
$_LANG['Your database connection settings are not valid. Please check your server, name, login and prefix.'] = 'Vos informations de connexion à la base de données ne sont pas valides. Veuillez vérifier le serveur, nom, login et préfixe que vous avez indiqué.';
$_LANG['Database Server is available but database is not found'] = 'Le serveur de bases de données est disponible mais la base de données n\'a pas été trouvée';
@@ -141,7 +141,6 @@ $_LANG['Update is complete!'] = 'Mise à jour terminée !';
$_LANG['Upgrade: get the latest stable version!'] = 'Mise à jour : installez la dernière version de PrestaShop';
$_LANG['Verify now!'] = 'Tester la connexion';
$_LANG['Verify system compatibility'] = 'Compatibilité système';
$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENTION : pour plus de sécurité, merci de supprimer le dossier \'/install\' et les fichiers readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attention : une sauvegarde manuelle est INDISPENSABLE avant de procéder à la mise à jour de l\'application PrestaShop, cela afin de prévenir toute perte de données accidentelle';
$_LANG['Welcome'] = 'Bienvenue';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenue dans l\'installation de PrestaShop %s';
install-dev/langs/it.php
-1
View File
@@ -140,7 +140,6 @@ $_LANG['Update is complete!'] = 'Aggiornamento terminato!';
$_LANG['Upgrade: get the latest stable version!'] = 'Aggiornamento installa l\'ultima versione di PrestaShop';
$_LANG['Verify now!'] = 'Prova la connessione SQL';
$_LANG['Verify system compatibility'] = 'Compatibilità sistema';
$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENZIONE: per motivi di sicurezza, adesso devi cancellare la cartella \'install\' e i file readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attenzione: E\' FONDAMENTALE un backup manuale prima di continuare l\'aggiornamento dell\'applicazione Prestashop, al fine di evitare la perdita accidentale di dati.';
$_LANG['Welcome'] = 'Benvenuto';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Benvenuto nell\'installazione di PrestaShop %s';
install-dev/langs/us.php
-1
View File
@@ -64,7 +64,6 @@ $_LANG['This is not a valid image file.'] = 'Invalid image file';
$_LANG['Too long!'] = 'Too long';
$_LANG['Upgrade: get the latest stable version!'] = 'Update: Get the latest stable version';
$_LANG['Verify system compatibility'] = 'System Compatibility';
$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'WARNING! A manual backup is HIGHLY recommended before continuing.';
$_LANG['Welcome'] = 'Welcome!';
$_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Welcome to the PrestaShop™ v'.INSTALL_VERSION.' Installer wizard.';
install-dev/model.php
+1 -2
View File
@@ -113,5 +113,4 @@ if (isset($_GET['method']))
require_once('xml/getVersionFromDb.php');
break;
}
}
}
install-dev/php/country_to_timezone.php
+1 -1
View File
@@ -63,7 +63,7 @@ $timezones = array(
'BW' => 'Africa/Gaborone',
'BY' => 'Europe/Minsk',
'BZ' => 'America/Belize',
'CA' => 'America/St_Johns',
'CA' => 'America/Toronto',
'CC' => 'Indian/Cocos',
'CD' => 'Africa/Kinshasa',
'CF' => 'Africa/Bangui',
install-dev/sql/upgrade/1.4.5.0.sql
+1 -1
View File
@@ -38,7 +38,7 @@ INSERT INTO `PREFIX_hook` (`name`, `title`, `description`, `position`, `live_edi
ALTER TABLE `PREFIX_employee` ADD `bo_show_screencast` TINYINT(1) NOT NULL DEFAULT '1' AFTER `bo_uimode`;
UPDATE `PREFIX_country` SET id_zone = (SELECT id_zone FROM `PREFIX_zone` WHERE name = 'Oceania') WHERE iso_code = 'KI' LIMIT 1
UPDATE `PREFIX_country` SET id_zone = (SELECT id_zone FROM `PREFIX_zone` WHERE name = 'Oceania' LIMIT 1) WHERE iso_code = 'KI' LIMIT 1;
ALTER TABLE `PREFIX_lang` ADD `date_format_lite` char(32) NOT NULL DEFAULT 'Y-m-d' AFTER language_code;
ALTER TABLE `PREFIX_lang` ADD `date_format_full` char(32) NOT NULL DEFAULT 'Y-m-d H:i:s' AFTER date_format_lite;
install-dev/xml/createDB.php
+34 -22
View File
@@ -46,7 +46,8 @@ global $logger;
//check db access
include_once(INSTALL_PATH.'/classes/ToolsInstall.php');
$resultDB = ToolsInstall::checkDB($_GET['server'], $_GET['login'], $_GET['password'], $_GET['name'], true);
if ($resultDB !== true){
if ($resultDB !== true)
{
$logger->logError('Invalid database configuration');
die("<action result='fail' error='".$resultDB."'/>\n");
}
@@ -102,19 +103,20 @@ require_once(SETTINGS_FILE);
//-----------
//import SQL data
//-----------
switch (_DB_TYPE_) {
case "MySQL" :
switch (_DB_TYPE_)
{
case 'MySQL':
$filePrefix = 'PREFIX_';
$engineType = 'ENGINE_TYPE';
//send the SQL structure file requests
$structureFile = dirname(__FILE__)."/../sql/db.sql";
$structureFile = dirname(__FILE__).'/../sql/db.sql';
if(!file_exists($structureFile))
{
$logger->logError('Impossible to access to a MySQL content file. ('.$structureFile.')');
die('<action result="fail" error="10" />'."\n");
}
$db_structure_settings ="";
$db_structure_settings = '';
if ( !$db_structure_settings .= file_get_contents($structureFile) )
{
$logger->logError('Impossible to read the content of a MySQL content file. ('.$structureFile.')');
@@ -128,14 +130,20 @@ switch (_DB_TYPE_) {
array_unshift($db_structure_settings, 'CREATE DATABASE `'.trim($_GET['name']).'`;');
array_unshift($db_structure_settings, 'DROP DATABASE `'.trim($_GET['name']).'`;');
}
foreach($db_structure_settings as $query){
foreach ($db_structure_settings as $query)
{
$query = trim($query);
if(!empty($query)){
if(!Db::getInstance()->execute($query)){
if(Db::getInstance()->getNumberError() == 1050){
if (!empty($query))
{
if (!Db::getInstance()->Execute($query))
{
if (Db::getInstance()->getNumberError() == 1050)
{
$logger->logError('A Prestashop database already exists, please drop it or change the prefix.');
die('<action result="fail" error="14" />'."\n");
} else {
}
else
{
$logger->logError('SQL query: '."\r\n".$query);
$logger->logError('SQL error: '."\r\n".Db::getInstance()->getMsgError());
die(
@@ -153,17 +161,17 @@ switch (_DB_TYPE_) {
}
//send the SQL data file requests
$db_data_settings = '';
$db_data_settings = "";
$liteFile = dirname(__FILE__)."/../sql/db_settings_lite.sql";
$liteFile = dirname(__FILE__).'/../sql/db_settings_lite.sql';
if(!file_exists($liteFile))
die('<action result="fail" error="10" />'."\n");
if ( !$db_data_settings .= file_get_contents( $liteFile ) )
die('<action result="fail" error="9" />'."\n");
if($_GET['mode'] == "full"){
$fullFile = dirname(__FILE__)."/../sql/db_settings_extends.sql";
if ($_GET['mode'] == 'full')
{
$fullFile = dirname(__FILE__).'/../sql/db_settings_extends.sql';
if(!file_exists($fullFile))
{
$logger->logError('Impossible to access to a MySQL content file. ('.$fullFile.')');
@@ -182,13 +190,17 @@ switch (_DB_TYPE_) {
$db_data_settings = preg_split("/;\s*[\r\n]+/",$db_data_settings);
/* UTF-8 support */
array_unshift($db_data_settings, 'SET NAMES \'utf8\';');
foreach($db_data_settings as $query){
foreach ($db_data_settings as $query)
{
$query = trim($query);
if(!empty($query)){
if(!Db::getInstance()->execute($query)){
if(Db::getInstance()->getNumberError() == 1050){
if (!empty($query))
{
if (!Db::getInstance()->Execute($query))
{
if (Db::getInstance()->getNumberError() == 1050)
die('<action result="fail" error="14" />'."\n");
} else {
else
{
$logger->logError('SQL query: '."\r\n".$query);
$logger->logError('SQL error: '."\r\n".Db::getInstance()->getMsgError());
die(
@@ -206,6 +218,7 @@ switch (_DB_TYPE_) {
}
break;
}
$xml = '<result><action result="ok" error="" />'."\n";
$countries = Db::getInstance()->executeS('
@@ -226,5 +239,4 @@ foreach ($timezones as $timezone)
$xml .= "\t".'<timezone value="'.$timezone['name'].'" name="'.$timezone['name'].'" />'."\n";
$xml .= '</timezones></result>'."\n";
die($xml);
die($xml);