Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_5, updated. RELEASE_3_4_4-36-g2f28ce9
by Marc Delisle
The branch, MAINT_3_4_5 has been updated
via 2f28ce9c800274190418da0945ce3647d36e1db6 (commit)
from 4039683ab3ca63c979948e02345b6d38452f8dee (commit)
- Log -----------------------------------------------------------------
commit 2f28ce9c800274190418da0945ce3647d36e1db6
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 19 13:12:04 2011 +0200
[security] Fixed XSS in Inline Edit on save action
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
js/sql.js | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 20e1751..1376169 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog
- bug #3374347 [display] Backquotes in normal text on import page
- bug #3358750 [core] With Suhosin, urls are too long in edit links
- [security] Missing sanitization on the table, column and index names leads to XSS vulnerabilities, see PMASA-2011-13
+- [security] Fixed XSS in Inline Edit on save action
3.4.3.2 (2011-07-23)
- [security] Fixed XSS vulnerability, see PMASA-2011-9
diff --git a/js/sql.js b/js/sql.js
index dbba441..842b6c6 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -1111,7 +1111,7 @@ function PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings,
}
}
}
- $this_sibling.html(new_html);
+ $this_sibling.text(new_html);
}
})
}
hooks/post-receive
--
phpMyAdmin
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18600-gd630321
by Marc Delisle
The branch, master has been updated
via d6303215118e73062ac3749f893ab9630a948816 (commit)
from f1fbb2bb8c2ef908170fb919a9d9fbeb179b6205 (commit)
- Log -----------------------------------------------------------------
commit d6303215118e73062ac3749f893ab9630a948816
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Sep 7 12:39:23 2011 -0400
Missing HTML escape
-----------------------------------------------------------------------
Summary of changes:
tbl_zoom_select.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 01b4cc0..11754b8 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -278,7 +278,7 @@ for ($j = 0; $j < $fields_cnt; $j++) {
<?php
echo '<input type="text" name="maxPlotLimit" id="maxRowPlotLimit" value="';
if (! empty($maxPlotLimit)) {
- echo $maxPlotLimit;
+ echo htmlspecialchars($maxPlotLimit);
} else {
echo $GLOBALS['cfg']['maxRowPlotLimit'];
}
hooks/post-receive
--
phpMyAdmin
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18599-gf1fbb2b
by Marc Delisle
The branch, master has been updated
via f1fbb2bb8c2ef908170fb919a9d9fbeb179b6205 (commit)
via c02bd600eeee9a9f17a51c602bc32917de5e28eb (commit)
via 0bdbde8c90aa4fba8fa492dcddfac443dc74aaf4 (commit)
from f4a5bf4f586484719d48557c29b8bed729495702 (commit)
- Log -----------------------------------------------------------------
commit f1fbb2bb8c2ef908170fb919a9d9fbeb179b6205
Merge: f4a5bf4 c02bd60
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Sep 7 07:37:23 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/db_info.inc.php | 9 +++++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6020d7b..c22bfe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@ phpMyAdmin - ChangeLog
+ Support Drizzle database
3.4.6.0 (not yet released)
+- patch #3404173 InnoDB comment display with tooltips/aliases
3.4.5.0 (not yet released)
- bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index 9a92bad..80b8c51 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -41,6 +41,15 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset'];
*/
function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table)
{
+ if (strstr($table['Comment'], '; InnoDB free') === false) {
+ if (!strstr($table['Comment'], 'InnoDB free') === false) {
+ // here we have just InnoDB generated part
+ $table['Comment'] = '';
+ }
+ } else {
+ // remove InnoDB comment from end, just the minimal part (*? is non greedy)
+ $table['Comment'] = preg_replace('@; InnoDB free:.*?$@', '', $table['Comment']);
+ }
if (empty($table['Comment'])) {
$table['Comment'] = $table['Name'];
} else {
hooks/post-receive
--
phpMyAdmin
[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_4-38-gc02bd60
by Marc Delisle
The branch, QA_3_4 has been updated
via c02bd600eeee9a9f17a51c602bc32917de5e28eb (commit)
via 0bdbde8c90aa4fba8fa492dcddfac443dc74aaf4 (commit)
from 2694b3dae0e8c8feeb0c67f0c7606c351443fe42 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/db_info.inc.php | 9 +++++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 167760d..614d066 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
3.4.6.0 (not yet released)
+- patch #3404173 InnoDB comment display with tooltips/aliases
3.4.5.0 (not yet released)
- bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index d8610f2..44dc3a8 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -66,6 +66,15 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset'];
*/
function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table)
{
+ if (strstr($table['Comment'], '; InnoDB free') === false) {
+ if (!strstr($table['Comment'], 'InnoDB free') === false) {
+ // here we have just InnoDB generated part
+ $table['Comment'] = '';
+ }
+ } else {
+ // remove InnoDB comment from end, just the minimal part (*? is non greedy)
+ $table['Comment'] = preg_replace('@; InnoDB free:.*?$@', '', $table['Comment']);
+ }
if (empty($table['Comment'])) {
$table['Comment'] = $table['Name'];
} else {
hooks/post-receive
--
phpMyAdmin
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18596-gf4a5bf4
by Michal Čihař
The branch, master has been updated
via f4a5bf4f586484719d48557c29b8bed729495702 (commit)
via 64ba48c22cbaa1187742c4f9c56ddf31d964e9a0 (commit)
via 0c8e49fdf1e36461429da41d2d4d8a75d77b8753 (commit)
via f3f95687b9d68c7869828f24aa7ee131e3c9809a (commit)
via 26c5725e25bc763abb392f1935688d5da851abe5 (commit)
via 3509165c7de3516f1324a1f1c53654999fc6362f (commit)
via e25c74fc2b22972624275eda2590eb2eb5a0b209 (commit)
via 1074afb79c548d239d2b30bbc752dc6844c993ca (commit)
via be0d867663881f70a59090e54998804e32dff94d (commit)
via 02d7a2c3babf733f28e384def902aa64acfbf377 (commit)
via 87cb2b3f3ce1dedcdb825b9a8260f72dd4133623 (commit)
via f2b8cd913537f195c0deadeadc74fed2205de5b0 (commit)
via 9e818eee1d837123389369bfdc5ab41e9fc86900 (commit)
via df93d23478c2dfc71e2061fa62fecad25d591a97 (commit)
via 0a4a47e8f4b4ace77ead16c24590955856e2e214 (commit)
via 6f910ca4a43289fa75b7206ad7f62a828809c2d8 (commit)
via 32e3c8b4ef258d4a10da134fa9060703476cc82b (commit)
via 0e8950efe7dcd3621a7359624ea62c76d7174c13 (commit)
via 7f585db6717d872956c6e8f588f7a64a2ffc550d (commit)
via df9f58ff7066d72c7d1f9fbfad7033382837d6b3 (commit)
via bfaeee5ed99ee264585026d97111155487dbbe64 (commit)
via bf0ce3ab9b8761ef6ae9a7f9522f09038657ddcc (commit)
via 641f44d2d37e90fc94ce9c173b46fe2876ca5a82 (commit)
via af86ca74c68c4024977c00373c2b9c3685a46778 (commit)
via ade52113a95387865f6681603fc88bb2c554b667 (commit)
via d14edb8900813ddc3a36af4a9c2723e3cde38bc3 (commit)
via 408d7c2f4c5736c8feb66526033e275126ffa4b2 (commit)
via 464e7637f80bd04f211cd6d66e3ae510384dc5d4 (commit)
via 00656bdbce3012ff5bbafa469a6676a7947a9d9b (commit)
via fba9afac46a2b4e3e324f65e4c187ecf55276be0 (commit)
via 09b1e76fb5e65887022aad66c7c1a4ecdadd0808 (commit)
via 26068f5872dde9f6e5b71af596f1661740f78d93 (commit)
via 76e11ef3dd0108efd4b0f8cb50012a529e56ffc2 (commit)
via 53b495fd78b4af93b03f4f988b7248418439327d (commit)
via 6e59cd9e831312ba69a85ae1aa6dc22b0ffa4c47 (commit)
via 13ab8564ad31825316ccaa1a5cd4a7be8bc12170 (commit)
via 753f61449e12bf1a2fbbb85d49b42993804eaa3d (commit)
via 4041b0b12160f4aea5c5a854203c257102d3e442 (commit)
from 87459a5cf6b7c640c8a19cbd70575424420850f7 (commit)
- Log -----------------------------------------------------------------
commit f4a5bf4f586484719d48557c29b8bed729495702
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Sep 7 09:31:23 2011 +0200
Translation update done using Pootle.
commit 64ba48c22cbaa1187742c4f9c56ddf31d964e9a0
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Sep 7 09:30:15 2011 +0200
Translation update done using Pootle.
commit 0c8e49fdf1e36461429da41d2d4d8a75d77b8753
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Sep 7 09:29:02 2011 +0200
Translation update done using Pootle.
commit f3f95687b9d68c7869828f24aa7ee131e3c9809a
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Sep 7 09:28:32 2011 +0200
Translation update done using Pootle.
commit 26c5725e25bc763abb392f1935688d5da851abe5
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Sep 7 09:27:56 2011 +0200
Translation update done using Pootle.
commit 3509165c7de3516f1324a1f1c53654999fc6362f
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Sep 7 09:27:23 2011 +0200
Translation update done using Pootle.
commit e25c74fc2b22972624275eda2590eb2eb5a0b209
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Sep 7 09:26:02 2011 +0200
Translation update done using Pootle.
commit 1074afb79c548d239d2b30bbc752dc6844c993ca
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Sep 7 09:24:59 2011 +0200
Translation update done using Pootle.
commit be0d867663881f70a59090e54998804e32dff94d
Merge: 02d7a2c 87459a5
Author: Pootle server <pootle(a)cihar.com>
Date: Tue Sep 6 22:40:14 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 02d7a2c3babf733f28e384def902aa64acfbf377
Merge: 87cb2b3 a1c9a65
Author: Pootle server <pootle(a)cihar.com>
Date: Tue Sep 6 18:40:06 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 87cb2b3f3ce1dedcdb825b9a8260f72dd4133623
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:42:23 2011 +0200
Translation update done using Pootle.
commit f2b8cd913537f195c0deadeadc74fed2205de5b0
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:40:45 2011 +0200
Translation update done using Pootle.
commit 9e818eee1d837123389369bfdc5ab41e9fc86900
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:40:25 2011 +0200
Translation update done using Pootle.
commit df93d23478c2dfc71e2061fa62fecad25d591a97
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:39:26 2011 +0200
Translation update done using Pootle.
commit 0a4a47e8f4b4ace77ead16c24590955856e2e214
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:39:09 2011 +0200
Translation update done using Pootle.
commit 6f910ca4a43289fa75b7206ad7f62a828809c2d8
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:38:29 2011 +0200
Translation update done using Pootle.
commit 32e3c8b4ef258d4a10da134fa9060703476cc82b
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:37:10 2011 +0200
Translation update done using Pootle.
commit 0e8950efe7dcd3621a7359624ea62c76d7174c13
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:36:01 2011 +0200
Translation update done using Pootle.
commit 7f585db6717d872956c6e8f588f7a64a2ffc550d
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:35:47 2011 +0200
Translation update done using Pootle.
commit df9f58ff7066d72c7d1f9fbfad7033382837d6b3
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:35:02 2011 +0200
Translation update done using Pootle.
commit bfaeee5ed99ee264585026d97111155487dbbe64
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:34:48 2011 +0200
Translation update done using Pootle.
commit bf0ce3ab9b8761ef6ae9a7f9522f09038657ddcc
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:34:21 2011 +0200
Translation update done using Pootle.
commit 641f44d2d37e90fc94ce9c173b46fe2876ca5a82
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:34:00 2011 +0200
Translation update done using Pootle.
commit af86ca74c68c4024977c00373c2b9c3685a46778
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:33:25 2011 +0200
Translation update done using Pootle.
commit ade52113a95387865f6681603fc88bb2c554b667
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:31:09 2011 +0200
Translation update done using Pootle.
commit d14edb8900813ddc3a36af4a9c2723e3cde38bc3
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:30:17 2011 +0200
Translation update done using Pootle.
commit 408d7c2f4c5736c8feb66526033e275126ffa4b2
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:29:40 2011 +0200
Translation update done using Pootle.
commit 464e7637f80bd04f211cd6d66e3ae510384dc5d4
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:28:14 2011 +0200
Translation update done using Pootle.
commit 00656bdbce3012ff5bbafa469a6676a7947a9d9b
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:27:13 2011 +0200
Translation update done using Pootle.
commit fba9afac46a2b4e3e324f65e4c187ecf55276be0
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:26:44 2011 +0200
Translation update done using Pootle.
commit 09b1e76fb5e65887022aad66c7c1a4ecdadd0808
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:22:02 2011 +0200
Translation update done using Pootle.
commit 26068f5872dde9f6e5b71af596f1661740f78d93
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:21:40 2011 +0200
Translation update done using Pootle.
commit 76e11ef3dd0108efd4b0f8cb50012a529e56ffc2
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:21:02 2011 +0200
Translation update done using Pootle.
commit 53b495fd78b4af93b03f4f988b7248418439327d
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:20:02 2011 +0200
Translation update done using Pootle.
commit 6e59cd9e831312ba69a85ae1aa6dc22b0ffa4c47
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:19:14 2011 +0200
Translation update done using Pootle.
commit 13ab8564ad31825316ccaa1a5cd4a7be8bc12170
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:19:01 2011 +0200
Translation update done using Pootle.
commit 753f61449e12bf1a2fbbb85d49b42993804eaa3d
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:18:19 2011 +0200
Translation update done using Pootle.
commit 4041b0b12160f4aea5c5a854203c257102d3e442
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Tue Sep 6 17:17:58 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 22 ++++++++++++++++++----
po/pl.po | 47 ++++++++++++++++++++++-------------------------
2 files changed, 40 insertions(+), 29 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index 10ddf12..e70aebf 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,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-08-31 10:47+0200\n"
-"PO-Revision-Date: 2011-08-31 10:52+0200\n"
+"PO-Revision-Date: 2011-09-07 09:31+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"Language: cs\n"
@@ -1236,6 +1236,9 @@ msgid ""
"likely that your current configuration will not work anymore. Please reset "
"your configuration to default in the <i>Settings</i> menu."
msgstr ""
+"Uspořádání grafů uložené ve vašem prohlížeči není kompatibilní s touto verzí "
+"monitoru a pravděpodobně tedy nebude fungovat správně. Prosím obnovte "
+"výchozí nastavení v nabídce <i>Nastavení</i>."
#: js/messages.php:96
msgid "Query cache efficiency"
@@ -1400,6 +1403,9 @@ msgid ""
"than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
"depending on your system."
msgstr ""
+"slow_query_log je povolen, ale server zaznamená jen dotazy delší než %d "
+"sekund. Doporučujeme nastavit proměnnou long_query_time na 0-2 sekund, v "
+"závislosti na zatížení vašeho systému."
#: js/messages.php:143
#, php-format
@@ -1549,6 +1555,9 @@ msgid ""
"This is most likely because your session expired. Reloading the page and "
"reentering your credentials should help."
msgstr ""
+"Při načítání nových dat server vrátil chybnou odpověď. Pravděpodobně to bylo "
+"způsobeno vypršeným sezením. Problém můžete vyřešit novým načtením stránky "
+"a přihlášením."
#: js/messages.php:184
msgid "Reload page"
@@ -1769,7 +1778,7 @@ msgstr "Použijte kolečko myši pro změnu velikosti grafu."
#: js/messages.php:270
msgid "Click and drag the mouse to navigate the plot."
-msgstr ""
+msgstr "Kliknutím a táhnutím myší se můžete po grafu pohybovat."
#: js/messages.php:272
msgid "Click reset zoom link to come back to original state."
@@ -1785,7 +1794,7 @@ msgstr ""
#: js/messages.php:278
msgid "Strings are converted into integer for plotting"
-msgstr ""
+msgstr "Texty byly pro vykreslení převedeny na čísla"
#: js/messages.php:280
msgid "Select two columns"
@@ -1844,7 +1853,7 @@ msgstr "Klávesou Esc ukončíte editaci"
msgid ""
"You have edited some data and they have not been saved. Are you sure you "
"want to leave this page before saving the data?"
-msgstr ""
+msgstr "Na stránce jsou neuložené změny. Chcete ji opravdu opustit?"
#: js/messages.php:315
msgid "Drag to reorder"
@@ -1867,6 +1876,9 @@ msgid ""
"This table does not contain a unique column. Features related to the grid "
"edit, checkbox, Edit, Copy and Delete links may not work after saving."
msgstr ""
+"Tato tabulka neobsahuje unikátní klíč a proto nemusí některé funkce jako "
+"editování v mřížce, zaškrtávací políčka nebo odkazy na editaci a mazání "
+"fungovat."
#: js/messages.php:321
msgid ""
@@ -10338,6 +10350,8 @@ msgid ""
"The arrangement of the charts is stored to the browsers local storage. You "
"may want to export it if you have a complicated set up."
msgstr ""
+"Uspořádání grafů je uloženo ve vašem prohlížeči. Pokud máte komplikovanější "
+"nastavení, můžete ho chtít exportovat a zálohovat."
#: server_status.php:1589
msgid "Reset to default"
diff --git a/po/pl.po b/po/pl.po
index 6839c80..867843a 100644
--- a/po/pl.po
+++ b/po/pl.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-08-31 10:47+0200\n"
-"PO-Revision-Date: 2011-09-05 21:06+0200\n"
+"PO-Revision-Date: 2011-09-06 17:42+0200\n"
"Last-Translator: Stanisław Krukowski <stankruk(a)neostrada.pl>\n"
"Language-Team: polish <pl(a)li.org>\n"
"Language: pl\n"
@@ -191,7 +191,7 @@ msgstr "Domyślnie"
#: libraries/schema/Pdf_Relation_Schema.class.php:1311
#: libraries/schema/Pdf_Relation_Schema.class.php:1332 tbl_printview.php:144
msgid "Links to"
-msgstr "Łącze do"
+msgstr "Łącza do"
#: db_datadict.php:172 db_printview.php:110
#: libraries/config/messages.inc.php:94 libraries/config/messages.inc.php:109
@@ -324,7 +324,7 @@ msgstr "Dodaj %s"
#: db_operations.php:496 libraries/config/messages.inc.php:119
#: tbl_operations.php:318 tbl_operations.php:562
msgid "Add AUTO_INCREMENT value"
-msgstr "Dodaj wartości AUTO_INCREMENT"
+msgstr "Dodaj wartość AUTO_INCREMENT"
#: db_operations.php:500 tbl_operations.php:569
msgid "Add constraints"
@@ -345,7 +345,7 @@ msgid "Collation"
msgstr "Metoda porównywania napisów"
#: db_operations.php:549
-#, fuzzy, php-format
+#, php-format
#| msgid ""
#| "The additional features for working with linked tables have been "
#| "deactivated. To find out why click %shere%s."
@@ -353,12 +353,12 @@ msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
msgstr ""
-"Dodatkowe możliwości pracy z połączonymi tabelami zostały wyłączone. Aby "
-"dowiedzieć się, dlaczego - kliknij %stutaj%s."
+"Konfiguracja przechowywania w phpMyAdmin została wyłączona. Aby dowiedzieć "
+"się dlaczego, kliknij %shere%s."
#: db_operations.php:583
msgid "Edit or export relational schema"
-msgstr "Edytuj lub eksportuj schemat relacji"
+msgstr "Edytuj lub eksportuj schemat relacyjny"
#: db_printview.php:102 db_tracking.php:85 db_tracking.php:186
#: libraries/config/messages.inc.php:504 libraries/db_structure.lib.php:32
@@ -377,7 +377,7 @@ msgstr "Tabela"
#: tbl_printview.php:358 tbl_structure.php:361 tbl_structure.php:467
#: tbl_structure.php:879
msgid "Rows"
-msgstr "Rekordów"
+msgstr "Rzędy"
#: db_printview.php:107 libraries/db_structure.lib.php:53 tbl_indexes.php:197
msgid "Size"
@@ -421,10 +421,10 @@ msgid "You have to choose at least one column to display"
msgstr "Należy wybrać przynajmniej jedną kolumnę do wyświetlenia"
#: db_qbe.php:186
-#, fuzzy, php-format
+#, php-format
#| msgid "visual builder"
msgid "Switch to %svisual builder%s"
-msgstr "edytor graficzny"
+msgstr "Przełącz do %svisual builder%s"
#: db_qbe.php:222 libraries/db_structure.lib.php:90
#: libraries/display_tbl.lib.php:957
@@ -477,10 +477,9 @@ msgid "Modify"
msgstr "Modyfikacja"
#: db_qbe.php:606
-#, fuzzy
#| msgid "Add/Delete Criteria Row"
msgid "Add/Delete criteria rows"
-msgstr "Dodaj/usuń wiersz kryteriów"
+msgstr "Dodaj/usuń wiersze kryteriów"
#: db_qbe.php:618
msgid "Add/Delete columns"
@@ -488,7 +487,7 @@ msgstr "Dodaj/usuń kolumny"
#: db_qbe.php:631 db_qbe.php:656
msgid "Update Query"
-msgstr "Zmień zapytanie"
+msgstr "Aktualizuj zapytanie"
#: db_qbe.php:639
msgid "Use Tables"
@@ -520,11 +519,11 @@ msgstr "wszystkie słowa"
#: db_search.php:44 db_search.php:288
msgid "the exact phrase"
-msgstr "cała fraza"
+msgstr "dokładna fraza"
#: db_search.php:45 db_search.php:289
msgid "as regular expression"
-msgstr "wyrażenie regularne"
+msgstr "jako wyrażenie regularne"
#: db_search.php:208
#, php-format
@@ -548,7 +547,7 @@ msgstr "Przeglądaj"
#: db_search.php:238
#, php-format
msgid "Delete the matches for the %s table?"
-msgstr "Usuń wszystkie trafienia dla tabeli %s?"
+msgstr "Usunąć trafienia dla tabeli %s?"
#: db_search.php:238 libraries/display_tbl.lib.php:1364
#: libraries/display_tbl.lib.php:2354
@@ -575,10 +574,9 @@ msgid "Search in database"
msgstr "Szukaj w bazie danych"
#: db_search.php:277
-#, fuzzy
#| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):"
msgid "Words or values to search for (wildcard: \"%\"):"
-msgstr "Szukane słowa lub wartości (symbol wieloznaczny: \"%\"):"
+msgstr "Szukane słowa lub wartości dla (symbol wieloznaczny: \"%\"):"
#: db_search.php:282
msgid "Find:"
@@ -586,13 +584,12 @@ msgstr "Znajdź:"
#: db_search.php:286 db_search.php:287
msgid "Words are separated by a space character (\" \")."
-msgstr "Słowa są rozdzielane znakiem spacji (\" \")."
+msgstr "Słowa są rozdzielane znakiem spacji(\" \")."
#: db_search.php:300
-#, fuzzy
#| msgid "Inside table(s):"
msgid "Inside tables:"
-msgstr "Wewnątrz tabel(i):"
+msgstr "Wewnątrz tabel:"
#: db_search.php:330
msgid "Inside column:"
@@ -619,11 +616,11 @@ msgstr "Tabela %s została usunięta"
#: db_structure.php:296 tbl_create.php:269
msgid "Tracking is active."
-msgstr "Monitorowanie jest aktywne."
+msgstr "Śledzenie jest aktywne."
#: db_structure.php:298 tbl_create.php:271
msgid "Tracking is not active."
-msgstr "Monitorowanie nie jest aktywne."
+msgstr "Śledzenie nie jest aktywne."
#: db_structure.php:386 libraries/display_tbl.lib.php:2238
#, php-format
@@ -631,8 +628,8 @@ msgid ""
"This view has at least this number of rows. Please refer to %sdocumentation"
"%s."
msgstr ""
-"Ta perspektywa ma przynajmniej tyle wierszy. Więcej informacji w "
-"%sdocumentation%s."
+"Ten widok ma przynajmniej taką ilość rzędów. Więcej informacji w %"
+"sdokumentacja%s."
#: db_structure.php:397 db_structure.php:411 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:209
hooks/post-receive
--
phpMyAdmin
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18558-g87459a5
by Dieter Adriaenssens
The branch, master has been updated
via 87459a5cf6b7c640c8a19cbd70575424420850f7 (commit)
via a30554b1e4e5a0b6a048b4dfe12dfbeb45321c37 (commit)
from a1c9a65994630a28f76a08d86d498ef0493539eb (commit)
- Log -----------------------------------------------------------------
commit 87459a5cf6b7c640c8a19cbd70575424420850f7
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: Tue Sep 6 22:04:51 2011 +0200
use include() instead of require() when including file conditionally
commit a30554b1e4e5a0b6a048b4dfe12dfbeb45321c37
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: Tue Sep 6 21:48:05 2011 +0200
use require() instead of include() when including file unconditionally
-----------------------------------------------------------------------
Summary of changes:
export.php | 42 ++++++++++++------------
gis_data_editor.php | 4 +-
import.php | 16 ++++----
index.php | 2 +-
libraries/Advisor.class.php | 2 +-
libraries/auth/config.auth.lib.php | 6 ++--
libraries/auth/cookie.auth.lib.php | 14 ++++----
libraries/auth/http.auth.lib.php | 6 ++--
libraries/auth/signon.auth.lib.php | 2 +-
libraries/auth/swekey/swekey.auth.lib.php | 4 +-
libraries/charset_conversion.lib.php | 2 +-
libraries/common.inc.php | 34 +++++++++---------
libraries/config/ConfigFile.class.php | 8 ++--
libraries/core.lib.php | 4 +-
libraries/engines/berkeleydb.lib.php | 2 +-
libraries/engines/innobase.lib.php | 2 +-
libraries/engines/mrg_myisam.lib.php | 2 +-
libraries/schema/Dia_Relation_Schema.class.php | 2 +-
libraries/schema/Eps_Relation_Schema.class.php | 2 +-
pmd_display_field.php | 2 +-
pmd_pdf.php | 2 +-
pmd_relation_new.php | 4 +-
pmd_relation_upd.php | 4 +-
pmd_save_pos.php | 2 +-
schema_export.php | 4 +-
25 files changed, 87 insertions(+), 87 deletions(-)
diff --git a/export.php b/export.php
index e26427d..b82ef99 100644
--- a/export.php
+++ b/export.php
@@ -75,16 +75,16 @@ if ($_REQUEST['output_format'] == 'astext') {
// Does export require to be into file?
if (isset($export_list[$type]['force_file']) && ! $asfile) {
$message = PMA_Message::error(__('Selected export type has to be saved in file!'));
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
if ($export_type == 'server') {
$active_page = 'server_export.php';
- require './server_export.php';
+ include './server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
- require './db_export.php';
+ include './db_export.php';
} else {
$active_page = 'tbl_export.php';
- require './tbl_export.php';
+ include './tbl_export.php';
}
exit();
}
@@ -318,16 +318,16 @@ if ($save_on_server) {
}
}
if (isset($message)) {
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
if ($export_type == 'server') {
$active_page = 'server_export.php';
- require './server_export.php';
+ include './server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
- require './db_export.php';
+ include './db_export.php';
} else {
$active_page = 'tbl_export.php';
- require './tbl_export.php';
+ include './tbl_export.php';
}
exit();
}
@@ -352,14 +352,14 @@ if (!$save_on_server) {
$num_tables = count($tables);
if ($num_tables == 0) {
$message = PMA_Message::error(__('No tables found in database.'));
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
$active_page = 'db_export.php';
- require './db_export.php';
+ include './db_export.php';
exit();
}
}
$backup_cfgServer = $cfg['Server'];
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
$cfg['Server'] = $backup_cfgServer;
unset($backup_cfgServer);
echo "\n" . '<div align="' . $cell_align_left . '">' . "\n";
@@ -416,7 +416,7 @@ do {
$cfgRelation = PMA_getRelationsParam();
}
if ($do_mime) {
- require_once './libraries/transformations.lib.php';
+ include_once './libraries/transformations.lib.php';
}
// Include dates in export?
@@ -600,16 +600,16 @@ do {
// End of fake loop
if ($save_on_server && isset($message)) {
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
if ($export_type == 'server') {
$active_page = 'server_export.php';
- require './server_export.php';
+ include './server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
- require './db_export.php';
+ include './db_export.php';
} else {
$active_page = 'tbl_export.php';
- require './tbl_export.php';
+ include './tbl_export.php';
}
exit();
}
@@ -654,16 +654,16 @@ if (!empty($asfile)) {
$message = new PMA_Message(__('Dump has been saved to file %s.'), PMA_Message::SUCCESS, $save_filename);
}
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
if ($export_type == 'server') {
$active_page = 'server_export.php';
- require_once './server_export.php';
+ include_once './server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
- require_once './db_export.php';
+ include_once './db_export.php';
} else {
$active_page = 'tbl_export.php';
- require_once './tbl_export.php';
+ include_once './tbl_export.php';
}
exit();
} else {
@@ -704,6 +704,6 @@ if (!empty($asfile)) {
//]]>
</script>
<?php
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
} // end if
?>
diff --git a/gis_data_editor.php b/gis_data_editor.php
index fde183d..d9db06f 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -1,8 +1,8 @@
<?php
require_once './libraries/common.inc.php';
if (! isset($_REQUEST['get_gis_editor']) && ! isset($_REQUEST['generate'])) {
- require_once './libraries/header_http.inc.php';
- require_once './libraries/header_meta_style.inc.php';
+ include_once './libraries/header_http.inc.php';
+ include_once './libraries/header_meta_style.inc.php';
}
require_once './libraries/gis/pma_gis_factory.php';
require_once './libraries/gis_visualization.lib.php';
diff --git a/import.php b/import.php
index f305293..92859ff 100644
--- a/import.php
+++ b/import.php
@@ -53,7 +53,7 @@ if (!empty($sql_query)) {
// upload limit has been reached, let's assume the second possibility.
;
if ($_POST == array() && $_GET == array()) {
- require_once './libraries/header.inc.php';
+ include_once './libraries/header.inc.php';
$message = PMA_Message::error(__('You probably tried to upload too large file. Please refer to %sdocumentation%s for ways to workaround this limit.'));
$message->addParam('[a@./Documentation.html#faq1_16@_blank]');
$message->addParam('[/a]');
@@ -63,7 +63,7 @@ if ($_POST == array() && $_GET == array()) {
$_SESSION['Import_message']['go_back_url'] = $goto;
$message->display();
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
}
// Check needed parameters
@@ -148,7 +148,7 @@ $bookmark_created = false;
// Bookmark Support: get a query back from bookmark if required
if (!empty($id_bookmark)) {
$id_bookmark = (int)$id_bookmark;
- require_once './libraries/bookmark.lib.php';
+ include_once './libraries/bookmark.lib.php';
switch ($action_bookmark) {
case 0: // bookmarked query that have to be run
$import_text = PMA_Bookmark_get($db, $id_bookmark, 'id', isset($action_bookmark_all));
@@ -183,7 +183,7 @@ if (isset($GLOBALS['show_as_php'])) {
// Store the query as a bookmark before executing it if bookmarklabel was given
if (!empty($bkm_label) && !empty($import_text)) {
- require_once './libraries/bookmark.lib.php';
+ include_once './libraries/bookmark.lib.php';
$bfields = array(
'dbase' => $db,
'user' => $cfg['Bookmark']['user'],
@@ -377,7 +377,7 @@ if (!$error) {
} else {
// Do the real import
$plugin_param = $import_type;
- require './libraries/import/' . $format . '.php';
+ include './libraries/import/' . $format . '.php';
}
}
@@ -441,7 +441,7 @@ if (isset($message)) {
// (but if the query is too large, in case of an imported file, the parser
// can choke on it so avoid parsing)
if (strlen($sql_query) <= $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
- require_once './libraries/parse_analyze.lib.php';
+ include_once './libraries/parse_analyze.lib.php';
}
// There was an error?
@@ -461,10 +461,10 @@ if (! empty($last_query_with_results)) {
}
if ($go_sql) {
- require './sql.php';
+ include './sql.php';
} else {
$active_page = $goto;
- require './' . $goto;
+ include './' . $goto;
}
exit();
?>
diff --git a/index.php b/index.php
index 9add876..c8c7756 100644
--- a/index.php
+++ b/index.php
@@ -69,7 +69,7 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1];
// start output
-include './libraries/header_http.inc.php';
+require './libraries/header_http.inc.php';
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd ">
diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php
index bf4e404..533fe88 100644
--- a/libraries/Advisor.class.php
+++ b/libraries/Advisor.class.php
@@ -28,7 +28,7 @@ class Advisor
FROM data_dictionary.GLOBAL_STATEMENTS", 0, 1));
}
// Add total memory to variables as well
- require_once 'libraries/sysinfo.lib.php';
+ include_once 'libraries/sysinfo.lib.php';
$sysinfo = getSysInfo();
$memory = $sysinfo->memory();
$this->variables['system_memory'] = $memory['MemTotal'];
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index e90e0bf..573bede 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -75,7 +75,7 @@ function PMA_auth_fails()
header('Content-Type: text/html; charset=utf-8');
/* HTML header */
$page_title = __('Access denied');
- require './libraries/header_meta_style.inc.php';
+ include './libraries/header_meta_style.inc.php';
?>
</head>
@@ -117,7 +117,7 @@ function PMA_auth_fails()
<?php
if (count($GLOBALS['cfg']['Servers']) > 1) {
// offer a chance to login to other servers if the current one failed
- require_once './libraries/select_server.lib.php';
+ include_once './libraries/select_server.lib.php';
echo '<tr>' . "\n";
echo ' <td>' . "\n";
PMA_select_server(true, true);
@@ -125,7 +125,7 @@ function PMA_auth_fails()
echo '</tr>' . "\n";
}
echo '</table>' . "\n";
- require './libraries/footer.inc.php';
+ include './libraries/footer.inc.php';
return true;
} // end of the 'PMA_auth_fails()' function
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 2a3f7c1..b196461 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -73,7 +73,7 @@ if (function_exists('mcrypt_encrypt')) {
}
} else {
- require_once './libraries/blowfish.php';
+ include_once './libraries/blowfish.php';
}
/**
@@ -137,9 +137,9 @@ function PMA_auth()
/* HTML header; do not show here the PMA version to improve security */
$page_title = 'phpMyAdmin ';
- require './libraries/header_meta_style.inc.php';
+ include './libraries/header_meta_style.inc.php';
// if $page_title is set, this script uses it as the title:
- require './libraries/header_scripts.inc.php';
+ include './libraries/header_scripts.inc.php';
?>
<script type="text/javascript">
//<![CDATA[
@@ -155,7 +155,7 @@ if (top != self) {
<?php
if (file_exists(CUSTOM_HEADER_FILE)) {
- require CUSTOM_HEADER_FILE;
+ include CUSTOM_HEADER_FILE;
}
?>
@@ -184,7 +184,7 @@ if (top != self) {
// Displays the languages form
if (empty($GLOBALS['cfg']['Lang'])) {
- require_once './libraries/display_select_lang.lib.php';
+ include_once './libraries/display_select_lang.lib.php';
// use fieldset, don't show doc link
PMA_select_language(true, false);
}
@@ -234,7 +234,7 @@ if (top != self) {
}
echo '>';
- require_once './libraries/select_server.lib.php';
+ include_once './libraries/select_server.lib.php';
PMA_select_server(false, false);
echo '</select></div>';
@@ -283,7 +283,7 @@ if (top != self) {
</div>
<?php
if (file_exists(CUSTOM_FOOTER_FILE)) {
- require CUSTOM_FOOTER_FILE;
+ include CUSTOM_FOOTER_FILE;
}
?>
</body>
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
index b31d327..b54cf34 100644
--- a/libraries/auth/http.auth.lib.php
+++ b/libraries/auth/http.auth.lib.php
@@ -49,13 +49,13 @@ function PMA_auth()
header('Content-Type: text/html; charset=utf-8');
/* HTML header */
$page_title = __('Access denied');
- require './libraries/header_meta_style.inc.php';
+ include './libraries/header_meta_style.inc.php';
?>
</head>
<body>
<?php
if (file_exists(CUSTOM_HEADER_FILE)) {
- require CUSTOM_HEADER_FILE;
+ include CUSTOM_HEADER_FILE;
}
?>
@@ -69,7 +69,7 @@ function PMA_auth()
PMA_Message::error(__('Wrong username/password. Access denied.'))->display();
if (file_exists(CUSTOM_FOOTER_FILE)) {
- require CUSTOM_FOOTER_FILE;
+ include CUSTOM_FOOTER_FILE;
}
?>
diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
index 976845c..fb105c2 100644
--- a/libraries/auth/signon.auth.lib.php
+++ b/libraries/auth/signon.auth.lib.php
@@ -87,7 +87,7 @@ function PMA_auth_check()
if (! file_exists($script_name)) {
PMA_fatalError(__('Can not find signon authentication script:') . ' ' . $script_name);
}
- require $script_name;
+ include $script_name;
list ($PHP_AUTH_USER, $PHP_AUTH_PW) = get_login_credentials($cfg['Server']['user']);
diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php
index c748a53..f7299d1 100644
--- a/libraries/auth/swekey/swekey.auth.lib.php
+++ b/libraries/auth/swekey/swekey.auth.lib.php
@@ -69,7 +69,7 @@ function Swekey_auth_error()
if (! $_SESSION['SWEKEY']['ENABLED'])
return null;
- require_once './libraries/auth/swekey/authentication.inc.php';
+ include_once './libraries/auth/swekey/authentication.inc.php';
?>
<script>
@@ -115,7 +115,7 @@ function Swekey_auth_error()
if (count($_SESSION['SWEKEY']['VALID_SWEKEYS']) == 0)
return sprintf(__('File %s does not contain any key id'), $GLOBALS['cfg']['Server']['auth_swekey_config']);
- require_once "./libraries/auth/swekey/swekey.php";
+ include_once "./libraries/auth/swekey/swekey.php";
Swekey_SetCheckServer($_SESSION['SWEKEY']['CONF_SERVER_CHECK']);
Swekey_SetRndTokenServer($_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN']);
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index 8d19ad4..ecd71bc 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -51,7 +51,7 @@ if ($cfg['RecodingEngine'] == 'iconv') {
/* Load AIX iconv wrapper if needed */
if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) {
- require_once './libraries/iconv_wrapper.lib.php';
+ include_once './libraries/iconv_wrapper.lib.php';
}
/**
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 390325d..8c34bdb 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -124,17 +124,17 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/**
* common functions
*/
- require_once './libraries/common.lib.php';
+ include_once './libraries/common.lib.php';
/**
* Java script escaping.
*/
- require_once './libraries/js_escape.lib.php';
+ include_once './libraries/js_escape.lib.php';
/**
* Include URL/hidden inputs generating.
*/
- require_once './libraries/url_generating.lib.php';
+ include_once './libraries/url_generating.lib.php';
}
/******************************************************************************/
@@ -265,7 +265,7 @@ if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
* include deprecated grab_globals only if required
*/
if (empty($__redirect) && !defined('PMA_NO_VARIABLES_IMPORT')) {
- require './libraries/grab_globals.lib.php';
+ include './libraries/grab_globals.lib.php';
}
/**
@@ -484,7 +484,7 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
/**
* Require cleanup functions
*/
- require './libraries/cleanup.lib.php';
+ include './libraries/cleanup.lib.php';
/**
* Do actual cleanup
*/
@@ -740,12 +740,12 @@ if (! defined('PMA_MINIMUM_COMMON')) {
/**
* Character set conversion.
*/
- require_once './libraries/charset_conversion.lib.php';
+ include_once './libraries/charset_conversion.lib.php';
/**
* String handling
*/
- require_once './libraries/string.lib.php';
+ include_once './libraries/string.lib.php';
/**
* Lookup server by name
@@ -793,7 +793,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
*/
if (function_exists('mb_convert_encoding')
&& $lang == 'ja') {
- require_once './libraries/kanji-encoding.lib.php';
+ include_once './libraries/kanji-encoding.lib.php';
} // end if
/**
@@ -810,9 +810,9 @@ if (! defined('PMA_MINIMUM_COMMON')) {
/**
* Loads the proper database interface for this server
*/
- require_once './libraries/database_interface.lib.php';
+ include_once './libraries/database_interface.lib.php';
- require_once './libraries/logging.lib.php';
+ include_once './libraries/logging.lib.php';
// get LoginCookieValidity from preferences cache
// no generic solution for loading preferences from cache as some settings need to be kept
@@ -837,7 +837,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
/**
* the required auth type plugin
*/
- require_once './libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php';
+ include_once './libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php';
if (!PMA_auth_check()) {
/* Force generating of new session on login */
PMA_secureSession();
@@ -857,7 +857,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
/**
* ip based access library
*/
- require_once './libraries/ip_allow_deny.lib.php';
+ include_once './libraries/ip_allow_deny.lib.php';
$allowDeny_forbidden = false; // default
if ($cfg['Server']['AllowDeny']['order'] == 'allow,deny') {
@@ -954,17 +954,17 @@ if (! defined('PMA_MINIMUM_COMMON')) {
/**
* SQL Parser code
*/
- require_once './libraries/sqlparser.lib.php';
+ include_once './libraries/sqlparser.lib.php';
/**
* SQL Validator interface code
*/
- require_once './libraries/sqlvalidator.lib.php';
+ include_once './libraries/sqlvalidator.lib.php';
/**
* the PMA_List_Database class
*/
- require_once './libraries/PMA.php';
+ include_once './libraries/PMA.php';
$pma = new PMA;
$pma->userlink = $userlink;
$pma->controllink = $controllink;
@@ -991,7 +991,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
}
// library file for blobstreaming
- require_once './libraries/blobstreaming.lib.php';
+ include_once './libraries/blobstreaming.li .php'; { w,deny') { '.auth.lib.php'; be kept key_config']); for ways to workaround this limit.')); ����* ή�* �ʯ�* `�'� � ��* P�'� �'� k���* 6 � �! �! ��'� `�'� x�ɯ�* P�'� ���* ����* ��'� `��* /�'� ��-��* u����* �-��* ش-��* ��-��* ����* x�ɯ�* P�'� �'� k���* �! �! ��'� `�'� H����* 0�'� ���* ����* ��'� `��* /�'� �'� �'� 8ή�* �p� `�'� u����* ����* 0�'� �'� k���* G H I J K M N O P ��'� `�'� HE���* ��'� ���* ����* ��'� 0�-��* u����* �ɯ�* �y]��* �-��* ش-��* ��-��* ����* HE���* ��'� �'� k���* 8E���* ��'� @�'� k���* (E���* ��'� p�'� k���* E���* ��'� ��'� k���* ��-��* u����* ��-��* �'� ��]��* e����* ش-��* @�'� y�]��* e����* �-��* p�'� Z�]��* e����* �t]��* �ɯ�* �y]��* �-��* ��ɯ�* ش-��* ��-��* ����* 8ή�* =)��* `�'� p]��* �'� ��'� k���* 5 6 7 8 : <