gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2014-05-10 12:06:19 +02:00
commit c93a2f8c0f
7 changed files with 50 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
export.php
View File

@ -298,25 +298,13 @@ if (!defined('TESTSUITE')) {
// problem opening export file on server?
if (! empty($message)) {
if ($export_type == 'server') {
$active_page = 'server_export.php';
include 'server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
include 'db_export.php';
} else {
$active_page = 'tbl_export.php';
include 'tbl_export.php';
}
exit();
PMA_showExportPage($export_type);
}
}
/**
* Send headers depending on whether the user chose to download a dump file
* or not
*/
if (! $save_on_server) {
} else {
/**
* Send headers depending on whether the user chose to download a dump file
* or not
*/
if ($asfile) {
// Download
// (avoid rewriting data containing HTML with anchors and forms;
@ -414,17 +402,7 @@ if (!defined('TESTSUITE')) {
// End of fake loop
if ($save_on_server && ! empty($message)) {
if ($export_type == 'server') {
$active_page = 'server_export.php';
include 'server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
include 'db_export.php';
} else {
$active_page = 'tbl_export.php';
include 'tbl_export.php';
}
exit();
PMA_showExportPage($export_type);
}
/**
@ -451,17 +429,7 @@ if (!defined('TESTSUITE')) {
$message = PMA_closeExportFile(
$file_handle, $dump_buffer, $save_filename
);
if ($export_type == 'server') {
$active_page = 'server_export.php';
include_once 'server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
include_once 'db_export.php';
} else {
$active_page = 'tbl_export.php';
include_once 'tbl_export.php';
}
exit();
PMA_showExportPage($export_type);
} else {
echo $dump_buffer;
}

8
libraries/Config.class.php
View File

@ -758,10 +758,10 @@ class PMA_Config
}
$data = @curl_exec($ch);
if (! defined('TESTSUITE')) {
ini_set('session.use_only_cookies', false);
ini_set('session.use_cookies', false);
ini_set('session.use_trans_sid', false);
ini_set('session.cache_limiter', null);
ini_set('session.use_only_cookies', 'false');
ini_set('session.use_cookies', 'false');
ini_set('session.use_trans_sid', 'false');
ini_set('session.cache_limiter', 'nocache');
session_start();
}
if ($data === false) {

8
libraries/Util.class.php
View File

@ -4238,10 +4238,10 @@ class PMA_Util
&& $save
) {
if (! isset($_SESSION) && ! defined('TESTSUITE')) {
ini_set('session.use_only_cookies', false);
ini_set('session.use_cookies', false);
ini_set('session.use_trans_sid', false);
ini_set('session.cache_limiter', null);
ini_set('session.use_only_cookies', 'false');
ini_set('session.use_cookies', 'false');
ini_set('session.use_trans_sid', 'false');
ini_set('session.cache_limiter', 'nocache');
session_start();
}
$_SESSION['cache']['version_check'] = array(

2
libraries/common.inc.php
View File

@ -70,7 +70,7 @@ if (version_compare(phpversion(), '5.4', 'lt')) {
/**
* Avoid problems with magic_quotes_runtime
*/
@ini_set('magic_quotes_runtime', false);
@ini_set('magic_quotes_runtime', 'false');
}
/**

6
libraries/config/Validator.class.php
View File

@ -182,9 +182,9 @@ class PMA_Validator
$old_track_errors = ini_get('track_errors');
$old_display_errors = ini_get('display_errors');
$old_error_reporting = error_reporting(E_ALL);
ini_set('html_errors', false);
ini_set('track_errors', true);
ini_set('display_errors', true);
ini_set('html_errors', 'false');
ini_set('track_errors', 'true');
ini_set('display_errors', 'true');
set_error_handler(array("PMA_Validator", "nullErrorHandler"));
ob_start();
} else {

22
libraries/export.lib.php
View File

@ -741,4 +741,26 @@ function PMA_exportTable(
return;
}
}
/**
* Loads correct page after doing export
*
* @param string $export_type Export type
*
* @return void
*/
function PMA_showExportPage($export_type)
{
if ($export_type == 'server') {
$active_page = 'server_export.php';
include_once 'server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
include_once 'db_export.php';
} else {
$active_page = 'tbl_export.php';
include_once 'tbl_export.php';
}
exit();
}
?>

16
libraries/session.inc.php
View File

@ -25,7 +25,7 @@ if (!@function_exists('session_name')) {
// disable starting of sessions before all settings are done
// does not work, besides how it is written in php manual
//ini_set('session.auto_start', 0);
//ini_set('session.auto_start', '0');
// session cookie settings
session_set_cookie_params(
@ -34,7 +34,7 @@ session_set_cookie_params(
);
// cookies are safer (use @ini_set() in case this function is disabled)
@ini_set('session.use_cookies', true);
@ini_set('session.use_cookies', 'true');
// optionally set session_save_path
$path = $GLOBALS['PMA_Config']->get('SessionSavePath');
@ -43,9 +43,9 @@ if (!empty($path)) {
}
// but not all user allow cookies
@ini_set('session.use_only_cookies', false);
@ini_set('session.use_only_cookies', 'false');
// do not force transparent session ids, see bug #3398788
//@ini_set('session.use_trans_sid', true);
//@ini_set('session.use_trans_sid', 'true');
@ini_set(
'url_rewriter.tags',
'a=href,frame=src,input=src,form=fakeentry,fieldset='
@ -53,14 +53,14 @@ if (!empty($path)) {
//ini_set('arg_separator.output', '&');
// delete session/cookies when browser is closed
@ini_set('session.cookie_lifetime', 0);
@ini_set('session.cookie_lifetime', '0');
// warn but dont work with bug
@ini_set('session.bug_compat_42', false);
@ini_set('session.bug_compat_warn', true);
@ini_set('session.bug_compat_42', 'false');
@ini_set('session.bug_compat_warn', 'true');
// use more secure session ids
@ini_set('session.hash_function', 1);
@ini_set('session.hash_function', '1');
// some pages (e.g. stylesheet) may be cached on clients, but not in shared
// proxy servers