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

//fix correction norm in SQL manager

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8822 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-09-28 07:10:24 +00:00
parent a1a1c8340e
commit 8a4c8e1d04
9 changed files with 2263 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/requestSql.php
+42 -37
View File
@@ -1,6 +1,6 @@
<?php
/*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -24,49 +24,56 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
define('PS_ADMIN_DIR', getcwd());
include(PS_ADMIN_DIR.'/../config/config.inc.php');
include(PS_ADMIN_DIR.'/functions.php');
$file = 'request_sql_'.Tools::getValue('id_request_sql').'.csv';
if ($csv = fopen(PS_ADMIN_DIR.'/export/'.$file, 'w'))
if ($id = Tools::getValue('id_request_sql'))
{
$sql = RequestSql::getRequestSqlById(Tools::getValue('id_request_sql'));
if ($sql)
$file = 'request_sql_'.$id.'.csv';
if ($csv = fopen(PS_ADMIN_DIR.'/export/'.$file, 'w'))
{
$results = Db::getInstance()->ExecuteS($sql[0]['sql']);
foreach (array_keys($results[0]) as $key)
$sql = RequestSql::getRequestSqlById($id);
if ($sql)
{
$tab_key[] = $key;
fputs($csv, $key.';');
}
foreach ($results as $result)
{
fputs($csv, "\n");
foreach ($tab_key as $name)
fputs($csv, $result[$name].';');
}
if (file_exists(PS_ADMIN_DIR.'/export/'.$file))
{
$filesize = filesize(PS_ADMIN_DIR.'/export/'.$file);
$upload_max_filesize = return_bytes(ini_get('upload_max_filesize'));
if ($filesize < $upload_max_filesize)
$results = Db::getInstance()->ExecuteS($sql[0]['sql']);
foreach (array_keys($results[0]) as $key)
{
header("Content-type: text/csv");
header("Cache-Control: no-store, no-cache");
header("Content-Disposition: attachment; filename=\"$file\"");
header("Content-Length: ".$filesize);
readfile(PS_ADMIN_DIR.'/export/'.$file);
die();
$tab_key[] = $key;
fputs($csv, $key.';');
}
else
foreach ($results as $result)
{
header('Location: '.$_SERVER['HTTP_REFERER'].'&maxsize=1');
die();
fputs($csv, "\n");
foreach ($tab_key as $name)
fputs($csv, '"'.Tools::safeOutput($result[$name]).'";');
}
if (file_exists(PS_ADMIN_DIR.'/export/'.$file))
{
$filesize = filesize(PS_ADMIN_DIR.'/export/'.$file);
$upload_max_filesize = returnBytes(ini_get('upload_max_filesize'));
if ($filesize < $upload_max_filesize)
{
header('Content-type: text/csv');
header('Cache-Control: no-store, no-cache');
header('Content-Disposition: attachment; filename="$file"');
header('Content-Length: '.$filesize);
readfile(PS_ADMIN_DIR.'/export/'.$file);
die();
}
else
{
header('Location: '.$_SERVER['HTTP_REFERER'].'&maxsize=1');
die();
}
}
}
else
{
header('Location: '.$_SERVER['HTTP_REFERER']);
die();
}
}
else
@@ -81,13 +88,12 @@ else
die();
}
function return_bytes($val)
function returnBytes($val)
{
$val = trim($val);
$last = strtolower($val[strlen($val)-1]);
$last = strtolower($val[strlen($val) - 1]);
switch ($last)
{
// Le modifieur 'G' est disponible depuis PHP 5.1.0
{
case 'g':
$val *= 1024;
case 'm':
@@ -95,6 +101,5 @@ function return_bytes($val)
case 'k':
$val *= 1024;
}
return $val;
}