Git

git@phpmyadmin.net

23 participants
38397 discussions

[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

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15864-g1dba9c1
by Madhura Jayaratne 19 Aug '11

19 Aug '11

The branch, master has been updated via 1dba9c1836bf12aab40aeb129fd00aa04904a330 (commit) via a05eb3ebcde7b04d5f742b73b9a768b3f3a5d7d9 (commit) via c5b393665ca77d719bc67290cc4ddd003354cf4a (commit) via 77b2b7627d714f2621c5d320b5cfe5450229b7a5 (commit) via 4f438c33170e44f16282156540a1a6ab0b097035 (commit) via 0741a534017d2df65208eb1d288a079a84c76dc8 (commit) via 2d4a4427ef861373065b8630d5d6b6377c425eb3 (commit) via 46262835b6eb88290fbe32eec53c71b2568360a4 (commit) from cb9f7a2c26737fd0a2bc004bd289c3309dc7a78b (commit) - Log ----------------------------------------------------------------- commit 1dba9c1836bf12aab40aeb129fd00aa04904a330 Merge: a05eb3e cb9f7a2 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Aug 19 15:17:32 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin Conflicts: libraries/tbl_select.lib.php commit a05eb3ebcde7b04d5f742b73b9a768b3f3a5d7d9 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Aug 19 14:27:25 2011 +0530 Should return results when $propertiesIconic == true commit c5b393665ca77d719bc67290cc4ddd003354cf4a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Aug 19 13:36:28 2011 +0530 More code style corrections commit 77b2b7627d714f2621c5d320b5cfe5450229b7a5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Aug 19 11:21:21 2011 +0530 Adhere to PEAR coding standards commit 4f438c33170e44f16282156540a1a6ab0b097035 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Aug 19 11:07:11 2011 +0530 Coding style corrections commit 0741a534017d2df65208eb1d288a079a84c76dc8 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Aug 19 10:44:33 2011 +0530 Remove tab characters commit 2d4a4427ef861373065b8630d5d6b6377c425eb3 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Aug 19 10:42:57 2011 +0530 Fix doc blocks commit 46262835b6eb88290fbe32eec53c71b2568360a4 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Aug 19 10:03:35 2011 +0530 Only non-empty search values should go into where clause ----------------------------------------------------------------------- Summary of changes: libraries/tbl_select.lib.php | 360 +++++++++++++++++++---------------------- 1 files changed, 167 insertions(+), 193 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 57c520d..755322e 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -11,71 +11,64 @@ require_once 'url_generating.lib.php'; - /** - * PMA_tbl_setTitle() sets the title for foreign keys display link +/** + * Sets the title for foreign keys display link. * - * @param $propertiesIconic Type of icon property - * @param $themeImage Icon Image - * @return string $str Value of the Title + * @param mixed $propertiesIconic Type of icon property + * @param string $pmaThemeImage Icon Image * + * @return string $str Value of the Title */ - -function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage){ +function PMA_tbl_setTitle($propertiesIconic, $pmaThemeImage) +{ if ($propertiesIconic == true) { $str = '<img class="icon" width="16" height="16" src="' . $pmaThemeImage - .'b_browse.png" alt="' . __('Browse foreign values') . '" title="' - . __('Browse foreign values') . '" />'; - - if ($propertiesIconic === 'both') { - $str .= __('Browse foreign values'); - return $str; - } - } else { - return __('Browse foreign values'); - } + .'b_browse.png" alt="' . __('Browse foreign values') . '" title="' + . __('Browse foreign values') . '" />'; + + if ($propertiesIconic === 'both') { + $str .= __('Browse foreign values'); + } + + return $str; + } else { + return __('Browse foreign values'); + } } - /** - * PMA_tbl_getFields() gets all the fields of a table along with their types,collations and whether null or not. - * - * @uses PMA_DBI_query() - * @uses PMA_backquote() - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_fetch_assoc() - * @uses PMA_DBI_free_result() - * @uses preg_replace() - * @uses str_replace() - * @uses strncasecmp() - * @uses empty() - * - * @param $db Selected database - * @param $table Selected table +/** + * Gets all the fields of a table along with their types, collations + * and whether null or not. * - * @return array($fields_list,$fields_type,$fields_collation,$fields_null) Array containing the field list, field types, collations and null constatint + * @param string $table Selected table + * @param string $db Selected database * + * @return array Array containing the field list, field types, collations + * and null constraint */ - -function PMA_tbl_getFields($table,$db) { - +function PMA_tbl_getFields($table,$db) +{ // Gets the list and number of fields - - $fields = PMA_DBI_get_columns($db, $table, true); + $fields = PMA_DBI_get_columns($db, $table, true); $fields_list = $fields_null = $fields_type = $fields_collation = array(); $geom_column_present = false; $geom_types = PMA_getGISDatatypes(); + foreach ($fields as $row) { $fields_list[] = $row['Field']; $type = $row['Type']; + // check whether table contains geometric columns if (in_array($type, $geom_types)) { $geom_column_present = true; } + // reformat mysql query output if (strncasecmp($type, 'set', 3) == 0 - || strncasecmp($type, 'enum', 4) == 0) { + || strncasecmp($type, 'enum', 4) == 0 + ) { $type = str_replace(',', ', ', $type); } else { - // strip the "BINARY" attribute, except if we find "BINARY(" because // this would be a BINARY or VARBINARY field type if (!preg_match('@BINARY[\(]@i', $type)) { @@ -91,51 +84,49 @@ function PMA_tbl_getFields($table,$db) { } $fields_null[] = $row['Null']; $fields_type[] = $type; - $fields_collation[] = !empty($row['Collation']) && $row['Collation'] != 'NULL' - ? $row['Collation'] - : ''; + $fields_collation[] = ! empty($row['Collation']) && $row['Collation'] != 'NULL' + ? $row['Collation'] + : ''; } // end while - return array($fields_list,$fields_type,$fields_collation,$fields_null, $geom_column_present); - + return array($fields_list, $fields_type, $fields_collation, $fields_null, $geom_column_present); } -/* PMA_tbl_setTableHeader() sets the table header for displaying a table in query-by-example format +/** + * Sets the table header for displaying a table in query-by-example format. * - * @return HTML content, the tags and content for table header + * @param bool $geom_column_present whether a geometry column is present * + * @return HTML content, the tags and content for table header */ - -function PMA_tbl_setTableHeader($geom_column_present = false){ - +function PMA_tbl_setTableHeader($geom_column_present = false) +{ // Display the Function column only if there is alteast one geomety colum $func = ''; if ($geom_column_present) { $func = '<th>' . __('Function') . '</th>'; } -return '<thead> + return '<thead> <tr>' . $func . '<th>' . __('Column') . '</th> <th>' . __('Type') . '</th> <th>' . __('Collation') . '</th> <th>' . __('Operator') . '</th> <th>' . __('Value') . '</th> - </tr> + </tr> </thead>'; - - } -/* PMA_tbl_getSubTabs() returns an array with necessary configrations to create sub-tabs(Table Search and Zoom Search) in the table_select page - * - * @return array $subtabs Array containing configuration (icon,text,link,id,args) of sub-tabs for Table Search and Zoom search +/** + * Returns an array with necessary configrations to create + * sub-tabs(Table Search and Zoom Search) in the table_select page. * + * @return array Array containing configuration (icon, text, link, id, args) + * of sub-tabs for Table Search and Zoom search */ - -function PMA_tbl_getSubTabs(){ - +function PMA_tbl_getSubTabs() +{ $subtabs = array(); - $subtabs['search']['icon'] = 'b_search.png'; $subtabs['search']['text'] = __('Table Search'); $subtabs['search']['link'] = 'tbl_select.php'; @@ -148,74 +139,65 @@ function PMA_tbl_getSubTabs(){ $subtabs['zoom']['id'] = 'zoom_search_id'; return $subtabs; - } - -/* PMA_tbl_getForeignFields_Values() creates the HTML content for: 1) Browsing foreign data for a field. 2) Creating elements for search criteria input on fields. - * - * @uses PMA_foreignDropdown - * @uses PMA_generate_common_url - * @uses isset() - * @uses is_array() - * @uses in_array() - * @uses urlencode() - * @uses str_replace() - * @uses stbstr() - * - * @param $foreigners Array of foreign keys - * @param $foreignData Foreign keys data - * @param $field Column name - * @param $tbl_fields_type Column type - * @param $i Column index - * @param $db Selected database - * @param $table Selected table - * @param $titles Selected title - * @param $foreignMaxLimit Max limit of displaying foreign elements - * @param $fields Array of search criteria inputs - * @param $in_fbs In function based search +/** + * Creates the HTML content for: + * 1) Browsing foreign data for a field. + * 2) Creating elements for search criteria input on fields. * - * @return string $str HTML content for viewing foreing data and elements for search criteria input. + * @param array $foreigners Array of foreign keys + * @param array $foreignData Foreign keys data + * @param string $field Column name + * @param string $tbl_fields_type Column type + * @param int $i Column index + * @param string $db Selected database + * @param string $table Selected table + * @param array $titles Selected title + * @param int $foreignMaxLimit Max limit of displaying foreign elements + * @param array $fields Array of search criteria inputs + * @param bool $in_fbs Whether we are in 'function based search' * + * @return string HTML content for viewing foreing data and elements + * for search criteria input. */ - -function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, $table, $titles, $foreignMaxLimit, $fields, $in_fbs = false){ - +function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, $table, $titles, $foreignMaxLimit, $fields, $in_fbs = false) +{ $str = ''; - if ($foreigners && isset($foreigners[$field]) && is_array($foreignData['disp_row'])) { // f o r e i g n k e y s - $str .= ' <select name="fields[' . $i . ']" id="fieldID_' . $i .'">' . "\n"; + $str .= '<select name="fields[' . $i . ']" id="fieldID_' . $i .'">' . "\n"; // go back to first row // here, the 4th parameter is empty because there is no current // value of data for the dropdown (the search page initial values // are displayed empty) - $str .= PMA_foreignDropdown($foreignData['disp_row'], - $foreignData['foreign_field'], - $foreignData['foreign_display'], - '', $foreignMaxLimit); - $str .= ' </select>' . "\n"; - } - elseif ($foreignData['foreign_link'] == true) { + $str .= PMA_foreignDropdown( + $foreignData['disp_row'], $foreignData['foreign_field'], + $foreignData['foreign_display'], '', $foreignMaxLimit + ); + $str .= '</select>' . "\n"; + + } elseif ($foreignData['foreign_link'] == true) { if(isset($fields[$i]) && is_string($fields[$i])){ - $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . '] " value="' . $fields[$i] . '"'; - 'id="field_' . md5($field) . '[' . $i .']" - class="textfield"/>' ; + $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . '] " value="' . $fields[$i] . '"'; + 'id="field_' . md5($field) . '[' . $i .']" + class="textfield"/>' ; } else{ - $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . '] "'; - 'id="field_' . md5($field) . '[' . $i .']" - class="textfield" />' ; + $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . '] "'; + 'id="field_' . md5($field) . '[' . $i .']" + class="textfield" />' ; } ?> - <?php $str .= '<script type="text/javascript">'; + <?php $str .= '<script type="text/javascript">'; // <![CDATA[ - $str .= <<<EOT + $str .= <<<EOT <a target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes'); return false" href="browse_foreigners.php? EOT; $str .= '' . PMA_generate_common_url($db, $table) . '&field=' . urlencode($field) . '&fieldkey=' . $i . '">' . str_replace("'", "\'", $titles['Browse']) . '</a>'; // ]] $str .= '</script>'; + } elseif (in_array($tbl_fields_type[$i], PMA_getGISDatatypes())) { // g e o m e t r y $str .= '<input type="text" name="fields[' . $i . ']"' @@ -228,72 +210,68 @@ EOT; $str .= PMA_linkOrButton($edit_url, $edit_str, array(), false, false, '_blank'); $str .= '</span>'; } + } elseif (strncasecmp($tbl_fields_type[$i], 'enum', 4) == 0) { // e n u m s $enum_value=explode(', ', str_replace("'", '', substr($tbl_fields_type[$i], 5, -1))); $cnt_enum_value = count($enum_value); $str .= '<select name="fields[' . ($i) . '][]" id="fieldID_' . $i .'"' - .' multiple="multiple" size="' . min(3, $cnt_enum_value) . '">' . "\n"; - for ($j = 0; $j < $cnt_enum_value; $j++) { - if(isset($fields[$i]) && is_array($fields[$i]) && in_array($enum_value[$j],$fields[$i])){ - $str .= ' <option value="' . $enum_value[$j] . '" Selected>' - . $enum_value[$j] . '</option>'; - } - else{ - $str .= ' <option value="' . $enum_value[$j] . '">' - . $enum_value[$j] . '</option>'; - } - } // end for - $str .= ' </select>' . "\n"; - } - else { + .' multiple="multiple" size="' . min(3, $cnt_enum_value) . '">' . "\n"; + + for ($j = 0; $j < $cnt_enum_value; $j++) { + if (isset($fields[$i]) + && is_array($fields[$i]) + && in_array($enum_value[$j], $fields[$i]) + ) { + $str .= '<option value="' . $enum_value[$j] . '" Selected>' + . $enum_value[$j] . '</option>'; + } else { + $str .= '<option value="' . $enum_value[$j] . '">' + . $enum_value[$j] . '</option>'; + } + } // end for + $str .= '</select>' . "\n"; + + } else { // o t h e r c a s e s $the_class = 'textfield'; $type = $tbl_fields_type[$i]; + if ($type == 'date') { $the_class .= ' datefield'; } elseif ($type == 'datetime' || substr($type, 0, 9) == 'timestamp') { $the_class .= ' datetimefield'; } - if(isset($fields[$i]) && is_string($fields[$i])){ - $str .= ' <input type="text" name="fields[' . $i . ']" ' - .' size="40" class="' . $the_class . '" id="fieldID_' . $i .'" value = "' . $fields[$i] . '"/>' . "\n"; - } - else{ - $str .= ' <input type="text" name="fields[' . $i . ']"' - .' size="40" class="' . $the_class . '" id="fieldID_' . $i .'" />' . "\n"; - } - }; - return $str; + if (isset($fields[$i]) && is_string($fields[$i])) { + $str .= '<input type="text" name="fields[' . $i . ']"' + .' size="40" class="' . $the_class . '" id="fieldID_' + . $i .'" value = "' . $fields[$i] . '"/>' . "\n"; + } else { + $str .= '<input type="text" name="fields[' . $i . ']"' + .' size="40" class="' . $the_class . '" id="fieldID_' + . $i .'" />' . "\n"; + } + } + return $str; } - -/* PMA_tbl_search_getWhereClause() Return the where clause for query generation based on the inputs provided. - * - * @uses PMA_backquote - * @uses PMA_sqlAddslashes - * @uses preg_match - * @uses isset() - * @uses in_array() - * @uses str_replace() - * @uses strpos() - * @uses explode() - * @uses trim() - * - * @param $fields Search criteria input - * @param $names Name of the field(column) on which search criteria is submitted - * @param $types Type of the field - * @param $collations Field collation - * @param $func_type Search fucntion/operator - * @param $unaryFlag Whether operator unary or not +/** + * Return the where clause for query generation based on the inputs provided. * - * @return string $str HTML content for viewing foreing data and elements for search criteria input. + * @param mixed $fields Search criteria input + * @param string $names Name of the column on which search is submitted + * @param string $types Type of the field + * @param string $collations Field collation + * @param string $func_type Search fucntion/operator + * @param bool $unaryFlag Whether operator unary or not + * @param bool $geom_func Whether geometry functions should be applied * + * @return string HTML content for viewing foreing data and elements + * for search criteria input. */ - -function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $func_type, $unaryFlag, $geom_func = null){ - +function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $func_type, $unaryFlag, $geom_func = null) +{ /** * @todo move this to a more apropriate place */ @@ -305,7 +283,6 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu ); $w = ''; - // If geometry function is set apply it to the field name if ($geom_func != null && trim($geom_func) != '') { // Get details about the geometry fucntions @@ -314,8 +291,8 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu // If the function takes a single parameter if ($geom_funcs[$geom_func]['params'] == 1) { $backquoted_name = $geom_func . '(' . PMA_backquote($names) . ')'; - // If the function takes two parameters } else { + // If the function takes two parameters // create gis data from the string $gis_data = PMA_createGISData($fields); @@ -326,7 +303,7 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu // New output type is the output type of the function being applied $types = $geom_funcs[$geom_func]['type']; - // If the intended where clause is something like 'IsEmpty(`spatial_col_name`)' + // If the where clause is something like 'IsEmpty(`spatial_col_name`)' if (isset($geom_unary_functions[$geom_func]) && trim($fields) == '') { $w = $backquoted_name; return $w; @@ -335,11 +312,11 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu $backquoted_name = PMA_backquote($names); } - if($unaryFlag){ + if ($unaryFlag) { $fields = ''; - $w = $backquoted_name . ' ' . $func_type; + $w = $backquoted_name . ' ' . $func_type; - } elseif (in_array($types, PMA_getGISDatatypes())) { + } elseif (in_array($types, PMA_getGISDatatypes()) && ! empty($fields)) { // create gis data from the string $gis_data = PMA_createGISData($fields); $w = $backquoted_name . ' ' . $func_type . ' ' . $gis_data; @@ -360,23 +337,25 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu $parens_open = '('; $parens_close = ')'; - } else { - $parens_open = ''; - $parens_close = ''; - } - $enum_where = '\'' . PMA_sqlAddslashes($fields[0]) . '\''; - for ($e = 1; $e < $enum_selected_count; $e++) { - $enum_where .= ', \'' . PMA_sqlAddslashes($fields[$e]) . '\''; - } + } else { + $parens_open = ''; + $parens_close = ''; + } + $enum_where = '\'' . PMA_sqlAddslashes($fields[0]) . '\''; + for ($e = 1; $e < $enum_selected_count; $e++) { + $enum_where .= ', \'' . PMA_sqlAddslashes($fields[$e]) . '\''; + } - $w = $backquoted_name . ' ' . $func_type . ' ' . $parens_open . $enum_where . $parens_close; + $w = $backquoted_name . ' ' . $func_type . ' ' . $parens_open . $enum_where . $parens_close; } } elseif ($fields != '') { // For these types we quote the value. Even if it's another type (like INT), // for a LIKE we always quote the value. MySQL converts strings to numbers // and numbers to strings as necessary during the comparison - if (preg_match('@char|binary|blob|text|set|date|time|year@i', $types) || strpos(' ' . $func_type, 'LIKE')) { + if (preg_match('@char|binary|blob|text|set|date|time|year@i', $types) + || strpos(' ' . $func_type, 'LIKE') + ) { $quot = '\''; } else { $quot = ''; @@ -392,23 +371,28 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu $fields = '^' . $fields . '$'; } - if ($func_type == 'IN (...)' || $func_type == 'NOT IN (...)' || $func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') { + if ($func_type == 'IN (...)' + || $func_type == 'NOT IN (...)' + || $func_type == 'BETWEEN' + || $func_type == 'NOT BETWEEN' + ) { $func_type = str_replace(' (...)', '', $func_type); - // quote values one by one - $values = explode(',', $fields); - foreach ($values as &$value) - $value = $quot . PMA_sqlAddslashes(trim($value)) . $quot; + // quote values one by one + $values = explode(',', $fields); + foreach ($values as &$value) { + $value = $quot . PMA_sqlAddslashes(trim($value)) . $quot; + } - if ($func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') - $w = $backquoted_name . ' ' . $func_type . ' ' . (isset($values[0]) ? $values[0] : '') . ' AND ' . (isset($values[1]) ? $values[1] : ''); - else + if ($func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') { + $w = $backquoted_name . ' ' . $func_type . ' ' . (isset($values[0]) ? $values[0] : '') + . ' AND ' . (isset($values[1]) ? $values[1] : ''); + } else { $w = $backquoted_name . ' ' . $func_type . ' (' . implode(',', $values) . ')'; - } - else { + } + } else { $w = $backquoted_name . ' ' . $func_type . ' ' . $quot . PMA_sqlAddslashes($fields) . $quot;; } - } // end if return $w; @@ -417,14 +401,14 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu /** * Formats a SVG plot for the query results. * - * @param array $data Data for the status chart - * @param array &$settings Settings used to generate the chart + * @param array $data Data for the status chart + * @param array &$settings Settings used to generate the chart * * @return string HTML and JS code for the SVG plot */ function PMA_SVG_scatter_plot($data, &$settings) { - require_once './libraries/svg_plot/pma_scatter_plot.php'; + include_once './libraries/svg_plot/pma_scatter_plot.php'; if (empty($data)) { // empty data @@ -441,15 +425,5 @@ function PMA_SVG_scatter_plot($data, &$settings) } return $scatter_plot->asSVG(); } - } - - - - - - - - - ?> hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git