August 2011 - Git - lists.phpmyadmin.net

[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

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

19 Aug '11

The branch, master has been updated via cb9f7a2c26737fd0a2bc004bd289c3309dc7a78b (commit) via a3f14bbd801540b7971601ccf4d3f221d53dbc79 (commit) from 5624ed3dc0dd446fe6646db43c57a473026ca1d2 (commit) - Log ----------------------------------------------------------------- commit cb9f7a2c26737fd0a2bc004bd289c3309dc7a78b Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 11:15:31 2011 +0200 Clarify code commit a3f14bbd801540b7971601ccf4d3f221d53dbc79 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 11:15:24 2011 +0200 Fix indentation ----------------------------------------------------------------------- Summary of changes: libraries/Table.class.php | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index d018cd7..cdc3224 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -362,24 +362,26 @@ class PMA_Table } switch ($default_type) { - case 'USER_DEFINED' : - if ($is_timestamp && $default_value === '0') { - // a TIMESTAMP does not accept DEFAULT '0' - // but DEFAULT 0 works - $query .= ' DEFAULT 0'; - } elseif ($type == 'BIT') { - $query .= ' DEFAULT b\'' . preg_replace('/[^01]/', '0', $default_value) . '\''; - } else { - $query .= ' DEFAULT \'' . PMA_sqlAddSlashes($default_value) . '\''; - } - break; - case 'NULL' : - case 'CURRENT_TIMESTAMP' : - $query .= ' DEFAULT ' . $default_type; - break; - case 'NONE' : - default : - break; + case 'USER_DEFINED' : + if ($is_timestamp && $default_value === '0') { + // a TIMESTAMP does not accept DEFAULT '0' + // but DEFAULT 0 works + $query .= ' DEFAULT 0'; + } elseif ($type == 'BIT') { + $query .= ' DEFAULT b\'' + . preg_replace('/[^01]/', '0', $default_value) + . '\''; + } else { + $query .= ' DEFAULT \'' . PMA_sqlAddSlashes($default_value) . '\''; + } + break; + case 'NULL' : + case 'CURRENT_TIMESTAMP' : + $query .= ' DEFAULT ' . $default_type; + break; + case 'NONE' : + default : + break; } if (!empty($extra)) { @@ -389,8 +391,10 @@ class PMA_Table if ($extra == 'AUTO_INCREMENT') { $primary_cnt = count($field_primary); if (1 == $primary_cnt) { - for ($j = 0; $j < $primary_cnt && $field_primary[$j] != $index; $j++) { - //void + for ($j = 0; $j < $primary_cnt; $j++) { + if ($field_primary[$j] == $index) { + break; + } } if (isset($field_primary[$j]) && $field_primary[$j] == $index) { $query .= ' PRIMARY KEY'; hooks/post-receive -- phpMyAdmin

1 0

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

19 Aug '11

The branch, master has been updated via 5624ed3dc0dd446fe6646db43c57a473026ca1d2 (commit) from b0afa4d8bc904393d7c9902c95c24dd46ae88d6b (commit) - Log ----------------------------------------------------------------- commit 5624ed3dc0dd446fe6646db43c57a473026ca1d2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 19 11:04:50 2011 +0200 Fix class name ----------------------------------------------------------------------- Summary of changes: test/libraries/js_escape_test.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/libraries/js_escape_test.php b/test/libraries/js_escape_test.php index 41d96d3..ff185ef 100644 --- a/test/libraries/js_escape_test.php +++ b/test/libraries/js_escape_test.php @@ -11,7 +11,7 @@ */ require_once 'libraries/js_escape.lib.php'; -class PMA_File_test extends PHPUnit_Framework_TestCase +class PMA_JS_Escape_test extends PHPUnit_Framework_TestCase { /** * @dataProvider variables hooks/post-receive -- phpMyAdmin

1 0

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

19 Aug '11

The branch, master has been updated via b0afa4d8bc904393d7c9902c95c24dd46ae88d6b (commit) from 381b593e5997899184e1fc7f3522f4d83bd5f025 (commit) - Log ----------------------------------------------------------------- commit b0afa4d8bc904393d7c9902c95c24dd46ae88d6b Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 10:54:59 2011 +0200 Wrap long lines ----------------------------------------------------------------------- Summary of changes: server_status.php | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 deletions(-) diff --git a/server_status.php b/server_status.php index 30c3c5a..1dd4852 100644 --- a/server_status.php +++ b/server_status.php @@ -673,14 +673,38 @@ $server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost' || $cfg['Server']['host'] == '127.0.0.1' || $cfg['Server']['host'] == '::1'; -PMA_AddJSVar('pma_token', $_SESSION[' PMA_token ']); -PMA_AddJSVar('url_query', str_replace('&', '&', PMA_generate_common_url($db))); -PMA_AddJSVar('server_time_diff', 'new Date().getTime() - ' . (microtime(true) * 1000)); -PMA_AddJSVar('server_os', PHP_OS); -PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false); -PMA_AddJSVar('server_db_isLocal', $server_db_isLocal ? true : false); -PMA_AddJSVar('profiling_docu', PMA_showMySQLDocu('general-thread-states', 'general-thread-states')); -PMA_AddJSVar('explain_docu', PMA_showMySQLDocu('explain-output', 'explain-output')); +PMA_AddJSVar( + 'pma_token', + $_SESSION[' PMA_token '] +); +PMA_AddJSVar( + 'url_query', + str_replace('&', '&', PMA_generate_common_url($db)) +); +PMA_AddJSVar( + 'server_time_diff', + 'new Date().getTime() - ' . (microtime(true) * 1000) +); +PMA_AddJSVar( + 'server_os', + PHP_OS +); +PMA_AddJSVar( + 'is_superuser', + PMA_isSuperuser() +); +PMA_AddJSVar( + 'server_db_isLocal', + $server_db_isLocal +); +PMA_AddJSVar( + 'profiling_docu', + PMA_showMySQLDocu('general-thread-states', 'general-thread-states') +); +PMA_AddJSVar( + 'explain_docu', + PMA_showMySQLDocu('explain-output', 'explain-output') +); /** * start output hooks/post-receive -- phpMyAdmin

1 0

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

19 Aug '11

The branch, master has been updated via 381b593e5997899184e1fc7f3522f4d83bd5f025 (commit) via 3ab9bdf5e371dd4b5f11545da64619da22701229 (commit) via c289045dcde84ccad43b6ce6641edf36b3fc6c3a (commit) from e479f1c8431eb3a1b138d7812a1ab0f6d1020188 (commit) - Log ----------------------------------------------------------------- commit 381b593e5997899184e1fc7f3522f4d83bd5f025 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 19 10:52:32 2011 +0200 Fix typecasting commit 3ab9bdf5e371dd4b5f11545da64619da22701229 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 19 10:52:09 2011 +0200 Remove stray code commit c289045dcde84ccad43b6ce6641edf36b3fc6c3a Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 19 10:49:58 2011 +0200 Fix typo ----------------------------------------------------------------------- Summary of changes: libraries/js_escape.lib.php | 5 +++-- test/libraries/js_escape_test.php | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 85b62e1..87d8855 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -70,8 +70,9 @@ function PMA_formatJsVal($value) return 'true'; } else { return 'false'; - } else if (is_int($value)) { - return int($value); + } + } elseif (is_int($value)) { + return (int)$value; } else { return '"' . PMA_escapeJsString($value) . '"'; } diff --git a/test/libraries/js_escape_test.php b/test/libraries/js_escape_test.php index d29fcff..41d96d3 100644 --- a/test/libraries/js_escape_test.php +++ b/test/libraries/js_escape_test.php @@ -18,7 +18,6 @@ class PMA_File_test extends PHPUnit_Framework_TestCase */ public function testFormat($key, $value, $expected) { - $arr = new PMA_File($file); $this->assertEquals($expected, PMA_getJsValue($key, $value)); } hooks/post-receive -- phpMyAdmin

1 0

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

19 Aug '11

The branch, master has been updated via e479f1c8431eb3a1b138d7812a1ab0f6d1020188 (commit) via fb1c4bd9ee35e3b873bf0cb28a11ca860a09384e (commit) via 38e8365e5d502120534b8fa60a22d210eb8b1760 (commit) via 1b45290d5551a5619dcd1e29cd8956e30aeb690f (commit) via 4b5ae952dd6486735ed066b69e22962af72f80c2 (commit) via 17f4b82821695fba5317cb98dc86a692ccc11015 (commit) via d2df35108eb6fb98199cde72b4b9fbf00f9e1fa9 (commit) from 61335cdc2ed5839ac2914c83c9508cd9e4a6e5ee (commit) - Log ----------------------------------------------------------------- commit e479f1c8431eb3a1b138d7812a1ab0f6d1020188 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 10:47:45 2011 +0200 Add test for js escaping commit fb1c4bd9ee35e3b873bf0cb28a11ca860a09384e Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 10:43:08 2011 +0200 Handle more types in js variable formatting commit 38e8365e5d502120534b8fa60a22d210eb8b1760 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 10:39:45 2011 +0200 Use PMA_AddJSVar commit 1b45290d5551a5619dcd1e29cd8956e30aeb690f Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 10:38:51 2011 +0200 Use PMA_AddJSVar commit 4b5ae952dd6486735ed066b69e22962af72f80c2 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 10:36:22 2011 +0200 Function for setting variable commit 17f4b82821695fba5317cb98dc86a692ccc11015 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 10:35:00 2011 +0200 Factor out code escaping from echo commit d2df35108eb6fb98199cde72b4b9fbf00f9e1fa9 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 10:33:13 2011 +0200 Wrap some long lines ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 18 +++++++++++- libraries/js_escape.lib.php | 52 ++++++++++++++++++++++++++++++++----- server_status.php | 28 ++++++++++++-------- server_variables.php | 8 +++--- test/libraries/js_escape_test.php | 37 ++++++++++++++++++++++++++ 5 files changed, 119 insertions(+), 24 deletions(-) create mode 100644 test/libraries/js_escape_test.php diff --git a/libraries/core.lib.php b/libraries/core.lib.php index dcc5208..a277f29 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -708,13 +708,27 @@ function PMA_includeJS($url) } /** - * Adds JS code snippets to be displayed by header.inc.php. Adds a newline to each snippet. + * Adds JS code snippets to be displayed by header.inc.php. Adds a + * newline to each snippet. * * @param string $str Js code to be added (e.g. "token=1234;") * */ -function PMA_AddJSCode($str) { +function PMA_AddJSCode($str) +{ $GLOBALS['js_script'][] = $str; } +/** + * Adds JS code snippet for variable assignment to be displayed by header.inc.php. + * + * @param string $key Name of value to set + * @param mixed $value Value to set, can be either string or array of strings + * + */ +function PMA_AddJSVar($key, $value) +{ + PMA_AddJsCode(PMA_getJsValue($key, $value)); +} + ?> diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 656794f..85b62e1 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -57,24 +57,62 @@ function PMA_escapeJsString($string) } /** - * Prints an javascript assignment with proper escaping of a value + * Formats a value for javascript code. + * + * @param string $value String to be formatted. + * + * @retrun string formatted value. + */ +function PMA_formatJsVal($value) +{ + if (is_bool($value)) { + if ($value) { + return 'true'; + } else { + return 'false'; + } else if (is_int($value)) { + return int($value); + } else { + return '"' . PMA_escapeJsString($value) . '"'; + } +} + +/** + * Formats an javascript assignment with proper escaping of a value * and support for assigning array of strings. * * @param string $key Name of value to set * @param mixed $value Value to set, can be either string or array of strings + * + * @return string Javascript code. */ -function PMA_printJsValue($key, $value) +function PMA_getJsValue($key, $value) { - echo $key . ' = '; + $result = $key . ' = '; if (is_array($value)) { - echo '['; + $result .= '['; foreach ($value as $id => $val) { - echo "'" . PMA_escapeJsString($val) . "',"; + $result .= PMA_formatJsVal($value) . ","; } - echo "];\n"; + $result .= "];\n"; } else { - echo "'" . PMA_escapeJsString($value) . "';\n"; + $result .= PMA_formatJsVal($value) . ";\n"; } + return $result; +} + +/** + * Prints an javascript assignment with proper escaping of a value + * and support for assigning array of strings. + * + * @param string $key Name of value to set + * @param mixed $value Value to set, can be either string or array of strings + * + * @return nothing + */ +function PMA_printJsValue($key, $value) +{ + echo PMA_getJsValue($key, $value); } ?> diff --git a/server_status.php b/server_status.php index 7c2f30a..30c3c5a 100644 --- a/server_status.php +++ b/server_status.php @@ -620,7 +620,8 @@ $links['innodb']['doc'] = 'innodb'; // Variable to contain all com_ variables $used_queries = array(); -// Variable to map variable names to their respective section name (used for js category filtering) +// Variable to map variable names to their respective section name +// (used for js category filtering) $allocationMap = array(); // sort vars into arrays @@ -637,10 +638,15 @@ foreach ($server_status as $name => $value) { } if(PMA_DRIZZLE) { - $used_queries = PMA_DBI_fetch_result('SELECT * FROM data_dictionary.global_statements', 0, 1); + $used_queries = PMA_DBI_fetch_result( + 'SELECT * FROM data_dictionary.global_statements', + 0, + 1 + ); unset($used_queries['admin_commands']); } else { - // admin commands are not queries (e.g. they include COM_PING, which is excluded from $server_status['Questions']) + // admin commands are not queries (e.g. they include COM_PING, + // which is excluded from $server_status['Questions']) unset($used_queries['Com_admin_commands']); } @@ -667,14 +673,14 @@ $server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost' || $cfg['Server']['host'] == '127.0.0.1' || $cfg['Server']['host'] == '::1'; -PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" . - 'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n" . - 'server_time_diff = new Date().getTime() - ' . (microtime(true) * 1000) . ";\n" . - 'server_os = \'' . PHP_OS . "';\n" . - 'is_superuser = ' . (PMA_isSuperuser() ? 'true' : 'false') . ";\n" . - 'server_db_isLocal = ' . ($server_db_isLocal ? 'true' : 'false') . ";\n" . - 'profiling_docu = \'' . PMA_showMySQLDocu('general-thread-states', 'general-thread-states') . "';\n" . - 'explain_docu = \'' . PMA_showMySQLDocu('explain-output', 'explain-output') . ";'\n"); +PMA_AddJSVar('pma_token', $_SESSION[' PMA_token ']); +PMA_AddJSVar('url_query', str_replace('&', '&', PMA_generate_common_url($db))); +PMA_AddJSVar('server_time_diff', 'new Date().getTime() - ' . (microtime(true) * 1000)); +PMA_AddJSVar('server_os', PHP_OS); +PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false); +PMA_AddJSVar('server_db_isLocal', $server_db_isLocal ? true : false); +PMA_AddJSVar('profiling_docu', PMA_showMySQLDocu('general-thread-states', 'general-thread-states')); +PMA_AddJSVar('explain_docu', PMA_showMySQLDocu('explain-output', 'explain-output')); /** * start output diff --git a/server_variables.php b/server_variables.php index 4c2086a..af47f1f 100644 --- a/server_variables.php +++ b/server_variables.php @@ -16,9 +16,9 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'server_variables.js'; -PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" . - 'is_superuser = ' . (PMA_isSuperuser() ? 'true' : 'false') . ";\n" . - 'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n"); +PMA_AddJSVar('pma_token', $_SESSION[' PMA_token ']); +PMA_AddJSVar('url_query', str_replace('&', '&', PMA_generate_common_url($db))); +PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false); /** @@ -179,4 +179,4 @@ function formatVariable($name,$value) */ require './libraries/footer.inc.php'; -?> \ No newline at end of file +?> diff --git a/test/libraries/js_escape_test.php b/test/libraries/js_escape_test.php new file mode 100644 index 0000000..d29fcff --- /dev/null +++ b/test/libraries/js_escape_test.php @@ -0,0 +1,37 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * tests for JS variable formatting + * + * @package phpMyAdmin-test + */ + +/* + * Include to test. + */ +require_once 'libraries/js_escape.lib.php'; + +class PMA_File_test extends PHPUnit_Framework_TestCase +{ + /** + * @dataProvider variables + */ + public function testFormat($key, $value, $expected) + { + $arr = new PMA_File($file); + $this->assertEquals($expected, PMA_getJsValue($key, $value)); + } + + public function variables() { + return array( + array('foo', true, "foo = true;\n"), + array('foo', false, "foo = false;\n"), + array('foo', 100, "foo = 100;\n"), + array('foo', 0, "foo = 0;\n"), + array('foo', 'text', "foo = \"text\";\n"), + array('foo', 'quote"', "foo = \"quote\\\"\";\n"), + array('foo', 'apostroph\'', "foo = \"apostroph\\'\";\n"), + ); + } +} +?> hooks/post-receive -- phpMyAdmin

1 0

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

19 Aug '11

The branch, master has been updated via 61335cdc2ed5839ac2914c83c9508cd9e4a6e5ee (commit) from 6f33d1366af39331653d29df5a739ee036ce2997 (commit) - Log ----------------------------------------------------------------- commit 61335cdc2ed5839ac2914c83c9508cd9e4a6e5ee Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 10:30:56 2011 +0200 Improve coding style ----------------------------------------------------------------------- Summary of changes: server_status.php | 92 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 60 insertions(+), 32 deletions(-) diff --git a/server_status.php b/server_status.php index 6bd9fd6..7c2f30a 100644 --- a/server_status.php +++ b/server_status.php @@ -15,8 +15,9 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) { define('PMA_NO_VARIABLES_IMPORT', true); } -if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) +if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $GLOBALS['is_header_sent'] = true; +} require_once './libraries/common.inc.php'; @@ -104,13 +105,15 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { * Also do some white list filtering on the names */ case 'servervar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) + if (!preg_match('/[^a-zA-Z_]+/', $pName)) { $serverVars[] = $pName; + } break; case 'statusvar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) + if (!preg_match('/[^a-zA-Z_]+/', $pName)) { $statusVars[] = $pName; + } break; case 'proc': @@ -123,8 +126,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { require_once('libraries/sysinfo.lib.php'); $sysinfo = getSysInfo(); } - if (!$cpuload) + if (!$cpuload) { $cpuload = $sysinfo->loadavg(); + } if (PHP_OS == 'Linux') { $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle']; @@ -139,8 +143,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { require_once('libraries/sysinfo.lib.php'); $sysinfo = getSysInfo(); } - if (!$memory) + if (!$memory) { $memory = $sysinfo->memory(); + } $ret[$chart_id][$node_id][$point_id]['value'] = $memory[$pName]; break; @@ -190,7 +195,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if (isset($_REQUEST['log_data'])) { - if(PMA_MYSQL_INT_VERSION < 50106) exit('""'); + if (PMA_MYSQL_INT_VERSION < 50106) { + /* FIXME: why this? */ + exit('""'); + } $start = intval($_REQUEST['time_start']); $end = intval($_REQUEST['time_end']); @@ -224,7 +232,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { break; } - if(!isset($return['sum'][$type])) $return['sum'][$type] = 0; + if (!isset($return['sum'][$type])) { + $return['sum'][$type] = 0; + } $return['sum'][$type] += $row['#']; $return['rows'][] = $row; } @@ -237,7 +247,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($return)); } - if($_REQUEST['type'] == 'general') { + if ($_REQUEST['type'] == 'general') { $limitTypes = (isset($_REQUEST['limitTypes']) && $_REQUEST['limitTypes']) ? 'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' ' : ''; @@ -259,20 +269,23 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { preg_match('/^(\w+)\s/', $row['argument'], $match); $type = strtolower($match[1]); - if(!isset($return['sum'][$type])) $return['sum'][$type] = 0; + if (!isset($return['sum'][$type])) { + $return['sum'][$type] = 0; + } $return['sum'][$type] += $row['#']; switch($type) { case 'insert': // Group inserts if selected - if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { + if ($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { $insertTables[$matches[2]]++; if ($insertTables[$matches[2]] > 1) { $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; // Add a ... to the end of this query to indicate that there's been other queries - if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') + if ($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') { $return['rows'][$insertTablesFirst]['argument'] .= '<br/>...'; + } // Group this value, thus do not add to the result list continue 2; @@ -285,7 +298,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { case 'update': // Cut off big inserts and updates, but append byte count therefor - if(strlen($row['argument']) > 220) { + if (strlen($row['argument']) > 220) { $row['argument'] = substr($row['argument'], 0, 200) . '... [' . implode(' ', PMA_formatByteDown(strlen($row['argument'])), 2, 2) @@ -310,12 +323,15 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if (isset($_REQUEST['logging_vars'])) { - if(isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { + if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { $value = PMA_sqlAddslashes($_REQUEST['varValue']); - if(!is_numeric($value)) $value="'" . $value . "'"; + if (!is_numeric($value)) { + $value="'" . $value . "'"; + } - if(! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName'])) + if (! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName'])) { PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value); + } } @@ -323,14 +339,16 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($loggingVars)); } - if(isset($_REQUEST['query_analyzer'])) { + if (isset($_REQUEST['query_analyzer'])) { $return = array(); - if(strlen($_REQUEST['database'])) + if (strlen($_REQUEST['database'])) { PMA_DBI_select_db($_REQUEST['database']); + } - if ($profiling = PMA_profilingSupported()) + if ($profiling = PMA_profilingSupported()) { PMA_DBI_query('SET PROFILING=1;'); + } // Do not cache query $query = preg_replace('/^(\s*SELECT)/i', '\\1 SQL_NO_CACHE', $_REQUEST['query']); @@ -348,7 +366,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { PMA_DBI_free_result($result); - if($profiling) { + if ($profiling) { $return['profiling'] = array(); $result = PMA_DBI_try_query('SELECT seq,state,duration FROM INFORMATION_SCHEMA.PROFILING WHERE QUERY_ID=1 ORDER BY seq'); while ($row = PMA_DBI_fetch_assoc($result)) { @@ -360,7 +378,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($return)); } - if(isset($_REQUEST['advisor'])) { + if (isset($_REQUEST['advisor'])) { include('libraries/Advisor.class.php'); $advisor = new Advisor(); exit(json_encode($advisor->run())); @@ -610,7 +628,9 @@ foreach ($server_status as $name => $value) { foreach ($allocations as $filter => $section) { if (strpos($name, $filter) !== false) { $allocationMap[$name] = $section; - if ($section == 'com' && $value > 0) $used_queries[$name] = $value; + if ($section == 'com' && $value > 0) { + $used_queries[$name] = $value; + } break; // Only exits inner loop } } @@ -776,7 +796,9 @@ echo __('Runtime Information'); echo '<span class="status_' . $section_name . '"> '; $i=0; foreach ($section_links as $link_name => $link_url) { - if ($i > 0) echo ', '; + if ($i > 0) { + echo ', '; + } if ('doc' == $link_name) { echo PMA_showMySQLDocu($link_url, $link_url); } else { @@ -898,9 +920,11 @@ function printQueryStatistics() $name = str_replace(array('Com_', '_'), array('', ' '), $name); // Group together values that make out less than 2% into "Other", but only if we have more than 6 fractions already - if ($value < $query_sum * 0.02 && count($chart_json)>6) + if ($value < $query_sum * 0.02 && count($chart_json)>6) { $other_sum += $value; - else $chart_json[$name] = $value; + } else { + $chart_json[$name] = $value; + } ?> <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>"> <th class="name"><?php echo htmlspecialchars($name); ?></th> @@ -919,8 +943,9 @@ function printQueryStatistics() <div id="serverstatusquerieschart"> <span style="display:none;"> <?php - if ($other_sum > 0) + if ($other_sum > 0) { $chart_json[__('Other')] = $other_sum; + } echo json_encode($chart_json); ?> @@ -975,8 +1000,7 @@ function printServerTraffic() } /* if the server works as master or slave in replication process, display useful information */ - if ($server_master_status || $server_slave_status) - { + if ($server_master_status || $server_slave_status) { ?> <hr class="clearfloat" /> @@ -1125,7 +1149,8 @@ function printServerTraffic() <th><?php echo __('Status'); ?></th> <th><?php echo __('SQL query'); - if (! PMA_DRIZZLE) { ?> + if (! PMA_DRIZZLE) { + ?> <a href="<?php echo $full_text_link; ?>" title="<?php echo empty($full) ? __('Show Full Queries') : __('Truncate Shown Queries'); ?>"> <img src="<?php echo $GLOBALS['pmaThemeImage'] . 's_' . (empty($_REQUEST['full']) ? 'full' : 'partial'); ?>text.png" @@ -1492,7 +1517,7 @@ function printMonitor() <div id="monitorInstructionsDialog" title="<?php echo __('Monitor Instructions'); ?>" style="display:none;"> <?php echo __('The phpMyAdmin Monitor can assist you in optimizing the server configuration and track down time intensive queries. For the latter you will need to set log_output to \'TABLE\' and have either the slow_query_log or general_log enabled. Note however, that the general_log produces a lot of data and increases server load by up to 15%'); ?> - <?php if(PMA_MYSQL_INT_VERSION < 50106) { ?> + <?php if (PMA_MYSQL_INT_VERSION < 50106) { ?> <p> <img class="icon ic_s_attention" src="themes/dot.gif" alt="" /> <?php @@ -1634,7 +1659,9 @@ function printMonitor() $i=0; foreach ($server_status as $name=>$value) { if (is_numeric($value)) { - if ($i++ > 0) echo ", "; + if ($i++ > 0) { + echo ", "; + } echo "'" . $name . "'"; } } @@ -1652,10 +1679,11 @@ function refreshList($name, $defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20, foreach ($refreshRates as $rate) { $selected = ($rate == $defaultRate)?' selected="selected"':''; - if ($rate<60) + if ($rate<60) { echo '<option value="' . $rate . '"' . $selected . '>' . sprintf(_ngettext('%d second', '%d seconds', $rate), $rate) . '</option>'; - else + } else { echo '<option value="' . $rate . '"' . $selected . '>' . sprintf(_ngettext('%d minute', '%d minutes', $rate/60), $rate/60) . '</option>'; + } } ?> </select> hooks/post-receive -- phpMyAdmin

1 0

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

19 Aug '11

The branch, master has been updated via 6f33d1366af39331653d29df5a739ee036ce2997 (commit) via 555aa5cfa2f40382068c9f23c12ecc3c7023c2c0 (commit) from c4c445b0e9ba76f53de048d1b322595c06ebce26 (commit) - Log ----------------------------------------------------------------- commit 6f33d1366af39331653d29df5a739ee036ce2997 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:32:26 2011 +0200 Fix coding style commit 555aa5cfa2f40382068c9f23c12ecc3c7023c2c0 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:31:43 2011 +0200 Fix indentation ----------------------------------------------------------------------- Summary of changes: server_status.php | 396 +++++++++++++++++++++++++++-------------------------- 1 files changed, 200 insertions(+), 196 deletions(-) diff --git a/server_status.php b/server_status.php index 8d196ad..6bd9fd6 100644 --- a/server_status.php +++ b/server_status.php @@ -31,161 +31,161 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { // real-time charting data if (isset($_REQUEST['chart_data'])) { switch($_REQUEST['type']) { - // Process and Connections realtime chart - case 'proc': - $c = PMA_DBI_fetch_result("SHOW GLOBAL STATUS WHERE Variable_name = 'Connections'", 0, 1); - $result = PMA_DBI_query('SHOW PROCESSLIST'); - $num_procs = PMA_DBI_num_rows($result); - - $ret = array( - 'x' => microtime(true)*1000, - 'y_proc' => $num_procs, - 'y_conn' => $c['Connections'] - ); - - exit(json_encode($ret)); - - // Query realtime chart - case 'queries': - $queries = PMA_DBI_fetch_result( - "SHOW GLOBAL STATUS - WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions') - AND Value > 0'", 0, 1); - cleanDeprecated($queries); - // admin commands are not queries - unset($queries['Com_admin_commands']); - $questions = $queries['Questions']; - unset($queries['Questions']); - - //$sum=array_sum($queries); - $ret = array( - 'x' => microtime(true)*1000, - 'y' => $questions, - 'pointInfo' => $queries - ); - - exit(json_encode($ret)); - - // Traffic realtime chart - case 'traffic': - $traffic = PMA_DBI_fetch_result( - "SHOW GLOBAL STATUS - WHERE Variable_name = 'Bytes_received' - OR Variable_name = 'Bytes_sent'", 0, 1); - - $ret = array( - 'x' => microtime(true)*1000, - 'y_sent' => $traffic['Bytes_sent'], - 'y_received' => $traffic['Bytes_received'] - ); - - exit(json_encode($ret)); - - // Data for the monitor - case 'chartgrid': - $ret = json_decode($_REQUEST['requiredData'], true); - $statusVars = array(); - $serverVars = array(); - $sysinfo = $cpuload = $memory = 0; - $pName = ''; - - /* Accumulate all required variables and data */ - // For each chart - foreach ($ret as $chart_id => $chartNodes) { - // For each data series - foreach ($chartNodes as $node_id => $nodeDataPoints) { - // For each data point in the series (usually just 1) - foreach ($nodeDataPoints as $point_id => $dataPoint) { - $pName = $dataPoint['name']; - - switch ($dataPoint['type']) { - /* We only collect the status and server variables here to - * read them all in one query, and only afterwards assign them. - * Also do some white list filtering on the names - */ - case 'servervar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) - $serverVars[] = $pName; - break; - - case 'statusvar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) - $statusVars[] = $pName; - break; - - case 'proc': - $result = PMA_DBI_query('SHOW PROCESSLIST'); - $ret[$chart_id][$node_id][$point_id]['value'] = PMA_DBI_num_rows($result); - break; - - case 'cpu': - if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); - $sysinfo = getSysInfo(); - } - if (!$cpuload) - $cpuload = $sysinfo->loadavg(); - - if (PHP_OS == 'Linux') { - $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle']; - $ret[$chart_id][$node_id][$point_id]['busy'] = $cpuload['busy']; - } else - $ret[$chart_id][$node_id][$point_id]['value'] = $cpuload['loadavg']; - - break; - - case 'memory': - if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); - $sysinfo = getSysInfo(); - } - if (!$memory) - $memory = $sysinfo->memory(); - - $ret[$chart_id][$node_id][$point_id]['value'] = $memory[$pName]; - break; + // Process and Connections realtime chart + case 'proc': + $c = PMA_DBI_fetch_result("SHOW GLOBAL STATUS WHERE Variable_name = 'Connections'", 0, 1); + $result = PMA_DBI_query('SHOW PROCESSLIST'); + $num_procs = PMA_DBI_num_rows($result); + + $ret = array( + 'x' => microtime(true) * 1000, + 'y_proc' => $num_procs, + 'y_conn' => $c['Connections'] + ); + + exit(json_encode($ret)); + + // Query realtime chart + case 'queries': + $queries = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions') + AND Value > 0'", 0, 1); + cleanDeprecated($queries); + // admin commands are not queries + unset($queries['Com_admin_commands']); + $questions = $queries['Questions']; + unset($queries['Questions']); + + //$sum=array_sum($queries); + $ret = array( + 'x' => microtime(true) * 1000, + 'y' => $questions, + 'pointInfo' => $queries + ); + + exit(json_encode($ret)); + + // Traffic realtime chart + case 'traffic': + $traffic = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE Variable_name = 'Bytes_received' + OR Variable_name = 'Bytes_sent'", 0, 1); + + $ret = array( + 'x' => microtime(true) * 1000, + 'y_sent' => $traffic['Bytes_sent'], + 'y_received' => $traffic['Bytes_received'] + ); + + exit(json_encode($ret)); + + // Data for the monitor + case 'chartgrid': + $ret = json_decode($_REQUEST['requiredData'], true); + $statusVars = array(); + $serverVars = array(); + $sysinfo = $cpuload = $memory = 0; + $pName = ''; + + /* Accumulate all required variables and data */ + // For each chart + foreach ($ret as $chart_id => $chartNodes) { + // For each data series + foreach ($chartNodes as $node_id => $nodeDataPoints) { + // For each data point in the series (usually just 1) + foreach ($nodeDataPoints as $point_id => $dataPoint) { + $pName = $dataPoint['name']; + + switch ($dataPoint['type']) { + /* We only collect the status and server variables here to + * read them all in one query, and only afterwards assign them. + * Also do some white list filtering on the names + */ + case 'servervar': + if (!preg_match('/[^a-zA-Z_]+/', $pName)) + $serverVars[] = $pName; + break; + + case 'statusvar': + if (!preg_match('/[^a-zA-Z_]+/', $pName)) + $statusVars[] = $pName; + break; + + case 'proc': + $result = PMA_DBI_query('SHOW PROCESSLIST'); + $ret[$chart_id][$node_id][$point_id]['value'] = PMA_DBI_num_rows($result); + break; + + case 'cpu': + if (!$sysinfo) { + require_once('libraries/sysinfo.lib.php'); + $sysinfo = getSysInfo(); } - } - } - } + if (!$cpuload) + $cpuload = $sysinfo->loadavg(); - // Retrieve all required status variables - if (count($statusVars)) { - $statusVarValues = PMA_DBI_fetch_result( - "SHOW GLOBAL STATUS - WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1); - } else { - $statusVarValues = array(); - } + if (PHP_OS == 'Linux') { + $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle']; + $ret[$chart_id][$node_id][$point_id]['busy'] = $cpuload['busy']; + } else + $ret[$chart_id][$node_id][$point_id]['value'] = $cpuload['loadavg']; - // Retrieve all required server variables - if (count($serverVars)) { - $serverVarValues = PMA_DBI_fetch_result( - "SHOW GLOBAL VARIABLES - WHERE Variable_name='" . implode("' OR Variable_name='", $serverVars) . "'", 0, 1); - } else { - $serverVarValues = array(); - } + break; - // ...and now assign them - foreach ($ret as $chart_id => $chartNodes) { - foreach ($chartNodes as $node_id => $nodeDataPoints) { - foreach ($nodeDataPoints as $point_id => $dataPoint) { - switch($dataPoint['type']) { - case 'statusvar': - $ret[$chart_id][$node_id][$point_id]['value'] = $statusVarValues[$dataPoint['name']]; - break; - case 'servervar': - $ret[$chart_id][$node_id][$point_id]['value'] = $serverVarValues[$dataPoint['name']]; - break; + case 'memory': + if (!$sysinfo) { + require_once('libraries/sysinfo.lib.php'); + $sysinfo = getSysInfo(); } + if (!$memory) + $memory = $sysinfo->memory(); + + $ret[$chart_id][$node_id][$point_id]['value'] = $memory[$pName]; + break; + } /* switch */ + } /* foreach */ + } /* foreach */ + } /* foreach */ + + // Retrieve all required status variables + if (count($statusVars)) { + $statusVarValues = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1); + } else { + $statusVarValues = array(); + } + + // Retrieve all required server variables + if (count($serverVars)) { + $serverVarValues = PMA_DBI_fetch_result( + "SHOW GLOBAL VARIABLES + WHERE Variable_name='" . implode("' OR Variable_name='", $serverVars) . "'", 0, 1); + } else { + $serverVarValues = array(); + } + + // ...and now assign them + foreach ($ret as $chart_id => $chartNodes) { + foreach ($chartNodes as $node_id => $nodeDataPoints) { + foreach ($nodeDataPoints as $point_id => $dataPoint) { + switch($dataPoint['type']) { + case 'statusvar': + $ret[$chart_id][$node_id][$point_id]['value'] = $statusVarValues[$dataPoint['name']]; + break; + case 'servervar': + $ret[$chart_id][$node_id][$point_id]['value'] = $serverVarValues[$dataPoint['name']]; + break; } } } + } - $ret['x'] = microtime(true)*1000; + $ret['x'] = microtime(true) * 1000; - exit(json_encode($ret)); + exit(json_encode($ret)); } } @@ -210,16 +210,18 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $type = strtolower(substr($row['sql_text'], 0, strpos($row['sql_text'], ' '))); switch($type) { - case 'insert': - case 'update': - // Cut off big inserts and updates, but append byte count therefor - if(strlen($row['sql_text']) > 220) - $row['sql_text'] = substr($row['sql_text'], 0, 200) . '... [' . - implode(' ', PMA_formatByteDown(strlen($row['sql_text']), 2, 2)) . ']'; - - break; - default: - break; + case 'insert': + case 'update': + // Cut off big inserts and updates, but append byte count therefor + if (strlen($row['sql_text']) > 220) { + $row['sql_text'] = substr($row['sql_text'], 0, 200) + . '... [' + . implode(' ', PMA_formatByteDown(strlen($row['sql_text']), 2, 2)) + . ']'; + } + break; + default: + break; } if(!isset($return['sum'][$type])) $return['sum'][$type] = 0; @@ -261,35 +263,37 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $return['sum'][$type] += $row['#']; switch($type) { - case 'insert': - // Group inserts if selected - if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { - $insertTables[$matches[2]]++; - if ($insertTables[$matches[2]] > 1) { - $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; - - // Add a ... to the end of this query to indicate that there's been other queries - if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') - $return['rows'][$insertTablesFirst]['argument'] .= '<br/>...'; - - // Group this value, thus do not add to the result list - continue 2; - } else { - $insertTablesFirst = $i; - $insertTables[$matches[2]] += $row['#'] - 1; - } + case 'insert': + // Group inserts if selected + if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { + $insertTables[$matches[2]]++; + if ($insertTables[$matches[2]] > 1) { + $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; + + // Add a ... to the end of this query to indicate that there's been other queries + if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') + $return['rows'][$insertTablesFirst]['argument'] .= '<br/>...'; + + // Group this value, thus do not add to the result list + continue 2; + } else { + $insertTablesFirst = $i; + $insertTables[$matches[2]] += $row['#'] - 1; } - // No break here - - case 'update': - // Cut off big inserts and updates, but append byte count therefor - if(strlen($row['argument']) > 220) - $row['argument'] = substr($row['argument'], 0, 200) . '... [' . - implode(' ', PMA_formatByteDown(strlen($row['argument'])), 2, 2) . ']'; - - break; + } + // No break here + + case 'update': + // Cut off big inserts and updates, but append byte count therefor + if(strlen($row['argument']) > 220) { + $row['argument'] = substr($row['argument'], 0, 200) + . '... [' + . implode(' ', PMA_formatByteDown(strlen($row['argument'])), 2, 2) + . ']'; + } + break; - default: break; + default: break; } $return['rows'][] = $row; @@ -623,19 +627,19 @@ if(PMA_DRIZZLE) { /* Ajax request refresh */ if (isset($_REQUEST['show']) && isset($_REQUEST['ajax_request'])) { switch($_REQUEST['show']) { - case 'query_statistics': - printQueryStatistics(); - exit(); - case 'server_traffic': - printServerTraffic(); - exit(); - case 'variables_table': - // Prints the variables table - printVariablesTable(); - exit(); - - default: - break; + case 'query_statistics': + printQueryStatistics(); + exit(); + case 'server_traffic': + printServerTraffic(); + exit(); + case 'variables_table': + // Prints the variables table + printVariablesTable(); + exit(); + + default: + break; } } @@ -645,7 +649,7 @@ $server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost' PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" . 'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n" . - 'server_time_diff = new Date().getTime() - ' . (microtime(true)*1000) . ";\n" . + 'server_time_diff = new Date().getTime() - ' . (microtime(true) * 1000) . ";\n" . 'server_os = \'' . PHP_OS . "';\n" . 'is_superuser = ' . (PMA_isSuperuser() ? 'true' : 'false') . ";\n" . 'server_db_isLocal = ' . ($server_db_isLocal ? 'true' : 'false') . ";\n" . hooks/post-receive -- phpMyAdmin

1 0