[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24857-g56ec7b2
The branch, master has been updated via 56ec7b205944cad67356c39cb5ab6cf558233496 (commit) via cd4cd9d95abd1750c237757af7b1ea6ab116c0b2 (commit) via ac94d08c1322744336969fa6d962b03edf406942 (commit) via a0afe72fa7d0d3b1edce2fd948128f2a9371c339 (commit) via 7ab5e68fd0731ccd3eb4af3f54b3cfe7d25b8f2c (commit) via 8d87df168dbe84c75b0a3564a77892fe2ad59b46 (commit) via b8b7c620a1e22b8186b25ea0fa3729bcba78a5a3 (commit) via 496f660840a793cad323f015b6aead3872f6c290 (commit) from 64d4f8b00c03e2d9b20baa307597f856931b3d5b (commit) - Log - commit 56ec7b205944cad67356c39cb5ab6cf558233496 Author: Yuichiro yuich...@pop07.odn.ne.jp Date: Fri Dec 16 11:45:05 2011 +0200 Translation update done using Pootle. commit cd4cd9d95abd1750c237757af7b1ea6ab116c0b2 Author: Yuichiro yuich...@pop07.odn.ne.jp Date: Fri Dec 16 11:44:54 2011 +0200 Translation update done using Pootle. commit ac94d08c1322744336969fa6d962b03edf406942 Merge: a0afe72 64d4f8b Author: Pootle server poo...@cihar.com Date: Fri Dec 16 00:40:10 2011 +0100 Merge remote-tracking branch 'origin/master' commit a0afe72fa7d0d3b1edce2fd948128f2a9371c339 Author: Domen dbc...@gmail.com Date: Thu Dec 15 20:37:39 2011 +0200 Translation update done using Pootle. commit 7ab5e68fd0731ccd3eb4af3f54b3cfe7d25b8f2c Author: Victor Volkov ha...@php-myadmin.ru Date: Thu Dec 15 19:40:32 2011 +0200 Translation update done using Pootle. commit 8d87df168dbe84c75b0a3564a77892fe2ad59b46 Merge: b8b7c62 e5c094d Author: Pootle server poo...@cihar.com Date: Thu Dec 15 16:40:09 2011 +0100 Merge remote-tracking branch 'origin/master' commit b8b7c620a1e22b8186b25ea0fa3729bcba78a5a3 Author: Matías Bellone matiasbell...@gmail.com Date: Thu Dec 15 17:27:31 2011 +0200 Translation update done using Pootle. commit 496f660840a793cad323f015b6aead3872f6c290 Author: Michal Čihař mic...@cihar.com Date: Thu Dec 15 16:25:29 2011 +0200 Translation update done using Pootle. --- Summary of changes: po/cs.po |2 +- po/es.po |4 ++-- po/ja.po |7 +++ po/ru.po |8 +--- po/sl.po |8 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/po/cs.po b/po/cs.po index 2a894e8..04ac77c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2304,7 +2304,7 @@ msgstr Velikost písma #: libraries/Error_Handler.class.php:62 msgid Too many error messages, some are not displayed. -msgstr +msgstr Příliš mnoho chyb, některé nebudou zobrazeny. #: libraries/File.class.php:221 msgid File was not an uploaded file. diff --git a/po/es.po b/po/es.po index 376fefb..b489ec2 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr Project-Id-Version: phpMyAdmin 3.5.0-dev\n Report-Msgid-Bugs-To: phpmyadmin-de...@lists.sourceforge.net\n POT-Creation-Date: 2011-12-14 18:08+0100\n -PO-Revision-Date: 2011-12-12 15:10+0200\n +PO-Revision-Date: 2011-12-15 17:27+0200\n Last-Translator: Matías Bellone matiasbell...@gmail.com\n Language-Team: spanish e...@li.org\n Language: es\n @@ -2337,7 +2337,7 @@ msgstr Tamaño de fuente #: libraries/Error_Handler.class.php:62 msgid Too many error messages, some are not displayed. -msgstr +msgstr Demasiados mensajes de error, algunos no son mostrados. #: libraries/File.class.php:221 msgid File was not an uploaded file. diff --git a/po/ja.po b/po/ja.po index b35b0ea..7425882 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-de...@lists.sourceforge.net\n POT-Creation-Date: 2011-12-14 18:08+0100\n -PO-Revision-Date: 2011-12-15 11:46+0200\n +PO-Revision-Date: 2011-12-16 11:44+0200\n Last-Translator: Yuichiro yuich...@pop07.odn.ne.jp\n Language-Team: japanese j...@li.org\n Language: ja\n @@ -10555,13 +10555,12 @@ msgstr 系列の選択： #: server_status.php:1651 msgid Commonly monitored -msgstr +msgstr 一般的なモニタ対象 #: server_status.php:1666 -#, fuzzy #| msgid You must provide a valid table name msgid or type variable name: -msgstr 有効なテーブル名を指定してください +msgstr もしくは対象変数名: #: server_status.php:1670 msgid Display as differential value diff --git a/po/ru.po b/po/ru.po index 2e1bd76..8bd8ae1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,15 +4,15 @@ msgstr Project-Id-Version: phpMyAdmin 3.5.0-dev\n Report-Msgid-Bugs-To: phpmyadmin-de...@lists.sourceforge.net\n POT-Creation-Date: 2011-12-14 18:08+0100\n -PO-Revision-Date: 2011-12-14 19:08+0200\n +PO-Revision-Date: 2011-12-15 19:39+0200\n Last-Translator: Victor Volkov ha...@php-myadmin.ru\n Language-Team: russian r...@li.org\n Language: ru\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n -%10=4 (n%10010 || n%100=20) ? 1 : 2);\n +Plural-Forms:
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24861-g6adcae4
The branch, master has been updated via 6adcae41645646f1ff1ee7d44102449f37d4b7d9 (commit) from c6888b36e9104c9716ed8a0402910d4c665f23a0 (commit) - Log - commit 6adcae41645646f1ff1ee7d44102449f37d4b7d9 Author: Michal Čihař mci...@suse.cz Date: Fri Dec 16 15:12:32 2011 +0100 Add FALSE as reserved word (bug#3460596) --- Summary of changes: libraries/sqlparser.data.php |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 0a86784..319fa63 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -451,6 +451,7 @@ $PMA_SQPdata_reserved_word = array ( 'EXISTS', 'EXPLAIN', 'EXTENDED', +'FALSE', 'FAST', 'FIELDS', 'FILE', hooks/post-receive -- phpMyAdmin -- Learn Windows Azure Live! Tuesday, Dec 13, 2011 Microsoft is holding a special Learn Windows Azure training event for developers. It will provide a great way to learn Windows Azure and what it provides. You can attend the event by watching it streamed LIVE online. Learn more at http://p.sf.net/sfu/ms-windowsazure ___ Phpmyadmin-git mailing list Phpmyadmin-git@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24867-gbb1fd3c
The branch, master has been updated
via bb1fd3c966b04d3ed8374d065ad804c6d58643d8 (commit)
via 03f26421dc26f8b4cebe4851ab669e6c9088838e (commit)
via 9502e57c347208ec3c42cdcbe8fef468b87b6fb1 (commit)
from c296064614b6c31cf79b48a34d9308e5e7943588 (commit)
- Log -
commit bb1fd3c966b04d3ed8374d065ad804c6d58643d8
Author: Michal Čihař mci...@suse.cz
Date: Fri Dec 16 15:36:06 2011 +0100
Expect token here as well
commit 03f26421dc26f8b4cebe4851ab669e6c9088838e
Author: Michal Čihař mci...@suse.cz
Date: Fri Dec 16 15:35:57 2011 +0100
Load theme here, otherwise it pollutes cache in PMA_getImage
commit 9502e57c347208ec3c42cdcbe8fef468b87b6fb1
Author: Michal Čihař mci...@suse.cz
Date: Fri Dec 16 15:35:35 2011 +0100
Whitespace cleanup
---
Summary of changes:
libraries/common.lib.php | 12 ++--
test/classes/Advisor_test.php |1 +
test/classes/PMA_Message_test.php |3 ++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 62e49ff..cd56d03 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2363,18 +2363,18 @@ function PMA_pageselector($rows, $pageNow = 1,
$nbTotalPage = 1,
}
}
-/*
+/*
Add page numbers with geometrically increasing distances.
This helps me a lot when navigating through giant tables.
-
+
Test case: table with 2.28 million sets, 76190 pages. Page of interest is
-between 72376 and 76190.
+between 72376 and 76190.
Selecting page 72376.
-Now, old version enumerated only +/- 10 pages around 72376 and the
+Now, old version enumerated only +/- 10 pages around 72376 and the
percentage increment produced steps of about 3000.
-The following code adds page numbers +/- 2,4,8,16,32,64,128,256 etc.
+The following code adds page numbers +/- 2,4,8,16,32,64,128,256 etc.
around the current page.
*/
@@ -2397,7 +2397,7 @@ function PMA_pageselector($rows, $pageNow = 1,
$nbTotalPage = 1,
$pages[] = $i;
}
}
-
+
// Since because of ellipsing of the current page some numbers may be
double,
// we unify our array:
sort($pages);
diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php
index 1ef60b2..c57b367 100644
--- a/test/classes/Advisor_test.php
+++ b/test/classes/Advisor_test.php
@@ -20,6 +20,7 @@ class Advisor_test extends PHPUnit_Framework_TestCase
{
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
+$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
}
/**
diff --git a/test/classes/PMA_Message_test.php
b/test/classes/PMA_Message_test.php
index 5968594..72ab91a 100644
--- a/test/classes/PMA_Message_test.php
+++ b/test/classes/PMA_Message_test.php
@@ -256,7 +256,7 @@ class PMA_Message_test extends
PHPUnit_Extensions_OutputTestCase
),
array(
'[a@http://foo.bar/@Documentation]link[/a]',
-'a href=./url.php?url=http%3A%2F%2Ffoo.bar%2Famp;lang=en
target=Documentationlink/a'
+'a
href=./url.php?url=http%3A%2F%2Ffoo.bar%2Famp;lang=enamp;token=token
target=Documentationlink/a'
),
array(
'[a@./non-existing@Documentation]link[/a]',
@@ -277,6 +277,7 @@ class PMA_Message_test extends
PHPUnit_Extensions_OutputTestCase
public function testDecodeBB($actual, $expected)
{
$GLOBALS['lang'] = 'en';
+$_SESSION[' PMA_token '] = 'token';
$this-assertEquals($expected, PMA_Message::decodeBB($actual));
}
hooks/post-receive
--
phpMyAdmin
--
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
___
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24868-g07472a7
The branch, master has been updated
via 07472a7f2a726580b02c2c14a7ab852b2ccac90d (commit)
from bb1fd3c966b04d3ed8374d065ad804c6d58643d8 (commit)
- Log -
commit 07472a7f2a726580b02c2c14a7ab852b2ccac90d
Author: Michal Čihař mci...@suse.cz
Date: Fri Dec 16 15:40:04 2011 +0100
Make this test pass (it was built not to expect links to documentation)
---
Summary of changes:
test/libraries/common/PMA_formatSql_test.php | 20 ++--
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/test/libraries/common/PMA_formatSql_test.php
b/test/libraries/common/PMA_formatSql_test.php
index ca1c567..809ebb1 100644
--- a/test/libraries/common/PMA_formatSql_test.php
+++ b/test/libraries/common/PMA_formatSql_test.php
@@ -53,7 +53,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
function testFormatSQLfmTypeHtml_1(){
global $cfg;
$cfg['SQP']['fmtType'] = 'html';
-$cfg['MySQLManualType'] = 'viewable';
+$cfg['MySQLManualType'] = 'none';
$sql = array (
'raw' = 'SELECT 1;',
@@ -87,7 +87,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
function testFormatSQLfmTypeHtml_2(){
global $cfg;
$cfg['SQP']['fmtType'] = 'html';
-$cfg['MySQLManualType'] = 'viewable';
+$cfg['MySQLManualType'] = 'none';
$unparsed = SELECT * from `tTable`;;
$sql = array (
@@ -134,7 +134,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
function testFormatSQLfmTypeHtml_3(){
global $cfg;
$cfg['SQP']['fmtType'] = 'html';
-$cfg['MySQLManualType'] = 'viewable';
+$cfg['MySQLManualType'] = 'none';
$unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON
B.ID = A.ID;';
$sql = array (
@@ -269,7 +269,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
function testFormatSQLfmTypeText_1(){
global $cfg;
$cfg['SQP']['fmtType'] = 'text';
-$cfg['MySQLManualType'] = 'viewable';
+$cfg['MySQLManualType'] = 'none';
$sql = array (
'raw' = 'SELECT 1;',
@@ -303,7 +303,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
function testFormatSQLfmTypeText_2(){
global $cfg;
$cfg['SQP']['fmtType'] = 'text';
-$cfg['MySQLManualType'] = 'viewable';
+$cfg['MySQLManualType'] = 'none';
$unparsed = SELECT * from `tTable`;;
$sql = array (
@@ -350,7 +350,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
function testFormatSQLfmTypeText_3(){
global $cfg;
$cfg['SQP']['fmtType'] = 'text';
-$cfg['MySQLManualType'] = 'viewable';
+$cfg['MySQLManualType'] = 'none';
$unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON
B.ID = A.ID;';
$sql = array (
@@ -484,7 +484,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
function testFormatSQLfmTypeNone_1(){
global $cfg;
$cfg['SQP']['fmtType'] = 'none';
-$cfg['MySQLManualType'] = 'viewable';
+$cfg['MySQLManualType'] = 'none';
$sql = array (
'raw' = 'SELECT 1;',
@@ -521,7 +521,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
function testFormatSQLfmTypeNone_2(){
global $cfg;
$cfg['SQP']['fmtType'] = 'none';
-$cfg['MySQLManualType'] = 'viewable';
+$cfg['MySQLManualType'] = 'none';
$unparsed = SELECT * from `tTable`;;
$sql = array (
@@ -571,7 +571,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
function testFormatSQLfmTypeNone_3(){
global $cfg;
$cfg['SQP']['fmtType'] = 'none';
-$cfg['MySQLManualType'] = 'viewable';
+$cfg['MySQLManualType'] = 'none';
$unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON
B.ID = A.ID;';
$sql = array (
@@ -708,7 +708,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase
function testFormatSQLWithoutType(){
global $cfg;
$cfg['SQP']['fmtType'] = '';
-$cfg['MySQLManualType'] = 'viewable';
+$cfg['MySQLManualType'] = 'none';
$sql = array (
'raw' = 'SELECT 1;',
0 =
hooks/post-receive
--
phpMyAdmin
--
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
___
Phpmyadmin-git mailing list
[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_9RC1-9-g173d43d
The branch, QA_3_4 has been updated
via 173d43d15bf58d09e06ed17fd4e3b0bd0734756b (commit)
via a9d98907268ed1eb643e2c36780d45f360534500 (commit)
via 797ec6faf0b6db8103bef1de06890fc357a6c521 (commit)
via 7ef064f648fbaff787183b2d194981821d72054a (commit)
via 9fc23c882467bca9809c6e05dd1dd38284b05abd (commit)
via e43ed55b045dec9724e0695d7039b7a8aad90a99 (commit)
from 5130615c0a94a3a13d9e97c3845c408732bfc019 (commit)
- Log -
commit 173d43d15bf58d09e06ed17fd4e3b0bd0734756b
Author: Marc Delisle m...@infomarc.info
Date: Fri Dec 16 11:40:56 2011 -0500
patch #3375984 [export] PHP Array export might generate invalid php code
commit a9d98907268ed1eb643e2c36780d45f360534500
Author: Sven Strickroth em...@cs-ware.de
Date: Wed Dec 14 16:16:31 2011 +0100
fixed typo
Signed-off-by: Sven Strickroth em...@cs-ware.de
commit 797ec6faf0b6db8103bef1de06890fc357a6c521
Author: Sven Strickroth em...@cs-ware.de
Date: Sat Jul 23 04:04:41 2011 +0200
added spaces to improve look and feel of output
Signed-off-by: Sven Strickroth em...@cs-ware.de
commit 7ef064f648fbaff787183b2d194981821d72054a
Author: Sven Strickroth em...@cs-ware.de
Date: Sat Jul 23 04:04:23 2011 +0200
add backquotes to improve look and feel of output
Signed-off-by: Sven Strickroth em...@cs-ware.de
commit 9fc23c882467bca9809c6e05dd1dd38284b05abd
Author: Sven Strickroth em...@cs-ware.de
Date: Sat Jul 23 03:56:36 2011 +0200
escape single quotes in column names
Column names like `id'` must be escaped in a PHP string
Signed-off-by: Sven Strickroth em...@cs-ware.de
commit e43ed55b045dec9724e0695d7039b7a8aad90a99
Author: Sven Strickroth em...@cs-ware.de
Date: Sat Jul 23 03:55:13 2011 +0200
fix invalid PHP variable names
Tables with names like `0-` are allowed in SQL, but not in PHP variable
names
Signed-off-by: Sven Strickroth em...@cs-ware.de
---
Summary of changes:
ChangeLog |1 +
libraries/export/php_array.php | 22 +-
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 86b6965..c51c785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
3.4.10.0 (not yet released)
- bug #3460090 [interface] TextareaAutoSelect feature broken
+- patch #3375984 [export] PHP Array export might generate invalid php code
3.4.9.0 (not yet released)
- bug #3442028 [edit] Inline editing enum fields with null shows no dropdown
diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php
index 983673c..5b5937d 100644
--- a/libraries/export/php_array.php
+++ b/libraries/export/php_array.php
@@ -87,7 +87,7 @@ function PMA_exportHeader()
*/
function PMA_exportDBHeader($db)
{
-PMA_exportOutputHandler('//' . $GLOBALS['crlf'] . '// Database ' . $db .
'' . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf']);
+PMA_exportOutputHandler('//' . $GLOBALS['crlf'] . '// Database ' .
PMA_backquote($db) . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf']);
return true;
}
@@ -142,6 +142,19 @@ function PMA_exportData($db, $table, $crlf, $error_url,
$sql_query)
}
unset($i);
+// fix variable names (based on
http://www.php.net/manual/language.variables.basics.php)
+if (preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $table) ==
false) {
+// fix invalid chars in variable names by replacing them with
underscores
+$tablefixed = preg_replace('/[^a-zA-Z0-9_\x7f-\xff]/', '_', $table);
+
+// variable name must not start with a number or dash...
+if (preg_match('/^[a-zA-Z_\x7f-\xff]/', $tablefixed) == false) {
+$tablefixed = '_' . $tablefixed;
+}
+} else {
+$tablefixed = $table;
+}
+
$buffer = '';
$record_cnt = 0;
while ($record = PMA_DBI_fetch_row($result)) {
@@ -150,16 +163,15 @@ function PMA_exportData($db, $table, $crlf, $error_url,
$sql_query)
// Output table name as comment if this is the first record of the
table
if ($record_cnt == 1) {
-$buffer .= $crlf . '// ' . $db . '.' . $table . $crlf;
-$buffer .= '$' . $table . ' = array(' . $crlf;
+$buffer .= $crlf . '// ' . PMA_backquote($db) . '.' .
PMA_backquote($table) . $crlf;
+$buffer .= '$' . $tablefixed . ' = array(' . $crlf;
$buffer .= ' array(';
} else {
$buffer .= ',' . $crlf . ' array(';
}
-
for ($i = 0; $i $columns_cnt; $i++) {
-$buffer .= ' . $columns[$i]. '= . var_export($record[$i],
true) . (($i + 1 = $columns_cnt) ? '' : ',');
+$buffer .= var_export($columns[$i], true) . = .
var_export($record[$i], true) . (($i + 1 = $columns_cnt) ? '' : ',');
}
