- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15880-gcd69e5b
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via cd69e5bdf2081561e5d8891d72820d16a4d99266 (commit) via a1c5e7f67a4577bc4ac9a90cd8f7e6c581f12ce5 (commit) from 7b54504cc0981821619ffd3f0759766448e6b879 (commit) - Log ----------------------------------------------------------------- commit cd69e5bdf2081561e5d8891d72820d16a4d99266 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:25:47 2011 +0200 Include missing database tabs commit a1c5e7f67a4577bc4ac9a90cd8f7e6c581f12ce5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:21:55 2011 +0200 Move library to libraries ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 3 ++- pmd_common.php => libraries/pmd_common.php | 0 pmd_display_field.php | 2 +- pmd_general.php | 2 +- pmd_help.php | 2 +- pmd_pdf.php | 2 +- pmd_relation_new.php | 2 +- pmd_relation_upd.php | 2 +- pmd_save_pos.php | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) rename pmd_common.php => libraries/pmd_common.php (100%) diff --git a/db_datadict.php b/db_datadict.php index fca38b7..89b2bc5 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -11,7 +11,8 @@ require_once './libraries/common.inc.php'; if (! isset($selected_tbl)) { - require_once './libraries/header.inc.php'; + require './libraries/db_common.inc.php'; + require './libraries/db_info.inc.php'; } diff --git a/pmd_common.php b/libraries/pmd_common.php similarity index 100% rename from pmd_common.php rename to libraries/pmd_common.php diff --git a/pmd_display_field.php b/pmd_display_field.php index 0e51cd7..9f82912 100644 --- a/pmd_display_field.php +++ b/pmd_display_field.php @@ -7,7 +7,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $table = $T; diff --git a/pmd_general.php b/pmd_general.php index be504ac..d270cbd 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -7,7 +7,7 @@ /** * */ -require_once "./pmd_common.php"; +require_once './libraries/pmd_common.php'; $tab_column = get_tab_info(); $script_tabs = get_script_tabs(); diff --git a/pmd_help.php b/pmd_help.php index f653b14..f81df43 100644 --- a/pmd_help.php +++ b/pmd_help.php @@ -8,7 +8,7 @@ /** * */ -require_once 'pmd_common.php'; +require_once './libraries/pmd_common.php'; ?> <html> <head> diff --git a/pmd_pdf.php b/pmd_pdf.php index adf5fac..2afe131 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -5,7 +5,7 @@ * @package phpMyAdmin-Designer */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; /** * If called directly from the designer, first save the positions diff --git a/pmd_relation_new.php b/pmd_relation_new.php index a104cc1..fbd6246 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $die_save_pos = 0; include_once 'pmd_save_pos.php'; extract($_POST, EXTR_SKIP); diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 58c9135..7151cf7 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; extract($_POST, EXTR_SKIP); extract($_GET, EXTR_SKIP); $die_save_pos = 0; diff --git a/pmd_save_pos.php b/pmd_save_pos.php index c487ddb..1a071af 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $cfgRelation = PMA_getRelationsParam(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15878-g7b54504
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 7b54504cc0981821619ffd3f0759766448e6b879 (commit) from 679814416f4842f8e0e189c054772edf2d20ddef (commit) - Log ----------------------------------------------------------------- commit 7b54504cc0981821619ffd3f0759766448e6b879 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:16:59 2011 +0200 Fix handling of tables with something what gets urlencoded ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index a1b7acb..685b817 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1416,7 +1416,7 @@ if (isset($_REQUEST['flush_privileges'])) { /** * defines some standard links */ -$link_edit = '<a class="edit_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . $GLOBALS['url_query'] +$link_edit = '<a class="edit_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . str_replace($GLOBALS['url_query'], '%', '%%') . '&username=%s' . '&hostname=%s' . '&dbname=%s' @@ -1424,7 +1424,7 @@ $link_edit = '<a class="edit_user_anchor ' . $conditional_class . '" href="serve . PMA_getIcon('b_usredit.png', __('Edit Privileges')) . '</a>'; -$link_revoke = '<a href="server_privileges.php?' . $GLOBALS['url_query'] +$link_revoke = '<a href="server_privileges.php?' . str_replace($GLOBALS['url_query'], '%', '%%') . '&username=%s' . '&hostname=%s' . '&dbname=%s' @@ -1433,7 +1433,7 @@ $link_revoke = '<a href="server_privileges.php?' . $GLOBALS['url_query'] . PMA_getIcon('b_usrdrop.png', __('Revoke')) . '</a>'; -$link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . $GLOBALS['url_query'] +$link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . str_replace($GLOBALS['url_query'], '%', '%%') . '&username=%s' . '&hostname=%s' . '&initial=%s' hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15877-g6798144
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 679814416f4842f8e0e189c054772edf2d20ddef (commit) from 282e730985a24e5b03b5b8195ef93ac98aee7274 (commit) - Log ----------------------------------------------------------------- commit 679814416f4842f8e0e189c054772edf2d20ddef Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:11:31 2011 +0200 Format ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 78e4f06..a1b7acb 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2353,7 +2353,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' ' . ($current['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . "\n" . ' </td>' . "\n" . ' <td>' . "\n"; - $user_form .= sprintf($link_edit, urlencode($current_user), + $user_form .= sprintf( + $link_edit, + urlencode($current_user), urlencode($current_host), urlencode(! isset($current['Db']) || $current['Db'] == '*' ? '' : $current['Db']), ''); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15876-g282e730
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 282e730985a24e5b03b5b8195ef93ac98aee7274 (commit) via da6e51d00780dd941f4b496c69ae15d0d09bd3a3 (commit) via 8cec4ac91ce0da8e73d8b8313cdb5c34d03bdb4b (commit) from 54f96664a486164d23a7bc48efb2a504190c812e (commit) - Log ----------------------------------------------------------------- commit 282e730985a24e5b03b5b8195ef93ac98aee7274 Merge: 54f9666 da6e51d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:08:14 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 10cd8a9..fca38b7 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -203,7 +203,7 @@ foreach($tables as $table) { } else { $row['Default'] = htmlspecialchars($row['Default']); } - $field_name = htmlspecialchars($row['Field']); + $field_name = $row['Field']; if (PMA_MYSQL_INT_VERSION < 50025 && ! empty($analyzed_sql[0]['create_table_fields'][$field_name]['type']) @@ -225,9 +225,9 @@ foreach($tables as $table) { <td nowrap="nowrap"> <?php if (isset($pk_array[$row['Field']])) { - echo '<u>' . $field_name . '</u>'; + echo '<u>' . htmlspecialchars($field_name) . '</u>'; } else { - echo $field_name; + echo htmlspecialchars($field_name); } ?> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_2-69-gda6e51d
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, QA_3_4 has been updated via da6e51d00780dd941f4b496c69ae15d0d09bd3a3 (commit) via 8cec4ac91ce0da8e73d8b8313cdb5c34d03bdb4b (commit) from 414363d38d788c1c126d0aafc4eda69c0a8157c8 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 938ebf7..b910c76 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -227,7 +227,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { } else { $row['Default'] = htmlspecialchars($row['Default']); } - $field_name = htmlspecialchars($row['Field']); + $field_name = $row['Field']; if (PMA_MYSQL_INT_VERSION < 50025 && ! empty($analyzed_sql[0]['create_table_fields'][$field_name]['type']) @@ -249,9 +249,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { <td nowrap="nowrap"> <?php if (isset($pk_array[$row['Field']])) { - echo '<u>' . $field_name . '</u>'; + echo '<u>' . htmlspecialchars($field_name) . '</u>'; } else { - echo $field_name; + echo htmlspecialchars($field_name); } ?> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15873-g54f9666
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 54f96664a486164d23a7bc48efb2a504190c812e (commit) via 414363d38d788c1c126d0aafc4eda69c0a8157c8 (commit) from 889ea0afb047b255e81ebb1fe54f5bb825a804ef (commit) - Log ----------------------------------------------------------------- commit 54f96664a486164d23a7bc48efb2a504190c812e Merge: 889ea0a 414363d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:06:13 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index e74524d..10cd8a9 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -225,9 +225,9 @@ foreach($tables as $table) { <td nowrap="nowrap"> <?php if (isset($pk_array[$row['Field']])) { - echo '<u>' . htmlspecialchars($field_name) . '</u>'; + echo '<u>' . $field_name . '</u>'; } else { - echo htmlspecialchars($field_name); + echo $field_name; } ?> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_2-67-g414363d
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, QA_3_4 has been updated via 414363d38d788c1c126d0aafc4eda69c0a8157c8 (commit) from 599c9b5e1bacc01a9c9bb6621ec1ed3279c4104a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 6981462..938ebf7 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -249,9 +249,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { <td nowrap="nowrap"> <?php if (isset($pk_array[$row['Field']])) { - echo '<u>' . htmlspecialchars($field_name) . '</u>'; + echo '<u>' . $field_name . '</u>'; } else { - echo htmlspecialchars($field_name); + echo $field_name; } ?> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15871-g889ea0a
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 889ea0afb047b255e81ebb1fe54f5bb825a804ef (commit) from 270960ee35349a40315b4abe5512ebaea1967580 (commit) - Log ----------------------------------------------------------------- commit 889ea0afb047b255e81ebb1fe54f5bb825a804ef Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:05:15 2011 +0200 Fix getting tables ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index e9a8c55..e74524d 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -58,8 +58,7 @@ PMA_DBI_select_db($db); $tables = PMA_DBI_get_tables($db); $count = 0; -foreach($tables as $row) { - $table = $row[0]; +foreach($tables as $table) { $comments = PMA_getComments($db, $table); echo '<div>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15870-g270960e
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 270960ee35349a40315b4abe5512ebaea1967580 (commit) via f6fd4323381cb0e8c041e8d7f1b3cfc13302bb19 (commit) via 68da79da00140730542d6c58e074d31363e3c6aa (commit) via 599c9b5e1bacc01a9c9bb6621ec1ed3279c4104a (commit) via 9d011bbbcd20d6beb7b9b0a3002d132565a5e498 (commit) via e7d6cab2a25e5014c1c10ce927413481dc9ab074 (commit) from 1dba9c1836bf12aab40aeb129fd00aa04904a330 (commit) - Log ----------------------------------------------------------------- commit 270960ee35349a40315b4abe5512ebaea1967580 Merge: f6fd432 1dba9c1 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:02:31 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit f6fd4323381cb0e8c041e8d7f1b3cfc13302bb19 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 11:57:44 2011 +0200 Use PMA_DBI_get_tables instead of own query commit 68da79da00140730542d6c58e074d31363e3c6aa Merge: 9d011bb 599c9b5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 11:56:43 2011 +0200 Merge branch 'QA_3_4' commit 9d011bbbcd20d6beb7b9b0a3002d132565a5e498 Merge: cb9f7a2 e7d6cab Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 11:54:47 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index acfb531..e9a8c55 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -55,16 +55,16 @@ if ($cfgRelation['commwork']) { * Selects the database and gets tables names */ PMA_DBI_select_db($db); -$rowset = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE); +$tables = PMA_DBI_get_tables($db); $count = 0; -while ($row = PMA_DBI_fetch_row($rowset)) { +foreach($tables as $row) { $table = $row[0]; $comments = PMA_getComments($db, $table); echo '<div>' . "\n"; - echo '<h2>' . $table . '</h2>' . "\n"; + echo '<h2>' . htmlspecialchars($table) . '</h2>' . "\n"; /** * Gets table informations @@ -226,9 +226,9 @@ while ($row = PMA_DBI_fetch_row($rowset)) { <td nowrap="nowrap"> <?php if (isset($pk_array[$row['Field']])) { - echo '<u>' . $field_name . '</u>'; + echo '<u>' . htmlspecialchars($field_name) . '</u>'; } else { - echo $field_name; + echo htmlspecialchars($field_name); } ?> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_2-66-g599c9b5
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, QA_3_4 has been updated via 599c9b5e1bacc01a9c9bb6621ec1ed3279c4104a (commit) via e7d6cab2a25e5014c1c10ce927413481dc9ab074 (commit) from 514697082675f054671f6af4aa27c0c4601fcce8 (commit) - Log ----------------------------------------------------------------- commit 599c9b5e1bacc01a9c9bb6621ec1ed3279c4104a Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 11:56:38 2011 +0200 More of missing escaping commit e7d6cab2a25e5014c1c10ce927413481dc9ab074 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 11:54:34 2011 +0200 Missing escaping ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index e67c096..6981462 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -65,7 +65,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { echo '<div>' . "\n"; - echo '<h2>' . $table . '</h2>' . "\n"; + echo '<h2>' . htmlspecialchars($table) . '</h2>' . "\n"; /** * Gets table informations @@ -249,9 +249,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { <td nowrap="nowrap"> <?php if (isset($pk_array[$row['Field']])) { - echo '<u>' . $field_name . '</u>'; + echo '<u>' . htmlspecialchars($field_name) . '</u>'; } else { - echo $field_name; + echo htmlspecialchars($field_name); } ?> </td> hooks/post-receive -- phpMyAdmin

1 0