From 0dee9a77898cd0d71c374d63ef5c4e102fcb7b37 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 11 Jun 2013 16:58:55 +0530 Subject: [PATCH 1/6] Wrap a long line --- libraries/plugins/export/PMA_ExportPdf.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/plugins/export/PMA_ExportPdf.class.php b/libraries/plugins/export/PMA_ExportPdf.class.php index c0f620a824..c3e14a232a 100644 --- a/libraries/plugins/export/PMA_ExportPdf.class.php +++ b/libraries/plugins/export/PMA_ExportPdf.class.php @@ -397,7 +397,9 @@ class PMA_ExportPdf extends PMA_PDF // Pass 2 - $this->results = $GLOBALS['dbi']->query($query, null, PMA_DatabaseInterface::QUERY_UNBUFFERED); + $this->results = $GLOBALS['dbi']->query( + $query, null, PMA_DatabaseInterface::QUERY_UNBUFFERED + ); $this->setY($this->tMargin); $this->AddPage(); $this->SetFont(PMA_PDF_FONT, '', 9); From 37eaa0a6808e3119546df90771c7b463e481337a Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 11 Jun 2013 17:00:11 +0530 Subject: [PATCH 2/6] rename PMA_import_apcCheck() -> PMA_Import_apcCheck() --- libraries/display_import_ajax.lib.php | 2 +- libraries/plugins/import/upload/UploadApc.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index f8e917343b..1e34412c6c 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -56,7 +56,7 @@ foreach ($plugins as $plugin) { * @return boolean true if APC extension is available and if rfc1867 is enabled, * false if it is not */ -function PMA_import_apcCheck() +function PMA_Import_apcCheck() { if (! extension_loaded('apc') || ! function_exists('apc_fetch') diff --git a/libraries/plugins/import/upload/UploadApc.class.php b/libraries/plugins/import/upload/UploadApc.class.php index 881832fda1..3ddb7a7f84 100644 --- a/libraries/plugins/import/upload/UploadApc.class.php +++ b/libraries/plugins/import/upload/UploadApc.class.php @@ -57,7 +57,7 @@ class UploadApc implements UploadInterface } $ret = $_SESSION[$SESSION_KEY][$id]; - if (! PMA_import_apcCheck() || $ret['finished']) { + if (! PMA_Import_apcCheck() || $ret['finished']) { return $ret; } $status = apc_fetch('upload_' . $id); From afdb9ec796ef2bed732b740158cdc6f9a645182c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 11 Jun 2013 17:00:54 +0530 Subject: [PATCH 3/6] Rename PMA_import_nopluginCheck() -> PMA_Import_nopluginCheck() --- libraries/display_import_ajax.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index 1e34412c6c..990441bbf5 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -105,7 +105,7 @@ function PMA_import_sessionCheck() * * @return boolean true */ -function PMA_import_nopluginCheck() +function PMA_Import_nopluginCheck() { return true; } From 0ecadbba0d6131cfd57c0eaef896a7209e4b5648 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 11 Jun 2013 17:01:42 +0530 Subject: [PATCH 4/6] Rename PMA_import_progressCheck() -> PMA_Import_progressCheck() --- libraries/display_import_ajax.lib.php | 2 +- libraries/plugins/import/upload/UploadProgress.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index 990441bbf5..4accad1e3d 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -73,7 +73,7 @@ function PMA_Import_apcCheck() * @return boolean true if UploadProgress extension is available, * false if it is not */ -function PMA_import_progressCheck() +function PMA_Import_progressCheck() { if (! function_exists("uploadprogress_get_info") || ! function_exists('getallheaders') diff --git a/libraries/plugins/import/upload/UploadProgress.class.php b/libraries/plugins/import/upload/UploadProgress.class.php index 1a507763d2..d7647b326a 100644 --- a/libraries/plugins/import/upload/UploadProgress.class.php +++ b/libraries/plugins/import/upload/UploadProgress.class.php @@ -58,7 +58,7 @@ class UploadProgress implements UploadInterface } $ret = $_SESSION[$SESSION_KEY][$id]; - if (! PMA_import_progressCheck() || $ret['finished']) { + if (! PMA_Import_progressCheck() || $ret['finished']) { return $ret; } From 9c681b30af3b56d991098d4f6db99cef21dd83f2 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 11 Jun 2013 17:02:20 +0530 Subject: [PATCH 5/6] Rename PMA_import_sessionCheck() -> PMA_Import_sessionCheck() --- libraries/display_import_ajax.lib.php | 2 +- libraries/plugins/import/upload/UploadSession.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index 4accad1e3d..dc89bab6a2 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -89,7 +89,7 @@ function PMA_Import_progressCheck() * @return boolean true if PHP 5.4 session upload-progress is available, * false if it is not */ -function PMA_import_sessionCheck() +function PMA_Import_sessionCheck() { if (PMA_PHP_INT_VERSION < 50400 || ! ini_get('session.upload_progress.enabled') diff --git a/libraries/plugins/import/upload/UploadSession.class.php b/libraries/plugins/import/upload/UploadSession.class.php index 36404133ee..d9bdd53105 100644 --- a/libraries/plugins/import/upload/UploadSession.class.php +++ b/libraries/plugins/import/upload/UploadSession.class.php @@ -58,7 +58,7 @@ class UploadSession implements UploadInterface } $ret = $_SESSION[$SESSION_KEY][$id]; - if (! PMA_import_sessionCheck() || $ret['finished']) { + if (! PMA_Import_sessionCheck() || $ret['finished']) { return $ret; } From 56db0c29c6c76d9e402f1606113d1a41908b16e6 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 11 Jun 2013 17:04:25 +0530 Subject: [PATCH 6/6] Update the call to renamed functions --- libraries/display_import_ajax.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index dc89bab6a2..b721d3dce0 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -40,7 +40,7 @@ $plugins = array( // select available plugin foreach ($plugins as $plugin) { - $check = "PMA_import_" . $plugin . "Check"; + $check = "PMA_Import_" . $plugin . "Check"; if ($check()) { $upload_class = "Upload" . ucwords($plugin);