[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19901-gefa9eeb
by Marc Delisle 24 Sep '11
by Marc Delisle 24 Sep '11
24 Sep '11
The branch, master has been updated
via efa9eeb5583d95972af3fe195e903ac843103de8 (commit)
via 5b2befc1716bfca6b21305a0cb5df6d965eb4c9a (commit)
from 3cbc022058c384cdc0327405ef4ebac8df94fbe4 (commit)
- Log -----------------------------------------------------------------
commit efa9eeb5583d95972af3fe195e903ac843103de8
Merge: 3cbc022 5b2befc
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sat Sep 24 06:03:54 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
main.php | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 99e2dc6..cd028c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog
- bug #3383572 [interface] Cannot execute saved query
- bug #3411535 [display] Full text button unchecks results display options
- bug #3411224 [display] Broken binary column when 'Show binary contents' is not set
+- bug #3411633 [core] Call to undefined function PMA_isSuperuser()
3.4.5.0 (2011-09-14)
- bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/main.php b/main.php
index f85f1c0..051b5ef 100644
--- a/main.php
+++ b/main.php
@@ -139,10 +139,12 @@ echo '</ul>';
// User preferences
-echo '<ul>';
-echo PMA_printListItem(__('More settings'), 'li_user_preferences',
+if ($server > 0) {
+ echo '<ul>';
+ echo PMA_printListItem(__('More settings'), 'li_user_preferences',
'./prefs_manage.php?' . $common_url_query);
-echo '</ul>';
+ echo '</ul>';
+}
echo '</div>';
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-20-g5b2befc
by Marc Delisle 24 Sep '11
by Marc Delisle 24 Sep '11
24 Sep '11
The branch, QA_3_4 has been updated
via 5b2befc1716bfca6b21305a0cb5df6d965eb4c9a (commit)
from a211b8ba0ee947a0aacdf23b7ec72fb038a0c83c (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
main.php | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6ba0b67..e46b9df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
- bug #3383572 [interface] Cannot execute saved query
- bug #3411535 [display] Full text button unchecks results display options
- bug #3411224 [display] Broken binary column when 'Show binary contents' is not set
+- bug #3411633 [core] Call to undefined function PMA_isSuperuser()
3.4.5.0 (2011-09-14)
- bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/main.php b/main.php
index 836a250..0b0de1a 100644
--- a/main.php
+++ b/main.php
@@ -142,10 +142,12 @@ echo '</ul>';
// User preferences
-echo '<ul>';
-echo PMA_printListItem(__('More settings'), 'li_user_preferences',
+if ($server > 0) {
+ echo '<ul>';
+ echo PMA_printListItem(__('More settings'), 'li_user_preferences',
'./prefs_manage.php?' . $common_url_query);
-echo '</ul>';
+ echo '</ul>';
+}
echo '</div>';
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19899-g3cbc022
by Rouslan Placella 23 Sep '11
by Rouslan Placella 23 Sep '11
23 Sep '11
The branch, master has been updated
via 3cbc022058c384cdc0327405ef4ebac8df94fbe4 (commit)
from a827abba17758d10b3d8216baf5bb23dc8dbdfbf (commit)
- Log -----------------------------------------------------------------
commit 3cbc022058c384cdc0327405ef4ebac8df94fbe4
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Fri Sep 23 19:15:17 2011 +0100
Use the fallback in PMA_toggleButton(), if the theme is missing the graphics for it
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index b648ccf..1236667 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2637,7 +2637,7 @@ function PMA_toggleButton($action, $select_name, $options, $callback)
}
// Generate output
$retval = "<!-- TOGGLE START -->\n";
- if ($GLOBALS['cfg']['AjaxEnable']) {
+ if ($GLOBALS['cfg']['AjaxEnable'] && is_readable($_SESSION['PMA_Theme']->getImgPath() . 'toggle-ltr.png')) {
$retval .= "<noscript>\n";
}
$retval .= "<div class='wrapper'>\n";
@@ -2653,7 +2653,7 @@ function PMA_toggleButton($action, $select_name, $options, $callback)
$retval .= " <input type='submit' value='" . __('Change') . "'/>\n";
$retval .= " </form>\n";
$retval .= "</div>\n";
- if ($GLOBALS['cfg']['AjaxEnable']) {
+ if ($GLOBALS['cfg']['AjaxEnable'] && is_readable($_SESSION['PMA_Theme']->getImgPath() . 'toggle-ltr.png')) {
$retval .= "</noscript>\n";
$retval .= "<div class='wrapper toggleAjax hide'>\n";
$retval .= " <div class='toggleButton'>\n";
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19898-ga827abb
by Michal Čihař 23 Sep '11
by Michal Čihař 23 Sep '11
23 Sep '11
The branch, master has been updated
via a827abba17758d10b3d8216baf5bb23dc8dbdfbf (commit)
via e656eb98002268a82ca510dbf224a27268bb95ef (commit)
via 97c0255294f80f39867535621ebefa7b1103d958 (commit)
via 1a23e054b7adca107b6a980a2181adb751264001 (commit)
via a6fcf17238fd9b8e6e5224acb3c558d34efbab49 (commit)
via 7bc7ebba2b8497099341b78f90c53b01eb59ad2e (commit)
via b1dce61b9bcb51dd758df71118b951cb3e13b7a0 (commit)
via 631729ca0074103a717849c835cdd7737f4025ac (commit)
via dd6803bbfc9910b5402bb8d3ce59ea6d58ca833f (commit)
via 8a8f300c68bff9ca9626a827bef1ed59d62b1893 (commit)
via 0f110e75d01dfa17d9aab7d788cf9623615c35d1 (commit)
via 5cb926a29cddf0562f271cfda4762384d1ac9897 (commit)
via 4a1b8a15d4174ef314b81b4cb3ca3a2a0f8af2be (commit)
via 2bef82398676f886ca5f5e3090d430bc4c0fedaa (commit)
via d1ebe40d81dfede472680ee447a00505fc3a82f8 (commit)
via da112fc0c301eda3f523cb8fe2978ac9ce669ac6 (commit)
via 4d447bcd4d88b3ee74b71f60ef5574eef90389b1 (commit)
via c3a83283646681526dba98fe3a8d9d88ad9724f6 (commit)
via 618e292f821e32d1da9ff37b99fa735491e00479 (commit)
via 53e059075b97b158f51d436df6caefd45a2e682a (commit)
via b911aaf71f866237adf6025b7977d47ae639e5fb (commit)
via ae7399bb9cdf790cd3b8a97a4d475f48f3ccd978 (commit)
via fb04a57ee5eed3a8291bbd5f62f02ed87ffd04d7 (commit)
via d6d20b9d0a6f8f86619f670ff5ad482bc7b8e3d9 (commit)
via 1c4e823a9640c7569e55df54ae91f0400f1b90eb (commit)
via 108b17b0d3a5d9e1e766d82ffec4572ac0e7acba (commit)
via 0b3109ff6b4e1fb6604558701e65e1d9c3d55b38 (commit)
via 53eb96d0cf4aa6e3016d6c4f04976a305c8fc39b (commit)
via fe21d96fd4672508d54dbfacf26594c0a19d85e9 (commit)
via fd44356160b31b5ce843d2634ff2660b74a6d7f5 (commit)
via 97766a8078a4d21bd792b9e5e60ac57cd2c2131e (commit)
via 6a4fe79d824f8d0a2ef9e0199f7e54091eb221f0 (commit)
via f9e46d50854799ab3cef0c8bbf067d1ee966a2ef (commit)
via 0aefc67decece306780aec791b04beb967e4eec4 (commit)
via 7e075c90ccc3e36201d851091c1137ca77a90711 (commit)
via 8f59e53aad29276518445e7952a7215c72a7f4bd (commit)
via 4bb87a6cdeb40c302fe969a40201e0fdbe475e0a (commit)
via a9bbc2309debe7d271c6d8bd4d2b88d7ca74b440 (commit)
via 7e5880b19788d1b7973542b2ff3de5c88f5bac79 (commit)
via a40a605d9ee91333ac0bd3ab32ac8d8f9cdccf9f (commit)
via 98ac25de7fea9cfb3d813a33220fe98260657482 (commit)
via c487e8b6f9b86fdd5b9f98b20ae27d3eabc24934 (commit)
via f57585fa2f310d1d7bc439b13e2b1ef02cdfcfdb (commit)
via e2eaf82a71d178416e4bdf914254f9ac3d1c560b (commit)
via c6b2e07d2e8e9629dcfb72af21281725772296e7 (commit)
via a7a265b292fc6feb722d8028b20597a7c45ac70e (commit)
via 16b39f84681dbb28f6547bf996b8b5a56d1cab27 (commit)
via c4be0eb551133f1cf71559be38f097b13c099202 (commit)
via 0ab0d62562275536c0e6d2af378772c47c267cb9 (commit)
via 9dda1fd11d2b3be232a69eb2247c79103426a2e0 (commit)
via 18b02d534c21b6aa0d8a1a5e518770b661b33348 (commit)
via 249266443f1be7e248f1b72d02f8daccbdb4889f (commit)
via 252e870ffc447c62f376f5db68cc525495aacbc5 (commit)
via 54fb8f60bb768041a58d73cd555523d577edd220 (commit)
via 5e9140e264569f588d6f92674fac2b6b27c76d89 (commit)
via 028bcab80a3014383484a7ef8c55f457e2a7bede (commit)
via 8eed488a7186ad68d95361a7e2fdb01cb301d54d (commit)
via 3f811380f5a2aec5ec047ee06265580ff8b71a3b (commit)
via 3704676a2a04c7e1567c98a2d682dcae51a665b5 (commit)
via 85479485690204969701bd483fbc739db35b14fa (commit)
via a43f04e31eff05b22f00e98056911ee38cbd1315 (commit)
via 8fe5d0c38650760f6a63b7c58cd2bf59fe964142 (commit)
via 6dcb74d9376b5c261e54fc3662d0ec6909ae00cf (commit)
via f775972af88e41513d3d77678cf8a5efce910688 (commit)
via c5a317a17735ed1f212bd7654e1055df1ce38b74 (commit)
via f009992ab6900ff53cadd2820c27787d3a8a23b7 (commit)
via 0db1bfddd2f3fbb848a918da879e10d504e78288 (commit)
via 8e9821bb239f71e673dbf2889297af28264d0b1a (commit)
via 5cad2c2f766bcf96ee41f570dde335ae11544e53 (commit)
via 6cab1a6e73f7e7a2d48dae2b6b5969461cc8ee88 (commit)
via c6ef591583f920ce7ef6303d68b760406bb4e892 (commit)
via 20d7479fce814ea6cc6e62d064147cae39a41a19 (commit)
via 52e021bed2408aca8c37feea6add40127160f24f (commit)
via ec030459b19514efee97f71cce60772635d9d94a (commit)
via 18321f1b04b679adc1c8116e34c9a834cfece766 (commit)
via 22c95d4f6cd7edb6329190b598c1e892b628ed19 (commit)
via 546c9bef3a37da72bbc6574bc25a17b7565a4cb8 (commit)
via 3cfbbb21d08b95c82d8c1e215618cda2f73792a6 (commit)
from 4c56367ecd239689852afc0509ef7db4a10c1ca8 (commit)
- Log -----------------------------------------------------------------
commit a827abba17758d10b3d8216baf5bb23dc8dbdfbf
Merge: 4c56367 e656eb9
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Sep 23 15:31:54 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit e656eb98002268a82ca510dbf224a27268bb95ef
Merge: 97c0255 299da6d
Author: Pootle server <pootle(a)cihar.com>
Date: Fri Sep 23 08:40:05 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 97c0255294f80f39867535621ebefa7b1103d958
Merge: 1a23e05 e67a0a2
Author: Pootle server <pootle(a)cihar.com>
Date: Fri Sep 23 06:40:09 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 1a23e054b7adca107b6a980a2181adb751264001
Merge: a6fcf17 ac088aa
Author: Pootle server <pootle(a)cihar.com>
Date: Fri Sep 23 02:40:17 2011 +0200
Merge remote-tracking branch 'origin/master'
commit a6fcf17238fd9b8e6e5224acb3c558d34efbab49
Merge: 7bc7ebb ff56cbf
Author: Pootle server <pootle(a)cihar.com>
Date: Thu Sep 22 18:40:06 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 7bc7ebba2b8497099341b78f90c53b01eb59ad2e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:50:17 2011 +0200
Translation update done using Pootle.
commit b1dce61b9bcb51dd758df71118b951cb3e13b7a0
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:49:55 2011 +0200
Translation update done using Pootle.
commit 631729ca0074103a717849c835cdd7737f4025ac
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:45:57 2011 +0200
Translation update done using Pootle.
commit dd6803bbfc9910b5402bb8d3ce59ea6d58ca833f
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:45:50 2011 +0200
Translation update done using Pootle.
commit 8a8f300c68bff9ca9626a827bef1ed59d62b1893
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:45:26 2011 +0200
Translation update done using Pootle.
commit 0f110e75d01dfa17d9aab7d788cf9623615c35d1
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:45:16 2011 +0200
Translation update done using Pootle.
commit 5cb926a29cddf0562f271cfda4762384d1ac9897
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:45:09 2011 +0200
Translation update done using Pootle.
commit 4a1b8a15d4174ef314b81b4cb3ca3a2a0f8af2be
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:44:59 2011 +0200
Translation update done using Pootle.
commit 2bef82398676f886ca5f5e3090d430bc4c0fedaa
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:42:28 2011 +0200
Translation update done using Pootle.
commit d1ebe40d81dfede472680ee447a00505fc3a82f8
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:35:49 2011 +0200
Translation update done using Pootle.
commit da112fc0c301eda3f523cb8fe2978ac9ce669ac6
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:35:33 2011 +0200
Translation update done using Pootle.
commit 4d447bcd4d88b3ee74b71f60ef5574eef90389b1
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:35:17 2011 +0200
Translation update done using Pootle.
commit c3a83283646681526dba98fe3a8d9d88ad9724f6
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:35:08 2011 +0200
Translation update done using Pootle.
commit 618e292f821e32d1da9ff37b99fa735491e00479
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:33:52 2011 +0200
Translation update done using Pootle.
commit 53e059075b97b158f51d436df6caefd45a2e682a
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:33:41 2011 +0200
Translation update done using Pootle.
commit b911aaf71f866237adf6025b7977d47ae639e5fb
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:31:28 2011 +0200
Translation update done using Pootle.
commit ae7399bb9cdf790cd3b8a97a4d475f48f3ccd978
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:26:13 2011 +0200
Translation update done using Pootle.
commit fb04a57ee5eed3a8291bbd5f62f02ed87ffd04d7
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:24:25 2011 +0200
Translation update done using Pootle.
commit d6d20b9d0a6f8f86619f670ff5ad482bc7b8e3d9
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:22:38 2011 +0200
Translation update done using Pootle.
commit 1c4e823a9640c7569e55df54ae91f0400f1b90eb
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Sep 22 12:19:16 2011 +0200
Translation update done using Pootle.
commit 108b17b0d3a5d9e1e766d82ffec4572ac0e7acba
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 22 11:54:31 2011 +0200
Translation update done using Pootle.
commit 0b3109ff6b4e1fb6604558701e65e1d9c3d55b38
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 22 11:53:45 2011 +0200
Translation update done using Pootle.
commit 53eb96d0cf4aa6e3016d6c4f04976a305c8fc39b
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 22 11:52:26 2011 +0200
Translation update done using Pootle.
commit fe21d96fd4672508d54dbfacf26594c0a19d85e9
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 22 11:51:44 2011 +0200
Translation update done using Pootle.
commit fd44356160b31b5ce843d2634ff2660b74a6d7f5
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 22 11:51:29 2011 +0200
Translation update done using Pootle.
commit 97766a8078a4d21bd792b9e5e60ac57cd2c2131e
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 22 11:50:22 2011 +0200
Translation update done using Pootle.
commit 6a4fe79d824f8d0a2ef9e0199f7e54091eb221f0
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 22 11:50:00 2011 +0200
Translation update done using Pootle.
commit f9e46d50854799ab3cef0c8bbf067d1ee966a2ef
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 22 11:49:09 2011 +0200
Translation update done using Pootle.
commit 0aefc67decece306780aec791b04beb967e4eec4
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 22 11:48:35 2011 +0200
Translation update done using Pootle.
commit 7e075c90ccc3e36201d851091c1137ca77a90711
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:28:47 2011 +0200
Translation update done using Pootle.
commit 8f59e53aad29276518445e7952a7215c72a7f4bd
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:28:35 2011 +0200
Translation update done using Pootle.
commit 4bb87a6cdeb40c302fe969a40201e0fdbe475e0a
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:28:14 2011 +0200
Translation update done using Pootle.
commit a9bbc2309debe7d271c6d8bd4d2b88d7ca74b440
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:28:04 2011 +0200
Translation update done using Pootle.
commit 7e5880b19788d1b7973542b2ff3de5c88f5bac79
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:27:33 2011 +0200
Translation update done using Pootle.
commit a40a605d9ee91333ac0bd3ab32ac8d8f9cdccf9f
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:27:20 2011 +0200
Translation update done using Pootle.
commit 98ac25de7fea9cfb3d813a33220fe98260657482
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:27:10 2011 +0200
Translation update done using Pootle.
commit c487e8b6f9b86fdd5b9f98b20ae27d3eabc24934
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:25:56 2011 +0200
Translation update done using Pootle.
commit f57585fa2f310d1d7bc439b13e2b1ef02cdfcfdb
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:25:09 2011 +0200
Translation update done using Pootle.
commit e2eaf82a71d178416e4bdf914254f9ac3d1c560b
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:24:46 2011 +0200
Translation update done using Pootle.
commit c6b2e07d2e8e9629dcfb72af21281725772296e7
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:24:24 2011 +0200
Translation update done using Pootle.
commit a7a265b292fc6feb722d8028b20597a7c45ac70e
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:24:19 2011 +0200
Translation update done using Pootle.
commit 16b39f84681dbb28f6547bf996b8b5a56d1cab27
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:24:04 2011 +0200
Translation update done using Pootle.
commit c4be0eb551133f1cf71559be38f097b13c099202
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:23:51 2011 +0200
Translation update done using Pootle.
commit 0ab0d62562275536c0e6d2af378772c47c267cb9
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:23:20 2011 +0200
Translation update done using Pootle.
commit 9dda1fd11d2b3be232a69eb2247c79103426a2e0
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:23:09 2011 +0200
Translation update done using Pootle.
commit 18b02d534c21b6aa0d8a1a5e518770b661b33348
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:22:56 2011 +0200
Translation update done using Pootle.
commit 249266443f1be7e248f1b72d02f8daccbdb4889f
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:22:48 2011 +0200
Translation update done using Pootle.
commit 252e870ffc447c62f376f5db68cc525495aacbc5
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:22:37 2011 +0200
Translation update done using Pootle.
commit 54fb8f60bb768041a58d73cd555523d577edd220
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:22:02 2011 +0200
Translation update done using Pootle.
commit 5e9140e264569f588d6f92674fac2b6b27c76d89
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:21:47 2011 +0200
Translation update done using Pootle.
commit 028bcab80a3014383484a7ef8c55f457e2a7bede
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:21:22 2011 +0200
Translation update done using Pootle.
commit 8eed488a7186ad68d95361a7e2fdb01cb301d54d
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:21:03 2011 +0200
Translation update done using Pootle.
commit 3f811380f5a2aec5ec047ee06265580ff8b71a3b
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:20:07 2011 +0200
Translation update done using Pootle.
commit 3704676a2a04c7e1567c98a2d682dcae51a665b5
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:19:52 2011 +0200
Translation update done using Pootle.
commit 85479485690204969701bd483fbc739db35b14fa
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:19:31 2011 +0200
Translation update done using Pootle.
commit a43f04e31eff05b22f00e98056911ee38cbd1315
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:18:59 2011 +0200
Translation update done using Pootle.
commit 8fe5d0c38650760f6a63b7c58cd2bf59fe964142
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:15:59 2011 +0200
Translation update done using Pootle.
commit 6dcb74d9376b5c261e54fc3662d0ec6909ae00cf
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:15:31 2011 +0200
Translation update done using Pootle.
commit f775972af88e41513d3d77678cf8a5efce910688
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:11:21 2011 +0200
Translation update done using Pootle.
commit c5a317a17735ed1f212bd7654e1055df1ce38b74
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:11:04 2011 +0200
Translation update done using Pootle.
commit f009992ab6900ff53cadd2820c27787d3a8a23b7
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:10:42 2011 +0200
Translation update done using Pootle.
commit 0db1bfddd2f3fbb848a918da879e10d504e78288
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:10:28 2011 +0200
Translation update done using Pootle.
commit 8e9821bb239f71e673dbf2889297af28264d0b1a
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:10:05 2011 +0200
Translation update done using Pootle.
commit 5cad2c2f766bcf96ee41f570dde335ae11544e53
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:09:57 2011 +0200
Translation update done using Pootle.
commit 6cab1a6e73f7e7a2d48dae2b6b5969461cc8ee88
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:09:39 2011 +0200
Translation update done using Pootle.
commit c6ef591583f920ce7ef6303d68b760406bb4e892
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:09:01 2011 +0200
Translation update done using Pootle.
commit 20d7479fce814ea6cc6e62d064147cae39a41a19
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:08:58 2011 +0200
Translation update done using Pootle.
commit 52e021bed2408aca8c37feea6add40127160f24f
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:06:19 2011 +0200
Translation update done using Pootle.
commit ec030459b19514efee97f71cce60772635d9d94a
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:06:01 2011 +0200
Translation update done using Pootle.
commit 18321f1b04b679adc1c8116e34c9a834cfece766
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:05:46 2011 +0200
Translation update done using Pootle.
commit 22c95d4f6cd7edb6329190b598c1e892b628ed19
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:04:09 2011 +0200
Translation update done using Pootle.
commit 546c9bef3a37da72bbc6574bc25a17b7565a4cb8
Author: deminoth <deminoth(a)naver.com>
Date: Thu Sep 22 11:02:47 2011 +0200
Translation update done using Pootle.
commit 3cfbbb21d08b95c82d8c1e215618cda2f73792a6
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Sep 21 15:24:27 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/es.po | 6 ++--
po/fr.po | 21 ++++++++-----
po/ja.po | 42 ++++++++++++-------------
po/ko.po | 105 ++++++++++++++++++++++++++-----------------------------------
4 files changed, 81 insertions(+), 93 deletions(-)
diff --git a/po/es.po b/po/es.po
index a22f89d..62762e2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-09-19 08:41-0400\n"
-"PO-Revision-Date: 2011-09-19 15:13+0200\n"
+"PO-Revision-Date: 2011-09-21 15:24+0200\n"
"Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n"
"Language-Team: spanish <es(a)li.org>\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -11953,7 +11953,7 @@ msgstr "Criterios de búsqueda adicionales"
#: tbl_zoom_select.php:276
msgid "Use this column to label each point"
-msgstr ""
+msgstr "Utilice esta columna para etiquetar cada punto"
#: tbl_zoom_select.php:296
msgid "Maximum rows to plot"
diff --git a/po/fr.po b/po/fr.po
index b6e49f7..603df4c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-09-19 08:41-0400\n"
-"PO-Revision-Date: 2011-09-20 18:58+0200\n"
+"PO-Revision-Date: 2011-09-22 11:54+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: french <fr(a)li.org>\n"
"Language: fr\n"
@@ -12232,39 +12232,45 @@ msgid ""
"The query cache is enabled and the server receives %d queries per second. "
"This rule fires if there is more than 100 queries per second."
msgstr ""
+"La cache de requêtes est activée et le serveur traite %d requêtes par "
+"seconde. Cette règle intervient s'il y a plus de 100 requêtes par seconde."
#: po/advisory_rules.php:80
msgid "Query cache efficiency (%)"
-msgstr ""
+msgstr "Efficacité de la cache de requêtes (%)"
#: po/advisory_rules.php:81
msgid "Query cache not running efficiently, it has a low hit rate."
msgstr ""
+"La cache de requêtes ne fonctionne pas efficacement, son taux de réussite "
+"est bas."
#: po/advisory_rules.php:82
msgid "Consider increasing {query_cache_limit}."
-msgstr ""
+msgstr "Il est suggéré d'augmenter {query_cache_limit}."
#: po/advisory_rules.php:83
#, php-format
msgid "The current query cache hit rate of %s%% is below 20%%"
msgstr ""
+"Le taux actuel de réussite de la cache de requêtes (%s%%) est sous les 20%%"
#: po/advisory_rules.php:85
-#, fuzzy
msgid "Query Cache usage"
-msgstr "Cache des requêtes"
+msgstr "Utilisation de la cache des requêtes"
#: po/advisory_rules.php:86
#, php-format
msgid "Less than 80%% of the query cache is being utilized."
-msgstr ""
+msgstr "Moins de 80%% de la cache des requêtes est utilisé."
#: po/advisory_rules.php:87
msgid ""
"This might be caused by {query_cache_limit} being too low. Flushing the "
"query cache might help as well."
msgstr ""
+"Ceci peut être causé par une trop faible valeur de {query_cache_limit}. "
+"Initialiser la cache des requêtes pourrait également aider."
#: po/advisory_rules.php:88
#, php-format
@@ -12274,10 +12280,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:90
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache fragmentation"
-msgstr "Cache des requêtes"
+msgstr "Fragmentation de la cache des requêtes"
#: po/advisory_rules.php:91
msgid "The query cache is considerably fragmented."
diff --git a/po/ja.po b/po/ja.po
index 6b32713..f59ccc6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-09-19 08:41-0400\n"
-"PO-Revision-Date: 2011-09-20 12:28+0200\n"
+"PO-Revision-Date: 2011-09-22 12:50+0200\n"
"Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n"
"Language-Team: japanese <jp(a)li.org>\n"
"Language: ja\n"
@@ -6748,23 +6748,23 @@ msgstr "金額は単位を取り除く<i>（例：$5.00 を 5.00）</i>"
#: libraries/import/shp.php:14
msgid "ESRI Shape File"
-msgstr ""
+msgstr "ESRI シェープファイル"
#: libraries/import/shp.php:275
#, php-format
msgid "There was an error importing the ESRI shape file: \"%s\"."
-msgstr ""
+msgstr "ESRI シェープファイルをインポート中にエラーがありました: \"%s\""
#: libraries/import/shp.php:331
msgid ""
"You tried to import an invalid file or the imported file contains invalid "
"data"
-msgstr ""
+msgstr "無効なファイルもしくは無効なデータが含まれているファイルをインポートしようとしました。"
#: libraries/import/shp.php:333
#, php-format
msgid "MySQL Spatial Extension does not support ESRI type \"%s\"."
-msgstr ""
+msgstr "MySQL の空間拡張が ESRI タイプをサポートしていません: \"%s\""
#: libraries/import/shp.php:371
msgid "The imported file does not contain any data"
@@ -11828,7 +11828,7 @@ msgstr "遅いクエリの割合が高いので、サーバの稼働時間と比
msgid ""
"You have a slow query rate of %s per hour, you should have less than 1%% per "
"hour."
-msgstr "現在の遅いクエリの割合は 1 時間当たり %s です。1 時間当たり 1%% 未満がいいと言われています。"
+msgstr "現在の遅いクエリの割合は 1 時間当たり %s です。この値は、1 時間当たり 1%% 未満がいいと言われています。"
#: po/advisory_rules.php:25
msgid "Long query time"
@@ -12257,13 +12257,13 @@ msgid ""
"This means that joins are doing full table scans. Adding indexes for the "
"fields being used in the join conditions will greatly speed up table joins"
msgstr ""
-"これは、テーブルをフルスキャンしていることを意味しています。結合条件にあったカラムにインデックスを追加することで、テーブル結合のスピードは大幅に上がるで"
-"しょう。"
+"これは、テーブルをフルスキャンしていることを示しています。結合条件にあったカラムにインデックスを追加することで、テーブル結合のスピードは大幅に上がるでし"
+"ょう。"
#: po/advisory_rules.php:128
#, php-format
msgid "Table joins average: %s, this value should be less than 1 per hour"
-msgstr "テーブル結合の平均：%s。1 時間当たり 1 未満がいいと言われています。"
+msgstr "テーブル結合の平均：%s。この値は、1 時間当たり 1 未満がいいと言われています。"
#: po/advisory_rules.php:130
msgid "Rate of reading first index entry"
@@ -12286,7 +12286,7 @@ msgstr ""
#: po/advisory_rules.php:133
#, php-format
msgid "Index scans average: %s, this value should be less than 1 per hour"
-msgstr "インデックススキャンの平均：%s。1 時間当たり 1 未満がいいと言われています。"
+msgstr "インデックススキャンの平均：%s。この値は、1 時間当たり 1 未満がいいと言われています。"
#: po/advisory_rules.php:135
msgid "Rate of reading fixed position"
@@ -12311,7 +12311,7 @@ msgstr ""
msgid ""
"Rate of reading fixed position average: %s, this value should be less than 1 "
"per hour"
-msgstr "決まった位置を読み込む割合の平均：%s。1 時間当たり 1 未満がいいと言われています。"
+msgstr "決まった位置を読み込む割合の平均：%s。この値は、1 時間当たり 1 未満がいいと言われています。"
#: po/advisory_rules.php:140
msgid "Rate of reading next table row"
@@ -12333,7 +12333,7 @@ msgstr ""
#, php-format
msgid ""
"Rate of reading next table row: %s, this value should be less than 1 per hour"
-msgstr "テーブルの次行を読み込む割合：%s。1 時間当たり 1 未満がいいと言われています。"
+msgstr "テーブルの次行を読み込む割合：%s。この値は、1 時間当たり 1 未満がいいと言われています。"
#: po/advisory_rules.php:145
msgid "tmp_table_size vs. max_heap_table_size"
@@ -12500,7 +12500,7 @@ msgstr ""
#: po/advisory_rules.php:183
#, php-format
msgid "Opened table rate: %s, this value should be less than 10 per hour"
-msgstr "テーブルを開く割合：%s。1 時間当たり 10 未満がいいと言われています。"
+msgstr "テーブルを開く割合：%s。この値は、1 時間当たり 10 未満がいいと言われています。"
#: po/advisory_rules.php:185
#, fuzzy
@@ -12539,7 +12539,7 @@ msgstr "ファイルを開く割合が高いです。"
#: po/advisory_rules.php:193
#, php-format
msgid "Opened files rate: %s, this value should be less than 5 per hour"
-msgstr "ファイルを開く割合：%s。1 時間当たり 5 未満がいいと言われています。"
+msgstr "ファイルを開く割合：%s。この値は、1 時間当たり 5 未満がいいと言われています。"
#: po/advisory_rules.php:195
#, fuzzy, php-format
@@ -12677,14 +12677,13 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:230
-#, fuzzy
#| msgid "Persistent connections"
msgid "Percentage of aborted connections"
-msgstr "永続的な接続"
+msgstr "中断された接続の割合"
#: po/advisory_rules.php:231
msgid "Too many connections are aborted."
-msgstr ""
+msgstr "中断された接続が多いです。"
#: po/advisory_rules.php:232 po/advisory_rules.php:237
msgid ""
@@ -12697,23 +12696,22 @@ msgstr ""
#: po/advisory_rules.php:233
#, php-format
msgid "%s%% of all connections are aborted. This value should be below 1%%"
-msgstr ""
+msgstr "全接続のうち %s%% が中断されています。この値は、1%% 未満がいいと言われています。"
#: po/advisory_rules.php:235
-#, fuzzy
#| msgid "Persistent connections"
msgid "Rate of aborted connections"
-msgstr "永続的な接続"
+msgstr "中断された接続の割合"
#: po/advisory_rules.php:236
msgid "Too many connections are aborted"
-msgstr ""
+msgstr "中断された接続が多いです。"
#: po/advisory_rules.php:238
#, php-format
msgid ""
"Aborted connections rate is at %s, this value should be less than 1 per hour"
-msgstr ""
+msgstr "中断された接続の割合は %s です。この値は、1 時間当たり 1 未満がいいと言われています。"
#: po/advisory_rules.php:240
#, fuzzy
diff --git a/po/ko.po b/po/ko.po
index ed0a5f0..d68d4b9 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-09-19 08:41-0400\n"
-"PO-Revision-Date: 2011-09-18 19:35+0200\n"
-"Last-Translator: <joungkyun(a)yahoo.com>\n"
+"PO-Revision-Date: 2011-09-22 11:28+0200\n"
+"Last-Translator: <deminoth(a)naver.com>\n"
"Language-Team: korean <ko(a)li.org>\n"
+"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -110,16 +110,14 @@ msgstr "디스크 쓰기에 실패했습니다."
#: bs_disp_as_mime_type.php:41
msgid "Failed to open remote URL"
-msgstr "원격 URL 열기 실패했습니다"
+msgstr "원격 URL 열기에 실패했습니다"
#: changelog.php:32 license.php:28
#, php-format
msgid ""
"The %s file is not available on this system, please visit www.phpmyadmin.net "
"for more information."
-msgstr ""
-"%s 파일은 사용할 수 없습니다. www.phpmyadmin.net에 방문하여 정보를 확인하세"
-"요."
+msgstr "%s 파일이 이 시스템에서 사용 가능하지 않습니다. www.phpmyadmin.net에 방문하여 정보를 확인하세요."
#: db_create.php:60
#, php-format
@@ -345,20 +343,18 @@ msgid "Collation"
msgstr "데이터정렬방식"
#: db_operations.php:555
-#, fuzzy, php-format
+#, php-format
#| msgid ""
#| "The additional features for working with linked tables have been "
#| "deactivated. To find out why click %shere%s."
msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
-msgstr ""
-"링크 테이블을 처리하는 추가 기능이 비활성화되어 있습니다. 원인을 확인하려면 %"
-"s여기를 클릭%s하십시오."
+msgstr "phpMyAdmin 설정 스토리지가 비활성화 되어 있습니다. 원인을 확인하려면 %s여기를 클릭%s하십시오."
#: db_operations.php:589
msgid "Edit or export relational schema"
-msgstr ""
+msgstr "관계 스키마를 수정 또는 내보내기"
#: db_printview.php:101 db_tracking.php:85 db_tracking.php:186
#: libraries/config/messages.inc.php:504 libraries/db_structure.lib.php:32
@@ -419,10 +415,10 @@ msgid "You have to choose at least one column to display"
msgstr "출력하려면 적어도 1개 이상의 열(칼럼)을 선택해야 합니다."
#: db_qbe.php:186
-#, fuzzy, php-format
+#, php-format
#| msgid "Switch to copied table"
msgid "Switch to %svisual builder%s"
-msgstr "복사한 테이블로 옮겨감"
+msgstr "%s비주얼 쿼리 빌더%s로 전환"
#: db_qbe.php:222 libraries/db_structure.lib.php:90
#: libraries/display_tbl.lib.php:957
@@ -528,11 +524,11 @@ msgid "Search results for \"<i>%s</i>\" %s:"
msgstr "\"<i>%s</i>\"의 검색 결과 %s:"
#: db_search.php:226
-#, fuzzy, php-format
+#, php-format
#| msgid "%s match(es) inside table <i>%s</i>"
msgid "%s match inside table <i>%s</i>"
msgid_plural "%s matches inside table <i>%s</i>"
-msgstr[0] "%s 건 일치 (테이블 <i>%s</i>)"
+msgstr[0] "테이블 <i>%s</i>에서 %s 건 일치"
#: db_search.php:233 libraries/common.lib.php:3038
#: libraries/common.lib.php:3245 libraries/common.lib.php:3246
@@ -541,10 +537,10 @@ msgid "Browse"
msgstr "보기"
#: db_search.php:238
-#, fuzzy, php-format
+#, php-format
#| msgid "Dumping data for table"
msgid "Delete the matches for the %s table?"
-msgstr "테이블의 덤프 데이터"
+msgstr "테이블 %s에 대하여 일치하는 것들을 삭제 하겠습니까?"
#: db_search.php:238 libraries/display_tbl.lib.php:1364
#: libraries/display_tbl.lib.php:2354
@@ -559,7 +555,7 @@ msgid "Delete"
msgstr "삭제"
#: db_search.php:251
-#, fuzzy, php-format
+#, php-format
#| msgid "<b>Total:</b> <i>%s</i> match(es)"
msgid "<b>Total:</b> <i>%s</i> match"
msgid_plural "<b>Total:</b> <i>%s</i> matches"
@@ -570,7 +566,6 @@ msgid "Search in database"
msgstr "데이터베이스 검색"
#: db_search.php:276
-#, fuzzy
#| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):"
msgid "Words or values to search for (wildcard: \"%\"):"
msgstr "찾을 단어, 값 (와일드카드: \"%\"):"
@@ -584,17 +579,15 @@ msgid "Words are separated by a space character (\" \")."
msgstr "단어는 스페이스(\" \")로 구분됩니다."
#: db_search.php:299
-#, fuzzy
#| msgid "Inside table(s):"
msgid "Inside tables:"
-msgstr "찾을 테이블:"
+msgstr "검색할 테이블:"
#: db_search.php:329
msgid "Inside column:"
msgstr "검색할 컬럼:"
#: db_structure.php:67
-#, fuzzy
#| msgid "No tables found in database."
msgid "No tables found in database"
msgstr "데이터베이스에 테이블이 없습니다."
@@ -627,7 +620,7 @@ msgstr "트래킹이 활성화되어 있지 않습니다."
msgid ""
"This view has at least this number of rows. Please refer to %sdocumentation%"
"s."
-msgstr ""
+msgstr "이 뷰는 최소 이 숫자 이상의 열을 가지고 있습니다. %s문서%s를 참조해 주십시오."
#: db_structure.php:438 db_structure.php:452 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:209
@@ -671,7 +664,7 @@ msgstr "모두 체크안함"
#: db_structure.php:544
msgid "Check tables having overhead"
-msgstr ""
+msgstr "오버헤드를 가진 테이블들을 체크"
#: db_structure.php:552 libraries/common.lib.php:3258
#: libraries/common.lib.php:3259 libraries/config/messages.inc.php:164
@@ -718,19 +711,17 @@ msgstr "테이블 분석"
#: db_structure.php:572
msgid "Add prefix to table"
-msgstr ""
+msgstr "테이블에 접두사 추가"
#: db_structure.php:574 libraries/mult_submits.inc.php:251
-#, fuzzy
#| msgid "Replace table data with file"
msgid "Replace table prefix"
-msgstr "파일로 테이블 대치하기"
+msgstr "테이블의 접두사를 교체"
#: db_structure.php:576 libraries/mult_submits.inc.php:251
-#, fuzzy
#| msgid "Replace table data with file"
msgid "Copy table with prefix"
-msgstr "파일로 테이블 대치하기"
+msgstr "테이블에 접두사를 추가하여 복제"
#: db_structure.php:619 libraries/schema/User_Schema.class.php:420
msgid "Data Dictionary"
@@ -738,7 +729,7 @@ msgstr "데이터 사전 (전체 구조보기)"
#: db_tracking.php:79
msgid "Tracked tables"
-msgstr ""
+msgstr "추적된 테이블"
#: db_tracking.php:84 libraries/config/messages.inc.php:498
#: libraries/export/htmlword.php:78 libraries/export/latex.php:151
@@ -755,16 +746,15 @@ msgstr "데이터베이스"
#: db_tracking.php:86
msgid "Last version"
-msgstr ""
+msgstr "최근 버전"
#: db_tracking.php:87 tbl_tracking.php:636
-#, fuzzy
msgid "Created"
-msgstr "만들기 "
+msgstr "생성됨"
#: db_tracking.php:88 tbl_tracking.php:637
msgid "Updated"
-msgstr ""
+msgstr "수정됨"
#: db_tracking.php:89 libraries/rte/rte_events.lib.php:380
#: libraries/rte/rte_list.lib.php:67 libraries/server_links.inc.php:51
@@ -782,52 +772,49 @@ msgstr "실행"
#: db_tracking.php:101 js/messages.php:36
msgid "Delete tracking data for this table"
-msgstr ""
+msgstr "이 테이블에 대한 추적 데이터를 제거"
#: db_tracking.php:119 tbl_tracking.php:590 tbl_tracking.php:648
msgid "active"
-msgstr ""
+msgstr "활성"
#: db_tracking.php:121 tbl_tracking.php:592 tbl_tracking.php:650
msgid "not active"
-msgstr ""
+msgstr "비활성"
#: db_tracking.php:134
-#, fuzzy
msgid "Versions"
-msgstr "테이블 작업"
+msgstr "버전"
#: db_tracking.php:135 tbl_tracking.php:400 tbl_tracking.php:668
msgid "Tracking report"
-msgstr ""
+msgstr "추적 보고서"
#: db_tracking.php:136 tbl_tracking.php:235 tbl_tracking.php:670
-#, fuzzy
msgid "Structure snapshot"
-msgstr "구조만"
+msgstr "구조 요약"
#: db_tracking.php:181
msgid "Untracked tables"
-msgstr ""
+msgstr "추적되지 않은 테이블"
#: db_tracking.php:201 db_tracking.php:203 tbl_structure.php:638
-#, fuzzy
msgid "Track table"
-msgstr "테이블 검사"
+msgstr "테이블 추적"
#: db_tracking.php:229
-#, fuzzy
msgid "Database Log"
-msgstr "데이터베이스"
+msgstr "데이터베이스 로그"
#: enum_editor.php:21 libraries/tbl_properties.inc.php:754
#, php-format
msgid "Values for the column \"%s\""
-msgstr ""
+msgstr "\"%s\" 열의 값"
#: enum_editor.php:22 libraries/tbl_properties.inc.php:755
+#, fuzzy
msgid "Enter each value in a separate field."
-msgstr ""
+msgstr "각각의 필드에 값을 입력하세요"
#: enum_editor.php:57
msgid "+ Restart insertion and add a new value"
@@ -835,40 +822,38 @@ msgstr ""
#: enum_editor.php:67 gis_data_editor.php:317
msgid "Output"
-msgstr ""
+msgstr "출력"
#: enum_editor.php:68
+#, fuzzy
msgid "Copy and paste the joined values into the \"Length/Values\" field"
-msgstr ""
+msgstr "\"길이/값\" 필드로 결합된 값을 복사하여 붙여넣으세요"
#: export.php:29
#, fuzzy
#| msgid "Bar type"
msgid "Bad type!"
-msgstr "질의 종류"
+msgstr "잘못된 타입!"
#: export.php:77
msgid "Selected export type has to be saved in file!"
-msgstr ""
+msgstr "선택한 내보내기가 파일에 저장되었습니다!"
#: export.php:106
-#, fuzzy
#| msgid "Rename database to"
msgid "Bad parameters!"
-msgstr "데이터베이스 이름 변경"
+msgstr "잘못된 인자!"
#: export.php:166 export.php:191 export.php:652
#, php-format
msgid "Insufficient space to save the file %s."
-msgstr ""
+msgstr "파일 %s를 저장하기에 공간이 부족합니다."
#: export.php:307
#, php-format
msgid ""
"File %s already exists on server, change filename or check overwrite option."
-msgstr ""
-"%s 라는 이름의 파일이 이미 서버에 존재합니다. 파일명을 변경하거나 덮어쓰기 옵"
-"션을 설정해주세요."
+msgstr "%s 라는 이름의 파일이 이미 서버에 존재합니다. 파일명을 변경하거나 덮어쓰기 옵션을 설정해주세요."
#: export.php:311 export.php:315
#, php-format
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19820-g4c56367
by Marc Delisle 23 Sep '11
by Marc Delisle 23 Sep '11
23 Sep '11
The branch, master has been updated
via 4c56367ecd239689852afc0509ef7db4a10c1ca8 (commit)
via 3fc3194bce70c44e17a2758cb52b01ec5d50825c (commit)
from 299da6d047de5374ea8964c17f9c6bff059391e8 (commit)
- Log -----------------------------------------------------------------
commit 4c56367ecd239689852afc0509ef7db4a10c1ca8
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Sep 23 08:43:10 2011 -0400
Incorrect messages were shown
commit 3fc3194bce70c44e17a2758cb52b01ec5d50825c
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Sep 23 08:14:42 2011 -0400
- Bug #3383572 Cannot execute saved query
- Remove bookmark from the list after deletion (Ajax)
-----------------------------------------------------------------------
Summary of changes:
js/sql.js | 32 +++++++++++++++++++++++++++++++-
libraries/sql_query_form.lib.php | 2 +-
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/js/sql.js b/js/sql.js
index 813bf68..c6f2f0c 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -130,6 +130,22 @@ $(document).ready(function() {
});
}
+
+ /**
+ * Event handler for sqlqueryform.ajax button_submit_query
+ *
+ * @memberOf jQuery
+ */
+ $("#button_submit_query").live('click', function(event) {
+ var $form = $(this).closest("form");
+ // the Go button related to query submission was clicked,
+ // instead of the one related to Bookmarks, so empty the
+ // id_bookmark selector to avoid misinterpretation in
+ // import.php about what needs to be done
+ $form.find("select[name=id_bookmark]").attr("value","");
+ // let normal event propagation happen
+ });
+
/**
* Ajax Event handler for 'SQL Query Submit'
*
@@ -156,11 +172,25 @@ $(document).ready(function() {
$.post($form.attr('action'), $form.serialize() , function(data) {
if (data.success == true) {
+ // success happens if the query returns rows or not
+ //
// fade out previous messages, if any
$('.success').fadeOut();
$('.sqlquery_message').fadeOut();
// show a message that stays on screen
- if (typeof data.sql_query != 'undefined') {
+ if (typeof data.action_bookmark != 'undefined') {
+ // view only
+ if ('1' == data.action_bookmark) {
+ $('#sqlquery').text(data.sql_query);
+ // send to codemirror if possible
+ setQuery(data.sql_query);
+ }
+ // delete
+ if ('2' == data.action_bookmark) {
+ $("#id_bookmark option[value='" + data.id_bookmark + "']").remove();
+ }
+ $('#sqlqueryform').before(data.message);
+ } elseif (typeof data.sql_query != 'undefined') {
$('<div class="sqlquery_message"></div>')
.html(data.sql_query)
.insertBefore('#sqlqueryform');
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 44b2321..0e4f47c 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -367,7 +367,7 @@ function PMA_sqlQueryFormBookmark()
echo '<legend>';
echo __('Bookmarked SQL query') . '</legend>' . "\n";
echo '<div class="formelement">';
- echo '<select name="id_bookmark">' . "\n";
+ echo '<select name="id_bookmark" id="id_bookmark">' . "\n";
echo '<option value=""> </option>' . "\n";
foreach ($bookmark_list as $key => $value) {
echo '<option value="' . htmlspecialchars($key) . '">'
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19818-g299da6d
by Madhura Jayaratne 23 Sep '11
by Madhura Jayaratne 23 Sep '11
23 Sep '11
The branch, master has been updated
via 299da6d047de5374ea8964c17f9c6bff059391e8 (commit)
via 21c5148d1701fa249379b523b49cdf9cf46c3ead (commit)
via 13adb5adf7e2b429819a85131edd998b34726ad7 (commit)
via 9bcb83af03d9f988a2e2c754e6b9b3cf2c468555 (commit)
from e67a0a2531fff325477c5babcfffbf205ca755b3 (commit)
- Log -----------------------------------------------------------------
commit 299da6d047de5374ea8964c17f9c6bff059391e8
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Fri Sep 23 11:36:14 2011 +0530
More style errors fixed
commit 21c5148d1701fa249379b523b49cdf9cf46c3ead
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Fri Sep 23 11:24:06 2011 +0530
Style errors with class declarations
commit 13adb5adf7e2b429819a85131edd998b34726ad7
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Fri Sep 23 11:11:41 2011 +0530
Use lower case for true, false and null
commit 9bcb83af03d9f988a2e2c754e6b9b3cf2c468555
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Fri Sep 23 10:56:30 2011 +0530
File is being conditionally included; use "include" instead
-----------------------------------------------------------------------
Summary of changes:
bs_play_media.php | 4 +-
db_create.php | 6 ++--
db_operations.php | 4 +-
import.php | 2 +-
libraries/List_Database.class.php | 2 +-
libraries/database_interface.lib.php | 4 +-
libraries/db_info.inc.php | 2 +-
libraries/db_table_exists.lib.php | 2 +-
libraries/dbi/mysql.dbi.lib.php | 8 ++--
libraries/display_create_database.lib.php | 2 +-
libraries/display_export.lib.php | 2 +-
libraries/display_import.lib.php | 2 +-
libraries/engines/innobase.lib.php | 5 ++-
libraries/export/excel.php | 2 +-
libraries/export/latex.php | 4 +-
libraries/export/ods.php | 2 +-
libraries/export/odt.php | 2 +-
libraries/export/pdf.php | 2 +-
libraries/export/sql.php | 4 +-
libraries/footer.inc.php | 2 +-
libraries/import/shp.php | 4 +-
libraries/opendocument.lib.php | 12 ++++----
libraries/pmd_common.php | 6 ++--
libraries/relation.lib.php | 4 +-
libraries/rte/rte_events.lib.php | 2 +-
libraries/rte/rte_routines.lib.php | 4 +-
libraries/rte/rte_triggers.lib.php | 2 +-
libraries/sqlparser.lib.php | 6 ++--
libraries/sqlvalidator.class.php | 4 +-
libraries/sqlvalidator.lib.php | 2 +-
libraries/svg_plot/pma_svg_data_element.php | 8 ++--
libraries/tbl_properties.inc.php | 4 +-
.../transformations/image_jpeg__inline.inc.php | 2 +-
libraries/transformations/image_jpeg__link.inc.php | 2 +-
.../transformations/image_png__inline.inc.php | 2 +-
.../transformations/text_plain__imagelink.inc.php | 2 +-
libraries/transformations/text_plain__link.inc.php | 2 +-
pmd_relation_upd.php | 31 +++++++++++---------
prefs_manage.php | 6 ++--
querywindow.php | 6 ++--
server_databases.php | 6 ++--
server_replication.php | 6 ++--
server_status.php | 2 +-
server_synchronize.php | 8 +++--
setup/config.php | 2 +-
sql.php | 10 +++---
tbl_addfield.php | 2 +-
tbl_alter.php | 2 +-
tbl_indexes.php | 10 +++---
tbl_move_copy.php | 6 ++--
tbl_operations.php | 2 +-
tbl_printview.php | 4 +-
tbl_replace.php | 4 +-
tbl_tracking.php | 2 +-
test/classes/PMA_Config_test.php | 2 +-
test/libraries/common/PMA_getDbLink_test.php | 4 +-
.../common/PMA_showMessage_test_disabled.php | 2 +-
test/libraries/core/PMA_array_test.php | 2 +-
.../core/PMA_headerLocation_test_disabled.php | 8 ++--
.../rte/PMA_RTN_getDataFromRequest_test.php | 2 +-
test/libraries/rte/PMA_RTN_getEditorForm_test.php | 2 +-
test/libraries/rte/PMA_RTN_getExecuteForm_test.php | 2 +-
.../rte/PMA_RTN_getQueryFromRequest_test.php | 2 +-
test/selenium/PmaSeleniumLoginTest.php | 4 +-
test/selenium/PmaSeleniumPrivilegesTest.php | 4 +-
test/selenium/PmaSeleniumTestCase.php | 2 +-
test/selenium/PmaSeleniumXssTest.php | 4 +-
transformation_overview.php | 2 +-
view_create.php | 2 +-
69 files changed, 145 insertions(+), 139 deletions(-)
diff --git a/bs_play_media.php b/bs_play_media.php
index fe6f574..d9ba62a 100644
--- a/bs_play_media.php
+++ b/bs_play_media.php
@@ -12,7 +12,7 @@
/*
* @var string contains media type of BLOB reference
*/
- $mediaType = isset($_REQUEST['media_type']) ? $_REQUEST['media_type'] : NULL;
+ $mediaType = isset($_REQUEST['media_type']) ? $_REQUEST['media_type'] : null;
/*
* @var string indicates whether media type is of custom type
@@ -22,7 +22,7 @@
/*
* @var string contains BLOB reference
*/
- $bsReference = isset($_REQUEST['bs_reference']) ? $_REQUEST['bs_reference'] : NULL;
+ $bsReference = isset($_REQUEST['bs_reference']) ? $_REQUEST['bs_reference'] : null;
// if media type and BS reference are specified
if (isset($mediaType) && isset($bsReference)) {
diff --git a/db_create.php b/db_create.php
index 27bf279..3548f8f 100644
--- a/db_create.php
+++ b/db_create.php
@@ -69,16 +69,16 @@ if (! $result) {
/**
* String containing the SQL Query formatted in pretty HTML
* @global array $GLOBALS['extra_data']
- * @name $extra_data
+ * @name $extra_data
*/
- $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query, 'success');
+ $extra_data['sql_query'] = PMA_showMessage(null, $sql_query, 'success');
//Construct the html for the new database, so that it can be appended to the list of databases on server_databases.php
/**
* Build the array to be passed to {@link PMA_generate_common_url} to generate the links
* @global array $GLOBALS['db_url_params']
- * @name $db_url_params
+ * @name $db_url_params
*/
$db_url_params['db'] = $new_db;
diff --git a/db_operations.php b/db_operations.php
index b364d81..0bfedb0 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -304,7 +304,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
*/
if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['newname'] = $newname;
- $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
+ $extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
};
}
@@ -442,7 +442,7 @@ echo __('Remove database');
'reload' => '1',
'purge' => '1',
'message_to_show' => sprintf(__('Database %s has been dropped.'), htmlspecialchars(PMA_backquote($db))),
- 'db' => NULL,
+ 'db' => null,
);
?>
<li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'id="drop_db_anchor"' : ''); ?>>
diff --git a/import.php b/import.php
index d3c4b79..fab1d3f 100644
--- a/import.php
+++ b/import.php
@@ -395,7 +395,7 @@ if (!$error) {
}
}
-if (! $error && false !== $import_handle && NULL !== $import_handle) {
+if (! $error && false !== $import_handle && null !== $import_handle) {
fclose($import_handle);
}
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index 760d19d..dd5593a 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -453,7 +453,7 @@ require_once './libraries/List.class.php';
// TODO: db names may contain characters
// that are regexp instructions
$re = '(^|(\\\\\\\\)+|[^\])';
- $tmp_regex = preg_replace('/' . addcslashes($re, '/') . '%/', '\\1.*', preg_replace('/' . addcslashes($re,'/') . '_/', '\\1.{1}', $tmp_matchpattern));
+ $tmp_regex = preg_replace('/' . addcslashes($re, '/') . '%/', '\\1.*', preg_replace('/' . addcslashes($re, '/') . '_/', '\\1.{1}', $tmp_matchpattern));
// Fixed db name matching
// 2000-08-28 -- Benjamin Gandon
if (preg_match('/^' . addcslashes($tmp_regex, '/') . '$/', $tmp_db)) {
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index f0520a7..921ba90 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -203,7 +203,7 @@ function PMA_DBI_convert_message($message)
if (! empty($server_language) && isset($encodings[$server_language])) {
if (function_exists('iconv')) {
if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
- require_once './libraries/iconv_wrapper.lib.php';
+ include_once './libraries/iconv_wrapper.lib.php';
$message = PMA_aix_iconv_wrapper($encodings[$server_language],
'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], $message);
} else {
@@ -730,7 +730,7 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false,
$databases[$database_name]['SCHEMA_NAME'] = $database_name;
if ($force_stats) {
- require_once './libraries/mysql_charsets.lib.php';
+ include_once './libraries/mysql_charsets.lib.php';
$databases[$database_name]['DEFAULT_COLLATION_NAME']
= PMA_getDbCollation($database_name);
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index 80b8c51..3e5f342 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -257,6 +257,6 @@ unset($each_table, $tbl_group_sql, $db_info_result);
* If in an Ajax request, we do not need to show this
*/
if ($GLOBALS['is_ajax_request'] != true) {
- require './libraries/db_links.inc.php';
+ include './libraries/db_links.inc.php';
}
?>
diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php
index 97b7ec8..cd74d78 100644
--- a/libraries/db_table_exists.lib.php
+++ b/libraries/db_table_exists.lib.php
@@ -73,7 +73,7 @@ if (empty($is_table) && !defined('PMA_SUBMIT_MULT') && ! defined('TABLE_MAY_BE_A
}
if (! $is_table) {
- require './db_sql.php';
+ include './db_sql.php';
exit;
}
}
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index d745f1b..57cb7ff 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -99,17 +99,17 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
}
if (!$server) {
- $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, $password, empty($client_flags) ? NULL : $client_flags);
+ $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, $password, empty($client_flags) ? null : $client_flags);
// Retry with empty password if we're allowed to
if (empty($link) && $cfg['Server']['nopassword'] && !$is_controluser) {
- $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, '', empty($client_flags) ? NULL : $client_flags);
+ $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, '', empty($client_flags) ? null : $client_flags);
}
} else {
if (!isset($server['host'])) {
- $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL);
+ $link = PMA_DBI_real_connect($server_socket, $user, $password, null);
} else {
- $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL);
+ $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, null);
}
}
if (empty($link)) {
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
index 1ec7931..eac2c1d 100644
--- a/libraries/display_create_database.lib.php
+++ b/libraries/display_create_database.lib.php
@@ -23,7 +23,7 @@ if ($is_create_db_priv) {
<input type="hidden" name="reload" value="1" />
<input type="text" name="new_db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" id="text_create_db"/>
<?php
- require_once './libraries/mysql_charsets.lib.php';
+ include_once './libraries/mysql_charsets.lib.php';
echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', null, null, true, 5);
if (! empty($dbstats)) {
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index a37c571..b855191 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -35,7 +35,7 @@ $export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $exp
/* Fail if we didn't find any plugin */
if (empty($export_list)) {
PMA_Message::error( __('Could not load export plugins, please check your installation!'))->display();
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
}
?>
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index d709631..8e17e5a 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -21,7 +21,7 @@ $import_list = PMA_getPlugins('./libraries/import/', $import_type);
/* Fail if we didn't find any plugin */
if (empty($import_list)) {
PMA_Message::error(__('Could not load import plugins, please check your installation!'))->display();
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
}
?>
diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php
index f626975..818e9e1 100644
--- a/libraries/engines/innobase.lib.php
+++ b/libraries/engines/innobase.lib.php
@@ -14,6 +14,7 @@ require_once './libraries/engines/innodb.lib.php';
*
* @package phpMyAdmin-Engines
*/
-class PMA_StorageEngine_innobase extends PMA_StorageEngine_innodb {}
-
+class PMA_StorageEngine_innobase extends PMA_StorageEngine_innodb
+{
+}
?>
diff --git a/libraries/export/excel.php b/libraries/export/excel.php
index df329de..44bbc44 100644
--- a/libraries/export/excel.php
+++ b/libraries/export/excel.php
@@ -38,6 +38,6 @@ if (isset($plugin_list)) {
);
} else {
/* Everything rest is coded in csv plugin */
- require './libraries/export/csv.php';
+ include './libraries/export/csv.php';
}
?>
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index 1e84820..ad10478 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -209,7 +209,7 @@ if (isset($plugin_list)) {
$buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf;
if (isset($GLOBALS['latex_caption'])) {
$buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
- . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\';
+ . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], null, array('table' => $table, 'database' => $db)) . '} \\\\';
}
if (!PMA_exportOutputHandler($buffer)) {
return false;
@@ -372,7 +372,7 @@ if (isset($plugin_list)) {
// Table caption for first page and label
if (isset($GLOBALS['latex_caption'])) {
$buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
- . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], NULL, array('table' => $table, 'database' => $db))
+ . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], null, array('table' => $table, 'database' => $db))
. '} \\\\' . $crlf;
}
$buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf;
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index 0c62878..a13360f 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -31,7 +31,7 @@ if (isset($plugin_list)) {
} else {
$GLOBALS['ods_buffer'] = '';
- require_once './libraries/opendocument.lib.php';
+ include_once './libraries/opendocument.lib.php';
/**
* Outputs export footer
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index fc2b536..b2c88eb 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -63,7 +63,7 @@ if (isset($plugin_list)) {
} else {
$GLOBALS['odt_buffer'] = '';
- require_once './libraries/opendocument.lib.php';
+ include_once './libraries/opendocument.lib.php';
/**
* Outputs export footer
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index 61c8dce..903df74 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -30,7 +30,7 @@ if (isset($plugin_list)) {
);
} else {
- require_once './libraries/PDF.class.php';
+ include_once './libraries/PDF.class.php';
/**
* Adapted from a LGPL script by Philip Clarke
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 988ec46..dff5a94 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -627,7 +627,7 @@ if (isset($plugin_list)) {
$delimiter = '$$';
if (PMA_MYSQL_INT_VERSION > 50100) {
- $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';');
+ $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db, true) . '\';');
} else {
$event_names = array();
}
@@ -759,7 +759,7 @@ if (isset($plugin_list)) {
$schema_create .= $new_crlf;
// no need to generate a DROP VIEW here, it was done earlier
- if (! empty($sql_drop_table) && ! PMA_Table::isView($db,$table)) {
+ if (! empty($sql_drop_table) && ! PMA_Table::isView($db, $table)) {
$schema_create .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table, $sql_backquotes) . ';' . $crlf;
}
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index dbb1f1a..9d6259d 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -174,7 +174,7 @@ setURLHash("<?php echo PMA_generate_common_url($url_params, 'text', ''); ?>");
// Include possible custom footers
if (! $GLOBALS['is_ajax_request'] && file_exists(CUSTOM_FOOTER_FILE)) {
- require CUSTOM_FOOTER_FILE;
+ include CUSTOM_FOOTER_FILE;
}
/**
diff --git a/libraries/import/shp.php b/libraries/import/shp.php
index 977d117..948b87c 100644
--- a/libraries/import/shp.php
+++ b/libraries/import/shp.php
@@ -63,8 +63,8 @@ if (isset($plugin_list)) {
* reading directly from a file. Using readFromBuffer() in place of fread().
* This makes it possible to use compressions.
*/
- class PMA_ShapeFile extends ShapeFile {
-
+ class PMA_ShapeFile extends ShapeFile
+ {
function _isDbaseLoaded()
{
return extension_loaded('dbase');
diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php
index c161f22..85ad3f3 100644
--- a/libraries/opendocument.lib.php
+++ b/libraries/opendocument.lib.php
@@ -45,8 +45,8 @@ function PMA_createOpenDocument($mime, $data)
. '<meta:initial-creator>phpMyAdmin ' . PMA_VERSION . '</meta:initial-creator>'
. '<meta:creation-date>' . strftime('%Y-%m-%dT%H:%M:%S') . '</meta:creation-date>'
. '</office:meta>'
- . '</office:document-meta>'
- , 'meta.xml');
+ . '</office:document-meta>',
+ 'meta.xml');
$zipfile -> addFile('<?xml version="1.0" encoding="UTF-8"?' . '>'
. '<office:document-styles '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
. '<office:font-face-decls>'
@@ -89,16 +89,16 @@ function PMA_createOpenDocument($mime, $data)
. '<office:master-styles>'
. '<style:master-page style:name="Standard" style:page-layout-name="pm1"/>'
. '</office:master-styles>'
- . '</office:document-styles>'
- , 'styles.xml');
+ . '</office:document-styles>',
+ 'styles.xml');
$zipfile -> addFile('<?xml version="1.0" encoding="UTF-8"?' . '>'
. '<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">'
. '<manifest:file-entry manifest:media-type="' . $mime . '" manifest:full-path="/"/>'
. '<manifest:file-entry manifest:media-type="text/xml" manifest:full-path="content.xml"/>'
. '<manifest:file-entry manifest:media-type="text/xml" manifest:full-path="meta.xml"/>'
. '<manifest:file-entry manifest:media-type="text/xml" manifest:full-path="styles.xml"/>'
- . '</manifest:manifest>'
- , 'META-INF/manifest.xml');
+ . '</manifest:manifest>',
+ 'META-INF/manifest.xml');
return $zipfile -> file();
}
?>
diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php
index 7d14191..4c42c57 100644
--- a/libraries/pmd_common.php
+++ b/libraries/pmd_common.php
@@ -75,7 +75,7 @@ function get_tab_info()
PMA_DBI_select_db($GLOBALS['db']);
$tab_column = array();
for ($i = 0, $cnt = count($GLOBALS['PMD']["TABLE_NAME"]); $i < $cnt; $i++) {
- $fields_rs = PMA_DBI_query(PMA_DBI_get_columns_sql($GLOBALS['db'], $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i], null, true), NULL, PMA_DBI_QUERY_STORE);
+ $fields_rs = PMA_DBI_query(PMA_DBI_get_columns_sql($GLOBALS['db'], $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i], null, true), null, PMA_DBI_QUERY_STORE);
$j = 0;
while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
$tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['COLUMN_ID'][$j] = $j;
@@ -98,7 +98,7 @@ function get_script_contr()
PMA_DBI_select_db($GLOBALS['db']);
$con["C_NAME"] = array();
$i = 0;
- $alltab_rs = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($GLOBALS['db']), NULL, PMA_DBI_QUERY_STORE);
+ $alltab_rs = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($GLOBALS['db']), null, PMA_DBI_QUERY_STORE);
while ($val = @PMA_DBI_fetch_row($alltab_rs)) {
$row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'internal');
//echo "<br> internal ".$GLOBALS['db']." - ".$val[0]." - ";
@@ -172,7 +172,7 @@ function get_pk_or_unique_keys()
*/
function get_all_keys($unique_only = false)
{
- require_once './libraries/Index.class.php';
+ include_once './libraries/Index.class.php';
$keys = array();
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index d0ff706..b7ea862 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -440,10 +440,10 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
if (($is_information_schema || $is_data_dictionary) && ($source == 'internal' || $source == 'both')) {
if ($is_information_schema) {
$relations_key = 'information_schema_relations';
- require_once './libraries/information_schema_relations.lib.php';
+ include_once './libraries/information_schema_relations.lib.php';
} else {
$relations_key = 'data_dictionary_relations';
- require_once './libraries/data_dictionary_relations.lib.php';
+ include_once './libraries/data_dictionary_relations.lib.php';
}
if (isset($GLOBALS[$relations_key][$table])) {
foreach ($GLOBALS[$relations_key][$table] as $field => $relations) {
diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php
index a35d436..c4b6a1f 100644
--- a/libraries/rte/rte_events.lib.php
+++ b/libraries/rte/rte_events.lib.php
@@ -205,7 +205,7 @@ function PMA_EVN_handleEditor()
} else {
echo "\n\n<h2>$title</h2>\n\n$editor";
unset($_POST);
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
}
// exit;
} else {
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index 8cd0529..a6557d7 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -366,7 +366,7 @@ function PMA_RTN_handleEditor()
PMA_ajaxResponse($editor, true, $extra_data);
}
echo "\n\n<h2>$title</h2>\n\n$editor";
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
// exit;
} else {
$message = __('Error in processing request') . ' : ';
@@ -1297,7 +1297,7 @@ function PMA_RTN_handleExecute()
} else {
echo "\n\n<h2>" . __("Execute routine") . "</h2>\n\n";
echo $form;
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
// exit;
}
} else if (($GLOBALS['is_ajax_request'] == true)) {
diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php
index b4e5d40..29cc60f 100644
--- a/libraries/rte/rte_triggers.lib.php
+++ b/libraries/rte/rte_triggers.lib.php
@@ -180,7 +180,7 @@ function PMA_TRI_handleEditor()
} else {
echo "\n\n<h2>$title</h2>\n\n$editor";
unset($_POST);
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
}
// exit;
} else {
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 703d08a..6b1a315 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -37,14 +37,14 @@ if (! defined('PMA_MINIMUM_COMMON')) {
/**
* Include the string library as we use it heavily
*/
- require_once './libraries/string.lib.php';
+ include_once './libraries/string.lib.php';
/**
* Include data for the SQL Parser
*/
- require_once './libraries/sqlparser.data.php';
+ include_once './libraries/sqlparser.data.php';
if (!defined('TESTSUITE')) {
- require_once './libraries/mysql_charsets.lib.php';
+ include_once './libraries/mysql_charsets.lib.php';
}
if (! isset($mysql_charsets)) {
$mysql_charsets = array();
diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php
index abbe6e9..654a9c8 100644
--- a/libraries/sqlvalidator.class.php
+++ b/libraries/sqlvalidator.class.php
@@ -45,8 +45,8 @@ if (!$GLOBALS['sqlvalidator_error']) {
/**
* @package phpMyAdmin
*/
- class PMA_SQLValidator {
-
+ class PMA_SQLValidator
+ {
var $url;
var $service_name;
var $wsdl;
diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php
index 68934dd..5309890 100644
--- a/libraries/sqlvalidator.lib.php
+++ b/libraries/sqlvalidator.lib.php
@@ -39,7 +39,7 @@ if (! defined('PHPMYADMIN')) {
* For now we actually use a configuration flag
*/
if ($cfg['SQLValidator']['use'] == true) {
- require_once './libraries/sqlvalidator.class.php';
+ include_once './libraries/sqlvalidator.class.php';
} // if ($cfg['SQLValidator']['use'] == true)
diff --git a/libraries/svg_plot/pma_svg_data_element.php b/libraries/svg_plot/pma_svg_data_element.php
index 97f7734..15a3ddc 100644
--- a/libraries/svg_plot/pma_svg_data_element.php
+++ b/libraries/svg_plot/pma_svg_data_element.php
@@ -4,8 +4,8 @@
*
* @package phpMyAdmin
*/
-abstract class PMA_SVG_Data_Element{
-
+abstract class PMA_SVG_Data_Element
+{
protected $label = '';
protected $dataRow = array();
@@ -26,7 +26,7 @@ abstract class PMA_SVG_Data_Element{
* @return the code related to a row in the GIS dataset
*/
public abstract function prepareRowAsSVG($options);
-
+
public function getLabel()
{
return $this->label;
@@ -36,7 +36,7 @@ abstract class PMA_SVG_Data_Element{
{
$this->label = $label;
}
-
+
public function getDataRow()
{
return $this->dataRow;
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 8b42189..e5342d3 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -29,9 +29,9 @@ require_once './libraries/Partition.class.php';
// load additional configuration variables
if (PMA_DRIZZLE) {
- require_once './libraries/data_drizzle.inc.php';
+ include_once './libraries/data_drizzle.inc.php';
} else {
- require_once './libraries/data_mysql.inc.php';
+ include_once './libraries/data_mysql.inc.php';
}
if (is_int($cfg['DefaultPropDisplay'])) {
diff --git a/libraries/transformations/image_jpeg__inline.inc.php b/libraries/transformations/image_jpeg__inline.inc.php
index 4ff1e72..97e4baf 100644
--- a/libraries/transformations/image_jpeg__inline.inc.php
+++ b/libraries/transformations/image_jpeg__inline.inc.php
@@ -16,7 +16,7 @@ function PMA_transformation_image_jpeg__inline_info()
*/
function PMA_transformation_image_jpeg__inline($buffer, $options = array(), $meta = '')
{
- require_once './libraries/transformations/global.inc.php';
+ include_once './libraries/transformations/global.inc.php';
if (PMA_IS_GD2) {
$transform_options = array ('string' => '<a href="transformation_wrapper.php' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php' . $options['wrapper_link'] . '&resize=jpeg&newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0" /></a>');
diff --git a/libraries/transformations/image_jpeg__link.inc.php b/libraries/transformations/image_jpeg__link.inc.php
index 8988dd7..82800c1 100644
--- a/libraries/transformations/image_jpeg__link.inc.php
+++ b/libraries/transformations/image_jpeg__link.inc.php
@@ -16,7 +16,7 @@ function PMA_transformation_image_jpeg__link_info()
*/
function PMA_transformation_image_jpeg__link($buffer, $options = array(), $meta = '')
{
- require_once './libraries/transformations/global.inc.php';
+ include_once './libraries/transformations/global.inc.php';
$transform_options = array ('string' => '<a href="transformation_wrapper.php' . $options['wrapper_link'] . '" alt="[__BUFFER__]">[BLOB]</a>');
$buffer = PMA_transformation_global_html_replace($buffer, $transform_options);
diff --git a/libraries/transformations/image_png__inline.inc.php b/libraries/transformations/image_png__inline.inc.php
index 5c9fc4b..481af25 100644
--- a/libraries/transformations/image_png__inline.inc.php
+++ b/libraries/transformations/image_png__inline.inc.php
@@ -16,7 +16,7 @@ function PMA_transformation_image_png__inline_info()
*/
function PMA_transformation_image_png__inline($buffer, $options = array(), $meta = '')
{
- require_once './libraries/transformations/global.inc.php';
+ include_once './libraries/transformations/global.inc.php';
if (PMA_IS_GD2) {
$transform_options = array ('string' => '<a href="transformation_wrapper.php' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php' . $options['wrapper_link'] . '&resize=png&newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0" /></a>');
diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php
index 4148c1f..06fd97f 100644
--- a/libraries/transformations/text_plain__imagelink.inc.php
+++ b/libraries/transformations/text_plain__imagelink.inc.php
@@ -16,7 +16,7 @@ function PMA_transformation_text_plain__imagelink_info()
*/
function PMA_transformation_text_plain__imagelink($buffer, $options = array(), $meta = '')
{
- require_once './libraries/transformations/global.inc.php';
+ include_once './libraries/transformations/global.inc.php';
$transform_options = array ('string' => '<a href="' . (isset($options[0]) ? $options[0] : '') . $buffer . '" target="_blank"><img src="' . (isset($options[0]) ? $options[0] : '') . $buffer . '" border="0" width="' . (isset($options[1]) ? $options[1] : 100) . '" height="' . (isset($options[2]) ? $options[2] : 50) . '" />' . $buffer . '</a>');
$buffer = PMA_transformation_global_html_replace($buffer, $transform_options);
diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php
index 4a807da..4daa565 100644
--- a/libraries/transformations/text_plain__link.inc.php
+++ b/libraries/transformations/text_plain__link.inc.php
@@ -16,7 +16,7 @@ function PMA_transformation_text_plain__link_info()
*/
function PMA_transformation_text_plain__link($buffer, $options = array(), $meta = '')
{
- require_once './libraries/transformations/global.inc.php';
+ include_once './libraries/transformations/global.inc.php';
// $transform_options = array ('string' => '<a href="' . (isset($options[0]) ? $options[0] : '') . '%1$s" title="' . (isset($options[1]) ? $options[1] : '%1$s') . '">' . (isset($options[1]) ? $options[1] : '%1$s') . '</a>');
diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
index 7fd78e4..d61d9d2 100644
--- a/pmd_relation_upd.php
+++ b/pmd_relation_upd.php
@@ -41,24 +41,27 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) &&
}
if ($try_to_delete_internal_relation) {
// internal relations
- PMA_query_as_controluser('DELETE FROM '
- . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.'
- . $cfg['Server']['relation'].' WHERE '
- . 'master_db = \'' . PMA_sqlAddSlashes($DB2) . '\''
- . ' AND master_table = \'' . PMA_sqlAddSlashes($T2) . '\''
- . ' AND master_field = \'' . PMA_sqlAddSlashes($F2) . '\''
- . ' AND foreign_db = \'' . PMA_sqlAddSlashes($DB1) . '\''
- . ' AND foreign_table = \'' . PMA_sqlAddSlashes($T1) . '\''
- . ' AND foreign_field = \'' . PMA_sqlAddSlashes($F1) . '\''
- , false, PMA_DBI_QUERY_STORE);
+ PMA_query_as_controluser(
+ 'DELETE FROM '
+ . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.'
+ . $cfg['Server']['relation'].' WHERE '
+ . 'master_db = \'' . PMA_sqlAddSlashes($DB2) . '\''
+ . ' AND master_table = \'' . PMA_sqlAddSlashes($T2) . '\''
+ . ' AND master_field = \'' . PMA_sqlAddSlashes($F2) . '\''
+ . ' AND foreign_db = \'' . PMA_sqlAddSlashes($DB1) . '\''
+ . ' AND foreign_table = \'' . PMA_sqlAddSlashes($T1) . '\''
+ . ' AND foreign_field = \'' . PMA_sqlAddSlashes($F1) . '\'',
+ false,
+ PMA_DBI_QUERY_STORE
+ );
}
PMD_return_upd(1, __('Relation deleted'));
function PMD_return_upd($b, $ret)
{
- global $K;
- header("Content-Type: text/xml; charset=utf-8");
- header("Cache-Control: no-cache");
- die('<root act="relation_upd" return="'.$ret.'" b="'.$b.'" K="'.$K.'"></root>');
+ global $K;
+ header("Content-Type: text/xml; charset=utf-8");
+ header("Cache-Control: no-cache");
+ die('<root act="relation_upd" return="'.$ret.'" b="'.$b.'" K="'.$K.'"></root>');
}
?>
diff --git a/prefs_manage.php b/prefs_manage.php
index 7c5d3f8..267eb43 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -105,8 +105,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
}
if (!$all_ok) {
// mimic original form and post json in a hidden field
- require './libraries/header.inc.php';
- require './libraries/user_preferences.inc.php';
+ include './libraries/header.inc.php';
+ include './libraries/user_preferences.inc.php';
$msg = PMA_Message::error(__('Configuration contains incorrect data for some fields.'));
$msg->display();
echo '<div class="config-form">';
@@ -128,7 +128,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
<input type="submit" name="submit_ignore" value="<?php echo __('No') ?>" />
</form>
<?php
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
return;
}
diff --git a/querywindow.php b/querywindow.php
index 5641d1c..7a9f83d 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -95,11 +95,11 @@ if ($no_js) {
// ... we redirect to appropriate query sql page
// works only full if $db and $table is also stored/grabbed from $_COOKIE
if (strlen($table)) {
- require './tbl_sql.php';
+ include './tbl_sql.php';
} elseif (strlen($db)) {
- require './db_sql.php';
+ include './db_sql.php';
} else {
- require './server_sql.php';
+ include './server_sql.php';
}
exit;
}
diff --git a/server_databases.php b/server_databases.php
index c709f83..8ae3422 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -12,7 +12,7 @@ require_once './libraries/common.inc.php';
require './libraries/server_common.inc.php';
if (!PMA_DRIZZLE) {
- require './libraries/replication.inc.php';
+ include './libraries/replication.inc.php';
} else {
$replication_types = array();
$replication_info = null;
@@ -74,7 +74,7 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
if (isset($_REQUEST['selected_dbs'])) {
$selected_db = $_REQUEST['selected_dbs'];
}
- require './libraries/mult_submits.inc.php';
+ include './libraries/mult_submits.inc.php';
unset($action, $submit_mult, $err_url, $selected_db, $GLOBALS['db']);
if (empty($message)) {
$message = PMA_Message::success(__('%s databases have been dropped successfully.'));
@@ -109,7 +109,7 @@ echo '<h2>' . "\n"
*/
if ($cfg['ShowCreateDb']) {
echo '<ul><li id="li_create_database">' . "\n";
- require './libraries/display_create_database.lib.php';
+ include './libraries/display_create_database.lib.php';
echo ' </li>' . "\n";
echo '</ul>' . "\n";
}
diff --git a/server_replication.php b/server_replication.php
index 59d72f7..68db315 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -25,13 +25,13 @@ require_once './libraries/server_synchronize.lib.php';
* Checks if the user is allowed to do what he tries to...
*/
if (! $is_superuser) {
- require './libraries/server_links.inc.php';
+ include './libraries/server_links.inc.php';
echo '<h2>' . "\n"
. PMA_getIcon('s_replication.png')
. __('Replication') . "\n"
. '</h2>' . "\n";
PMA_Message::error(__('No Privileges'))->display();
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
}
/**
@@ -234,7 +234,7 @@ if (isset($GLOBALS['mr_configure'])) {
echo ' </form>';
echo '</fieldset>';
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
exit;
}
diff --git a/server_status.php b/server_status.php
index bbac0c3..4a8a37f 100644
--- a/server_status.php
+++ b/server_status.php
@@ -1486,7 +1486,7 @@ function printVariablesTable()
}
if ('%' === substr($name, -1, 1)) {
echo htmlspecialchars(PMA_formatNumber($value, 0, 2)) . ' %';
- } elseif (strpos($name, 'Uptime')!==FALSE) {
+ } elseif (strpos($name, 'Uptime') !== false) {
echo htmlspecialchars(PMA_timespanFormat($value));
} elseif (is_numeric($value) && $value == (int) $value && $value > 1000) {
echo htmlspecialchars(PMA_formatNumber($value, 3, 1));
diff --git a/server_synchronize.php b/server_synchronize.php
index d4627cf..3b8ff59 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -1109,13 +1109,15 @@ if (isset($_REQUEST['synchronize_db'])) {
PMA_updateTargetTables($matching_tables, $update_array, $src_db, $trg_db,
$trg_link, $p, $matching_tables_keys, true);
- PMA_insertIntoTargetTable($matching_tables, $src_db, $trg_db, $src_link,
- $trg_link , $matching_tables_fields, $insert_array, $p,
+ PMA_insertIntoTargetTable(
+ $matching_tables, $src_db, $trg_db, $src_link,
+ $trg_link, $matching_tables_fields, $insert_array, $p,
$matching_tables_keys, $matching_tables_keys, $source_columns,
$add_column_array, $criteria, $target_tables_keys, $uncommon_tables,
$uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes,
$target_indexes, $add_indexes_array,
- $alter_indexes_array, $delete_array, $update_array, true);
+ $alter_indexes_array, $delete_array, $update_array, true
+ );
}
/**
diff --git a/setup/config.php b/setup/config.php
index b90d24c..89bcdc9 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -54,7 +54,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
// Load config file from the server
//
$cfg = array();
- require_once $config_file_path;
+ include_once $config_file_path;
ConfigFile::getInstance()->setConfigData($cfg);
header('HTTP/1.1 303 See Other');
header('Location: index.php');
diff --git a/sql.php b/sql.php
index 53d9759..42a9ac1 100644
--- a/sql.php
+++ b/sql.php
@@ -104,7 +104,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value
}
$extra_data['dropdown'] = $dropdown;
- PMA_ajaxResponse(NULL, true, $extra_data);
+ PMA_ajaxResponse(null, true, $extra_data);
}
/**
@@ -133,7 +133,7 @@ if (isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true)
$dropdown = '<select>' . $dropdown . '</select>';
$extra_data['dropdown'] = $dropdown;
- PMA_ajaxResponse(NULL, true, $extra_data);
+ PMA_ajaxResponse(null, true, $extra_data);
}
/**
@@ -162,7 +162,7 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
$select = '<select multiple="multiple" size="' . $select_size . '">' . $select . '</select>';
$extra_data['select'] = $select;
- PMA_ajaxResponse(NULL, true, $extra_data);
+ PMA_ajaxResponse(null, true, $extra_data);
}
/**
@@ -191,7 +191,7 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
}
}
- PMA_ajaxResponse(NULL, ($retval == true));
+ PMA_ajaxResponse(null, ($retval == true));
}
// Default to browse if no query set and we have table
@@ -766,7 +766,7 @@ else {
$row = PMA_DBI_fetch_row($result);
$extra_data = array();
$extra_data['value'] = $row[0];
- PMA_ajaxResponse(NULL, true, $extra_data);
+ PMA_ajaxResponse(null, true, $extra_data);
}
if (isset($_REQUEST['ajax_request']) && isset($_REQUEST['table_maintenance'])) {
diff --git a/tbl_addfield.php b/tbl_addfield.php
index f9324fe..c2a2e96 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -186,7 +186,7 @@ if (isset($_REQUEST['do_save_data'])) {
$message->addParam($table);
if( $GLOBALS['is_ajax_request'] == true) {
- $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
+ $extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}
diff --git a/tbl_alter.php b/tbl_alter.php
index dcde601..a268866 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -131,7 +131,7 @@ if (isset($_REQUEST['do_save_data'])) {
}
if ( $_REQUEST['ajax_request'] == true) {
- $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
+ $extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 1bffbe7..1d678db 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -97,20 +97,20 @@ if (isset($_REQUEST['do_save_data'])) {
PMA_DBI_query($sql_query);
$message = PMA_Message::success(__('Table %1$s has been altered successfully'));
$message->addParam($table);
-
+
if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['index_table'] = PMA_Index::getView($table, $db);
- $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
+ $extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}
-
+
$active_page = 'tbl_structure.php';
- require './tbl_structure.php';
+ include './tbl_structure.php';
exit;
} else {
if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['error'] = $error;
- PMA_ajaxResponse($error,false);
+ PMA_ajaxResponse($error, false);
}
$error->display();
}
diff --git a/tbl_move_copy.php b/tbl_move_copy.php
index 58d90f3..e25cf69 100644
--- a/tbl_move_copy.php
+++ b/tbl_move_copy.php
@@ -65,13 +65,13 @@ if (PMA_isValid($_REQUEST['new_name'])) {
$db = $_REQUEST['target_db'];
$table = $_REQUEST['new_name'];
}
-
+
if ( $_REQUEST['ajax_request'] == true) {
- $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
+ $extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
$extra_data['db'] = $GLOBALS['db'];
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}
-
+
$reload = 1;
}
} else {
diff --git a/tbl_operations.php b/tbl_operations.php
index 95b602e..d859a52 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -230,7 +230,7 @@ if (isset($result) && empty($message_to_show)) {
// $result should exist, regardless of $_message
$_type = $result ? 'success' : 'error';
if ( $_REQUEST['ajax_request'] == true) {
- $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
+ $extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
PMA_ajaxResponse($_message, $_message->isSuccess(), $extra_data);
}
}
diff --git a/tbl_printview.php b/tbl_printview.php
index 76d4e73..3643d58 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -17,7 +17,7 @@ require './libraries/tbl_common.php';
*/
$print_view = true;
if (! isset($selected_tbl)) {
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
}
// Check parameters
@@ -62,7 +62,7 @@ $multi_tables = (count($the_tables) > 1);
if ($multi_tables) {
if (empty($GLOBALS['is_header_sent'])) {
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
}
$tbl_list = '';
foreach ($the_tables as $key => $table) {
diff --git a/tbl_replace.php b/tbl_replace.php
index b6da1ba..b5c43dc 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -231,8 +231,8 @@ foreach ($loop_array as $rownumber => $where_clause) {
// for blobstreaming
if ($blob_streaming_active) {
- $remove_blob_repo = isset($_REQUEST['remove_blob_repo_' . $key]) ? $_REQUEST['remove_blob_repo_' . $key] : NULL;
- $upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : NULL;
+ $remove_blob_repo = isset($_REQUEST['remove_blob_repo_' . $key]) ? $_REQUEST['remove_blob_repo_' . $key] : null;
+ $upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : null;
// checks if an existing blob repository reference should be removed
if (isset($remove_blob_repo) && ! isset($upload_blob_repo)) {
diff --git a/tbl_tracking.php b/tbl_tracking.php
index 847578c..496982a 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -219,7 +219,7 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump')
$table_temp = $table;
$db = $table = '';
- require_once './libraries/sql_query_form.lib.php';
+ include_once './libraries/sql_query_form.lib.php';
PMA_sqlQueryForm($new_query, 'sql');
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index 42fab56..edcc6aa 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -19,7 +19,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
/**
* Turn off backup globals
*/
- protected $backupGlobals = FALSE;
+ protected $backupGlobals = false;
/**
* @var PMA_Config
diff --git a/test/libraries/common/PMA_getDbLink_test.php b/test/libraries/common/PMA_getDbLink_test.php
index 85a76e8..303ec38 100644
--- a/test/libraries/common/PMA_getDbLink_test.php
+++ b/test/libraries/common/PMA_getDbLink_test.php
@@ -21,8 +21,8 @@ class PMA_getDbLink_test extends PHPUnit_Framework_TestCase
function setUp()
{
global $cfg;
- require_once 'libraries/vendor_config.php';
- require 'libraries/config.default.php';
+ include_once 'libraries/vendor_config.php';
+ include 'libraries/config.default.php';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$GLOBALS['server'] = 99;
diff --git a/test/libraries/common/PMA_showMessage_test_disabled.php b/test/libraries/common/PMA_showMessage_test_disabled.php
index d89aa10..daf855f 100644
--- a/test/libraries/common/PMA_showMessage_test_disabled.php
+++ b/test/libraries/common/PMA_showMessage_test_disabled.php
@@ -23,7 +23,7 @@ class PMA_showMessage_test extends PHPUnit_Extensions_OutputTestCase
function setUp()
{
global $cfg;
- require 'libraries/config.default.php';
+ include 'libraries/config.default.php';
}
function testShowMessageNotAjax()
diff --git a/test/libraries/core/PMA_array_test.php b/test/libraries/core/PMA_array_test.php
index 0eea363..8fc63fb 100644
--- a/test/libraries/core/PMA_array_test.php
+++ b/test/libraries/core/PMA_array_test.php
@@ -94,7 +94,7 @@ class PMA_array_test extends PHPUnit_Framework_TestCase
PMA_array_write('sarr/not_existing/1', $arr, 'some_val');
$this->assertEquals($arr['sarr']['not_existing'][1], 'some_val');
- PMA_array_write('sarr/0/2', $arr, NULL);
+ PMA_array_write('sarr/0/2', $arr, null);
$this->assertNull($arr['sarr'][0][2]);
}
diff --git a/test/libraries/core/PMA_headerLocation_test_disabled.php b/test/libraries/core/PMA_headerLocation_test_disabled.php
index a303d24..089064b 100644
--- a/test/libraries/core/PMA_headerLocation_test_disabled.php
+++ b/test/libraries/core/PMA_headerLocation_test_disabled.php
@@ -104,9 +104,9 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase
if (defined('PMA_IS_IIS')) {
$this->oldIISvalue = PMA_IS_IIS;
- runkit_constant_redefine('PMA_IS_IIS', NULL);
+ runkit_constant_redefine('PMA_IS_IIS', null);
} else {
- runkit_constant_add('PMA_IS_IIS', NULL);
+ runkit_constant_add('PMA_IS_IIS', null);
}
@@ -114,9 +114,9 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase
if (defined('SID')) {
$this->oldSIDvalue = SID;
- runkit_constant_redefine('SID', NULL);
+ runkit_constant_redefine('SID', null);
} else {
- runkit_constant_add('SID', NULL);
+ runkit_constant_add('SID', null);
}
}
diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
index db61325..112315d 100644
--- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
@@ -21,7 +21,7 @@ class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase
global $cfg;
$cfg['ShowFunctionFields'] = false;
- require 'libraries/data_mysql.inc.php';
+ include 'libraries/data_mysql.inc.php';
}
/**
diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
index 2fd0129..2230ca9 100644
--- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
@@ -20,7 +20,7 @@ class PMA_RTN_getEditorForm_test extends PHPUnit_Framework_TestCase
global $cfg;
$cfg['ShowFunctionFields'] = false;
- require 'libraries/data_mysql.inc.php';
+ include 'libraries/data_mysql.inc.php';
if (! function_exists('PMA_generateCharsetDropdownBox')) {
function PMA_generateCharsetDropdownBox() {}
diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
index f8db88c..03fc82a 100644
--- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
@@ -54,7 +54,7 @@ class PMA_RTN_getExecuteForm_test extends PHPUnit_Framework_TestCase
$cfg['DefaultFunctions']['FUNC_SPATIAL'] = 'GeomFromText';
$GLOBALS['tear_down']['default'] = true;
}
- require 'libraries/data_mysql.inc.php';
+ include 'libraries/data_mysql.inc.php';
}
public function tearDown()
diff --git a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
index db11ff4..95473e3 100644
--- a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
+++ b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
@@ -29,7 +29,7 @@ class PMA_RTN_getQueryFromRequest_test extends PHPUnit_Framework_TestCase
$cfg['ShowFunctionFields'] = false;
- require 'libraries/data_mysql.inc.php';
+ include 'libraries/data_mysql.inc.php';
$errors = array();
PMA_RTN_setGlobals();
diff --git a/test/selenium/PmaSeleniumLoginTest.php b/test/selenium/PmaSeleniumLoginTest.php
index 1a5d22d..bde93bf 100644
--- a/test/selenium/PmaSeleniumLoginTest.php
+++ b/test/selenium/PmaSeleniumLoginTest.php
@@ -10,9 +10,9 @@
require_once 'PmaSeleniumTestCase.php';
-class PmaSeleniumLoginTest extends PmaSeleniumTestCase
+class PmaSeleniumLoginTest extends PmaSeleniumTestCase
{
- protected $captureScreenshotOnFailure = TRUE;
+ protected $captureScreenshotOnFailure = true;
protected $screenshotPath = '/var/www/screenshots';
protected $screenshotUrl = 'http://localhost/screenshots';
diff --git a/test/selenium/PmaSeleniumPrivilegesTest.php b/test/selenium/PmaSeleniumPrivilegesTest.php
index 7eddf7a..0e3f4cf 100644
--- a/test/selenium/PmaSeleniumPrivilegesTest.php
+++ b/test/selenium/PmaSeleniumPrivilegesTest.php
@@ -10,9 +10,9 @@
require_once 'PmaSeleniumTestCase.php';
-class PmaSeleniumPrivilegesTest extends PmaSeleniumTestCase
+class PmaSeleniumPrivilegesTest extends PmaSeleniumTestCase
{
- public function testChangePassword()
+ public function testChangePassword()
{
$this->doLogin();
$this->selectFrame("frame_content");
diff --git a/test/selenium/PmaSeleniumTestCase.php b/test/selenium/PmaSeleniumTestCase.php
index 90da642..1b33ff0 100644
--- a/test/selenium/PmaSeleniumTestCase.php
+++ b/test/selenium/PmaSeleniumTestCase.php
@@ -21,7 +21,7 @@ class PmaSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
protected $selenium;
protected $cfg;
- protected $captureScreenshotOnFailure = TRUE;
+ protected $captureScreenshotOnFailure = true;
protected $screenshotPath = '/var/www/screenshots';
protected $screenshotUrl = 'http://localhost/screenshots';
diff --git a/test/selenium/PmaSeleniumXssTest.php b/test/selenium/PmaSeleniumXssTest.php
index 06f960e..0cba510 100644
--- a/test/selenium/PmaSeleniumXssTest.php
+++ b/test/selenium/PmaSeleniumXssTest.php
@@ -9,9 +9,9 @@
require_once 'PmaSeleniumTestCase.php';
-class PmaSeleniumXSSTest extends PmaSeleniumTestCase
+class PmaSeleniumXSSTest extends PmaSeleniumTestCase
{
- public function testXssQueryTab()
+ public function testXssQueryTab()
{
$this->doLogin();
$this->selectFrame("frame_content");
diff --git a/transformation_overview.php b/transformation_overview.php
index 81211d5..35d41c0 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -52,7 +52,7 @@ foreach ($types['mimetype'] as $key => $mimetype) {
$odd_row = true;
foreach ($types['transformation'] as $key => $transform) {
$func = strtolower(str_ireplace('.inc.php', '', $types['transformation_file'][$key]));
- require './libraries/transformations/' . $types['transformation_file'][$key];
+ include './libraries/transformations/' . $types['transformation_file'][$key];
$funcname = 'PMA_transformation_' . $func . '_info';
$desc = '<i>' . sprintf(__('No description is available for this transformation.<br />Please ask the author what %s does.'), 'PMA_transformation_' . $func . '()') . '</i>';
if (function_exists($funcname)) {
diff --git a/view_create.php b/view_create.php
index c7d63ce..3571c82 100644
--- a/view_create.php
+++ b/view_create.php
@@ -72,7 +72,7 @@ if (isset($_REQUEST['createview'])) {
if (PMA_DBI_try_query($sql_query)) {
$message = PMA_Message::success();
- require './' . $cfg['DefaultTabDatabase'];
+ include './' . $cfg['DefaultTabDatabase'];
exit();
} else {
$message = PMA_Message::rawError(PMA_DBI_getError());
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19814-ge67a0a2
by Madhura Jayaratne 23 Sep '11
by Madhura Jayaratne 23 Sep '11
23 Sep '11
The branch, master has been updated
via e67a0a2531fff325477c5babcfffbf205ca755b3 (commit)
from ac088aaee0194f28f435b63b978db96426cda642 (commit)
- Log -----------------------------------------------------------------
commit e67a0a2531fff325477c5babcfffbf205ca755b3
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Fri Sep 23 08:43:41 2011 +0530
Spaces between parameters in function calls
-----------------------------------------------------------------------
Summary of changes:
db_operations.php | 2 +-
export.php | 2 +-
libraries/List_Database.class.php | 4 +-
libraries/auth/swekey/swekey.php | 40 ++++++++++----------
libraries/header_scripts.inc.php | 2 +-
libraries/import.lib.php | 2 +-
libraries/mult_submits.inc.php | 4 +-
libraries/replication.inc.php | 2 +-
libraries/select_lang.lib.php | 4 +-
libraries/server_synchronize.lib.php | 8 ++--
libraries/svg_plot/pma_scatter_plot.php | 12 +++---
libraries/svg_plot/pma_svg_data_point.php | 8 ++--
libraries/sysinfo.lib.php | 4 +-
navigation.php | 2 +-
pmd_general.php | 18 ++++----
pmd_pdf.php | 4 +-
pmd_relation_new.php | 8 ++--
pmd_relation_upd.php | 6 +-
schema_export.php | 4 +-
server_synchronize.php | 8 ++--
server_variables.php | 14 +++---
sql.php | 6 +-
tbl_addfield.php | 2 +-
tbl_export.php | 2 +-
tbl_operations.php | 2 +-
tbl_replace.php | 2 +-
tbl_select.php | 4 +-
tbl_structure.php | 2 +-
tbl_tracking.php | 4 +-
test/Environment_test.php | 2 +-
test/classes/PMA_Config_test.php | 32 ++++++++--------
.../PMA_contains_nonprintable_ascii_test.php | 4 +-
.../common/PMA_display_html_checkbox_test.php | 8 ++--
.../common/PMA_display_html_radio_test.php | 16 ++++----
.../PMA_extractValueFromFormattedSize_test.php | 8 ++--
test/libraries/common/PMA_formatSql_test.php | 28 +++++++-------
.../common/PMA_generate_html_dropdown_test.php | 6 +-
.../common/PMA_generate_slider_effect_test.php | 6 +-
test/libraries/common/PMA_getDbLink_test.php | 6 +-
.../common/PMA_getTitleForTarget_test.php | 2 +-
test/libraries/core/PMA_array_test.php | 12 +++---
test/libraries/core/PMA_checkPageValidity_test.php | 10 ++--
test/libraries/core/PMA_getTableCount_test_dis.php | 2 +-
.../core/PMA_headerLocation_test_disabled.php | 8 ++--
.../core/PMA_warnMissingExtension_test.php | 10 ++--
45 files changed, 171 insertions(+), 171 deletions(-)
diff --git a/db_operations.php b/db_operations.php
index 512c894..b364d81 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -234,7 +234,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
// to avoid selecting alternatively the current and new db
// we would need to modify the CREATE definitions to qualify
// the db name
- $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';');
+ $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db, true) . '\';');
if ($event_names) {
foreach ($event_names as $event_name) {
PMA_DBI_select_db($db);
diff --git a/export.php b/export.php
index b82ef99..0c8a644 100644
--- a/export.php
+++ b/export.php
@@ -342,7 +342,7 @@ if (!$save_on_server) {
// Download
// (avoid rewriting data containing HTML with anchors and forms;
// this was reported to happen under Plesk)
- @ini_set('url_rewriter.tags','');
+ @ini_set('url_rewriter.tags', '');
$filename = PMA_sanitize_filename($filename);
PMA_download_header($filename, $mime_type);
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index 1e1b31f..760d19d 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -453,10 +453,10 @@ require_once './libraries/List.class.php';
// TODO: db names may contain characters
// that are regexp instructions
$re = '(^|(\\\\\\\\)+|[^\])';
- $tmp_regex = preg_replace('/' . addcslashes($re,'/') . '%/', '\\1.*', preg_replace('/' . addcslashes($re,'/') . '_/', '\\1.{1}', $tmp_matchpattern));
+ $tmp_regex = preg_replace('/' . addcslashes($re, '/') . '%/', '\\1.*', preg_replace('/' . addcslashes($re,'/') . '_/', '\\1.{1}', $tmp_matchpattern));
// Fixed db name matching
// 2000-08-28 -- Benjamin Gandon
- if (preg_match('/^' . addcslashes($tmp_regex,'/') . '$/', $tmp_db)) {
+ if (preg_match('/^' . addcslashes($tmp_regex, '/') . '$/', $tmp_db)) {
$dblist[] = $tmp_db;
break;
}
diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php
index 869d3d5..453437e 100644
--- a/libraries/auth/swekey/swekey.php
+++ b/libraries/auth/swekey/swekey.php
@@ -18,18 +18,18 @@
/**
* Errors codes
*/
-define ("SWEKEY_ERR_INVALID_DEV_STATUS",901); // The satus of the device is not SWEKEY_STATUS_OK
-define ("SWEKEY_ERR_INTERNAL",902); // Should never occurd
-define ("SWEKEY_ERR_OUTDATED_RND_TOKEN",910); // You random token is too old
-define ("SWEKEY_ERR_INVALID_OTP",911); // The otp was not correct
+define ("SWEKEY_ERR_INVALID_DEV_STATUS", 901); // The satus of the device is not SWEKEY_STATUS_OK
+define ("SWEKEY_ERR_INTERNAL", 902); // Should never occurd
+define ("SWEKEY_ERR_OUTDATED_RND_TOKEN", 910); // You random token is too old
+define ("SWEKEY_ERR_INVALID_OTP", 911); // The otp was not correct
/**
* Those errors are considered as an attack and your site will be blacklisted during one minute
* if you receive one of those errors
*/
-define ("SWEKEY_ERR_BADLY_ENCODED_REQUEST",920);
-define ("SWEKEY_ERR_INVALID_RND_TOKEN",921);
-define ("SWEKEY_ERR_DEV_NOT_FOUND",922);
+define ("SWEKEY_ERR_BADLY_ENCODED_REQUEST", 920);
+define ("SWEKEY_ERR_INVALID_RND_TOKEN", 921);
+define ("SWEKEY_ERR_DEV_NOT_FOUND", 922);
/**
* Default values for configuration.
@@ -252,7 +252,7 @@ function Swekey_HttpGet($url, &$response_code)
$r = new HttpRequest($url);
$options = array('timeout' => '3');
- if (substr($url,0, 6) == "https:")
+ if (substr($url, 0, 6) == "https:")
{
$sslOptions = array();
$sslOptions['verifypeer'] = true;
@@ -392,7 +392,7 @@ function Swekey_GetFastHalfRndToken()
{
// we unlink the file so no possible tempfile race attack
unlink($cachefile);
- $file = fopen($cachefile , "x");
+ $file = fopen($cachefile, "x");
if ($file != false)
{
@fwrite($file, $res);
@@ -442,22 +442,22 @@ function Swekey_CheckOtp($id, $rt, $otp)
* Values that are associated with a key.
* The following values can be returned by the Swekey_GetStatus() function
*/
-define ("SWEKEY_STATUS_OK",0);
-define ("SWEKEY_STATUS_NOT_FOUND",1); // The key does not exist in the db
-define ("SWEKEY_STATUS_INACTIVE",2); // The key has never been activated
-define ("SWEKEY_STATUS_LOST",3); // The user has lost his key
-define ("SWEKEY_STATUS_STOLEN",4); // The key was stolen
-define ("SWEKEY_STATUS_FEE_DUE",5); // The annual fee was not paid
-define ("SWEKEY_STATUS_OBSOLETE",6); // The hardware is no longer supported
-define ("SWEKEY_STATUS_UNKOWN",201); // We could not connect to the authentication server
+define ("SWEKEY_STATUS_OK", 0);
+define ("SWEKEY_STATUS_NOT_FOUND", 1); // The key does not exist in the db
+define ("SWEKEY_STATUS_INACTIVE", 2); // The key has never been activated
+define ("SWEKEY_STATUS_LOST", 3); // The user has lost his key
+define ("SWEKEY_STATUS_STOLEN", 4); // The key was stolen
+define ("SWEKEY_STATUS_FEE_DUE", 5); // The annual fee was not paid
+define ("SWEKEY_STATUS_OBSOLETE", 6); // The hardware is no longer supported
+define ("SWEKEY_STATUS_UNKOWN", 201); // We could not connect to the authentication server
/**
* Values that are associated with a key.
* The Javascript Api can also return the following values
*/
-define ("SWEKEY_STATUS_REPLACED",100); // This key has been replaced by a backup key
-define ("SWEKEY_STATUS_BACKUP_KEY",101); // This key is a backup key that is not activated yet
-define ("SWEKEY_STATUS_NOTPLUGGED",200); // This key is not plugged in the computer
+define ("SWEKEY_STATUS_REPLACED", 100); // This key has been replaced by a backup key
+define ("SWEKEY_STATUS_BACKUP_KEY", 101); // This key is a backup key that is not activated yet
+define ("SWEKEY_STATUS_NOTPLUGGED", 200); // This key is not plugged in the computer
/**
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index 0563868..21c5d9a 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -61,7 +61,7 @@ if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknow
}
<?php
if(count($GLOBALS['js_script']) > 0) {
- echo implode("\n",$GLOBALS['js_script'])."\n";
+ echo implode("\n", $GLOBALS['js_script'])."\n";
}
foreach ($GLOBALS['js_events'] as $js_event) {
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index c2de669..c44cb16 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -407,7 +407,7 @@ function PMA_getColumnNumberFromName($name)
// base26 to base10 conversion : multiply each number
// with corresponding value of the position, in this case
// $i=0 : 1; $i=1 : 26; $i=2 : 676; ...
- $column_number += $number * pow(26,$i);
+ $column_number += $number * pow(26, $i);
}
return $column_number;
} else {
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 6a4c242..1c3713b 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -430,14 +430,14 @@ elseif ($mult_btn == __('Yes')) {
case 'replace_prefix_tbl':
$current = $selected[$i];
- $newtablename = preg_replace("/^" . $from_prefix . "/" , $to_prefix , $current);
+ $newtablename = preg_replace("/^" . $from_prefix . "/", $to_prefix, $current);
$a_query = 'ALTER TABLE ' . PMA_backquote($selected[$i]) . ' RENAME ' . PMA_backquote($newtablename) ; // CHANGE PREFIX PATTERN
$run_parts = true;
break;
case 'copy_tbl_change_prefix':
$current = $selected[$i];
- $newtablename = preg_replace("/^" . $from_prefix . "/" , $to_prefix , $current);
+ $newtablename = preg_replace("/^" . $from_prefix . "/", $to_prefix, $current);
$a_query = 'CREATE TABLE ' . PMA_backquote($newtablename) . ' SELECT * FROM ' . PMA_backquote($selected[$i]) ; // COPY TABLE AND CHANGE PREFIX PATTERN
$run_parts = true;
break;
diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
index 0871d32..b057680 100644
--- a/libraries/replication.inc.php
+++ b/libraries/replication.inc.php
@@ -369,7 +369,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true)
$target_columns, $alter_str_array, $add_column_array, $uncommon_columns, $criteria, $target_tables_keys, $counter);
PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_indexes, $target_indexes,
- $add_indexes_array, $alter_indexes_array,$remove_indexes_array, $counter);
+ $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $counter);
}
/**
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 62b1ea7..a755511 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -149,8 +149,8 @@ function PMA_langDetect($str, $envType)
if (strpos($expr, '[-_]') === false) {
$expr = str_replace('|', '([-_][[:alpha:]]{2,3})?|', $expr);
}
- if (($envType == 1 && preg_match('/^(' . addcslashes($expr,'/') . ')(;q=[0-9]\\.[0-9])?$/i', $str))
- || ($envType == 2 && preg_match('/(\(|\[|;[[:space:]])(' . addcslashes($expr,'/') . ')(;|\]|\))/i', $str))) {
+ if (($envType == 1 && preg_match('/^(' . addcslashes($expr, '/') . ')(;q=[0-9]\\.[0-9])?$/i', $str))
+ || ($envType == 2 && preg_match('/(\(|\[|;[[:space:]])(' . addcslashes($expr, '/') . ')(;|\]|\))/i', $str))) {
if (PMA_langSet($lang)) {
return true;
}
diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index 8947b00..0bc7ae5 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -467,7 +467,7 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li
*/
function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, &$array_insert, $matching_table_index,
$matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields, $uncommon_cols,
- &$alter_str_array,&$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$delete_array, &$update_array, $display)
+ &$alter_str_array, &$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$delete_array, &$update_array, $display)
{
if (isset($array_insert[$matching_table_index])) {
if (sizeof($array_insert[$matching_table_index])) {
@@ -519,7 +519,7 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
unset($delete_array[$table_index[0]]);
}
PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, $add_column_array,
- $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables,$uncommon_tables_fields,
+ $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, $uncommon_tables_fields,
$table_index[0], $uncommon_cols, $display);
unset($add_column_array[$table_index[0]]);
}
@@ -1125,8 +1125,8 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi
&$alter_indexes_array, &$remove_indexes_array, $table_counter)
{
//Gets indexes information for source and target table
- $source_indexes[$table_counter] = PMA_DBI_get_table_indexes($src_db, $matching_tables[$table_counter],$src_link);
- $target_indexes[$table_counter] = PMA_DBI_get_table_indexes($trg_db, $matching_tables[$table_counter],$trg_link);
+ $source_indexes[$table_counter] = PMA_DBI_get_table_indexes($src_db, $matching_tables[$table_counter], $src_link);
+ $target_indexes[$table_counter] = PMA_DBI_get_table_indexes($trg_db, $matching_tables[$table_counter], $trg_link);
for ($a = 0; $a < sizeof($source_indexes[$table_counter]); $a++) {
$found = false;
$z = 0;
diff --git a/libraries/svg_plot/pma_scatter_plot.php b/libraries/svg_plot/pma_scatter_plot.php
index c0be405..e7ef90e 100644
--- a/libraries/svg_plot/pma_scatter_plot.php
+++ b/libraries/svg_plot/pma_scatter_plot.php
@@ -119,7 +119,7 @@ class PMA_Scatter_Plot
$this->_dataPoints = array();
if (! is_null($this->_userSpecifiedSettings)) {
foreach (array_keys($this->_userSpecifiedSettings) as $key){
- $this->_settings[$key] = $this->_userSpecifiedSettings[$key];
+ $this->_settings[$key] = $this->_userSpecifiedSettings[$key];
}
}
if ($this->_settings['dataLabel'] == '') {
@@ -188,17 +188,17 @@ class PMA_Scatter_Plot
*
* @return an array containing the scale, x and y offsets
*/
- private function _scaleDataSet($data,$xField,$yField)
+ private function _scaleDataSet($data, $xField, $yField)
{
- // Currently assuming only numeric fields are selected
+ // Currently assuming only numeric fields are selected
$coordinates = array();
foreach ($data as $row) {
$coordinates[0][] = $row[$xField];
$coordinates[1][] = $row[$yField];
}
for ($i = 0 ; $i < 2 ; $i++) {
- $maxC = ($i == 0) ? 500 : 320;
+ $maxC = ($i == 0) ? 500 : 320;
if ( !is_numeric($coordinates[$i][0])) {
$uniqueC = array_unique($coordinates[$i]);
@@ -244,8 +244,8 @@ class PMA_Scatter_Plot
for ($i = 0 ; $i < count($data) ; $i++) {
$index = $color_number % sizeof($this->_settings['colors']);
-
- $data_element = new PMA_SVG_Data_Point($scale_data[0][$i],$scale_data[1][$i],$data[$i][$label],$data[$i]);
+
+ $data_element = new PMA_SVG_Data_Point($scale_data[0][$i], $scale_data[1][$i], $data[$i][$label], $data[$i]);
$options = array('color' => $this->_settings['colors'][$index], 'id' => $i);
$this->_dataPoints[] = $data_element;
diff --git a/libraries/svg_plot/pma_svg_data_point.php b/libraries/svg_plot/pma_svg_data_point.php
index ceaa8bc..cc07bff 100644
--- a/libraries/svg_plot/pma_svg_data_point.php
+++ b/libraries/svg_plot/pma_svg_data_point.php
@@ -13,7 +13,7 @@ class PMA_SVG_Data_Point extends PMA_SVG_Data_Element
* X-Coordinate of the point
*/
private $cx;
-
+
/*
* Y-Coordinate of the point
*/
@@ -24,7 +24,7 @@ class PMA_SVG_Data_Point extends PMA_SVG_Data_Element
*/
public function __construct($cx, $cy, $label, $dataRow)
{
- parent::__construct($label,$dataRow);
+ parent::__construct($label, $dataRow);
$this->cx = $cx;
$this->cy = $cy;
}
@@ -50,7 +50,7 @@ class PMA_SVG_Data_Point extends PMA_SVG_Data_Element
'stroke' => $options['color'],
'stroke-width'=> 2,
);
-
+
$row = '<circle cx="' . $this->cx . '" cy="' . $this->cy . '" r=".1"';
foreach ($point_options as $option => $val) {
$row .= ' ' . $option . '="' . trim($val) . '"';
@@ -59,7 +59,7 @@ class PMA_SVG_Data_Point extends PMA_SVG_Data_Element
return $row;
}
-
+
public function getCx()
{
return $this->cx;
diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php
index 96ac0e2..e5f18b7 100644
--- a/libraries/sysinfo.lib.php
+++ b/libraries/sysinfo.lib.php
@@ -14,7 +14,7 @@
*/
function getSysInfo()
{
- $supported = array('Linux','WINNT');
+ $supported = array('Linux', 'WINNT');
$sysinfo = array();
@@ -110,7 +110,7 @@ class Linux
function loadavg() {
$buf = file_get_contents('/proc/stat');
- $nums=preg_split("/\s+/", substr($buf,0,strpos($buf,"\n")));
+ $nums=preg_split("/\s+/", substr($buf, 0, strpos($buf, "\n")));
return Array('busy' => $nums[1]+$nums[2]+$nums[3], 'idle' => intval($nums[4]));
}
diff --git a/navigation.php b/navigation.php
index 26716ac..1db459c 100644
--- a/navigation.php
+++ b/navigation.php
@@ -315,7 +315,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
echo '</div>' . "\n";
$common_url_query = PMA_generate_common_url();
- PMA_displayDbList($GLOBALS['pma']->databases->getGroupedDetails($_SESSION['tmp_user_values']['navi_limit_offset'],$GLOBALS['cfg']['MaxDbList']), $_SESSION['tmp_user_values']['navi_limit_offset'],$GLOBALS['cfg']['MaxDbList']);
+ PMA_displayDbList($GLOBALS['pma']->databases->getGroupedDetails($_SESSION['tmp_user_values']['navi_limit_offset'], $GLOBALS['cfg']['MaxDbList']), $_SESSION['tmp_user_values']['navi_limit_offset'], $GLOBALS['cfg']['MaxDbList']);
}
/**
diff --git a/pmd_general.php b/pmd_general.php
index 73c6543..3f59a4c 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -287,17 +287,17 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
} else {
?>
<img src="<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Field_small<?php
- if (strstr($tab_column[$t_n]["TYPE"][$j],'char')
- || strstr($tab_column[$t_n]["TYPE"][$j],'text')) {
+ if (strstr($tab_column[$t_n]["TYPE"][$j], 'char')
+ || strstr($tab_column[$t_n]["TYPE"][$j], 'text')) {
echo '_char';
- } elseif (strstr($tab_column[$t_n]["TYPE"][$j],'int')
- || strstr($tab_column[$t_n]["TYPE"][$j],'float')
- || strstr($tab_column[$t_n]["TYPE"][$j],'double')
- || strstr($tab_column[$t_n]["TYPE"][$j],'decimal')) {
+ } elseif (strstr($tab_column[$t_n]["TYPE"][$j], 'int')
+ || strstr($tab_column[$t_n]["TYPE"][$j], 'float')
+ || strstr($tab_column[$t_n]["TYPE"][$j], 'double')
+ || strstr($tab_column[$t_n]["TYPE"][$j], 'decimal')) {
echo '_int';
- } elseif (strstr($tab_column[$t_n]["TYPE"][$j],'date')
- || strstr($tab_column[$t_n]["TYPE"][$j],'time')
- || strstr($tab_column[$t_n]["TYPE"][$j],'year')) {
+ } elseif (strstr($tab_column[$t_n]["TYPE"][$j], 'date')
+ || strstr($tab_column[$t_n]["TYPE"][$j], 'time')
+ || strstr($tab_column[$t_n]["TYPE"][$j], 'year')) {
echo '_date';
}
?>.png" alt="*" />
diff --git a/pmd_pdf.php b/pmd_pdf.php
index f8102da..95a412b 100644
--- a/pmd_pdf.php
+++ b/pmd_pdf.php
@@ -39,7 +39,7 @@ if (isset($mode)) {
if ('export' == $mode) {
$sql = "REPLACE INTO " . $pma_table . " (db_name, table_name, pdf_page_number, x, y) SELECT db_name, table_name, " . $pdf_page_number_q . ", ROUND(x/" . $scale_q . ") , ROUND(y/" . $scale_q . ") y FROM " . $pmd_table . " WHERE db_name = '" . PMA_sqlAddSlashes($db) . "'";
- PMA_query_as_controluser($sql,true,PMA_DBI_QUERY_STORE);
+ PMA_query_as_controluser($sql, true, PMA_DBI_QUERY_STORE);
}
if ('import' == $mode) {
@@ -101,7 +101,7 @@ if (1 == count($choices)) {
echo $choices['create_export'];
echo '<input type="hidden" name="mode" value="create_export" />';
} else {
- PMA_display_html_radio('mode', $choices, $checked_choice = '', $line_break = true, $escape_label = false, $class='');
+ PMA_display_html_radio('mode', $choices, $checked_choice = '', $line_break = true, $escape_label = false, $class = '');
}
echo '<br />';
echo '<label for="newpage">' . __('New page name: ') . '</label>';
diff --git a/pmd_relation_new.php b/pmd_relation_new.php
index a171658..c0a6ad8 100644
--- a/pmd_relation_new.php
+++ b/pmd_relation_new.php
@@ -24,7 +24,7 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) &&
$existrel_foreign = PMA_getForeigners($db, $T2, '', 'foreign');
if (isset($existrel_foreign[$F2])
&& isset($existrel_foreign[$F2]['constraint'])) {
- PMD_return_new(0,__('Error: relation already exists.'));
+ PMD_return_new(0, __('Error: relation already exists.'));
}
// note: in InnoDB, the index does not requires to be on a PRIMARY
// or UNIQUE key
@@ -56,8 +56,8 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) &&
if ($on_update != 'nix') {
$upd_query .= ' ON UPDATE ' . $on_update;
}
- PMA_DBI_try_query($upd_query) or PMD_return_new(0,__('Error: Relation not added.'));
- PMD_return_new(1,__('FOREIGN KEY relation added'));
+ PMA_DBI_try_query($upd_query) or PMD_return_new(0, __('Error: Relation not added.'));
+ PMD_return_new(1, __('FOREIGN KEY relation added'));
}
// internal (pmadb) relation
@@ -78,7 +78,7 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) &&
. '\'' . PMA_sqlAddSlashes($T1) . '\','
. '\'' . PMA_sqlAddSlashes($F1) . '\')';
- if (PMA_query_as_controluser($q , false, PMA_DBI_QUERY_STORE)) {
+ if (PMA_query_as_controluser($q, false, PMA_DBI_QUERY_STORE)) {
PMD_return_new(1, __('Internal relation added'));
} else {
PMD_return_new(0, __('Error: Relation not added.'));
diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
index 29bc688..7fd78e4 100644
--- a/pmd_relation_upd.php
+++ b/pmd_relation_upd.php
@@ -13,8 +13,8 @@ extract($_POST, EXTR_SKIP);
extract($_GET, EXTR_SKIP);
$die_save_pos = 0;
require_once 'pmd_save_pos.php';
-list($DB1,$T1) = explode(".",$T1);
-list($DB2,$T2) = explode(".",$T2);
+list($DB1, $T1) = explode(".", $T1);
+list($DB2, $T2) = explode(".", $T2);
$tables = PMA_DBI_get_tables_full($db, $T1);
$type_T1 = strtoupper($tables[$T1]['ENGINE']);
@@ -54,7 +54,7 @@ if ($try_to_delete_internal_relation) {
}
PMD_return_upd(1, __('Relation deleted'));
-function PMD_return_upd($b,$ret)
+function PMD_return_upd($b, $ret)
{
global $K;
header("Content-Type: text/xml; charset=utf-8");
diff --git a/schema_export.php b/schema_export.php
index e566c7c..d67bc85 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -28,7 +28,7 @@ require_once "./libraries/schema/Export_Relation_Schema.class.php";
* call and include the appropriate Schema Class depending on $export_type
* default is PDF
*/
-global $db,$export_type;
+global $db, $export_type;
if (!isset($export_type) || !preg_match('/^[a-zA-Z]+$/', $export_type)) {
$export_type = 'pdf';
}
@@ -36,7 +36,7 @@ PMA_DBI_select_db($db);
$path = PMA_securePath(ucfirst($export_type));
if (!file_exists('./libraries/schema/' . $path . '_Relation_Schema.class.php')) {
- PMA_Export_Relation_Schema::dieSchema($_POST['chpage'],$export_type,__('File doesn\'t exist'));
+ PMA_Export_Relation_Schema::dieSchema($_POST['chpage'], $export_type, __('File doesn\'t exist'));
}
require "./libraries/schema/".$path."_Relation_Schema.class.php";
$obj_schema = eval("new PMA_".$path."_Relation_Schema();");
diff --git a/server_synchronize.php b/server_synchronize.php
index 8057f89..d4627cf 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -587,10 +587,10 @@ if (isset($_REQUEST['Table_ids'])) {
unset($delete_array[$matching_table_structure_diff[$q]]);
}
- PMA_addColumnsInTargetTable($src_db, $trg_db,$src_link, $trg_link,
+ PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link,
$matching_tables, $source_columns, $add_column_array,
$matching_tables_fields, $criteria, $matching_tables_keys,
- $target_tables_keys, $uncommon_tables,$uncommon_tables_fields,
+ $target_tables_keys, $uncommon_tables, $uncommon_tables_fields,
$matching_table_structure_diff[$q], $uncommon_cols, false);
unset($add_column_array[$matching_table_structure_diff[$q]]);
@@ -653,7 +653,7 @@ if (isset($_REQUEST['Table_ids'])) {
unset($delete_array[$matching_table_data_diff[$p]]);
}
- PMA_addColumnsInTargetTable($src_db, $trg_db,$src_link, $trg_link,
+ PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link,
$matching_tables, $source_columns, $add_column_array,
$matching_tables_fields, $criteria, $matching_tables_keys,
$target_tables_keys, $uncommon_tables, $uncommon_tables_fields,
@@ -1113,7 +1113,7 @@ if (isset($_REQUEST['synchronize_db'])) {
$trg_link , $matching_tables_fields, $insert_array, $p,
$matching_tables_keys, $matching_tables_keys, $source_columns,
$add_column_array, $criteria, $target_tables_keys, $uncommon_tables,
- $uncommon_tables_fields,$uncommon_cols, $alter_str_array,$source_indexes,
+ $uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes,
$target_indexes, $add_indexes_array,
$alter_indexes_array, $delete_array, $update_array, true);
}
diff --git a/server_variables.php b/server_variables.php
index af47f1f..f09706a 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -45,7 +45,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="' . PMA_sqlAddslashes($_REQUEST['varName']) . '";', 'NUM');
if (isset($VARIABLE_DOC_LINKS[$_REQUEST['varName']][3])
&& $VARIABLE_DOC_LINKS[$_REQUEST['varName']][3] == 'byte') {
- exit(implode(' ', PMA_formatByteDown($varValue[1],3,3)));
+ exit(implode(' ', PMA_formatByteDown($varValue[1], 3, 3)));
}
exit($varValue[1]);
break;
@@ -55,7 +55,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if (isset($VARIABLE_DOC_LINKS[$_REQUEST['varName']][3])
&& $VARIABLE_DOC_LINKS[$_REQUEST['varName']][3] == 'byte'
- && preg_match('/^\s*(\d+(\.\d+)?)\s*(mb|kb|mib|kib|gb|gib)\s*$/i',$value,$matches)) {
+ && preg_match('/^\s*(\d+(\.\d+)?)\s*(mb|kb|mib|kib|gb|gib)\s*$/i', $value, $matches)) {
$exp = array('kb' => 1, 'kib' => 1, 'mb' => 2, 'mib' => 2, 'gb' => 3, 'gib' => 3);
$value = floatval($matches[1]) * pow(1024, $exp[strtolower($matches[3])]);
} else {
@@ -97,7 +97,7 @@ require './libraries/server_links.inc.php';
echo '<h2>' . "\n"
. ($cfg['MainPageIconic'] ? '<img class="icon ic_s_vars" src="themes/dot.gif" alt="" />' : '')
. '' . __('Server variables and settings') . "\n"
- . PMA_showMySQLDocu('server_system_variables','server_system_variables')
+ . PMA_showMySQLDocu('server_system_variables', 'server_system_variables')
. '</h2>' . "\n";
/**
@@ -138,7 +138,7 @@ foreach ($serverVars as $name => $value) {
?>
<tr class="<?php echo $row_class; ?>">
<th nowrap="nowrap"><?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th>
- <td class="value"><?php echo formatVariable($name,$value); ?></td>
+ <td class="value"><?php echo formatVariable($name, $value); ?></td>
<td class="value"><?php
// To display variable documentation link
if (isset($VARIABLE_DOC_LINKS[$name]))
@@ -150,7 +150,7 @@ foreach ($serverVars as $name => $value) {
</tr>
<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> ">
<td>(<?php echo __('Session value'); ?>)</td>
- <td class="value"><?php echo formatVariable($name,$serverVarsSession[$name]); ?></td>
+ <td class="value"><?php echo formatVariable($name, $serverVarsSession[$name]); ?></td>
<td class="value"></td>
<?php } ?>
</tr>
@@ -162,13 +162,13 @@ foreach ($serverVars as $name => $value) {
</table>
<?php
-function formatVariable($name,$value)
+function formatVariable($name, $value)
{
global $VARIABLE_DOC_LINKS;
if (is_numeric($value)) {
if (isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte')
- return '<abbr title="'.PMA_formatNumber($value, 0).'">'.implode(' ',PMA_formatByteDown($value,3,3)).'</abbr>';
+ return '<abbr title="'.PMA_formatNumber($value, 0).'">'.implode(' ', PMA_formatByteDown($value, 3, 3)).'</abbr>';
else return PMA_formatNumber($value, 0);
}
return htmlspecialchars($value);
di return htmlspecialchars($value); value, 0); r($value, 0).'">'.implode(' ', PMA_formatByteDown($value, 3, 3)).'</abbr>'; T['varName']) . '";', 'NUM'); . $scale_q . ") , ROUND(y/" . $scale_q . ") y FROM " . $pmd_table . " WHERE db_name = '" . PMA_sqlAddSlashes($db) . "'"; � � ! � ! pz�� �z�� x���* �p�� ���* �0��* pz�� `��* �z�� ��e��* u��* �e��* ��e��* ��e��* �:��* x���* �p�� �o�� k0��* �! �! pz�� �z�� H���* �q�� ���* �0��* pz�� `��* �z�� �z�� �z�� 8;��* �p� �z�� u��* �:��* �q�� �p�� k0��* G H I J K M N O P pz�� �z�� He���* Ps�� ���* �0��* pz�� 0�e��* u��* ���* �����* �e��* ��e��* ��e��* �:��* He���* Ps�� �q�� k0��* 8e���* Ps�� �q�� k0��* (e���* Ps�� �q�� k0��* e���* Ps�� r�� k0��* ��e��* u��* ��e��* �l�� �蕷�* e��* ��e��* �r�� y蕷�* e��* �e��* �r�� Z蕷�* e��* ؔ���* ���* �����* �e��* ����* ��e��* ��e��* �:��* 8;��* ]a��* �z�� p+���* �t�� ps�� k0��* 5 6 7 8 : < = > ? @ B D pz�� �z�� �]^��* �z�� u��* 5��* s�� ]a��* e��* 5��* �_@f �S Q��l�� �s-��* �z�� �]^��* �u�� �t�� k0��* u]�� 4Q��U^Qʉ� �u������*ēvpz�� �z�� H�*��* �f��* |�� � ɸ�* � ɸ�* �Fd��* �z�� �{�� �z�� w�� ���* u��* ����* `}�� � ɸ�* 0|�� �w�� ��������� ɸ�* �z�� ff --git a/sql.php b/sql.php
index 619893a..53d9759 100644
--- a/sql.php
+++ b/sql.php
@@ -751,7 +751,7 @@ if (0 == $num_rows || $is_affected) {
} else {
// avoid a redirect loop when last record was deleted
if (0 == $num_rows && 'sql.php' == $cfg['DefaultTabTable']) {
- $goto = str_replace('sql.php','tbl_structure.php',$goto);
+ $goto = str_replace('sql.php', 'tbl_structure.php', $goto);
}
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . str_replace('&', '&', $goto) . '&message=' . urlencode($message));
} // end else
@@ -869,7 +869,7 @@ $(document).ready(makeProfilingChart);
echo '<div style="float: left;">';
echo '<table>' . "\n";
echo ' <tr>' . "\n";
- echo ' <th>' . __('Status') . PMA_showMySQLDocu('general-thread-states','general-thread-states') . '</th>' . "\n";
+ echo ' <th>' . __('Status') . PMA_showMySQLDocu('general-thread-states', 'general-thread-states') . '</th>' . "\n";
echo ' <th>' . __('Time') . '</th>' . "\n";
echo ' </tr>' . "\n";
@@ -877,7 +877,7 @@ $(document).ready(makeProfilingChart);
foreach ($profiling_results as $one_result) {
echo ' <tr>' . "\n";
echo '<td>' . ucwords($one_result['Status']) . '</td>' . "\n";
- echo '<td align="right">' . (PMA_formatNumber($one_result['Duration'],3,1)) . 's</td>' . "\n";
+ echo '<td align="right">' . (PMA_formatNumber($one_result['Duration'], 3, 1)) . 's</td>' . "\n";
$chart_json[ucwords($one_result['Status'])] = $one_result['Duration'];
}
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 50fb422..f9324fe 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -187,7 +187,7 @@ if (isset($_REQUEST['do_save_data'])) {
if( $GLOBALS['is_ajax_request'] == true) {
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
- PMA_ajaxResponse($message, $message->isSuccess(),$extra_data);
+ PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}
$active_page = 'tbl_structure.php';
diff --git a/tbl_export.php b/tbl_export.php
index a2ce305..379d26c 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -51,7 +51,7 @@ if (! empty($sql_query)) {
if (isset($where_clause) && is_array($where_clause)
&& count($where_clause) > 0) {
- $wheres[] = '(' . implode(') OR (',$where_clause) . ')';
+ $wheres[] = '(' . implode(') OR (', $where_clause) . ')';
}
if (!empty($analyzed_sql[0]['where_clause'])) {
diff --git a/tbl_operations.php b/tbl_operations.php
index b2f8ab1..95b602e 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -231,7 +231,7 @@ if (isset($result) && empty($message_to_show)) {
$_type = $result ? 'success' : 'error';
if ( $_REQUEST['ajax_request'] == true) {
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
- PMA_ajaxResponse($_message,$_message->isSuccess() ,$extra_data);
+ PMA_ajaxResponse($_message, $_message->isSuccess(), $extra_data);
}
}
if (! empty($warning_messages)) {
diff --git a/tbl_replace.php b/tbl_replace.php
index 987fb0a..b6da1ba 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -554,7 +554,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
}
/**Get the total row count of the table*/
- $extra_data['row_count'] = PMA_Table::countRecords($_REQUEST['db'],$_REQUEST['table']);
+ $extra_data['row_count'] = PMA_Table::countRecords($_REQUEST['db'], $_REQUEST['table']);
$extra_data['sql_query'] = PMA_showMessage($message, $GLOBALS['display_query']);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}
diff --git a/tbl_select.php b/tbl_select.php
index 8bb3b0e..ebc3621 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -153,7 +153,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
$foreignData = PMA_getForeignData($foreigners, $field, false, '', '');
- echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '', true);
+ echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $fields_type, $i, $db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], '', true);
?>
<input type="hidden" name="names[<?php echo $i; ?>]"
@@ -282,7 +282,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
$unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) ? true : false;
$tmp_geom_func = isset($geom_func[$i]) ? $geom_func[$i] : null;
- $whereClause = PMA_tbl_search_getWhereClause($fields[$i],$names[$i], $types[$i], $collations[$i], $func_type, $unaryFlag, $tmp_geom_func);
+ $whereClause = PMA_tbl_search_getWhereClause($fields[$i], $names[$i], $types[$i], $collations[$i], $func_type, $unaryFlag, $tmp_geom_func);
if($whereClause)
$w[] = $whereClause;
diff --git a/tbl_structure.php b/tbl_structure.php
index 79e6f05..3a6ae2a 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -356,7 +356,7 @@ foreach ($fields as $row) {
echo $row['Default'];
}
} else {
- echo '<i>' . _pgettext('None for default','None') . '</i>';
+ echo '<i>' . _pgettext('None for default', 'None') . '</i>';
} ?></td>
<td nowrap="nowrap"><?php echo strtoupper($row['Extra']); ?></td>
<td align="center" class="browse">
diff --git a/tbl_tracking.php b/tbl_tracking.php
index 6148bbb..847578c 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -104,7 +104,7 @@ if (isset($_REQUEST['report_export'])) {
// Export as file download
if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldumpfile') {
- @ini_set('url_rewriter.tags','');
+ @ini_set('url_rewriter.tags', '');
$dump = "# " . sprintf(__('Tracking report for table `%s`'), htmlspecialchars($_REQUEST['table'])) . "\n" .
"# " . date('Y-m-d H:i:s') . "\n";
@@ -665,7 +665,7 @@ if ($last_version > 0) {
<td><?php echo htmlspecialchars($version['date_updated']);?></td>
<td><?php echo $version_status;?></td>
<td> <a href="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('report' => 'true', 'version' => $version['version'])
-);?>"><?php echo __('Tracking report');?></a>
+);?>"><?php echo __('Tracking report');?></a>
| <a href="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('snapshot' => 'true', 'version' => $version['version'])
);?>"><?php echo __('Structure snapshot');?></a>
</td>
diff --git a/test/Environment_test.php b/test/Environment_test.php
index c72a165..4cae38f 100644
--- a/test/Environment_test.php
+++ b/test/Environment_test.php
@@ -26,7 +26,7 @@ class Environment_test extends PHPUnit_Framework_TestCase
{
try{
$pdo = new PDO("mysql:host=".TESTSUITE_SERVER.";dbname=".TESTSUITE_DATABASE, TESTSUITE_USER, TESTSUITE_PASSWORD);
- $this->assertNull($pdo->errorCode(),"Error when trying to connect to database");
+ $this->assertNull($pdo->errorCode(), "Error when trying to connect to database");
//$pdo->beginTransaction();
$test = $pdo->exec("SHOW TABLES;");
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index 9a5bf78..42fab56 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -46,7 +46,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
public function testCheckSystem()
{
$this->object->checkSystem();
-
+
$this->assertNotNull($this->object->get('PMA_VERSION'));
$this->assertNotEmpty($this->object->get('PMA_THEME_VERSION'));
$this->assertNotEmpty($this->object->get('PMA_THEME_GENERATION'));
@@ -66,7 +66,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
$this->object->set('PMA_USR_BROWSER_AGENT', 'MOZILLA');
$this->object->set('PMA_USR_BROWSER_VER', 5);
$this->object->checkOutputCompression();
- $this->assertEquals('auto',$this->object->get("OBGzip"));
+ $this->assertEquals('auto', $this->object->get("OBGzip"));
ini_set('zlib.output_compression', 'Off');
$this->object->checkOutputCompression();
@@ -120,15 +120,15 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
{
$prevIsGb2Val = $this->object->get('PMA_IS_GD2');
- $this->object->set('GD2Available','yes');
+ $this->object->set('GD2Available', 'yes');
$this->object->checkGd2();
$this->assertEquals(1, $this->object->get('PMA_IS_GD2'));
- $this->object->set('GD2Available','no');
+ $this->object->set('GD2Available', 'no');
$this->object->checkGd2();
$this->assertEquals(0, $this->object->get('PMA_IS_GD2'));
- $this->object->set('GD2Available',$prevIsGb2Val);
+ $this->object->set('GD2Available', $prevIsGb2Val);
if (!@function_exists('imagecreatetruecolor')) {
$this->object->checkGd2();
@@ -179,7 +179,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
if (defined('PHP_OS')) {
switch (PHP_OS) {
- case stristr(PHP_OS,'win'):
+ case stristr(PHP_OS, 'win'):
$this->assertEquals(1, $this->object->get('PMA_IS_WINDOWS'), 'PHP_OS equals: ' . PHP_OS . ' PMA_IS_WINDOWS should be 1');
break;
case stristr(PHP_OS, 'OS/2'):
@@ -192,7 +192,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
} else {
$this->assertEquals(0, $this->object->get('PMA_IS_WINDOWS'), 'PMA_IS_WINDOWS Default to Unix or Equiv');
- define('PHP_OS','Windows');
+ define('PHP_OS', 'Windows');
$this->assertEquals(1, $this->object->get('PMA_IS_WINDOWS'), 'PMA_IS_WINDOWS must be 1');
}
}
@@ -247,7 +247,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
$expectedSettings = PMA_array_merge_recursive($this->object->settings, $loadedConf);
- $this->assertEquals($expectedSettings, $this->object->settings,'Settings loaded wrong');
+ $this->assertEquals($expectedSettings, $this->object->settings, 'Settings loaded wrong');
$this->assertFalse($this->object->error_config_default_file);
}
@@ -298,7 +298,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
public function testCheckPmaAbsoluteUriEmpty()
{
- $this->object->set('PmaAbsoluteUri','');
+ $this->object->set('PmaAbsoluteUri', '');
$this->assertFalse($this->object->checkPmaAbsoluteUri(), 'PmaAbsoluteUri is not set and should be error');
$this->assertTrue($this->object->error_pma_uri, 'PmaAbsoluteUri is not set and should be error');
}
@@ -308,11 +308,11 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
*/
public function testCheckPmaAbsoluteUriNormal()
{
- $this->object->set('PmaAbsoluteUri','http://localhost/phpmyadmin/');
+ $this->object->set('PmaAbsoluteUri', 'http://localhost/phpmyadmin/');
$this->object->checkPmaAbsoluteUri();
$this->assertEquals("http://localhost/phpmyadmin/", $this->object->get('PmaAbsoluteUri'));
- $this->object->set('PmaAbsoluteUri','http://localhost/phpmyadmin');
+ $this->object->set('PmaAbsoluteUri', 'http://localhost/phpmyadmin');
$this->object->checkPmaAbsoluteUri();
$this->assertEquals("http://localhost/phpmyadmin/", $this->object->get('PmaAbsoluteUri'), 'Expected trailing slash at the end of the phpMyAdmin uri');
@@ -328,7 +328,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
$_SERVER['HTTPS'] = 'off';
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
- $this->object->set('PmaAbsoluteUri','');
+ $this->object->set('PmaAbsoluteUri', '');
$this->object->checkPmaAbsoluteUri();
$this->assertEquals("http://localhost/", $this->object->get('PmaAbsoluteUri'));
@@ -339,12 +339,12 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
*/
public function testCheckPmaAbsoluteUriUser()
{
- $this->object->set('PmaAbsoluteUri','http://user:pwd@localhost/phpmyadmin/index.php');
+ $this->object->set('PmaAbsoluteUri', 'http://user:pwd@localhost/phpmyadmin/index.php');
$this->object->checkPmaAbsoluteUri();
$this->assertEquals("http://user:pwd@localhost/phpmyadmin/index.php/", $this->object->get('PmaAbsoluteUri'));
- $this->object->set('PmaAbsoluteUri','https://user:pwd@localhost/phpmyadmin/index.php');
+ $this->object->set('PmaAbsoluteUri', 'https://user:pwd@localhost/phpmyadmin/index.php');
$this->object->checkPmaAbsoluteUri();
$this->assertEquals("https://user:pwd@localhost/phpmyadmin/index.php/", $this->object->get('PmaAbsoluteUri'));
@@ -400,7 +400,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
{
$this->object->checkCookiePath();
echo $this->object->get('cookie_path');
- $this->assertEquals('',$this->object->get('cookie_path'));
+ $this->assertEquals('', $this->object->get('cookie_path'));
}
/**
@@ -546,7 +546,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
public function testSetUserValue()
{
$this->object->setUserValue(null, 'lang', $GLOBALS['lang'], 'en');
- $this->object->setUserValue("TEST_COOKIE_USER_VAL",'','cfg_val_1');
+ $this->object->setUserValue("TEST_COOKIE_USER_VAL", '', 'cfg_val_1');
// Remove the following lines when you implement this test.
// $this->markTestIncomplete(
diff --git a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
index a5c04c1..f13154b 100644
--- a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
+++ b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
@@ -22,7 +22,7 @@ class PMA_contains_nonprintable_ascii extends PHPUnit_Framework_TestCase
array("new\nline", 1),
array("tab\tspace", 1),
array("escape" . chr(27) . "char", 1),
- array("chars%$\r\n",1),
+ array("chars%$\r\n", 1),
);
}
@@ -30,7 +30,7 @@ class PMA_contains_nonprintable_ascii extends PHPUnit_Framework_TestCase
* @dataProvider dataProvider
*/
function testContainsNonPrintableAscii($str, $res){
- $this->assertEquals($res,PMA_contains_nonprintable_ascii($str));
+ $this->assertEquals($res, PMA_contains_nonprintable_ascii($str));
}
}
diff --git a/test/libraries/common/PMA_display_html_checkbox_test.php b/test/libraries/common/PMA_display_html_checkbox_test.php
index b33a5fe..4eca636 100644
--- a/test/libraries/common/PMA_display_html_checkbox_test.php
+++ b/test/libraries/common/PMA_display_html_checkbox_test.php
@@ -21,7 +21,7 @@ class PMA_display_html_checkbox_test extends PHPUnit_Extensions_OutputTestCase
$label = "text_label_for_checkbox";
$this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" /><label for="' . $name . '">' . $label . '</label>');
- PMA_display_html_checkbox($name,$label,false,false);
+ PMA_display_html_checkbox($name, $label, false, false);
}
function testDisplayHtmlCheckboxChecked()
@@ -30,7 +30,7 @@ class PMA_display_html_checkbox_test extends PHPUnit_Extensions_OutputTestCase
$label = "text_label_for_checkbox";
$this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" checked="checked" /><label for="' . $name . '">' . $label . '</label>');
- PMA_display_html_checkbox($name,$label,true,false);
+ PMA_display_html_checkbox($name, $label, true, false);
}
function testDisplayHtmlCheckboxOnclick()
@@ -39,7 +39,7 @@ class PMA_display_html_checkbox_test extends PHPUnit_Extensions_OutputTestCase
$label = "text_label_for_checkbox";
$this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" class="autosubmit" /><label for="' . $name . '">' . $label . '</label>');
- PMA_display_html_checkbox($name,$label,false,true);
+ PMA_display_html_checkbox($name, $label, false, true);
}
function testDisplayHtmlCheckboxCheckedOnclick()
@@ -48,7 +48,7 @@ class PMA_display_html_checkbox_test extends PHPUnit_Extensions_OutputTestCase
$label = "text_label_for_checkbox";
$this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" checked="checked" class="autosubmit" /><label for="' . $name . '">' . $label . '</label>');
- PMA_display_html_checkbox($name,$label,true,true);
+ PMA_display_html_checkbox($name, $label, true, true);
}
}
diff --git a/test/libraries/common/PMA_display_html_radio_test.php b/test/libraries/common/PMA_display_html_radio_test.php
index c5f2d4b..6e7c014 100644
--- a/test/libraries/common/PMA_display_html_radio_test.php
+++ b/test/libraries/common/PMA_display_html_radio_test.php
@@ -21,7 +21,7 @@ class PMA_display_html_radio_test extends PHPUnit_Extensions_OutputTestCase
$choices = array();
$this->expectOutputString("");
- PMA_display_html_radio($name,$choices);
+ PMA_display_html_radio($name, $choices);
}
function testDisplayHtmlRadio()
@@ -40,7 +40,7 @@ class PMA_display_html_radio_test extends PHPUnit_Extensions_OutputTestCase
}
$this->expectOutputString($out);
- PMA_display_html_radio($name,$choices);
+ PMA_display_html_radio($name, $choices);
}
function testDisplayHtmlRadioWithChecked()
@@ -63,7 +63,7 @@ class PMA_display_html_radio_test extends PHPUnit_Extensions_OutputTestCase
}
$this->expectOutputString($out);
- PMA_display_html_radio($name,$choices,$checked_choice);
+ PMA_display_html_radio($name, $choices, $checked_choice);
}
function testDisplayHtmlRadioWithCheckedWithClass()
@@ -89,7 +89,7 @@ class PMA_display_html_radio_test extends PHPUnit_Extensions_OutputTestCase
}
$this->expectOutputString($out);
- PMA_display_html_radio($name,$choices,$checked_choice,true,false,$class);
+ PMA_display_html_radio($name, $choices, $checked_choice, true, false, $class);
}
function testDisplayHtmlRadioWithoutBR()
@@ -111,7 +111,7 @@ class PMA_display_html_radio_test extends PHPUnit_Extensions_OutputTestCase
}
$this->expectOutputString($out);
- PMA_display_html_radio($name,$choices,$checked_choice,false);
+ PMA_display_html_radio($name, $choices, $checked_choice, false);
}
function testDisplayHtmlRadioEscapeLabelEscapeLabel()
@@ -134,7 +134,7 @@ class PMA_display_html_radio_test extends PHPUnit_Extensions_OutputTestCase
}
$this->expectOutputString($out);
- PMA_display_html_radio($name,$choices,$checked_choice,true,true);
+ PMA_display_html_radio($name, $choices, $checked_choice, true, true);
}
function testDisplayHtmlRadioEscapeLabelNotEscapeLabel()
@@ -157,7 +157,7 @@ class PMA_display_html_radio_test extends PHPUnit_Extensions_OutputTestCase
}
$this->expectOutputString($out);
- PMA_display_html_radio($name,$choices,$checked_choice,true,false);
+ PMA_display_html_radio($name, $choices, $checked_choice, true, false);
}
function testDisplayHtmlRadioEscapeLabelEscapeLabelWithClass()
@@ -183,6 +183,6 @@ class PMA_display_html_radio_test extends PHPUnit_Extensions_OutputTestCase
}
$this->expectOutputString($out);
- PMA_display_html_radio($name,$choices,$checked_choice,true,true,$class);
+ PMA_display_html_radio($name, $choices, $checked_choice, true, true, $class);
}
}
\ No newline at end of file
diff --git a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
index c1e4f20..d80c797 100644
--- a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
+++ b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
@@ -18,21 +18,21 @@ class PMA_extractValueFromFormattedSize_test extends PHPUnit_Framework_TestCase
function testExtractValueFromFormattedSizeNoFormat(){
- $this->assertEquals(-1,PMA_extractValueFromFormattedSize(100));
+ $this->assertEquals(-1, PMA_extractValueFromFormattedSize(100));
}
function testExtractValueFromFormattedSizeGB(){
- $this->assertEquals(10737418240,PMA_extractValueFromFormattedSize("10GB"));
+ $this->assertEquals(10737418240, PMA_extractValueFromFormattedSize("10GB"));
}
function testExtractValueFromFormattedSizeMB(){
- $this->assertEquals(15728640,PMA_extractValueFromFormattedSize("15MB"));
+ $this->assertEquals(15728640, PMA_extractValueFromFormattedSize("15MB"));
}
function testExtractValueFromFormattedSizeK(){
- $this->assertEquals(262144,PMA_extractValueFromFormattedSize("256K"));
+ $this->assertEquals(262144, PMA_extractValueFromFormattedSize("256K"));
}
}
diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php
index a3683f8..e7a1c1f 100644
--- a/test/libraries/common/PMA_formatSql_test.php
+++ b/test/libraries/common/PMA_formatSql_test.php
@@ -47,7 +47,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
global $cfg;
$cfg['SQP']['fmtType'] = 'html';
$sql = "SELECT * FROM tTable;";
- $this->assertEquals("<pre>\n$sql\n</pre>",PMA_formatSql($sql));
+ $this->assertEquals("<pre>\n$sql\n</pre>", PMA_formatSql($sql));
}
function testFormatSQLfmTypeHtml_1(){
@@ -81,7 +81,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
$unparsed = "SELECT 1;";
$expected = '<span class="syntax"><span class="inner_sql"><span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span></a> <span class="syntax_digit syntax_digit_integer">1</span> <span class="syntax_punct syntax_punct_queryend">;</span><br /><br /></span></span>';
- $this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
+ $this->assertEquals($expected, PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeHtml_2(){
@@ -128,7 +128,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
);
$expected = '<span class="syntax"><span class="inner_sql"><span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span></a> <span class="syntax_punct">*</span> <br /><span class="syntax_alpha syntax_alpha_reservedWord">FROM</span> <span class="syntax_quote syntax_quote_backtick">`tTable`</span> <span class="syntax_punct syntax_punct_queryend">;</span><br /><br /></span></span>';
- $this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
+ $this->assertEquals($expected, PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeHtml_3(){
@@ -263,7 +263,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
$expected = '<span class="syntax"><span class="inner_sql"><span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span></a> <span class="syntax_punct">*</span> <br /><span class="syntax_alpha syntax_alpha_reservedWord">FROM</span> <span class="syntax_quote syntax_quote_backtick">`tTable_A`</span> <span class="syntax_alpha syntax_alpha_identifier">A</span><br /><span class="syntax_alpha syntax_alpha_reservedWord">INNER</span> <span class="syntax_alpha syntax_alpha_reservedWord">JOIN</span> <span class="syntax_quote syntax_quote_backtick">`tTable_B`</span> <span class="syntax_alpha syntax_alpha_identifier">B</span> <span class="syntax_alpha syntax_alpha_reservedWord">ON</span> <span class="syntax_alpha syntax_alpha_identifier">B</span><span class="syntax_punct syntax_punct_qualifier">.</span><span class="syntax_alpha syntax_alpha_identifier">ID</span> <span class="syntax_punct">=</span></a> <span class="syntax_alpha syntax_alpha_identifier">A</span><span class="syntax_punct syntax_punct_qualifier">.</span><span class="syntax_alpha syntax_alpha_identifier">ID</span><span class="syntax_punct syntax_punct_queryend">;</span><br /><br /></span></span>';
- $this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
+ $this->assertEquals($expected, PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeText_1(){
@@ -297,7 +297,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
$unparsed = "SELECT 1;";
$expected = '<span class="inner_sql">SELECT</a> 1 ;<br /><br /></span>';
- $this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
+ $this->assertEquals($expected, PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeText_2(){
@@ -344,7 +344,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
);
$expected = '<span class="inner_sql">SELECT</a> * <br />FROM `tTable` ;<br /><br /></span>';
- $this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
+ $this->assertEquals($expected, PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeText_3(){
@@ -478,7 +478,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
);
$expected = '<span class="inner_sql">SELECT</a> * <br />FROM `tTable_A` A<br />INNER JOIN `tTable_B` B ON B.ID =</a> A.ID;<br /><br /></span>';
- $this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
+ $this->assertEquals($expected, PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeNone_1(){
@@ -512,10 +512,10 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
$unparsed = "SELECT 1;";
$expected = "<span class=\"inner_sql\"><pre>\nSELECT 1;\n</pre></span>";
- $this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
+ $this->assertEquals($expected, PMA_formatSql($sql, $unparsed));
$expected = "SELECT 1;";
- $this->assertEquals($expected,PMA_formatSql($sql));
+ $this->assertEquals($expected, PMA_formatSql($sql));
}
function testFormatSQLfmTypeNone_2(){
@@ -562,10 +562,10 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
);
$expected = "<span class=\"inner_sql\"><pre>\nSELECT * from `tTable`;\n</pre></span>";
- $this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
+ $this->assertEquals($expected, PMA_formatSql($sql, $unparsed));
$expected = "SELECT * from `tTable`;";
- $this->assertEquals($expected,PMA_formatSql($sql));
+ $this->assertEquals($expected, PMA_formatSql($sql));
}
function testFormatSQLfmTypeNone_3(){
@@ -699,10 +699,10 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
);
$expected = "<span class=\"inner_sql\"><pre>\nSELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;\n</pre></span>";
- $this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
+ $this->assertEquals($expected, PMA_formatSql($sql, $unparsed));
$expected = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;';
- $this->assertEquals($expected,PMA_formatSql($sql));
+ $this->assertEquals($expected, PMA_formatSql($sql));
}
function testFormatSQLWithoutType(){
@@ -739,7 +739,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
global $SQP_errorString;
$SQP_errorString = true;
$sql = array("raw" => "& \" < >");
- $this->assertEquals("& " < >",PMA_formatSql($sql));
+ $this->assertEquals("& " < >", PMA_formatSql($sql));
$SQP_errorString = false;
}
}
diff --git a/test/libraries/common/PMA_generate_html_dropdown_test.php b/test/libraries/common/PMA_generate_html_dropdown_test.php
index 8e27c20..0035646 100644
--- a/test/libraries/common/PMA_generate_html_dropdown_test.php
+++ b/test/libraries/common/PMA_generate_html_dropdown_test.php
@@ -24,7 +24,7 @@ class PMA_generate_html_dropdown_test extends PHPUnit_Framework_TestCase
$result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '"></select>';
- $this->assertEquals($result, PMA_generate_html_dropdown($name,$choices,$active_choice,$id));
+ $this->assertEquals($result, PMA_generate_html_dropdown($name, $choices, $active_choice, $id));
}
function testGenerateHtmlDropdown()
@@ -44,7 +44,7 @@ class PMA_generate_html_dropdown_test extends PHPUnit_Framework_TestCase
}
$result .= '</select>';
- $this->assertEquals($result, PMA_generate_html_dropdown($name,$choices,$active_choice,$id));
+ $this->assertEquals($result, PMA_generate_html_dropdown($name, $choices, $active_choice, $id));
}
function testGenerateHtmlDropdownWithActive()
@@ -64,6 +64,6 @@ class PMA_generate_html_dropdown_test extends PHPUnit_Framework_TestCase
}
$result .= '</select>';
- $this->assertEquals($result, PMA_generate_html_dropdown($name,$choices,$active_choice,$id));
+ $this->assertEquals($result, PMA_generate_html_dropdown($name, $choices, $active_choice, $id));
}
}
\ No newline at end of file
diff --git a/test/libraries/common/PMA_generate_slider_effect_test.php b/test/libraries/common/PMA_generate_slider_effect_test.php
index 62458be..8012cef 100644
--- a/test/libraries/common/PMA_generate_slider_effect_test.php
+++ b/test/libraries/common/PMA_generate_slider_effect_test.php
@@ -24,7 +24,7 @@ class PMA_generate_slider_effect_test extends PHPUnit_Extensions_OutputTestCase
$message = "test_message";
$this->expectOutputString('<div id="' . $id . '" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">' . "\n" . ' ');
- PMA_generate_slider_effect($id,$message);
+ PMA_generate_slider_effect($id, $message);
}
function testGenerateSliderEffectTestClosed()
@@ -36,7 +36,7 @@ class PMA_generate_slider_effect_test extends PHPUnit_Extensions_OutputTestCase
$message = "test_message";
$this->expectOutputString('<div id="' . $id . '" style="display: none; overflow:auto;" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">' . "\n" . ' ');
- PMA_generate_slider_effect($id,$message);
+ PMA_generate_slider_effect($id, $message);
}
function testGenerateSliderEffectTestDisabled()
@@ -48,6 +48,6 @@ class PMA_generate_slider_effect_test extends PHPUnit_Extensions_OutputTestCase
$message = "test_message";
$this->expectOutputString('<div id="' . $id . '">');
- PMA_generate_slider_effect($id,$message);
+ PMA_generate_slider_effect($id, $message);
}
}
\ No newline at end of file
diff --git a/test/libraries/common/PMA_getDbLink_test.php b/test/libraries/common/PMA_getDbLink_test.php
index eba4ec2..85a76e8 100644
--- a/test/libraries/common/PMA_getDbLink_test.php
+++ b/test/libraries/common/PMA_getDbLink_test.php
@@ -41,7 +41,7 @@ class PMA_getDbLink_test extends PHPUnit_Framework_TestCase
$database = $GLOBALS['db'];
$this->assertEquals('<a href="' . $cfg['DefaultTabDatabase'] . '?db=' . $database
. '&server=99&lang=en&token=token" title="Jump to database "' . htmlspecialchars($database) . '".">'
- . htmlspecialchars($database) . '</a>',PMA_getDbLink());
+ . htmlspecialchars($database) . '</a>', PMA_getDbLink());
}
function testGetDbLink()
@@ -50,7 +50,7 @@ class PMA_getDbLink_test extends PHPUnit_Framework_TestCase
$database = 'test_database';
$this->assertEquals('<a href="' . $cfg['DefaultTabDatabase'] . '?db=' . $database
. '&server=99&lang=en&token=token" title="Jump to database "' . htmlspecialchars($database) . '".">'
- . htmlspecialchars($database) . '</a>',PMA_getDbLink($database));
+ . htmlspecialchars($database) . '</a>', PMA_getDbLink($database));
}
function testGetDbLinkWithSpecialChars()
@@ -59,6 +59,6 @@ class PMA_getDbLink_test extends PHPUnit_Framework_TestCase
$database = 'test&data\'base';
$this->assertEquals('<a href="' . $cfg['DefaultTabDatabase'] . '?db=' . htmlspecialchars(urlencode($database))
. '&server=99&lang=en&token=token" title="Jump to database "' . htmlspecialchars($database) . '".">'
- . htmlspecialchars($database) . '</a>',PMA_getDbLink($database));
+ . htmlspecialchars($database) . '</a>', PMA_getDbLink($database));
}
}
diff --git a/test/libraries/common/PMA_getTitleForTarget_test.php b/test/libraries/common/PMA_getTitleForTarget_test.php
index 3b4d4d1..478520d 100644
--- a/test/libraries/common/PMA_getTitleForTarget_test.php
+++ b/test/libraries/common/PMA_getTitleForTarget_test.php
@@ -36,7 +36,7 @@ class PMA_getTitleForTarget_test extends PHPUnit_Framework_TestCase
*/
function testGetTitleForTarget($target, $result){
- $this->assertEquals($result,PMA_getTitleForTarget($target));
+ $this->assertEquals($result, PMA_getTitleForTarget($target));
}
}
diff --git a/test/libraries/core/PMA_array_test.php b/test/libraries/core/PMA_array_test.php
index aae8332..0eea363 100644
--- a/test/libraries/core/PMA_array_test.php
+++ b/test/libraries/core/PMA_array_test.php
@@ -185,7 +185,7 @@ class PMA_array_test extends PHPUnit_Framework_TestCase
}
$arr = array(1, 2, 3, 4);
- $target = array('val: 1 processed','val: 2 processed','val: 3 processed','val: 4 processed');
+ $target = array('val: 1 processed', 'val: 2 processed', 'val: 3 processed', 'val: 4 processed');
PMA_arrayWalkRecursive($arr, 'fConcat');
$this->assertEquals($arr, $target);
@@ -213,8 +213,8 @@ class PMA_array_test extends PHPUnit_Framework_TestCase
*/
function testPMA_arrayWalkRecursiveSubArray()
{
- $arr = array("key1"=>'val1', 'key2'=>array('skey1'=>'sval1','skey2'=>'sval2'),'key3'=>'val3');
- $target = array('key1'=>'val: val1 processed', 'key2'=> array('skey1'=>'val: sval1 processed', 'skey2'=>'val: sval2 processed'),'key3'=>'val: val3 processed');
+ $arr = array("key1"=>'val1', 'key2'=>array('skey1'=>'sval1', 'skey2'=>'sval2'), 'key3'=>'val3');
+ $target = array('key1'=>'val: val1 processed', 'key2'=> array('skey1'=>'val: sval1 processed', 'skey2'=>'val: sval2 processed'), 'key3'=>'val: val3 processed');
PMA_arrayWalkRecursive($arr, 'fConcat');
$this->assertEquals($arr, $target);
@@ -222,10 +222,10 @@ class PMA_array_test extends PHPUnit_Framework_TestCase
function testPMA_arrayWalkRecursiveApplyToKeysStripSlashes()
{
- $arr = array("key\\1"=>'v\\\\al1', 'k\\ey2'=>array('s\\\\key1'=>'sval\\1','s\\k\\ey2'=>'s\\v\\al2'),'key3'=>'val3');
- $target = array("key1"=>'val1', 'key2'=>array('skey1'=>'sval1','skey2'=>'sval2'),'key3'=>'val3');
+ $arr = array("key\\1"=>'v\\\\al1', 'k\\ey2'=>array('s\\\\key1'=>'sval\\1', 's\\k\\ey2'=>'s\\v\\al2'), 'key3'=>'val3');
+ $target = array("key1"=>'val1', 'key2'=>array('skey1'=>'sval1', 'skey2'=>'sval2'), 'key3'=>'val3');
- PMA_arrayWalkRecursive($arr, 'stripslashes',true);
+ PMA_arrayWalkRecursive($arr, 'stripslashes', true);
$this->assertEquals($arr, $target);
}
}
\ No newline at end of file
diff --git a/test/libraries/core/PMA_checkPageValidity_test.php b/test/libraries/core/PMA_checkPageValidity_test.php
index dae64a2..fe10ace 100644
--- a/test/libraries/core/PMA_checkPageValidity_test.php
+++ b/test/libraries/core/PMA_checkPageValidity_test.php
@@ -37,31 +37,31 @@ class PMA_checkPageValidity_test extends PHPUnit_Framework_TestCase
function testGotoNowhere(){
$page = null;
- $this->assertFalse(PMA_checkPageValidity($page,null));
+ $this->assertFalse(PMA_checkPageValidity($page, null));
}
function testGotoWhitelist(){
$page = 'export.php';
- $this->assertTrue(PMA_checkPageValidity($page,$this->goto_whitelist));
+ $this->assertTrue(PMA_checkPageValidity($page, $this->goto_whitelist));
}
function testGotoNotInWhitelist(){
$page = 'shell.php';
- $this->assertFalse(PMA_checkPageValidity($page,$this->goto_whitelist));
+ $this->assertFalse(PMA_checkPageValidity($page, $this->goto_whitelist));
}
function testGotoWhitelistPage(){
$page = 'main.php?sql.php&test=true';
- $this->assertTrue(PMA_checkPageValidity($page,$this->goto_whitelist));
+ $this->assertTrue(PMA_checkPageValidity($page, $this->goto_whitelist));
}
function testGotoWhitelistEncodedPage(){
$page = 'main.php%3Fsql.php%26test%3Dtrue';
- $this->assertTrue(PMA_checkPageValidity($page,$this->goto_whitelist));
+ $this->assertTrue(PMA_checkPageValidity($page, $this->goto_whitelist));
}
}
diff --git a/test/libraries/core/PMA_getTableCount_test_dis.php b/test/libraries/core/PMA_getTableCount_test_dis.php
index 7910377..3c89b77 100644
--- a/test/libraries/core/PMA_getTableCount_test_dis.php
+++ b/test/libraries/core/PMA_getTableCount_test_dis.php
@@ -31,7 +31,7 @@ class PMA_getTableCount_test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['Server']['host'] = 'localhost';
$GLOBALS['cfg']['Server']['user'] = 'root';
- $this->assertEquals(5,PMA_getTableCount('meddb'));
+ $this->assertEquals(5, PMA_getTableCount('meddb'));
$this->assertTrue(true);
}
}
diff --git a/test/libraries/core/PMA_headerLocation_test_disabled.php b/test/libraries/core/PMA_headerLocation_test_disabled.php
index 147386a..a303d24 100644
--- a/test/libraries/core/PMA_headerLocation_test_disabled.php
+++ b/test/libraries/core/PMA_headerLocation_test_disabled.php
@@ -70,9 +70,9 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase
foreach ($substs as $func => $ren_func) {
if (function_exists("__overridden__"))
- rename_function("__overridden__", str_replace(array('.', ' '),array('', ''),microtime()));
+ rename_function("__overridden__", str_replace(array('.', ' '), array('', ''), microtime()));
override_function($func, $args[$func], $substs[$func]);
- rename_function("__overridden__", str_replace(array('.', ' '),array('', ''),microtime()));
+ rename_function("__overridden__", str_replace(array('.', ' '), array('', ''), microtime()));
}
}
@@ -85,8 +85,8 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase
if ($this->apdExt && $GLOBALS['test_header']) {
$GLOBALS['test_header'] = 0;
- rename_function('header', 'header'.str_replace(array('.', ' '),array('', ''),microtime()));
- rename_function('headers_sent', 'headers_sent'.str_replace(array('.', ' '),array('', ''),microtime()));
+ rename_function('header', 'header'.str_replace(array('.', ' '), array('', ''), microtime()));
+ rename_function('headers_sent', 'headers_sent'.str_replace(array('.', ' '), array('', ''), microtime()));
rename_function('test_header', 'header');
rename_function('test_headers_sent', 'headers_sent');
diff --git a/test/libraries/core/PMA_warnMissingExtension_test.php b/test/libraries/core/PMA_warnMissingExtension_test.php
index a0f1525..24128e1 100644
--- a/test/libraries/core/PMA_warnMissingExtension_test.php
+++ b/test/libraries/core/PMA_warnMissingExtension_test.php
@@ -27,11 +27,11 @@ class PMA_warnMissingExtension_test extends PHPUnit_Framework_TestCase
$warn = 'The <a href="'.PMA_linkURL(PMA_getPHPDocLink('book.' . $ext . '.php')).'" target="Documentation"><em>'.$ext.'</em></a> extension is missing. Please check your PHP configuration.';
ob_start();
- PMA_warnMissingExtension($ext,true);
+ PMA_warnMissingExtension($ext, true);
$printed = ob_get_contents();
ob_end_clean();
- $this->assertGreaterThan(0,strpos($printed,$warn));
+ $this->assertGreaterThan(0, strpos($printed, $warn));
}
function testMissingExtentionFatalWithExtra(){
@@ -41,11 +41,11 @@ class PMA_warnMissingExtension_test extends PHPUnit_Framework_TestCase
$warn = 'The <a href="'.PMA_linkURL(PMA_getPHPDocLink('book.' . $ext . '.php')).'" target="Documentation"><em>'.$ext.'</em></a> extension is missing. Please check your PHP configuration.'.' '.$extra;
ob_start();
- PMA_warnMissingExtension($ext,true,$extra);
+ PMA_warnMissingExtension($ext, true, $extra);
$printed = ob_get_contents();
ob_end_clean();
- $this->assertGreaterThan(0,strpos($printed,$warn));
+ $this->assertGreaterThan(0, strpos($printed, $warn));
}
function testMissingExtentionWithExtra(){
@@ -53,7 +53,7 @@ class PMA_warnMissingExtension_test extends PHPUnit_Framework_TestCase
$extra = 'Appended Extra String';
$this->setExpectedException('PHPUnit_Framework_Error',
'The [a@'.PMA_getPHPDocLink('book.' . $ext . '.php').'@Documentation][em]'.$ext.'[/em][/a] extension is missing. Please check your PHP configuration.'.' '.$extra);
- PMA_warnMissingExtension($ext,false,$extra);
+ PMA_warnMissingExtension($ext, false, $extra);
$this->assertTrue(true);
}
}
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19813-gac088aa
by Dieter Adriaenssens 23 Sep '11
by Dieter Adriaenssens 23 Sep '11
23 Sep '11
The branch, master has been updated
via ac088aaee0194f28f435b63b978db96426cda642 (commit)
from ff56cbf5d901a34bc3884254f5f56ce2d2ee0ab2 (commit)
- Log -----------------------------------------------------------------
commit ac088aaee0194f28f435b63b978db96426cda642
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: Fri Sep 23 00:46:58 2011 +0200
use include() instead of require() when including file conditionally
-----------------------------------------------------------------------
Summary of changes:
libraries/header.inc.php | 18 ++++++++--------
libraries/mult_submits.inc.php | 28 +++++++++++++-------------
libraries/rte/rte_main.inc.php | 10 ++++----
libraries/string.lib.php | 8 +++---
main.php | 12 +++++-----
schema_edit.php | 10 ++++----
server_status.php | 8 +++---
sql.php | 42 ++++++++++++++++++++--------------------
tbl_addfield.php | 14 ++++++------
tbl_alter.php | 8 +++---
tbl_change.php | 6 ++--
tbl_chart.php | 14 ++++++------
tbl_create.php | 8 +++---
tbl_operations.php | 8 +++---
tbl_replace.php | 16 +++++++-------
tbl_row_action.php | 10 ++++----
tbl_select.php | 10 ++++----
tbl_structure.php | 8 +++---
user_password.php | 8 +++---
19 files changed, 123 insertions(+), 123 deletions(-)
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index eb17e4c..54c59b2 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -39,7 +39,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
/**
* Gets a core script and starts output buffering work
*/
- require_once './libraries/ob.lib.php';
+ include_once './libraries/ob.lib.php';
PMA_outBufferPre();
// if database storage for user preferences is transient, offer to load
@@ -54,9 +54,9 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
// to a seperate file. It can now be included by header.inc.php,
// querywindow.php.
- require_once './libraries/header_http.inc.php';
- require_once './libraries/header_meta_style.inc.php';
- require_once './libraries/header_scripts.inc.php';
+ include_once './libraries/header_http.inc.php';
+ include_once './libraries/header_meta_style.inc.php';
+ include_once './libraries/header_scripts.inc.php';
?>
<meta name="OBGZip" content="<?php echo ($GLOBALS['cfg']['OBGzip'] ? 'true' : 'false'); ?>" />
<?php /* remove vertical scroll bar bug in ie */ ?>
@@ -76,7 +76,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
// Include possible custom headers
if (file_exists(CUSTOM_HEADER_FILE)) {
- require CUSTOM_HEADER_FILE;
+ include CUSTOM_HEADER_FILE;
}
@@ -89,7 +89,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
// offer to load user preferences from localStorage
if ($userprefs_offer_import) {
- require_once './libraries/user_preferences.lib.php';
+ include_once './libraries/user_preferences.lib.php';
PMA_userprefs_autoload_header();
}
@@ -148,7 +148,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
// if the table is being dropped, $_REQUEST['purge'] is set to '1'
// so do not display the table name in upper div
if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')) {
- require_once './libraries/tbl_info.inc.php';
+ include_once './libraries/tbl_info.inc.php';
echo $separator;
printf($item,
@@ -179,7 +179,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
/**
* Settings for relations stuff
*/
- require_once './libraries/relation.lib.php';
+ include_once './libraries/relation.lib.php';
$cfgRelation = PMA_getRelationsParam();
// Get additional information about tables for tooltip is done
@@ -208,7 +208,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
} //end if (!$GLOBALS['is_ajax_request'])
else {
if (empty($GLOBALS['is_header_sent'])) {
- require_once './libraries/header_http.inc.php';
+ include_once './libraries/header_http.inc.php';
$GLOBALS['is_header_sent'] = true;
}
}
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 6a16541..6a4c242 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -25,7 +25,7 @@ if (! empty($submit_mult)
} elseif (isset($selected_tbl) && !empty($selected_tbl)) {
// coming from database structure view - do something with selected tables
if ($submit_mult == 'print') {
- require './tbl_printview.php';
+ include './tbl_printview.php';
} else {
$selected = $selected_tbl;
switch ($submit_mult) {
@@ -47,7 +47,7 @@ if (! empty($submit_mult)
break;
case 'export':
unset($submit_mult);
- require 'db_export.php';
+ include 'db_export.php';
exit;
break;
} // end switch
@@ -102,7 +102,7 @@ if (! empty($submit_mult)
$mult_btn = __('Yes');
break;
case 'change':
- require './tbl_alter.php';
+ include './tbl_alter.php';
break;
case 'browse':
// this should already be handled by tbl_structure.php
@@ -121,18 +121,18 @@ if (! empty($submit_mult)
if (!empty($submit_mult) && !empty($what)) {
unset($message);
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
if (strlen($table)) {
- require './libraries/tbl_common.php';
+ include './libraries/tbl_common.php';
$url_query .= '&goto=tbl_sql.php&back=tbl_sql.php';
- require './libraries/tbl_info.inc.php';
- require_once './libraries/tbl_links.inc.php';
+ include './libraries/tbl_info.inc.php';
+ include_once './libraries/tbl_links.inc.php';
} elseif (strlen($db)) {
- require './libraries/db_common.inc.php';
- require './libraries/db_info.inc.php';
+ include './libraries/db_common.inc.php';
+ include './libraries/db_info.inc.php';
} else {
- require_once './libraries/server_common.inc.php';
- require_once './libraries/server_links.inc.php';
+ include_once './libraries/server_common.inc.php';
+ include_once './libraries/server_links.inc.php';
}
// Builds the query
@@ -288,7 +288,7 @@ if (!empty($submit_mult) && !empty($what)) {
</fieldset>
<?php
}
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
} // end if
@@ -299,7 +299,7 @@ if (!empty($submit_mult) && !empty($what)) {
elseif ($mult_btn == __('Yes')) {
if ($query_type == 'drop_db' || $query_type == 'drop_tbl' || $query_type == 'drop_fld') {
- require_once './libraries/relation_cleanup.lib.php';
+ include_once './libraries/relation_cleanup.lib.php';
}
$sql_query = '';
@@ -465,7 +465,7 @@ elseif ($mult_btn == __('Yes')) {
}
if ($use_sql) {
- require './sql.php';
+ include './sql.php';
} elseif (!$run_parts) {
PMA_DBI_select_db($db);
$result = PMA_DBI_try_query($sql_query);
diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php
index 988cf6b..796467e 100644
--- a/libraries/rte/rte_main.inc.php
+++ b/libraries/rte/rte_main.inc.php
@@ -23,12 +23,12 @@ if ($GLOBALS['is_ajax_request'] != true) {
* Displays the header and tabs
*/
if (! empty($table) && in_array($table, PMA_DBI_get_tables($db))) {
- require_once './libraries/tbl_common.php';
- require_once './libraries/tbl_links.inc.php';
+ include_once './libraries/tbl_common.php';
+ include_once './libraries/tbl_links.inc.php';
} else {
$table = '';
- require_once './libraries/db_common.inc.php';
- require_once './libraries/db_info.inc.php';
+ include_once './libraries/db_common.inc.php';
+ include_once './libraries/db_info.inc.php';
}
} else {
/**
@@ -92,7 +92,7 @@ case 'EVN':
* Display the footer, if necessary
*/
if ($GLOBALS['is_ajax_request'] != true) {
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
}
?>
diff --git a/libraries/string.lib.php b/libraries/string.lib.php
index 0e9f974..9773820 100644
--- a/libraries/string.lib.php
+++ b/libraries/string.lib.php
@@ -24,18 +24,18 @@ if (! defined('PHPMYADMIN')) {
*/
if (@function_exists('mb_strlen')) {
mb_internal_encoding('utf-8');
- require './libraries/string_mb.lib.php';
+ include './libraries/string_mb.lib.php';
} else {
- require './libraries/string_native.lib.php';
+ include './libraries/string_native.lib.php';
}
/**
* Load ctype handler.
*/
if (@extension_loaded('ctype')) {
- require './libraries/string_type_ctype.lib.php';
+ include './libraries/string_type_ctype.lib.php';
} else {
- require './libraries/string_type_native.lib.php';
+ include './libraries/string_type_native.lib.php';
}
/**
diff --git a/main.php b/main.php
index 0325f08..f85f1c0 100644
--- a/main.php
+++ b/main.php
@@ -30,9 +30,9 @@ $common_url_query = PMA_generate_common_url('', '');
// when $server > 0, a server has been chosen so we can display
// all MySQL-related information
if ($server > 0) {
- require './libraries/server_common.inc.php';
- require './libraries/StorageEngine.class.php';
- require './libraries/server_links.inc.php';
+ include './libraries/server_common.inc.php';
+ include './libraries/StorageEngine.class.php';
+ include './libraries/server_links.inc.php';
// Use the verbose name of the server instead of the hostname
// if a value is set
@@ -71,7 +71,7 @@ if ($server > 0
if (! $cfg['LeftDisplayServers']
&& (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) {
echo '<li id="li_select_server">';
- require_once './libraries/select_server.lib.php';
+ include_once './libraries/select_server.lib.php';
PMA_select_server(true, true);
echo '</li>';
}
@@ -80,7 +80,7 @@ if ($server > 0
* Displays the mysql server related links
*/
if ($server > 0 && !PMA_DRIZZLE) {
- require_once './libraries/check_user_privileges.lib.php';
+ include_once './libraries/check_user_privileges.lib.php';
// Logout for advanced authentication
if ($cfg['Server']['auth_type'] != 'config') {
@@ -119,7 +119,7 @@ echo ' <ul>';
// Displays language selection combo
if (empty($cfg['Lang'])) {
echo '<li id="li_select_lang">';
- require_once './libraries/display_select_lang.lib.php';
+ include_once './libraries/display_select_lang.lib.php';
PMA_select_language();
echo '</li>';
}
diff --git a/schema_edit.php b/schema_edit.php
index 3662b0b..85eeccc 100644
--- a/schema_edit.php
+++ b/schema_edit.php
@@ -37,24 +37,24 @@ $cfgRelation = PMA_getRelationsParam();
if (! $cfgRelation['relwork']) {
echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'relation', 'config.inc.php') . '<br />' . "\n"
. PMA_showDocu('relation') . "\n";
- require_once './libraries/footer.inc.php';
+ include_once './libraries/footer.inc.php';
}
if (! $cfgRelation['displaywork']) {
echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_info', 'config.inc.php') . '<br />' . "\n"
. PMA_showDocu('table_info') . "\n";
- require_once './libraries/footer.inc.php';
+ include_once './libraries/footer.inc.php';
}
if (! isset($cfgRelation['table_coords'])) {
echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_coords', 'config.inc.php') . '<br />' . "\n"
. PMA_showDocu('table_coords') . "\n";
- require_once './libraries/footer.inc.php';
+ include_once './libraries/footer.inc.php';
}
if (! isset($cfgRelation['pdf_pages'])) {
echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'pdf_page', 'config.inc.php') . '<br />' . "\n"
. PMA_showDocu('pdf_pages') . "\n";
- require_once './libraries/footer.inc.php';
+ include_once './libraries/footer.inc.php';
}
if ($cfgRelation['pdfwork']) {
@@ -64,7 +64,7 @@ if ($cfgRelation['pdfwork']) {
* so, user can interact with it and perform export of relations schema
*/
- require_once './libraries/schema/User_Schema.class.php';
+ include_once './libraries/schema/User_Schema.class.php';
$user_schema = new PMA_User_Schema();
/**
diff --git a/server_status.php b/server_status.php
index d7da7b3..bbac0c3 100644
--- a/server_status.php
+++ b/server_status.php
@@ -134,7 +134,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
case 'cpu':
if (!$sysinfo) {
- require_once 'libraries/sysinfo.lib.php';
+ include_once 'libraries/sysinfo.lib.php';
$sysinfo = getSysInfo();
}
if (!$cpuload) {
@@ -151,7 +151,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
case 'memory':
if (!$sysinfo) {
- require_once 'libraries/sysinfo.lib.php';
+ include_once 'libraries/sysinfo.lib.php';
$sysinfo = getSysInfo();
}
if (!$memory) {
@@ -404,8 +404,8 @@ if (PMA_DRIZZLE) {
$server_master_status = false;
$server_slave_status = false;
} else {
- require './libraries/replication.inc.php';
- require_once './libraries/replication_gui.lib.php';
+ include './libraries/replication.inc.php';
+ include_once './libraries/replication_gui.lib.php';
}
/**
diff --git a/sql.php b/sql.php
index 41d4504..619893a 100644
--- a/sql.php
+++ b/sql.php
@@ -71,7 +71,7 @@ if (isset($fields['dbase'])) {
* better place either.
*/
if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_values'] == true) {
- require_once 'libraries/relation.lib.php';
+ include_once 'libraries/relation.lib.php';
$column = $_REQUEST['column'];
$foreigners = PMA_getForeigners($db, $table, $column);
@@ -197,7 +197,7 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
// Default to browse if no query set and we have table
// (needed for browsing from DefaultTabTable)
if (empty($sql_query) && strlen($table) && strlen($db)) {
- require_once './libraries/bookmark.lib.php';
+ include_once './libraries/bookmark.lib.php';
$book_sql_query = PMA_Bookmark_get($db, '\'' . PMA_sqlAddSlashes($table) . '\'',
'label', false, true);
@@ -233,7 +233,7 @@ if (!defined('PMA_CHK_DROP')
&& !$cfg['AllowUserDropDatabase']
&& $is_drop_database
&& !$is_superuser) {
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
PMA_mysqlDie(__('"DROP DATABASE" statements are disabled.'), '', '', $err_url);
} // end if
@@ -286,7 +286,7 @@ if (isset($btnDrop) && $btnDrop == __('No')) {
$table = '';
}
$active_page = $goto;
- require './' . PMA_securePath($goto);
+ include './' . PMA_securePath($goto);
} else {
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . str_replace('&', '&', $goto));
}
@@ -315,7 +315,7 @@ if (! $cfg['Confirm'] || isset($_REQUEST['is_js_confirmed']) || isset($btnDrop)
if ($do_confirm) {
$stripped_sql_query = $sql_query;
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
if ($is_drop_database) {
echo '<h1 class="error">' . __('You are about to DESTROY a complete database!') . '</h1>';
}
@@ -346,7 +346,7 @@ if ($do_confirm) {
/**
* Displays the footer and exit
*/
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
} // end if $do_confirm
@@ -501,7 +501,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
/**
* Go to target path.
*/
- require './' . PMA_securePath($goto);
+ include './' . PMA_securePath($goto);
} else {
$full_err_url = (preg_match('@^(db|tbl)_@', $err_url))
? $err_url . '&show_query=1&sql_query=' . urlencode($sql_query)
@@ -637,7 +637,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
/**
* Cleanup relations.
*/
- require_once './libraries/relation_cleanup.lib.php';
+ include_once './libraries/relation_cleanup.lib.php';
if (strlen($table) && strlen($db)) {
PMA_relationsCleanupTable($db, $table);
@@ -650,7 +650,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
// If a column gets dropped, do relation magic.
if (isset($dropped_column) && strlen($db) && strlen($table) && !empty($dropped_column)) {
- require_once './libraries/relation_cleanup.lib.php';
+ include_once './libraries/relation_cleanup.lib.php';
PMA_relationsCleanupColumn($db, $table, $dropped_column);
} // end if column was dropped
@@ -744,10 +744,10 @@ if (0 == $num_rows || $is_affected) {
}
// Loads to target script
if ($goto != 'main.php') {
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
}
$active_page = $goto;
- require './' . $goto;
+ include './' . $goto;
} else {
// avoid a redirect loop when last record was deleted
if (0 == $num_rows && 'sql.php' == $cfg['DefaultTabTable']) {
@@ -802,7 +802,7 @@ else {
unset($show_query);
}
if (isset($printview) && $printview == '1') {
- require_once './libraries/header_printview.inc.php';
+ include_once './libraries/header_printview.inc.php';
} else {
$GLOBALS['js_include'][] = 'functions.js';
@@ -813,19 +813,19 @@ else {
if (! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) {
if (strlen($table)) {
- require './libraries/tbl_common.php';
+ include './libraries/tbl_common.php';
$url_query .= '&goto=tbl_sql.php&back=tbl_sql.php';
- require './libraries/tbl_info.inc.php';
- require './libraries/tbl_links.inc.php';
+ include './libraries/tbl_info.inc.php';
+ include './libraries/tbl_links.inc.php';
} elseif (strlen($db)) {
- require './libraries/db_common.inc.php';
- require './libraries/db_info.inc.php';
+ include './libraries/db_common.inc.php';
+ include './libraries/db_info.inc.php';
} else {
- require './libraries/server_common.inc.php';
- require './libraries/server_links.inc.php';
+ include './libraries/server_common.inc.php';
+ include './libraries/server_links.inc.php';
}
} else {
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
//we don't need to buffer the output in PMA_showMessage here.
//set a global variable and check against it in the function
$GLOBALS['buffer_message'] = false;
@@ -992,6 +992,6 @@ window.onload = function()
* Displays the footer
*/
if (! isset($_REQUEST['table_maintenance'])) {
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
}
?>
diff --git a/tbl_addfield.php b/tbl_addfield.php
index a866fef..50fb422 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -163,7 +163,7 @@ if (isset($_REQUEST['do_save_data'])) {
if ($result === true) {
// If comments were sent, enable relation stuff
- require_once './libraries/transformations.lib.php';
+ include_once './libraries/transformations.lib.php';
// Update comment table for mime types [MIME]
if (isset($_REQUEST['field_mimetype'])
@@ -191,7 +191,7 @@ if (isset($_REQUEST['do_save_data'])) {
}
$active_page = 'tbl_structure.php';
- require './tbl_structure.php';
+ include './tbl_structure.php';
} else {
PMA_mysqlDie('', '', '', $err_url, false);
// An error happened while inserting/updating a table definition.
@@ -215,21 +215,21 @@ if ($abort == false) {
/**
* Gets tables informations
*/
- require_once './libraries/tbl_common.php';
- require_once './libraries/tbl_info.inc.php';
+ include_once './libraries/tbl_common.php';
+ include_once './libraries/tbl_info.inc.php';
/**
* Displays top menu links
*/
$active_page = 'tbl_structure.php';
- require_once './libraries/tbl_links.inc.php';
+ include_once './libraries/tbl_links.inc.php';
/**
* Display the form
*/
$action = 'tbl_addfield.php';
- require_once './libraries/tbl_properties.inc.php';
+ include_once './libraries/tbl_properties.inc.php';
// Diplays the footer
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
}
?>
diff --git a/tbl_alter.php b/tbl_alter.php
index a76af59..dcde601 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -103,7 +103,7 @@ if (isset($_REQUEST['do_save_data'])) {
/**
* If comments were sent, enable relation stuff
*/
- require_once './libraries/transformations.lib.php';
+ include_once './libraries/transformations.lib.php';
// updaet field names in relation
if (isset($_REQUEST['field_orig']) && is_array($_REQUEST['field_orig'])) {
@@ -136,7 +136,7 @@ if (isset($_REQUEST['do_save_data'])) {
}
$active_page = 'tbl_structure.php';
- require './tbl_structure.php';
+ include './tbl_structure.php';
} else {
PMA_mysqlDie('', '', '', $err_url, false);
// An error happened while inserting/updating a table definition.
@@ -156,7 +156,7 @@ if (isset($_REQUEST['do_save_data'])) {
* $selected comes from multi_submits.inc.php
*/
if ($abort == false) {
- require_once './libraries/tbl_links.inc.php';
+ include_once './libraries/tbl_links.inc.php';
if (! isset($selected)) {
PMA_checkParameters(array('field'));
@@ -195,7 +195,7 @@ if ($abort == false) {
/**
* Form for changing properties.
*/
- require './libraries/tbl_properties.inc.php';
+ include './libraries/tbl_properties.inc.php';
}
diff --git a/tbl_change.php b/tbl_change.php
index 7bc0767..b64da6e 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -21,9 +21,9 @@ require_once './libraries/db_table_exists.lib.php';
// load additional configuration variables
if (PMA_DRIZZLE) {
- require_once './libraries/data_drizzle.inc.php';
+ include_once './libraries/data_drizzle.inc.php';
} else {
- require_once './libraries/data_mysql.inc.php';
+ include_once './libraries/data_mysql.inc.php';
}
/**
@@ -187,7 +187,7 @@ if (isset($where_clause)) {
unset($rows[$key_id], $where_clause_array[$key_id]);
PMA_showMessage(__('MySQL returned an empty result set (i.e. zero rows).'), $local_query);
echo "\n";
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
} else { // end if (no row returned)
$meta = PMA_DBI_get_fields_meta($result[$key_id]);
list($unique_condition, $tmp_clause_is_unique) = PMA_getUniqueCondition($result[$key_id], count($meta), $meta, $rows[$key_id], true);
diff --git a/tbl_chart.php b/tbl_chart.php
index 43de351..e396c53 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -35,19 +35,19 @@ $GLOBALS['js_include'][] = 'canvg/canvg.js';
if (strlen($GLOBALS['table'])) {
$url_params['goto'] = $cfg['DefaultTabTable'];
$url_params['back'] = 'tbl_sql.php';
- require './libraries/tbl_common.php';
- require './libraries/tbl_info.inc.php';
- require './libraries/tbl_links.inc.php';
+ include './libraries/tbl_common.php';
+ include './libraries/tbl_info.inc.php';
+ include './libraries/tbl_links.inc.php';
} elseif (strlen($GLOBALS['db'])) {
$url_params['goto'] = $cfg['DefaultTabDatabase'];
$url_params['back'] = 'sql.php';
- require './libraries/db_common.inc.php';
- require './libraries/db_info.inc.php';
+ include './libraries/db_common.inc.php';
+ include './libraries/db_info.inc.php';
} else {
$url_params['goto'] = $cfg['DefaultTabServer'];
$url_params['back'] = 'sql.php';
- require './libraries/server_common.inc.php';
- require './libraries/server_links.inc.php';
+ include './libraries/server_common.inc.php';
+ include './libraries/server_links.inc.php';
}
/*
diff --git a/tbl_create.php b/tbl_create.php
index fb9c72f..e60c172 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -197,7 +197,7 @@ if (isset($_REQUEST['do_save_data'])) {
if ($result) {
// If comments were sent, enable relation stuff
- require_once './libraries/transformations.lib.php';
+ include_once './libraries/transformations.lib.php';
// Update comment table for mime types [MIME]
if (isset($_REQUEST['field_mimetype'])
@@ -314,13 +314,13 @@ if (isset($_REQUEST['do_save_data'])) {
// read table info on this newly created table, in case
// the next page is Structure
$reread_info = true;
- require './libraries/tbl_info.inc.php';
+ include './libraries/tbl_info.inc.php';
// do not switch to sql.php - as there is no row to be displayed on a new table
if ($cfg['DefaultTabTable'] === 'sql.php') {
- require './tbl_structure.php';
+ include './tbl_structure.php';
} else {
- require './' . $cfg['DefaultTabTable'];
+ include './' . $cfg['DefaultTabTable'];
}
exit;
} else {
diff --git a/tbl_operations.php b/tbl_operations.php
index 38ecc50..b2f8ab1 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -72,13 +72,13 @@ $table_alters = array();
*/
if (isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) {
$_message = '';
- require_once './tbl_move_copy.php';
+ include_once './tbl_move_copy.php';
}
/**
* If the table has to be maintained
*/
if (isset($_REQUEST['table_maintenance'])) {
- require_once './sql.php';
+ include_once './sql.php';
unset($result);
}
/**
@@ -211,7 +211,7 @@ if ($reread_info) {
// a change, clear the cache
PMA_Table::$cache = array();
$page_checksum = $checksum = $delay_key_write = 0;
- require './libraries/tbl_info.inc.php';
+ include './libraries/tbl_info.inc.php';
}
unset($reread_info);
@@ -219,7 +219,7 @@ unset($reread_info);
* Displays top menu links in non ajax requests
*/
if (!isset($_REQUEST['ajax_request'])) {
- require_once './libraries/tbl_links.inc.php';
+ include_once './libraries/tbl_links.inc.php';
}
if (isset($result) && empty($message_to_show)) {
// set to success by default, because result set could be empty
diff --git a/tbl_replace.php b/tbl_replace.php
index bc9c27c..987fb0a 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -45,8 +45,8 @@ $GLOBALS['js_include'][] = 'sql.js';
if (isset($_REQUEST['insert_rows']) && is_numeric($_REQUEST['insert_rows']) && $_REQUEST['insert_rows'] != $cfg['InsertRows']) {
$cfg['InsertRows'] = $_REQUEST['insert_rows'];
$GLOBALS['js_include'][] = 'tbl_change.js';
- require_once './libraries/header.inc.php';
- require './tbl_change.php';
+ include_once './libraries/header.inc.php';
+ include './tbl_change.php';
exit;
}
@@ -227,7 +227,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
// Note: $key is an md5 of the fieldname. The actual fieldname is available in $me_fields_name[$key]
- require './libraries/tbl_replace_fields.inc.php';
+ include './libraries/tbl_replace_fields.inc.php';
// for blobstreaming
if ($blob_streaming_active) {
@@ -344,9 +344,9 @@ if ($is_insert && count($value_sets) > 0) {
$message = PMA_Message::success(__('No change'));
$active_page = $goto_include;
if (! $GLOBALS['is_ajax_request'] == true) {
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
}
- require './' . PMA_securePath($goto_include);
+ include './' . PMA_securePath($goto_include);
exit;
}
unset($me_fields, $is_insertignore);
@@ -442,7 +442,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
if (isset($_REQUEST['rel_fields_list']) && $_REQUEST['rel_fields_list'] != '') {
//handle relations work here for updated row.
- require_once './libraries/relation.lib.php';
+ include_once './libraries/relation.lib.php';
$map = PMA_getForeigners($db, $table, '', 'both');
@@ -509,7 +509,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
}
if (isset($_REQUEST['do_transformations']) && $_REQUEST['do_transformations'] == true ) {
- require_once './libraries/transformations.lib.php';
+ include_once './libraries/transformations.lib.php';
//if some posted fields need to be transformed, generate them here.
$mime_map = PMA_getMIME($db, $table);
@@ -538,7 +538,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
if (file_exists('./libraries/transformations/' . $include_file)) {
$transformfunction_name = str_replace('.inc.php', '', $transformation['transformation']);
- require_once './libraries/transformations/' . $include_file;
+ include_once './libraries/transformations/' . $include_file;
if (function_exists('PMA_transformation_' . $transformfunction_name)) {
$transform_function = 'PMA_transformation_' . $transformfunction_name;
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 6e9dde1..298fe7a 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -27,8 +27,8 @@ if (! PMA_isValid($_REQUEST['rows_to_delete'], 'array')
&& ! isset($_REQUEST['mult_btn'])) {
$disp_message = __('No rows selected');
$disp_query = '';
- require './sql.php';
- require './libraries/footer.inc.php';
+ include './sql.php';
+ include './libraries/footer.inc.php';
}
if (isset($_REQUEST['submit_mult'])) {
@@ -112,7 +112,7 @@ if (!empty($submit_mult)) {
$original_url_query = $url_query;
}
}
- require './libraries/mult_submits.inc.php';
+ include './libraries/mult_submits.inc.php';
$_url_params = $GLOBALS['url_params'];
$_url_params['goto'] = 'tbl_sql.php';
$url_query = PMA_generate_common_url($_url_params);
@@ -140,12 +140,12 @@ if (!empty($submit_mult)) {
unset($submit_mult, $_REQUEST['mult_btn']);
$active_page = 'sql.php';
- require './sql.php';
+ include './sql.php';
/**
* Displays the footer
*/
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
break;
}
}
diff --git a/tbl_select.php b/tbl_select.php
index 19ec4e4..8bb3b0e 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -33,19 +33,19 @@ $geom_types = PMA_getGISDatatypes();
*/
if (! isset($param) || $param[0] == '') {
// Gets some core libraries
- require_once './libraries/tbl_common.php';
+ include_once './libraries/tbl_common.php';
//$err_url = 'tbl_select.php' . $err_url;
$url_query .= '&goto=tbl_select.php&back=tbl_select.php';
/**
* Gets tables informations
*/
- require_once './libraries/tbl_info.inc.php';
+ include_once './libraries/tbl_info.inc.php';
/**
* Displays top menu links
*/
- require_once './libraries/tbl_links.inc.php';
+ include_once './libraries/tbl_links.inc.php';
if (! isset($goto)) {
$goto = $GLOBALS['cfg']['DefaultTabTable'];
@@ -237,7 +237,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
</form>
<div id="sqlqueryresults"></div>
<?php
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
?>
</fieldset>
@@ -295,7 +295,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
if ($orderField != '--nil--') {
$sql_query .= ' ORDER BY ' . PMA_backquote($orderField) . ' ' . $order;
} // end if
- require './sql.php';
+ include './sql.php';
}
?>
diff --git a/tbl_structure.php b/tbl_structure.php
index a0bec5d..79e6f05 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -62,13 +62,13 @@ if (! empty($submit_mult) && isset($_REQUEST['selected_fld'])) {
// what is this htmlspecialchars() for??
//$sql_query .= ' FROM ' . PMA_backquote(htmlspecialchars($table));
$sql_query .= ' FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
- require './sql.php';
+ include './sql.php';
exit;
} else {
// handle multiple field commands
// handle confirmation of deleting multiple fields/columns
$action = 'tbl_structure.php';
- require './libraries/mult_submits.inc.php';
+ include './libraries/mult_submits.inc.php';
//require_once './libraries/header.inc.php';
//require_once './libraries/tbl_links.inc.php';
@@ -224,7 +224,7 @@ $comments_map = array();
$mime_map = array();
if ($GLOBALS['cfg']['ShowPropertyComments']) {
- require_once './libraries/transformations.lib.php';
+ include_once './libraries/transformations.lib.php';
//$cfgRelation = PMA_getRelationsParam();
@@ -681,7 +681,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
* links again
*/
if (count($fields) > 20) {
- require './libraries/tbl_links.inc.php';
+ include './libraries/tbl_links.inc.php';
} // end if (count($fields) > 20)
/**
diff --git a/user_password.php b/user_password.php
index 3ca3442..d5859b8 100644
--- a/user_password.php
+++ b/user_password.php
@@ -30,9 +30,9 @@ if (!$cfg['ShowChgPassword']) {
$cfg['ShowChgPassword'] = PMA_DBI_select_db('mysql');
}
if ($cfg['Server']['auth_type'] == 'config' || !$cfg['ShowChgPassword']) {
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
PMA_Message::error(__('You don\'t have sufficient privileges to be here right now!'))->display();
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
} // end if
@@ -101,14 +101,14 @@ if (isset($_REQUEST['nopass'])) {
}
// Displays the page
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
echo '<h1>' . __('Change password') . '</h1>' . "\n\n";
PMA_showMessage($message, $sql_query, 'success');
?>
<a href="index.php<?php echo PMA_generate_common_url($_url_params); ?>" target="_parent">
<strong><?php echo __('Back'); ?></strong></a>
<?php
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
} // end if
} // end if
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19812-gff56cbf
by Marc Delisle 22 Sep '11
by Marc Delisle 22 Sep '11
22 Sep '11
The branch, master has been updated
via ff56cbf5d901a34bc3884254f5f56ce2d2ee0ab2 (commit)
from f44ba87d59c814659fce2e13b602c5fa4cf2f1fe (commit)
- Log -----------------------------------------------------------------
commit ff56cbf5d901a34bc3884254f5f56ce2d2ee0ab2
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 22 10:48:29 2011 -0400
Fix bug 3411523 (SQL query tab broken) which was introduced when
applying the fix for bug #3383572 (Cannot execute saved query), which
works for the 3.4 branch.
-----------------------------------------------------------------------
Summary of changes:
js/sql.js | 122 ++++++++++++++++++++++++-------------------------------------
1 files changed, 48 insertions(+), 74 deletions(-)
diff --git a/js/sql.js b/js/sql.js
index 599865e..813bf68 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -138,16 +138,10 @@ $(document).ready(function() {
* @memberOf jQuery
* @name sqlqueryform_submit
*/
- $("#sqlqueryform.ajax input:submit").live('click', function(event) {
+ $("#sqlqueryform.ajax").live('submit', function(event) {
event.preventDefault();
- var $form = $(this).closest("form");
- var clicked_button = $(this).attr('id');
-
- if ('button_submit_query' == clicked_button) {
- $form.find("select[name=id_bookmark]").attr("value","");
- }
-
+ var $form = $(this);
if (! checkSqlQuery($form[0])) {
return false;
}
@@ -161,78 +155,58 @@ $(document).ready(function() {
PMA_prepareForAjaxRequest($form);
$.post($form.attr('action'), $form.serialize() , function(data) {
- if ('button_submit_query' == clicked_button) {
- if (data.success == true) {
- // fade out previous messages, if any
- $('.success').fadeOut();
- $('.sqlquery_message').fadeOut();
- // show a message that stays on screen
- if (typeof data.sql_query != 'undefined') {
- $('<div class="sqlquery_message"></div>')
- .html(data.sql_query)
- .insertBefore('#sqlqueryform');
- // unnecessary div that came from data.sql_query
- $('.notice').remove();
- } else {
- $('#sqlqueryform').before(data.message);
- }
- $sqlqueryresults.show();
- // this happens if a USE command was typed
- if (typeof data.reload != 'undefined') {
- // Unbind the submit event before reloading. See bug #3295529
- $("#sqlqueryform.ajax").die('submit');
- $form.find('input[name=db]').val(data.db);
- // need to regenerate the whole upper part
- $form.find('input[name=ajax_request]').remove();
- $form.append('<input type="hidden" name="reload" value="true" />');
- $.post('db_sql.php', $form.serialize(), function(data) {
- $('body').html(data);
- }); // end inner post
- }
- } else if (data.success == false ) {
- // show an error message that stays on screen
- $('#sqlqueryform').before(data.error);
- $sqlqueryresults.hide();
+ if (data.success == true) {
+ // fade out previous messages, if any
+ $('.success').fadeOut();
+ $('.sqlquery_message').fadeOut();
+ // show a message that stays on screen
+ if (typeof data.sql_query != 'undefined') {
+ $('<div class="sqlquery_message"></div>')
+ .html(data.sql_query)
+ .insertBefore('#sqlqueryform');
+ // unnecessary div that came from data.sql_query
+ $('.notice').remove();
} else {
- // real results are returned
- // fade out previous messages, if any
- $('.success').fadeOut();
- $('.sqlquery_message').fadeOut();
- var $received_data = $(data);
- var $zero_row_results = $received_data.find('textarea[name="sql_query"]');
- // if zero rows are returned from the query execution
- if ($zero_row_results.length > 0) {
- $('#sqlquery').val($zero_row_results.val());
- } else {
- $sqlqueryresults
- .show()
- .html(data)
- .trigger('makegrid');
- $('#togglequerybox').show();
- if ($("#togglequerybox").siblings(":visible").length > 0) {
- $("#togglequerybox").trigger('click');
- }
- PMA_init_slider();
- }
- }
- } else {
- // button_submit_bookmark
- //
- // view only
- if ('1' == data.action_bookmark) {
- $('#sqlquery').text(data.sql_query);
- // send to codemirror if possible
- setQuery(data.sql_query);
+ $('#sqlqueryform').before(data.message);
}
- // delete
- if ('2' == data.action_bookmark) {
- $("#id_bookmark option[value='" + data.id_bookmark + "']").remove();
+ $sqlqueryresults.show();
+ // this happens if a USE command was typed
+ if (typeof data.reload != 'undefined') {
+ // Unbind the submit event before reloading. See bug #3295529
+ $("#sqlqueryform.ajax").die('submit');
+ $form.find('input[name=db]').val(data.db);
+ // need to regenerate the whole upper part
+ $form.find('input[name=ajax_request]').remove();
+ $form.append('<input type="hidden" name="reload" value="true" />');
+ $.post('db_sql.php', $form.serialize(), function(data) {
+ $('body').html(data);
+ }); // end inner post
}
+ } else if (data.success == false ) {
+ // show an error message that stays on screen
+ $('#sqlqueryform').before(data.error);
+ $sqlqueryresults.hide();
+ } else {
+ // real results are returned
// fade out previous messages, if any
$('.success').fadeOut();
$('.sqlquery_message').fadeOut();
- // show a message that stays on screen
- $('#sqlqueryform').before(data.message);
+ var $received_data = $(data);
+ var $zero_row_results = $received_data.find('textarea[name="sql_query"]');
+ // if zero rows are returned from the query execution
+ if ($zero_row_results.length > 0) {
+ $('#sqlquery').val($zero_row_results.val());
+ } else {
+ $sqlqueryresults
+ .show()
+ .html(data)
+ .trigger('makegrid');
+ $('#togglequerybox').show();
+ if ($("#togglequerybox").siblings(":visible").length > 0) {
+ $("#togglequerybox").trigger('click');
+ }
+ PMA_init_slider();
+ }
}
PMA_ajaxRemoveMessage($msgbox);
}); // end $.post()
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19811-gf44ba87
by Madhura Jayaratne 21 Sep '11
by Madhura Jayaratne 21 Sep '11
21 Sep '11
The branch, master has been updated
via f44ba87d59c814659fce2e13b602c5fa4cf2f1fe (commit)
via 92a00cdbe6e6b6491fb81cf072584adeeb952d1d (commit)
via bd786ea7c2d2ac9801f3ddd51b6bbb55118514ee (commit)
via 74461617386de90b16ac2fa4e82ec99be2efad60 (commit)
via 5dc7f9b5fa504e2e01e55b6ceb2a156a63fdc297 (commit)
via e42539a817a504e8367fb09fec3c0b06e035f3bc (commit)
via 2e7a8c9eead022e0713704b471af3a0d7d908063 (commit)
via 379ad840d32a3c58d3b4fe9d27a3fc4aab19a2ba (commit)
from 010d11189ac7a2b3419254e7fcfb4fd00fac76bf (commit)
- Log -----------------------------------------------------------------
commit f44ba87d59c814659fce2e13b602c5fa4cf2f1fe
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 17:51:35 2011 +0530
Fix some doc blocks
commit 92a00cdbe6e6b6491fb81cf072584adeeb952d1d
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 16:48:24 2011 +0530
Coding style improvements
commit bd786ea7c2d2ac9801f3ddd51b6bbb55118514ee
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 16:29:13 2011 +0530
Fix indentation for multiline function calls
commit 74461617386de90b16ac2fa4e82ec99be2efad60
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 16:15:12 2011 +0530
Proper indentation for multiline if statements
commit 5dc7f9b5fa504e2e01e55b6ceb2a156a63fdc297
Merge: e42539a 010d111
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 14:47:15 2011 +0530
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit e42539a817a504e8367fb09fec3c0b06e035f3bc
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 14:44:23 2011 +0530
Use PMA_getIcon()
commit 2e7a8c9eead022e0713704b471af3a0d7d908063
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 12:18:49 2011 +0530
better variable name
commit 379ad840d32a3c58d3b4fe9d27a3fc4aab19a2ba
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 11:34:08 2011 +0530
Fixing some undefined variables
-----------------------------------------------------------------------
Summary of changes:
db_structure.php | 10 +-
db_tracking.php | 6 +-
libraries/display_tbl.lib.php | 432 +++++++++++++++++++++++++----------------
querywindow.php | 16 +--
4 files changed, 271 insertions(+), 193 deletions(-)
diff --git a/db_structure.php b/db_structure.php
index b46fe29..3926eae 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -607,16 +607,10 @@ PMA_listNavigator(
/* Printable view of a table */
echo '<p>';
echo '<a href="db_printview.php?' . $url_query . '">';
-if ($cfg['PropertiesIconic']) {
- echo '<img class="icon ic_b_print" src="themes/dot.gif" alt="" />';
-}
-echo __('Print view') . '</a> ';
+echo PMA_getIcon('b_print.png', __('Print view'), true) . '</a>';
echo '<a href="./db_datadict.php?' . $url_query . '">';
-if ($cfg['PropertiesIconic']) {
- echo '<img class="icon ic_b_tblanalyse" src="themes/dot.gif" alt="" />';
-}
-echo __('Data Dictionary') . '</a>';
+echo PMA_getIcon('b_tblanalyse.png', __('Data Dictionary'), true) . '</a>';
echo '</p>';
if (empty($db_is_information_schema)) {
diff --git a/db_tracking.php b/db_tracking.php
index fd4f7ed..c876204 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -196,11 +196,7 @@ if (isset($my_tables)) {
foreach ($my_tables as $key => $tablename) {
if (PMA_Tracker::getVersion($GLOBALS['db'], $tablename) == -1) {
$my_link = '<a href="tbl_tracking.php?' . $url_query . '&table=' . htmlspecialchars($tablename) .'">';
-
- if ($cfg['PropertiesIconic']) {
- $my_link .= '<img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Track table') . '" /> ';
- }
- $my_link .= __('Track table') . '</a>';
+ $my_link .= PMA_getIcon('eye.png', __('Track table')) . '</a>';
?>
<tr class="noclick <?php echo $style;?>">
<td><?php echo htmlspecialchars($tablename);?></td>
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 704a96b..75ddc56 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -134,7 +134,7 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total)
// 2.3.2 Displays edit/delete/sort/insert links?
if ($is_link
&& ($fields_meta[$i]->table == '' || $fields_meta[$i]->table != $prev_table)
- ) {
+ ) {
$do_display['edit_lnk'] = 'nn'; // don't display links
$do_display['del_lnk'] = 'nn';
/**
@@ -362,14 +362,17 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
} // end show all
// Move to the next page or to the last one
- if (($_SESSION['tmp_user_values']['pos'] + $_SESSION['tmp_user_values']['max_rows'] < $unlim_num_rows) && $num_rows >= $_SESSION['tmp_user_values']['max_rows']
- && $_SESSION['tmp_user_values']['max_rows'] != 'all') {
-
+ if (($_SESSION['tmp_user_values']['pos'] + $_SESSION['tmp_user_values']['max_rows'] < $unlim_num_rows)
+ && $num_rows >= $_SESSION['tmp_user_values']['max_rows']
+ && $_SESSION['tmp_user_values']['max_rows'] != 'all'
+ ) {
// display the Next button
- PMA_displayTableNavigationOneButton('>',
+ PMA_displayTableNavigationOneButton(
+ '>',
_pgettext('Next page', 'Next'),
$pos_next,
- $html_sql_query);
+ $html_sql_query
+ );
// prepare some options for the End button
if ($is_innodb && $unlim_num_rows > $GLOBALS['cfg']['MaxExactCount']) {
@@ -381,14 +384,15 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
}
// display the End button
- PMA_displayTableNavigationOneButton('>>',
+ PMA_displayTableNavigationOneButton(
+ '>>',
_pgettext('Last page', 'End'),
@((ceil($unlim_num_rows / $_SESSION['tmp_user_values']['max_rows'])- 1) * $_SESSION['tmp_user_values']['max_rows']),
$html_sql_query,
'onsubmit="return ' . (($_SESSION['tmp_user_values']['pos'] + $_SESSION['tmp_user_values']['max_rows'] < $unlim_num_rows && $num_rows >= $_SESSION['tmp_user_values']['max_rows']) ? 'true' : 'false') . '"',
$input_for_real_end,
$onclick
- );
+ );
} // end move toward
// show separator if pagination happen
@@ -436,8 +440,10 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
unset($choices);
}
- printf(__('Headers every %s rows'),
- '<input type="text" size="3" name="repeat_cells" value="' . $_SESSION['tmp_user_values']['repeat_cells'] . '" class="textfield" />');
+ printf(
+ __('Headers every %s rows'),
+ '<input type="text" size="3" name="repeat_cells" value="' . $_SESSION['tmp_user_values']['repeat_cells'] . '" class="textfield" />'
+ );
echo "\n";
?>
</form>
@@ -505,9 +511,13 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$unsorted_sql_query = trim($unsorted_sql_query);
// sorting by indexes, only if it makes sense (only one table ref)
- if (isset($analyzed_sql) && isset($analyzed_sql[0]) &&
- isset($analyzed_sql[0]['querytype']) && $analyzed_sql[0]['querytype'] == 'SELECT' &&
- isset($analyzed_sql[0]['table_ref']) && count($analyzed_sql[0]['table_ref']) == 1) {
+ if (isset($analyzed_sql)
+ && isset($analyzed_sql[0])
+ && isset($analyzed_sql[0]['querytype'])
+ && $analyzed_sql[0]['querytype'] == 'SELECT'
+ && isset($analyzed_sql[0]['table_ref'])
+ && count($analyzed_sql[0]['table_ref']) == 1
+ ) {
// grab indexes data:
$indexes = PMA_Index::getFromTable($table, $db);
@@ -516,7 +526,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
if ($indexes) {
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
$span = $fields_cnt;
if ($is_display['edit_lnk'] != 'nn') {
$span++;
@@ -605,7 +616,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
);
echo PMA_generate_common_hidden_inputs($url_params);
echo '<br />';
- PMA_generate_slider_effect('displayoptions',__('Options'));
+ PMA_generate_slider_effect('displayoptions', __('Options'));
echo '<fieldset>';
echo '<div class="formelement">';
@@ -707,13 +718,15 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
}
echo '">' . "\n";
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
echo '<thead><tr>' . "\n";
}
// 1. Displays the full/partial text button (part 1)...
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
$colspan = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn')
? ' colspan="4"'
: '';
@@ -725,17 +738,19 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// ... before the result table
if (($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
- && $is_display['text_btn'] == '1') {
+ && $is_display['text_btn'] == '1'
+ ) {
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 0;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
?>
<th colspan="<?php echo $fields_cnt; ?>"></th>
</tr>
<tr>
<?php
- } // end horizontal/horizontalflipped mode
- else {
+ // end horizontal/horizontalflipped mode
+ } else {
?>
<tr>
<th colspan="<?php echo $num_rows + floor($num_rows/$_SESSION['tmp_user_values']['repeat_cells']) + 1; ?>"></th>
@@ -747,15 +762,17 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// ... at the left column of the result table header if possible
// and required
elseif (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && $is_display['text_btn'] == '1') {
+ && $is_display['text_btn'] == '1'
+ ) {
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 0;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
?>
<th <?php echo $colspan; ?>><?php echo $full_or_partial_text_link;?></th>
<?php
- } // end horizontal/horizontalflipped mode
- else {
+ // end horizontal/horizontalflipped mode
+ } else {
$vertical_display['textbtn'] = ' <th ' . $rowspan . ' valign="middle">' . "\n"
. ' ' . "\n"
. ' </th>' . "\n";
@@ -767,19 +784,21 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
&& ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')) {
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 0;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
?>
<td<?php echo $colspan; ?>></td>
<?php
- } // end horizontal/horizontalfipped mode
- else {
+ // end horizontal/horizontalfipped mode
+ } else {
$vertical_display['textbtn'] = ' <td' . $rowspan . '></td>' . "\n";
} // end vertical mode
}
// ... elseif display an empty column if the actions links are disabled to match the rest of the table
- elseif ($GLOBALS['cfg']['RowActionLinks'] == 'none' && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) {
+ elseif ($GLOBALS['cfg']['RowActionLinks'] == 'none'
+ && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')
+ ) {
echo '<th></th>';
}
@@ -790,7 +809,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// 2.0.1 Prepare Display column comments if enabled ($GLOBALS['cfg']['ShowBrowseComments']).
// Do not show comments, if using horizontalflipped mode, because of space usage
if ($GLOBALS['cfg']['ShowBrowseComments']
- && $_SESSION['tmp_user_values']['disp_direction'] != 'horizontalflipped') {
+ && $_SESSION['tmp_user_values']['disp_direction'] != 'horizontalflipped'
+ ) {
$comments_map = array();
if (isset($analyzed_sql[0]) && is_array($analyzed_sql[0])) {
foreach ($analyzed_sql[0]['table_ref'] as $tbl) {
@@ -802,15 +822,16 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
}
if ($GLOBALS['cfgRelation']['commwork'] && $GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME'] && ! $_SESSION['tmp_user_values']['hide_transformation']) {
- require_once './libraries/transformations.lib.php';
+ include_once './libraries/transformations.lib.php';
$GLOBALS['mime_map'] = PMA_getMIME($db, $table);
}
// See if we have to highlight any header fields of a WHERE query.
// Uses SQL-Parser results.
$highlight_columns = array();
- if (isset($analyzed_sql) && isset($analyzed_sql[0]) &&
- isset($analyzed_sql[0]['where_clause_identifiers'])) {
+ if (isset($analyzed_sql) && isset($analyzed_sql[0])
+ && isset($analyzed_sql[0]['where_clause_identifiers'])
+ ) {
$wi = 0;
if (isset($analyzed_sql[0]['where_clause_identifiers']) && is_array($analyzed_sql[0]['where_clause_identifiers'])) {
@@ -842,9 +863,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
}
// 2.0 Prepare comment-HTML-wrappers for each row, if defined/enabled.
- if (isset($comments_map) &&
- isset($comments_map[$fields_meta[$i]->table]) &&
- isset($comments_map[$fields_meta[$i]->table][$fields_meta[$i]->name])) {
+ if (isset($comments_map)
+ && isset($comments_map[$fields_meta[$i]->table])
+ && isset($comments_map[$fields_meta[$i]->table][$fields_meta[$i]->name])
+ ) {
$comments = '<span class="tblcomment">' . htmlspecialchars($comments_map[$fields_meta[$i]->table][$fields_meta[$i]->name]) . '</span>';
} else {
$comments = '';
@@ -892,7 +914,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// Another query to test this:
// SELECT p.*, FROM_UNIXTIME(p.temps) FROM mytable AS p
// (and try clicking on each column's header twice)
- if (! empty($sort_tbl) && strpos($sort_expression_nodirection, $sort_tbl) === false && strpos($sort_expression_nodirection, '(') === false) {
+ if (! empty($sort_tbl)
+ && strpos($sort_expression_nodirection, $sort_tbl) === false
+ && strpos($sort_expression_nodirection, '(') === false
+ ) {
$sort_expression_nodirection = $sort_tbl . $sort_expression_nodirection;
}
$is_in_sort = (str_replace('`', '', $sort_tbl) . $name_to_use_in_sort == str_replace('`', '', $sort_expression_nodirection) ? true : false);
@@ -961,7 +986,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
}
}
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
- && $GLOBALS['cfg']['HeaderFlipType'] == 'css') {
+ && $GLOBALS['cfg']['HeaderFlipType'] == 'css'
+ ) {
$order_link_params['style'] = 'direction: ltr; writing-mode: tb-rl;';
}
$order_link_params['title'] = __('Sort');
@@ -969,7 +995,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$order_link = PMA_linkOrButton($order_url, $order_link_content . $order_img, $order_link_params, false, true);
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
echo '<th';
$th_class = array();
$th_class[] = 'draggable';
@@ -1003,7 +1030,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// 2.2 Results can't be sorted
else {
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
echo '<th';
$th_class = array();
$th_class[] = 'draggable';
@@ -1018,12 +1046,14 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
echo ' valign="bottom"';
}
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
- && $GLOBALS['cfg']['HeaderFlipType'] == 'css') {
+ && $GLOBALS['cfg']['HeaderFlipType'] == 'css'
+ ) {
echo ' style="direction: ltr; writing-mode: tb-rl;"';
}
echo '>';
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
- && $GLOBALS['cfg']['HeaderFlipType'] == 'fake') {
+ && $GLOBALS['cfg']['HeaderFlipType'] == 'fake'
+ ) {
echo PMA_flipstring(htmlspecialchars($fields_meta[$i]->name), '<br />');
} else {
echo htmlspecialchars($fields_meta[$i]->name);
@@ -1042,18 +1072,20 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// 3. Displays the needed checkboxes at the right
// column of the result table header if possible and required...
if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')
- && $is_display['text_btn'] == '1') {
+ && ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')
+ && $is_display['text_btn'] == '1'
+ ) {
$vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 1;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
echo "\n";
?>
<th <?php echo $colspan; ?>><?php echo $full_or_partial_text_link;?>
</th>
<?php
- } // end horizontal/horizontalflipped mode
- else {
+ // end horizontal/horizontalflipped mode
+ } else {
$vertical_display['textbtn'] = ' <th ' . $rowspan . ' valign="middle">' . "\n"
. ' ' . "\n"
. ' </th>' . "\n";
@@ -1063,23 +1095,26 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// ... elseif no button, displays empty columns if required
// (unless coming from Browse mode print view)
elseif (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && ($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
- && (!$GLOBALS['is_header_sent'])) {
+ && ($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
+ && (! $GLOBALS['is_header_sent'])
+ ) {
$vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 1;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
echo "\n";
?>
<td<?php echo $colspan; ?>></td>
<?php
- } // end horizontal/horizontalflipped mode
- else {
+ // end horizontal/horizontalflipped mode
+ } else {
$vertical_display['textbtn'] = ' <td' . $rowspan . '></td>' . "\n";
} // end vertical mode
}
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
?>
</tr>
</thead>
@@ -1216,9 +1251,12 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// query without conditions to shorten URLs when needed, 200 is just
// guess, it should depend on remaining URL length
- if (isset($analyzed_sql) && isset($analyzed_sql[0]) &&
- isset($analyzed_sql[0]['querytype']) && $analyzed_sql[0]['querytype'] == 'SELECT' &&
- strlen($sql_query) > 200) {
+ if (isset($analyzed_sql)
+ && isset($analyzed_sql[0])
+ && isset($analyzed_sql[0]['querytype'])
+ && $analyzed_sql[0]['querytype'] == 'SELECT'
+ && strlen($sql_query) > 200
+ ) {
$url_sql_query = 'SELECT ';
if (isset($analyzed_sql[0]['queryflags']['distinct'])) {
@@ -1267,10 +1305,11 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
$odd_row = true;
while ($row = PMA_DBI_fetch_row($dt_result)) {
// "vertical display" mode stuff
- if ($row_no != 0 && $_SESSION['tmp_user_values']['repeat_cells'] != 0 && !($row_no % $_SESSION['tmp_user_values']['repeat_cells'])
- && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'))
- {
+ if ($row_no != 0 && $_SESSION['tmp_user_values']['repeat_cells'] != 0
+ && !($row_no % $_SESSION['tmp_user_values']['repeat_cells'])
+ && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')
+ ) {
echo '<tr>' . "\n";
if ($vertical_display['emptypre'] > 0) {
echo ' <th colspan="' . $vertical_display['emptypre'] . '">' . "\n"
@@ -1294,7 +1333,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
$odd_row = ! $odd_row;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
// pointer code part
echo '<tr class="' . $alternating_color_class . '">';
}
@@ -1395,15 +1435,17 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// 1.3 Displays the links at left if required
if (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) {
+ && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')
+ ) {
if (! isset($js_conf)) {
$js_conf = '';
}
echo PMA_generateCheckboxAndLinks('left', $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $condition_array, $del_query, 'l', $edit_url, $copy_url, $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf);
- } else if (($GLOBALS['cfg']['RowActionLinks'] == 'none')
- && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) {
+ } elseif (($GLOBALS['cfg']['RowActionLinks'] == 'none')
+ && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')
+ ) {
if (! isset($js_conf)) {
$js_conf = '';
}
@@ -1469,7 +1511,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
if (file_exists('./libraries/transformations/' . $include_file)) {
$transformfunction_name = str_replace('.inc.php', '', $GLOBALS['mime_map'][$meta->name]['transformation']);
- require_once './libraries/transformations/' . $include_file;
+ include_once './libraries/transformations/' . $include_file;
if (function_exists('PMA_transformation_' . $transformfunction_name)) {
$transform_function = 'PMA_transformation_' . $transformfunction_name;
@@ -1582,6 +1624,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// Display in Well Known Text(WKT) format.
} elseif ('WKT' == $_SESSION['tmp_user_values']['geometry_display']) {
+ $where_comparison = ' = ' . $row[$i];
+
// Convert to WKT format
$wktval = PMA_asWKT($row[$i]);
@@ -1594,12 +1638,14 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
$vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data(
$class, $condition_field, $analyzed_sql, $meta, $map, $wktval, $transform_function,
- $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated
+ $default_function, '', $where_comparison, $transform_options, $is_field_truncated
);
// Display in Well Known Binary(WKB) format.
} else {
if ($_SESSION['tmp_user_values']['display_binary']) {
+ $where_comparison = ' = ' . $row[$i];
+
if ($_SESSION['tmp_user_values']['display_binary_as_hex']
&& PMA_contains_nonprintable_ascii($row[$i])
) {
@@ -1617,7 +1663,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
$vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data(
$class, $condition_field, $analyzed_sql, $meta, $map, $wkbval, $transform_function,
- $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated
+ $default_function, '', $where_comparison, $transform_options, $is_field_truncated
);
} else {
$wkbval = PMA_handle_non_printable_contents(
@@ -1647,7 +1693,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// displays special characters from binaries
$field_flags = PMA_DBI_field_flags($dt_result, $i);
- $is_html = false;
+ $formatted = false;
if (isset($meta->_type) && $meta->_type === MYSQLI_TYPE_BIT) {
$row[$i] = PMA_printable_bit_value($row[$i], $meta->length);
// some results of PROCEDURE ANALYSE() are reported as
@@ -1666,11 +1712,11 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// we show the BINARY message and field's size
// (or maybe use a transformation)
$row[$i] = PMA_handle_non_printable_contents('BINARY', $row[$i], $transform_function, $transform_options, $default_function, $meta, $_url_params);
- $is_html = true;
+ $formatted = true;
}
}
- if ($is_html) {
+ if ($formatted) {
$vertical_display['data'][$row_no][$i] = PMA_buildValueDisplay($class, $condition_field, $row[$i]);
} else {
// transform functions may enable no-wrapping:
@@ -1689,7 +1735,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// output stored cell
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
echo $vertical_display['data'][$row_no][$i];
}
@@ -1702,8 +1749,9 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// 3. Displays the modify/delete links on the right if required
if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) {
+ && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')
+ ) {
if (! isset($js_conf)) {
$js_conf = '';
}
@@ -1711,7 +1759,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
} // end if (3)
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
?>
</tr>
<?php
@@ -1786,8 +1835,10 @@ function PMA_displayVerticalTable()
global $vertical_display;
// Displays "multi row delete" link at top if required
- if (($GLOBALS['cfg']['RowActionLinks'] != 'right')
- && is_array($vertical_display['row_delete']) && (count($vertical_display['row_delete']) > 0 || !empty($vertical_display['textbtn']))) {
+ if ($GLOBALS['cfg']['RowActionLinks'] != 'right'
+ && is_array($vertical_display['row_delete'])
+ && (count($vertical_display['row_delete']) > 0 || !empty($vertical_display['textbtn']))
+ ) {
echo '<tr>' . "\n";
if ($GLOBALS['cfg']['RowActionLinks'] == 'none') {
// if we are not showing the RowActionLinks, then we need to show the Multi-Row-Action checkboxes
@@ -1809,7 +1860,9 @@ function PMA_displayVerticalTable()
// Displays "edit" link at top if required
if (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) {
+ && is_array($vertical_display['edit'])
+ && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))
+ ) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -1822,7 +1875,9 @@ function PMA_displayVerticalTable()
// Displays "copy" link at top if required
if (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) {
+ && is_array($vertical_display['copy'])
+ && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))
+ ) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -1835,7 +1890,9 @@ function PMA_displayVerticalTable()
// Displays "delete" link at top if required
if (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) {
+ && is_array($vertical_display['delete'])
+ && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))
+ ) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -1879,7 +1936,9 @@ function PMA_displayVerticalTable()
// Displays "multi row delete" link at bottom if required
if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && is_array($vertical_display['row_delete']) && (count($vertical_display['row_delete']) > 0 || !empty($vertical_display['textbtn']))) {
+ && is_array($vertical_display['row_delete'])
+ && (count($vertical_display['row_delete']) > 0 || !empty($vertical_display['textbtn']))
+ ) {
echo '<tr>' . "\n";
echo $vertical_display['textbtn'];
$cell_displayed = 0;
@@ -1898,7 +1957,9 @@ function PMA_displayVerticalTable()
// Displays "edit" link at bottom if required
if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) {
+ && is_array($vertical_display['edit'])
+ && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))
+ ) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -1911,7 +1972,9 @@ function PMA_displayVerticalTable()
// Displays "copy" link at bottom if required
if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) {
+ && is_array($vertical_display['copy'])
+ && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))
+ ) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -1924,7 +1987,9 @@ function PMA_displayVerticalTable()
// Displays "delete" link at bottom if required
if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) {
+ && is_array($vertical_display['delete'])
+ && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))
+ ) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -1939,11 +2004,15 @@ function PMA_displayVerticalTable()
} // end of the 'PMA_displayVerticalTable' function
/**
+ * Checks the posted options for viewing query resutls
+ * and sets appropriate values in the session.
*
* @todo make maximum remembered queries configurable
* @todo move/split into SQL class!?
* @todo currently this is called twice unnecessary
* @todo ignore LIMIT and ORDER in query!?
+ *
+ * @return nothing
*/
function PMA_displayTable_checkConfigParams()
{
@@ -1969,7 +2038,8 @@ function PMA_displayTable_checkConfigParams()
// use PMA_isValid($_REQUEST['session_max_rows'], 'integer')
if ((PMA_isValid($_REQUEST['session_max_rows'], 'numeric')
&& (int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows'])
- || $_REQUEST['session_max_rows'] == 'all') {
+ || $_REQUEST['session_max_rows'] == 'all'
+ ) {
$_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'] = $_REQUEST['session_max_rows'];
unset($_REQUEST['session_max_rows']);
} elseif (empty($_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'])) {
@@ -2088,10 +2158,10 @@ function PMA_displayTable_checkConfigParams()
* Displays a table of results returned by a SQL query.
* This function is called by the "sql.php" script.
*
- * @param integer the link id associated to the query which results have
- * to be displayed
- * @param array the display mode
- * @param array the analyzed query
+ * @param integer &$dt_result the link id associated to the query which results have
+ * to be displayed
+ * @param array &$the_disp_mode the display mode
+ * @param array $analyzed_sql the analyzed query
*
* @global string $db the database name
* @global string $table the table name
@@ -2109,12 +2179,15 @@ function PMA_displayTable_checkConfigParams()
* mode
* @global array $highlight_columns column names to highlight
* @global array $cfgRelation the relation settings
+ * @global array $showtable table definitions
*
* @access private
*
* @see PMA_showMessage(), PMA_setDisplayMode(),
* PMA_displayTableNavigation(), PMA_displayTableHeaders(),
* PMA_displayTableBody(), PMA_displayResultsOperations()
+ *
+ * @return nothing
*/
function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
{
@@ -2134,10 +2207,10 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
$is_innodb = (isset($showtable['Type']) && $showtable['Type'] == 'InnoDB');
if ($is_innodb
- && ! isset($analyzed_sql[0]['queryflags']['union'])
- && ! isset($analyzed_sql[0]['table_ref'][1]['table_name'])
- && (empty($analyzed_sql[0]['where_clause'])
- || $analyzed_sql[0]['where_clause'] == '1 ')) {
+ && ! isset($analyzed_sql[0]['queryflags']['union'])
+ && ! isset($analyzed_sql[0]['table_ref'][1]['table_name'])
+ && (empty($analyzed_sql[0]['where_clause']) || $analyzed_sql[0]['where_clause'] == '1 ')
+ ) {
// "j u s t b r o w s i n g"
$pre_count = '~';
$after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')));
@@ -2214,7 +2287,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
// check for non printable sorted row data
$meta = $fields_meta[$sorted_column_index];
if (stristr($meta->type, 'BLOB') || $meta->type == 'geometry') {
- $column_for_first_row = PMA_handle_non_printable_contents($meta->type, $row[$sorted_column_index], $transform_function, $transform_options, $default_function, $meta, NULL);
+ $column_for_first_row = PMA_handle_non_printable_contents($meta->type, $row[$sorted_column_index], $transform_function, $transform_options, $default_function, $meta, null);
} else {
$column_for_first_row = $row[$sorted_column_index];
}
@@ -2225,7 +2298,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
// check for non printable sorted row data
$meta = $fields_meta[$sorted_column_index];
if (stristr($meta->type, 'BLOB') || $meta->type == 'geometry') {
- $column_for_last_row = PMA_handle_non_printable_contents($meta->type, $row[$sorted_column_index], $transform_function, $transform_options, $default_function, $meta, NULL);
+ $column_for_last_row = PMA_handle_non_printable_contents($meta->type, $row[$sorted_column_index], $transform_function, $transform_options, $default_function, $meta, null);
} else {
$column_for_last_row = $row[$sorted_column_index];
}
@@ -2253,7 +2326,8 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
: $pos_next - 1;
if (PMA_Table::isView($db, $table)
- && $total == $GLOBALS['cfg']['MaxExactCountViews']) {
+ && $total == $GLOBALS['cfg']['MaxExactCountViews']
+ ) {
$message = PMA_Message::notice(__('This view has at least this number of rows. Please refer to %sdocumentation%s.'));
$message->addParam('[a@./Documentation.html#cfg_MaxExactCount@_blank]');
$message->addParam('[/a]');
@@ -2297,7 +2371,8 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
// 2.3 Displays the navigation bars
if (! strlen($table)) {
if (isset($analyzed_sql[0]['query_type'])
- && $analyzed_sql[0]['query_type'] == 'SELECT') {
+ && $analyzed_sql[0]['query_type'] == 'SELECT'
+ ) {
// table does not always contain a real table name,
// for example in MySQL 5.0.x, the query SHOW STATUS
// returns STATUS as a table name
@@ -2324,7 +2399,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
$target=array();
if (isset($analyzed_sql[0]['table_ref']) && is_array($analyzed_sql[0]['table_ref'])) {
foreach ($analyzed_sql[0]['table_ref'] AS $table_ref_position => $table_ref) {
- $target[] = $analyzed_sql[0]['table_ref'][$table_ref_position]['table_true_name'];
+ $target[] = $analyzed_sql[0]['table_ref'][$table_ref_position]['table_true_name'];
}
}
$tabs = '(\'' . join('\',\'', $target) . '\')';
@@ -2402,14 +2477,19 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
.$uncheckall_link . "\n"
.'<i>' . __('With selected:') . '</i>' . "\n";
- PMA_buttonOrImage('submit_mult', 'mult_submit',
- 'submit_mult_change', __('Change'), 'b_edit.png', 'edit');
- PMA_buttonOrImage('submit_mult', 'mult_submit',
- 'submit_mult_delete', $delete_text, 'b_drop.png', 'delete');
+ PMA_buttonOrImage(
+ 'submit_mult', 'mult_submit', 'submit_mult_change',
+ __('Change'), 'b_edit.png', 'edit'
+ );
+ PMA_buttonOrImage(
+ 'submit_mult', 'mult_submit', 'submit_mult_delete',
+ $delete_text, 'b_drop.png', 'delete'
+ );
if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT') {
- PMA_buttonOrImage('submit_mult', 'mult_submit',
- 'submit_mult_export', __('Export'),
- 'b_tblexport.png', 'export');
+ PMA_buttonOrImage(
+ 'submit_mult', 'mult_submit', 'submit_mult_export',
+ __('Export'), 'b_tblexport.png', 'export'
+ );
}
echo "\n";
@@ -2445,8 +2525,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
function default_function($buffer)
{
$buffer = htmlspecialchars($buffer);
- $buffer = str_replace("\011", ' ',
- str_replace(' ', ' ', $buffer));
+ $buffer = str_replace("\011", ' ', str_replace(' ', ' ', $buffer));
$buffer = preg_replace("@((\015\012)|(\015)|(\012))@", '<br />', $buffer);
return $buffer;
@@ -2455,8 +2534,8 @@ function default_function($buffer)
/**
* Displays operations that are available on results.
*
- * @param array the display mode
- * @param array the analyzed query
+ * @param array $the_disp_mode the display mode
+ * @param array $analyzed_sql the analyzed query
*
* @global string $db the database name
* @global string $table the table name
@@ -2470,6 +2549,8 @@ function default_function($buffer)
* @see PMA_showMessage(), PMA_setDisplayMode(),
* PMA_displayTableNavigation(), PMA_displayTableHeaders(),
* PMA_displayTableBody(), PMA_displayResultsOperations()
+ *
+ * @return nothing
*/
function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql)
{
@@ -2498,14 +2579,16 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql)
echo PMA_linkOrButton(
'sql.php' . $url_query,
PMA_getIcon('b_print.png', __('Print view'), true),
- '', true, true, 'print_view') . "\n";
+ '', true, true, 'print_view'
+ ) . "\n";
if ($_SESSION['tmp_user_values']['display_text']) {
$_url_params['display_text'] = 'F';
echo PMA_linkOrButton(
'sql.php' . PMA_generate_common_url($_url_params),
PMA_getIcon('b_print.png', __('Print view (with full texts)'), true),
- '', true, true, 'print_view') . "\n";
+ '', true, true, 'print_view'
+ ) . "\n";
unset($_url_params['display_text']);
}
} // end displays "printable view"
@@ -2539,7 +2622,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql)
if (empty($_url_params['table']) && !empty($_url_params['db'])) {
$_url_params['table'] = PMA_DBI_fetch_value("SHOW TABLES");
/* No result (probably no database selected) */
- if ($_url_params['table'] === FALSE) {
+ if ($_url_params['table'] === false) {
unset($_url_params['table']);
}
}
@@ -2547,13 +2630,15 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql)
echo PMA_linkOrButton(
'tbl_export.php' . PMA_generate_common_url($_url_params),
PMA_getIcon('b_tblexport.png', __('Export'), true),
- '', true, true, '') . "\n";
+ '', true, true, ''
+ ) . "\n";
// show chart
echo PMA_linkOrButton(
'tbl_chart.php' . PMA_generate_common_url($_url_params),
PMA_getIcon('b_chart.png', __('Display chart'), true),
- '', true, true, '') . "\n";
+ '', true, true, ''
+ ) . "\n";
// show GIS chart
$geometry_found = false;
@@ -2568,7 +2653,8 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql)
echo PMA_linkOrButton(
'tbl_gis_visualization.php' . PMA_generate_common_url($_url_params),
PMA_getIcon('b_globe.gif', __('Visualize GIS data'), true),
- '', true, true, '') . "\n";
+ '', true, true, ''
+ ) . "\n";
}
}
@@ -2588,7 +2674,8 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql)
echo PMA_linkOrButton(
'view_create.php' . $url_query,
PMA_getIcon('b_views.png', __('Create view'), true),
- '', true, true, '') . "\n";
+ '', true, true, ''
+ ) . "\n";
}
if ($header_shown) {
echo '</fieldset><br />';
@@ -2605,6 +2692,8 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql)
* @param string $transform_options transformation parameters
* @param string $default_function default transformation function
* @param object $meta the meta-information about this field
+ * @param array $url_params parameters that should go to the download link
+ *
* @return mixed string or float
*/
function PMA_handle_non_printable_contents($category, $content, $transform_function, $transform_options, $default_function, $meta, $url_params = array())
@@ -2645,17 +2734,19 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct
* Prepares the displayable content of a data cell in Browse mode,
* taking into account foreign key description field and transformations
*
- * @param string $class
- * @param string $condition_field
- * @param string $analyzed_sql
- * @param object $meta the meta-information about this field
- * @param string $map
- * @param string $data
- * @param string $transform_function
- * @param string $default_function
- * @param string $nowrap
- * @param string $where_comparison
- * @param bool $is_field_truncated
+ * @param string $class css classes for the td element
+ * @param bool $condition_field whether the column is a part of the where clause
+ * @param string $analyzed_sql the analyzed query
+ * @param object $meta the meta-information about this field
+ * @param array $map the list of relations
+ * @param string $data data
+ * @param string $transform_function transformation function
+ * @param string $default_function default function
+ * @param string $nowrap 'nowrap' if the content should not be wrapped
+ * @param string $where_comparison data for the where cluase
+ * @param array $transform_options array of options for transformation
+ * @param bool $is_field_truncated whether the field is truncated
+ *
* @return string formatted data
*/
function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $data, $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated )
@@ -2747,13 +2838,15 @@ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $m
/**
* Generates a checkbox for multi-row submits
*
- * @param string $del_url
- * @param array $is_display
- * @param string $row_no
- * @param string $where_clause_html
- * @param string $del_query
- * @param string $id_suffix
- * @param string $class
+ * @param string $del_url delete url
+ * @param array $is_display array with explicit indexes for all the display elements
+ * @param string $row_no the row number
+ * @param string $where_clause_html url encoded where cluase
+ * @param array $condition_array array of conditions in the where cluase
+ * @param string $del_query delete query
+ * @param string $id_suffix suffix for the id
+ * @param string $class css classes for the td element
+ *
* @return string the generated HTML
*/
@@ -2778,11 +2871,12 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla
/**
* Generates an Edit link
*
- * @param string $edit_url
- * @param string $class
- * @param string $edit_str
- * @param string $where_clause
- * @param string $where_clause_html
+ * @param string $edit_url edit url
+ * @param string $class css classes for td element
+ * @param string $edit_str text for the edit link
+ * @param string $where_clause where cluase
+ * @param string $where_clause_html url encoded where cluase
+ *
* @return string the generated HTML
*/
function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html)
@@ -2806,10 +2900,12 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher
/**
* Generates an Copy link
*
- * @param string $copy_url
- * @param string $copy_str
- * @param string $where_clause
- * @param string $where_clause_html
+ * @param string $copy_url copy url
+ * @param string $copy_str text for the copy link
+ * @param string $where_clause where clause
+ * @param string $where_clause_html url encoded where cluase
+ * @param string $class css classes for the td element
+ *
* @return string the generated HTML
*/
function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause_html, $class)
@@ -2837,10 +2933,11 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause
/**
* Generates a Delete link
*
- * @param string $del_url
- * @param string $del_str
- * @param string $js_conf
- * @param string $class
+ * @param string $del_url delete url
+ * @param string $del_str text for the delete link
+ * @param string $js_conf text for the JS confirmation
+ * @param string $class css classes for the td element
+ *
* @return string the generated HTML
*/
function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class)
@@ -2862,20 +2959,23 @@ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class)
* Generates checkbox and links at some position (left or right)
* (only called for horizontal mode)
*
- * @param string $position
- * @param string $del_url
- * @param array $is_display
- * @param string $row_no
- * @param string $where_clause
- * @param string $where_clause_html
- * @param string $del_query
- * @param string $id_suffix
- * @param string $edit_url
- * @param string $copy_url
- * @param string $class
- * @param string $edit_str
- * @param string $del_str
- * @param string $js_conf
+ * @param string $position the position of the checkbox and links
+ * @param string $del_url delete url
+ * @param array $is_display array with explicit indexes for all the display elements
+ * @param string $row_no row number
+ * @param string $where_clause where clause
+ * @param string $where_clause_html url encoded where cluase
+ * @param array $condition_array array of conditions in the where cluase
+ * @param string $del_query delete query
+ * @param string $id_suffix suffix for the id
+ * @param string $edit_url edit url
+ * @param string $copy_url copy url
+ * @param string $class css classes for the td elements
+ * @param string $edit_str text for the edit link
+ * @param string $copy_str text for the copy link
+ * @param string $del_str text for the delete link
+ * @param string $js_conf text for the JS confirmation
+ *
* @return string the generated HTML
*/
function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $condition_array, $del_query, $id_suffix, $edit_url, $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf)
@@ -2883,7 +2983,7 @@ function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no,
$ret = '';
if ($position == 'left') {
- $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $condition_array, $del_query, $id_suffix='_left', '', '', '');
+ $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $condition_array, $del_query, $id_suffix = '_left', '', '', '');
$ret .= PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html, '');
@@ -2898,9 +2998,9 @@ function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no,
$ret .= PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html, '');
- $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $condition_array, $del_query, $id_suffix='_right', '', '', '');
+ $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $condition_array, $del_query, $id_suffix = '_right', '', '', '');
} else { // $position == 'none'
- $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $condition_array, $del_query, $id_suffix='_left', '', '', '');
+ $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $condition_array, $del_query, $id_suffix = '_left', '', '', '');
}
return $ret;
}
diff --git a/querywindow.php b/querywindow.php
index 76e2a3b..5641d1c 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -71,7 +71,7 @@ if ($no_js) {
$tabs['import']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'files\');return false;"';
$tabs['import']['active'] = (bool) ($querydisplay_tab == 'files');
$tabs['history']['icon'] = 'ic_b_bookmark';
- $tabs['history']['text'] = __('SQL history');
+ $tabs['history']['text'] = __('SQL history');
$tabs['history']['fragment'] = '#';
$tabs['history']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'history\');return false;"';
$tabs['history']['active'] = (bool) ($querydisplay_tab == 'history');
@@ -84,19 +84,7 @@ if ($no_js) {
}
}
-if ($GLOBALS['cfg']['PropertiesIconic']) {
- $titles['Change'] =
- '<img class="icon ic_b_edit" src="themes/dot.gif" alt="'
- . __('Change') . '" title="' . __('Change')
- . '" />';
-
- if ('both' === $GLOBALS['cfg']['PropertiesIconic']) {
- $titles['Change'] .= __('Change') . ' ';
- }
-} else {
- $titles['Change'] = __('Change') . ' ';
-}
-
+$titles['Change'] = PMA_getIcon('b_edit.png', __('Change'));
$url_query = PMA_generate_common_url($db, $table);
if (! empty($sql_query)) {
hooks/post-receive
--
phpMyAdmin
1
0