Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2012-04-14 07:39:21 +0400
committerMadhura Jayaratne <madhura.cj@gmail.com>2012-04-14 07:39:21 +0400
commit33321518591ade27e1651bf3e912d6bdecb7f342 (patch)
treeee0a53b563ed0f641dd90faccadf2bbda26ec2e0 /import_status.php
parente6626004155fbf2932c36e84bc3c251b2a76dce3 (diff)
Fix Checkstyle Warnings - Type: CloseBracketLine (Closing parenthesis of a multi-line function call must be on a line by itself)
Diffstat (limited to 'import_status.php')
-rw-r--r--import_status.php15
1 files changed, 9 insertions, 6 deletions
diff --git a/import_status.php b/import_status.php
index 71dda3e49f..33af5355c1 100644
--- a/import_status.php
+++ b/import_status.php
@@ -7,7 +7,7 @@
/* PHP 5.4 stores upload progress data only in the default session.
* After calling session_name(), we won't find the progress data anymore.
-
+
* The bug should be somewhere in
* https://github.com/php/php-src/blob/master/ext/session/session.c#L2342
@@ -21,14 +21,15 @@
*/
if (version_compare(PHP_VERSION, '5.4.0', '>=')
- && ini_get('session.upload_progress.enabled')) {
+ && ini_get('session.upload_progress.enabled')
+) {
if (!isset($_POST['session_upload_progress'])) {
$sessionupload = array();
$prefix = ini_get('session.upload_progress.prefix');
session_start();
- foreach($_SESSION as $key => $value) {
+ foreach ($_SESSION as $key => $value) {
// only copy session-prefixed data
if (substr($key, 0, strlen($prefix)) == $prefix) {
$sessionupload[$key] = $value;
@@ -50,8 +51,10 @@ if (version_compare(PHP_VERSION, '5.4.0', '>=')
}
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_POSTFIELDS,
- 'session_upload_progress=' . rawurlencode(serialize($sessionupload)));
+ curl_setopt(
+ $ch, CURLOPT_POSTFIELDS,
+ 'session_upload_progress=' . rawurlencode(serialize($sessionupload))
+ );
curl_setopt($ch, CURLOPT_COOKIE, $headers['Cookie']);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 3);
curl_setopt($ch, CURLOPT_TIMEOUT, 3);
@@ -75,7 +78,7 @@ if (isset($_POST['session_upload_progress'])) {
// then write sessionupload back into the loaded session
$sessionupload = unserialize($_POST['session_upload_progress']);
- foreach($sessionupload as $key => $value) {
+ foreach ($sessionupload as $key => $value) {
$_SESSION[$key] = $value;
}
}