- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8291-gb44ece2
by Marc Delisle 14 Jul '11

14 Jul '11

The branch, master has been updated via b44ece2949224200846811266eb96e799a7ca7e6 (commit) from f989d6f0cf61c861af0a37af12e3a24af7cdf4ee (commit) - Log ----------------------------------------------------------------- commit b44ece2949224200846811266eb96e799a7ca7e6 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jul 14 09:20:34 2011 -0400 Create a new is redundant ----------------------------------------------------------------------- Summary of changes: libraries/rte/rte_events.lib.php | 2 +- libraries/rte/rte_routines.lib.php | 2 +- libraries/rte/rte_triggers.lib.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index d7ffbc5..97ebcdd 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -59,7 +59,7 @@ function PMA_RTE_getWord($index) 'docu' => 'EVENTS', 'export' => __('Export of event %s'), 'human' => __('event'), - 'no_create' => __('You do not have the necessary privileges to create a new event'), + 'no_create' => __('You do not have the necessary privileges to create an event'), 'not_found' => __('No event with name %1$s found in database %2$s'), 'nothing' => __('There are no events to display.'), 'title' => __('Events'), diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 9a9c8f2..8c04d85 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -44,7 +44,7 @@ function PMA_RTE_getWord($index) 'docu' => 'STORED_ROUTINES', 'export' => __('Export of routine %s'), 'human' => __('routine'), - 'no_create' => __('You do not have the necessary privileges to create a new routine'), + 'no_create' => __('You do not have the necessary privileges to create a routine'), 'not_found' => __('No routine with name %1$s found in database %2$s'), 'nothing' => __('There are no routines to display.'), 'title' => __('Routines'), diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index 61b9943..66aebcf 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -40,7 +40,7 @@ function PMA_RTE_getWord($index) 'docu' => 'TRIGGERS', 'export' => __('Export of trigger %s'), 'human' => __('trigger'), - 'no_create' => __('You do not have the necessary privileges to create a new trigger'), + 'no_create' => __('You do not have the necessary privileges to create a trigger'), 'not_found' => __('No trigger with name %1$s found in database %2$s'), 'nothing' => __('There are no triggers to display.'), 'title' => __('Triggers'), hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8290-gf989d6f
by Rouslan Placella 14 Jul '11

14 Jul '11

The branch, master has been updated via f989d6f0cf61c861af0a37af12e3a24af7cdf4ee (commit) from 9ca378d79454c5a021bfdd9f231c399cfe8355fc (commit) - Log ----------------------------------------------------------------- commit f989d6f0cf61c861af0a37af12e3a24af7cdf4ee Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 14 13:06:31 2011 +0100 Fixed handling of length/values for the return variable of functions ----------------------------------------------------------------------- Summary of changes: libraries/rte/rte_routines.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 4172208..9a9c8f2 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1129,7 +1129,7 @@ function PMA_RTN_getQueryFromRequest() && !preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|SERIAL|BOOLEAN)$@i', $_REQUEST['item_returntype']) ) { - $query .= "(" . intval($_REQUEST['item_returnlength']) . ")"; + $query .= "(" . $_REQUEST['item_returnlength'] . ")"; } else if (empty($_REQUEST['item_returnlength']) && preg_match('@^(ENUM|SET|VARCHAR|VARBINARY)$@i', $_REQUEST['item_returntype'])) { if (! $warned_about_length) { $warned_about_length = true; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8289-g9ca378d
by Rouslan Placella 14 Jul '11

14 Jul '11

The branch, master has been updated via 9ca378d79454c5a021bfdd9f231c399cfe8355fc (commit) via 0e622faed642b3814ec140b287ad5ad7ad1655c7 (commit) via d3fa11c19b27d3c7debfb70edbe1bc046a8e37bb (commit) from ad87dcf884efa277fc9ed546e1986e511ae7928a (commit) - Log ----------------------------------------------------------------- commit 9ca378d79454c5a021bfdd9f231c399cfe8355fc Merge: ad87dcf884efa277fc9ed546e1986e511ae7928a 0e622faed642b3814ec140b287ad5ad7ad1655c7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 14 12:57:31 2011 +0100 Merge branch 'rte' commit 0e622faed642b3814ec140b287ad5ad7ad1655c7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 14 12:46:23 2011 +0100 Removed redundant code from rte_routines.lib.php commit d3fa11c19b27d3c7debfb70edbe1bc046a8e37bb Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Jul 13 18:42:10 2011 +0100 Move declarations of globals into functions, so that unit tests are possible ----------------------------------------------------------------------- Summary of changes: libraries/rte/rte_events.lib.php | 35 ++++++++++++++++++++++++++++ libraries/rte/rte_main.inc.php | 45 ------------------------------------ libraries/rte/rte_routines.lib.php | 37 ++++++++++++++++------------ libraries/rte/rte_triggers.lib.php | 16 ++++++++++++ 4 files changed, 72 insertions(+), 61 deletions(-) diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index 070dc20..d7ffbc5 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -10,6 +10,40 @@ if (! defined('PHPMYADMIN')) { } /** + * Sets required globals + */ +function PMA_EVN_setGlobals() +{ + global $event_status, $event_type, $event_interval; + + $event_status = array( + 'query' => array('ENABLE', + 'DISABLE', + 'DISABLE ON SLAVE'), + 'display' => array('ENABLED', + 'DISABLED', + 'SLAVESIDE_DISABLED') + ); + $event_type = array('RECURRING', + 'ONE TIME'); + $event_interval = array('YEAR', + 'QUARTER', + 'MONTH', + 'DAY', + 'HOUR', + 'MINUTE', + 'WEEK', + 'SECOND', + 'YEAR_MONTH', + 'DAY_HOUR', + 'DAY_MINUTE', + 'DAY_SECOND', + 'HOUR_MINUTE', + 'HOUR_SECOND', + 'MINUTE_SECOND'); +} + +/** * This function is defined in: rte_routines.lib.php, rte_triggers.lib.php and * rte_events.lib.php. It is used to retreive some language strings that are * used in functionalities that are common to routines, triggers and events. @@ -40,6 +74,7 @@ function PMA_RTE_main() { global $db; + PMA_EVN_setGlobals(); /** * Process all requests */ diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php index deae1d2..dd3e4c0 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -71,51 +71,6 @@ $titles = PMA_buildActionTitles(); */ $errors = array(); -// Some definitions for triggers -$action_timings = array('BEFORE', - 'AFTER'); -$event_manipulations = array('INSERT', - 'UPDATE', - 'DELETE'); - -// Some definitions for routines -$param_directions = array('IN', - 'OUT', - 'INOUT'); -$param_opts_num = array('UNSIGNED', - 'ZEROFILL', - 'UNSIGNED ZEROFILL'); -$param_sqldataaccess = array('NO SQL', - 'CONTAINS SQL', - 'READS SQL DATA', - 'MODIFIES SQL DATA'); - -// Some definitions for events -$event_status = array( - 'query' => array('ENABLE', - 'DISABLE', - 'DISABLE ON SLAVE'), - 'display' => array('ENABLED', - 'DISABLED', - 'SLAVESIDE_DISABLED') - ); -$event_type = array('RECURRING', - 'ONE TIME'); -$event_interval = array('YEAR', - 'QUARTER', - 'MONTH', - 'DAY', - 'HOUR', - 'MINUTE', - 'WEEK', - 'SECOND', - 'YEAR_MONTH', - 'DAY_HOUR', - 'DAY_MINUTE', - 'DAY_SECOND', - 'HOUR_MINUTE', - 'HOUR_SECOND', - 'MINUTE_SECOND'); /** * The below function is defined in rte_routines.lib.php, * rte_triggers.lib.php and rte_events.lib.php diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index a5a136f..4172208 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -10,6 +10,25 @@ if (! defined('PHPMYADMIN')) { } /** + * Sets required globals + */ +function PMA_RTN_setGlobals() +{ + global $param_directions, $param_opts_num, $param_sqldataaccess; + + $param_directions = array('IN', + 'OUT', + 'INOUT'); + $param_opts_num = array('UNSIGNED', + 'ZEROFILL', + 'UNSIGNED ZEROFILL'); + $param_sqldataaccess = array('NO SQL', + 'CONTAINS SQL', + 'READS SQL DATA', + 'MODIFIES SQL DATA'); +} + +/** * This function is defined in: rte_routines.lib.php, rte_triggers.lib.php and * rte_events.lib.php. It is used to retreive some language strings that are * used in functionalities that are common to routines, triggers and events. @@ -40,6 +59,7 @@ function PMA_RTE_main() { global $db; + PMA_RTN_setGlobals(); /** * Process all requests */ @@ -1100,22 +1120,7 @@ function PMA_RTN_getQueryFromRequest() } $query .= " (" . $params . ") "; if ($_REQUEST['item_type'] == 'FUNCTION') { - // Make a flat array with column types - $columnTypes = array(); - foreach ($cfg['ColumnTypes'] as $key => $value) { - if (is_array($value)) { - $columnTypes = array_merge($value, $columnTypes); - } else { - $columnTypes[] = $value; - } - } - foreach ($columnTypes as $key => $type) { - if ($type == '-') { - unset($columnTypes[$key]); - } - } - // Search the flat array for the supplied return type - if (! empty($_REQUEST['item_returntype']) && in_array($_REQUEST['item_returntype'], $columnTypes)) { + if (! empty($_REQUEST['item_returntype']) && in_array($_REQUEST['item_returntype'], PMA_getSupportedDatatypes())) { $query .= "RETURNS {$_REQUEST['item_returntype']}"; } else { $errors[] = __('You must provide a valid return type for the routine.'); diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index a80fca0..61b9943 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -10,6 +10,21 @@ if (! defined('PHPMYADMIN')) { } /** + * Sets required globals + */ +function PMA_TRI_setGlobals() +{ + global $action_timings, $event_manipulations; + + // Some definitions for triggers + $action_timings = array('BEFORE', + 'AFTER'); + $event_manipulations = array('INSERT', + 'UPDATE', + 'DELETE'); +} + +/** * This function is defined in: rte_routines.lib.php, rte_triggers.lib.php and * rte_events.lib.php. It is used to retreive some language strings that are * used in functionalities that are common to routines, triggers and events. @@ -40,6 +55,7 @@ function PMA_RTE_main() { global $db, $table; + PMA_TRI_setGlobals(); /** * Process all requests */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8286-gad87dcf
by Piotr Przybylski 14 Jul '11

14 Jul '11

The branch, master has been updated via ad87dcf884efa277fc9ed546e1986e511ae7928a (commit) from bce8eaf40a42b4982f4125e23f4ab988ed8e113b (commit) - Log ----------------------------------------------------------------- commit ad87dcf884efa277fc9ed546e1986e511ae7928a Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Jul 14 01:48:13 2011 +0200 Removed useless code ----------------------------------------------------------------------- Summary of changes: libraries/export/htmlword.php | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index a97aab2..e662cfb 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -313,8 +313,6 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals if ($row['Null'] != 'NO') { $row['Default'] = 'NULL'; } - } else { - $row['Default'] = $row['Default']; } $fmt_pre = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8285-gbce8eaf
by Piotr Przybylski 14 Jul '11

14 Jul '11

The branch, master has been updated via bce8eaf40a42b4982f4125e23f4ab988ed8e113b (commit) via 059ddeb79788a969c94c7817f0ccab4686511a73 (commit) via 590059cc30038d60e9c5ad11b2cb369c9ebc14fc (commit) from 151799f17f63f1329b381f61f0bf0e238565842b (commit) - Log ----------------------------------------------------------------- commit bce8eaf40a42b4982f4125e23f4ab988ed8e113b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Jul 14 01:44:41 2011 +0200 JSON export plugin: fix syntax for empty table, better data escaping commit 059ddeb79788a969c94c7817f0ccab4686511a73 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Jul 14 01:43:30 2011 +0200 Better db and table name escaping in codegen and htmlword export plugins commit 590059cc30038d60e9c5ad11b2cb369c9ebc14fc Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Jul 14 01:30:25 2011 +0200 Fix db/table name escaping in UI preferences ----------------------------------------------------------------------- Summary of changes: libraries/Table.class.php | 9 +++++---- libraries/export/codegen.php | 4 ++-- libraries/export/htmlword.php | 6 +++--- libraries/export/json.php | 14 ++++++++------ 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 9a15c48..83e67fd 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1240,8 +1240,8 @@ class PMA_Table $sql_query = " SELECT `prefs` FROM " . $pma_table . " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'" . - " AND `db_name` = '" . $this->db_name . "'" . - " AND `table_name` = '" . $this->name . "'"; + " AND `db_name` = '" . PMA_sqlAddSlashes($this->db_name) . "'" . + " AND `table_name` = '" . PMA_sqlAddSlashes($this->name) . "'"; $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); if (isset($row[0])) { @@ -1264,8 +1264,9 @@ class PMA_Table $username = $GLOBALS['cfg']['Server']['user']; $sql_query = " REPLACE INTO " . $pma_table . - " VALUES ('" . $username . "', '" . $this->db_name . "', '" . - $this->name . "', '" . PMA_sqlAddSlashes(json_encode($this->uiprefs)) . "')"; + " VALUES ('" . $username . "', '" . PMA_sqlAddSlashes($this->db_name) . "', '" . + PMA_sqlAddSlashes($this->name) . "', '" . + PMA_sqlAddSlashes(json_encode($this->uiprefs)) . "')"; $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']); diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index d60785c..fb81cf9 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -268,8 +268,8 @@ class TableProperty { $lines=array(); $lines[] = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"; - $lines[] = "<hibernate-mapping xmlns=\"urn:nhibernate-mapping-2.2\" namespace=\"".ucfirst($db)."\" assembly=\"".ucfirst($db)."\">"; - $lines[] = " <class name=\"".ucfirst($table)."\" table=\"".$table."\">"; + $lines[] = "<hibernate-mapping xmlns=\"urn:nhibernate-mapping-2.2\" namespace=\"".ucfirst(htmlspecialchars($db, ENT_COMPAT, 'UTF-8'))."\" assembly=\"".ucfirst(htmlspecialchars($db, ENT_COMPAT, 'UTF-8'))."\">"; + $lines[] = " <class name=\"".ucfirst(htmlspecialchars($table, ENT_COMPAT, 'UTF-8'))."\" table=\"".htmlspecialchars($table, ENT_COMPAT, 'UTF-8')."\">"; $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); if ($result) { diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index c840e93..a97aab2 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -75,7 +75,7 @@ xmlns="http://www.w3.org/TR/REC-html40"> * @access public */ function PMA_exportDBHeader($db) { - return PMA_exportOutputHandler('<h1>' . __('Database') . ' ' . $db . '</h1>'); + return PMA_exportOutputHandler('<h1>' . __('Database') . ' ' . htmlspecialchars($db) . '</h1>'); } /** @@ -118,7 +118,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { global $what; - if (! PMA_exportOutputHandler('<h2>' . __('Dumping data for table') . ' ' . $table . '</h2>')) { + if (! PMA_exportOutputHandler('<h2>' . __('Dumping data for table') . ' ' . htmlspecialchars($table) . '</h2>')) { return false; } if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) { @@ -192,7 +192,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals { global $cfgRelation; - if (! PMA_exportOutputHandler('<h2>' . __('Table structure for table') . ' ' .$table . '</h2>')) { + if (! PMA_exportOutputHandler('<h2>' . __('Table structure for table') . ' ' . htmlspecialchars($table) . '</h2>')) { return false; } diff --git a/libraries/export/json.php b/libraries/export/json.php index 86e2e89..989ef88 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -74,7 +74,7 @@ function PMA_exportHeader() */ function PMA_exportDBHeader($db) { - PMA_exportOutputHandler('/* Database \'' . $db . '\' */ ' . $GLOBALS['crlf'] ); + PMA_exportOutputHandler('// Database \'' . $db . '\'' . $GLOBALS['crlf'] ); return true; } @@ -134,7 +134,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) // Output table name as comment if this is the first record of the table if ($record_cnt == 1) { - $buffer .= '/* ' . $db . '.' . $table . ' */' . $crlf . $crlf; + $buffer .= '// ' . $db . '.' . $table . $crlf . $crlf; $buffer .= '[{'; } else { $buffer .= ', {'; @@ -147,18 +147,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) $column = $columns[$i]; if (is_null($record[$i])) { - $buffer .= '"' . $column . '": null' . (! $isLastLine ? ',' : ''); + $buffer .= '"' . addslashes($column) . '": null' . (! $isLastLine ? ',' : ''); } elseif (is_numeric($record[$i])) { - $buffer .= '"' . $column . '": ' . $record[$i] . (! $isLastLine ? ',' : ''); + $buffer .= '"' . addslashes($column) . '": ' . $record[$i] . (! $isLastLine ? ',' : ''); } else { - $buffer .= '"' . $column . '": "' . addslashes($record[$i]) . '"' . (! $isLastLine ? ',' : ''); + $buffer .= '"' . addslashes($column) . '": "' . addslashes($record[$i]) . '"' . (! $isLastLine ? ',' : ''); } } $buffer .= '}'; } - $buffer .= ']'; + if ($record_cnt) { + $buffer .= ']'; + } if (! PMA_exportOutputHandler($buffer)) { return false; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8282-g151799f
by Piotr Przybylski 14 Jul '11

14 Jul '11

The branch, master has been updated via 151799f17f63f1329b381f61f0bf0e238565842b (commit) from d84d51c77552bd166c03dcb6a1623f93952ad058 (commit) - Log ----------------------------------------------------------------- commit 151799f17f63f1329b381f61f0bf0e238565842b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Jul 14 00:41:11 2011 +0200 Properly escape database name ----------------------------------------------------------------------- Summary of changes: libraries/export/xml.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 85bab5f..cfa07f5 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -105,7 +105,7 @@ function PMA_exportHeader() { $head .= '<pma_xml_export version="1.0"' . (($export_struct) ? ' xmlns:pma="http://www.phpmyadmin.net/some_doc_url/"' : '') . '>' . $crlf; if ($export_struct) { - $result = PMA_DBI_fetch_result('SELECT `DEFAULT_CHARACTER_SET_NAME`, `DEFAULT_COLLATION_NAME` FROM `information_schema`.`SCHEMATA` WHERE `SCHEMA_NAME` = \''.$db.'\' LIMIT 1'); + $result = PMA_DBI_fetch_result('SELECT `DEFAULT_CHARACTER_SET_NAME`, `DEFAULT_COLLATION_NAME` FROM `information_schema`.`SCHEMATA` WHERE `SCHEMA_NAME` = \''.PMA_sqlAddSlashes($db).'\' LIMIT 1'); $db_collation = $result[0]['DEFAULT_COLLATION_NAME']; $db_charset = $result[0]['DEFAULT_CHARACTER_SET_NAME']; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8281-gd84d51c
by Piotr Przybylski 14 Jul '11

14 Jul '11

The branch, master has been updated via d84d51c77552bd166c03dcb6a1623f93952ad058 (commit) via 667cf67954c44facf978660f5fa7b9ed5c2b1b89 (commit) via 09e74a94150d84ba0014f7455446383311c6d190 (commit) from f57faf6b58702ad09e6c333fd927778fb6af1e41 (commit) - Log ----------------------------------------------------------------- commit d84d51c77552bd166c03dcb6a1623f93952ad058 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Jul 14 00:05:58 2011 +0200 Fix XML export so it actually can export table structure More escaping fixes commit 667cf67954c44facf978660f5fa7b9ed5c2b1b89 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 13 23:42:29 2011 +0200 Better escaping in XML export Note: it's still incorrect commit 09e74a94150d84ba0014f7455446383311c6d190 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 13 23:40:58 2011 +0200 Improve readability of XML export code ----------------------------------------------------------------------- Summary of changes: libraries/export/xml.php | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 2665051..85bab5f 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -71,13 +71,14 @@ function PMA_exportFooter() { function PMA_exportHeader() { global $crlf; global $cfg; - global $what; global $db; global $table; global $tables; - $export_struct = isset($GLOBALS[$what . '_export_struc']) ? true : false; - $export_data = isset($GLOBALS[$what . '_export_contents']) ? true : false; + $export_struct = isset($GLOBALS['xml_export_functions']) || isset($GLOBALS['xml_export_procedures']) + || isset($GLOBALS['xml_export_tables']) || isset($GLOBALS['xml_export_triggers']) + || isset($GLOBALS['xml_export_views']); + $export_data = isset($GLOBALS['xml_export_contents']) ? true : false; if ($GLOBALS['output_charset_conversion']) { $charset = $GLOBALS['charset_of_file']; @@ -112,7 +113,7 @@ function PMA_exportHeader() { $head .= ' - Structure schemas' . $crlf; $head .= ' -->' . $crlf; $head .= ' <pma:structure_schemas>' . $crlf; - $head .= ' <pma:database name="' . $db . '" collation="' . $db_collation . '" charset="' . $db_charset . '">' . $crlf; + $head .= ' <pma:database name="' . htmlspecialchars($db) . '" collation="' . $db_collation . '" charset="' . $db_charset . '">' . $crlf; if (count($tables) == 0) { $tables[] = $table; @@ -131,23 +132,23 @@ function PMA_exportHeader() { $type = 'table'; } - if ($is_view && ! isset($GLOBALS[$what . '_export_views'])) { + if ($is_view && ! isset($GLOBALS['xml_export_views'])) { continue; } - if (! $is_view && ! isset($GLOBALS[$what . '_export_tables'])) { + if (! $is_view && ! isset($GLOBALS['xml_export_tables'])) { continue; } $head .= ' <pma:' . $type . ' name="' . $table . '">' . $crlf; - $tbl = " " . $tbl; + $tbl = " " . htmlspecialchars($tbl); $tbl = str_replace("\n", "\n ", $tbl); $head .= $tbl . ';' . $crlf; $head .= ' </pma:' . $type . '>' . $crlf; - if (isset($GLOBALS[$what . '_export_triggers']) && $GLOBALS[$what . '_export_triggers']) { + if (isset($GLOBALS['xml_export_triggers']) && $GLOBALS['xml_export_triggers']) { // Export triggers $triggers = PMA_DBI_get_triggers($db, $table); if ($triggers) { @@ -157,7 +158,7 @@ function PMA_exportHeader() { // Do some formatting $code = substr(rtrim($code), 0, -3); - $code = " " . $code; + $code = " " . htmlspecialchars($code); $code = str_replace("\n", "\n ", $code); $head .= $code . $crlf; @@ -170,7 +171,7 @@ function PMA_exportHeader() { } } - if (isset($GLOBALS[$what . '_export_functions']) && $GLOBALS[$what . '_export_functions']) { + if (isset($GLOBALS['xml_export_functions']) && $GLOBALS['xml_export_functions']) { // Export functions $functions = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION'); if ($functions) { @@ -180,7 +181,7 @@ function PMA_exportHeader() { // Do some formatting $sql = PMA_DBI_get_definition($db, 'FUNCTION', $function); $sql = rtrim($sql); - $sql = " " . $sql; + $sql = " " . htmlspecialchars($sql); $sql = str_replace("\n", "\n ", $sql); $head .= $sql . $crlf; @@ -193,7 +194,7 @@ function PMA_exportHeader() { } } - if (isset($GLOBALS[$what . '_export_procedures']) && $GLOBALS[$what . '_export_procedures']) { + if (isset($GLOBALS['xml_export_procedures']) && $GLOBALS['xml_export_procedures']) { // Export procedures $procedures = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE'); if ($procedures) { @@ -203,7 +204,7 @@ function PMA_exportHeader() { // Do some formatting $sql = PMA_DBI_get_definition($db, 'PROCEDURE', $procedure); $sql = rtrim($sql); - $sql = " " . $sql; + $sql = " " . htmlspecialchars($sql); $sql = str_replace("\n", "\n ", $sql); $head .= $sql . $crlf; @@ -239,13 +240,12 @@ function PMA_exportHeader() { */ function PMA_exportDBHeader($db) { global $crlf; - global $what; - if (isset($GLOBALS[$what . '_export_contents']) && $GLOBALS[$what . '_export_contents']) { + if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) { $head = ' ' . $crlf - . ' <database name="' . $db . '">' . $crlf; + . ' <database name="' . htmlspecialchars($db) . '">' . $crlf; return PMA_exportOutputHandler($head); } @@ -265,9 +265,8 @@ function PMA_exportDBHeader($db) { */ function PMA_exportDBFooter($db) { global $crlf; - global $what; - if (isset($GLOBALS[$what . '_export_contents']) && $GLOBALS[$what . '_export_contents']) { + if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) { return PMA_exportOutputHandler(' </database>' . $crlf); } else @@ -301,12 +300,11 @@ function PMA_exportDBCreate($db) { * @access public */ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { - global $what; - - if (isset($GLOBALS[$what . '_export_contents']) && $GLOBALS[$what . '_export_contents']) { + if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) { $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); $columns_cnt = PMA_DBI_num_fields($result); + $columns = array(); for ($i = 0; $i < $columns_cnt; $i++) { $columns[$i] = stripslashes(str_replace(' ', '_', PMA_DBI_field_name($result, $i))); } @@ -324,7 +322,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { if (!isset($record[$i]) || is_null($record[$i])) { $record[$i] = 'NULL'; } - $buffer .= ' <column name="' . $columns[$i] . '">' . htmlspecialchars((string)$record[$i]) + $buffer .= ' <column name="' . htmlspecialchars($columns[$i]) . '">' . htmlspecialchars((string)$record[$i]) . '</column>' . $crlf; } $buffer .= ' </table>' . $crlf; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8278-gf57faf6
by Piotr Przybylski 13 Jul '11

13 Jul '11

The branch, master has been updated via f57faf6b58702ad09e6c333fd927778fb6af1e41 (commit) via df4c23f0c9fa5481558c890fed8ea9737dd74f1d (commit) via b5d450ff3193258a95c4d1a6700edf74dd1a17dc (commit) from ae780330e870052b1cd2ad84d0b7326074bef90a (commit) - Log ----------------------------------------------------------------- commit f57faf6b58702ad09e6c333fd927778fb6af1e41 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 13 17:25:10 2011 +0200 Removed unused code commit df4c23f0c9fa5481558c890fed8ea9737dd74f1d Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 13 17:22:07 2011 +0200 Comments and formatting in common.lib.php commit b5d450ff3193258a95c4d1a6700edf74dd1a17dc Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 13 17:07:08 2011 +0200 PMA_MYSQL_INT_VERSION is at least 50015 ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 100 ++++++++++++++++++++----------------------- libraries/db_links.inc.php | 4 +- libraries/tbl_links.inc.php | 2 +- 3 files changed, 49 insertions(+), 57 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 7d9564e..e64c751 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -140,10 +140,10 @@ function PMA_displayMaximumUploadSize($max_upload_size) * * @access public */ - function PMA_generateHiddenMaxFileSize($max_size) - { - return '<input type="hidden" name="MAX_FILE_SIZE" value="' .$max_size . '" />'; - } +function PMA_generateHiddenMaxFileSize($max_size) +{ + return '<input type="hidden" name="MAX_FILE_SIZE" value="' .$max_size . '" />'; +} /** * Add slashes before "'" and "\" characters so a value containing them can @@ -377,7 +377,7 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju $mysql = '5.1'; /* l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation. */ $lang = _pgettext('MySQL 5.1 documentation language', 'en'); - } elseif (PMA_MYSQL_INT_VERSION >= 50000) { + } else { $mysql = '5.0'; /* l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. */ $lang = _pgettext('MySQL 5.0 documentation language', 'en'); @@ -707,7 +707,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = $group_name_full = ''; $parts_cnt = count($parts) - 1; while ($i < $parts_cnt - && $i < $GLOBALS['cfg']['LeftFrameTableLevel']) { + && $i < $GLOBALS['cfg']['LeftFrameTableLevel']) { $group_name = $parts[$i] . $sep; $group_name_full .= $group_name; @@ -739,7 +739,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = if ($GLOBALS['cfg']['ShowTooltipAliasTB'] - && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { + && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { // switch tooltip and name $table['Comment'] = $table['Name']; $table['disp_name'] = $table['Comment']; @@ -807,8 +807,6 @@ function PMA_backquote($a_name, $do_it = true) */ function PMA_whichCrlf() { - $the_crlf = "\n"; - // The 'PMA_USR_OS' constant is defined in "./libraries/Config.class.php" // Win case if (PMA_USR_OS == 'Win') { @@ -825,15 +823,12 @@ function PMA_whichCrlf() /** * Reloads navigation if needed. * - * @param $jsonly prints out pure JavaScript - * @global array configuration + * @param bool $jsonly prints out pure JavaScript * * @access public */ function PMA_reloadNavigation($jsonly=false) { - global $cfg; - // Reloads the navigation frame via JavaScript if required if (isset($GLOBALS['reload']) && $GLOBALS['reload']) { // one of the reasons for a reload is when a table is dropped @@ -869,7 +864,7 @@ if (!$jsonly) * @param string $sql_query the query to display * @param string $type the type (level) of the message * @param boolean $is_view is this a message after a VIEW operation? - * @global array the configuration array + * @return string * @access public */ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view = false) @@ -1218,6 +1213,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view ob_end_clean(); return $buffer_contents; } + return null; } // end of the 'PMA_showMessage()' function /** @@ -1225,7 +1221,6 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view * * @access public * @return boolean whether profiling is supported - * */ function PMA_profilingSupported() { @@ -1250,7 +1245,6 @@ function PMA_profilingSupported() * * @param string $sql_query * @access public - * */ function PMA_profilingCheckbox($sql_query) { @@ -1350,8 +1344,6 @@ function PMA_localizeNumber($value) * @return string the formatted value and its unit * * @access public - * - * @version 1.1.0 - 2005-10-27 */ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_down = false, $noTrailingZero = true) { @@ -1769,7 +1761,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), } } // end if... else... - return $ret; + return $ret; } // end of the 'PMA_linkOrButton()' function @@ -1843,7 +1835,6 @@ function PMA_flipstring($string, $Separator = "<br />\n") return $format_string; } - /** * Function added to avoid path disclosures. * Called by each script that needs parameters, it displays @@ -1930,9 +1921,8 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force $meta->orgname = $meta->name; if (isset($GLOBALS['analyzed_sql'][0]['select_expr']) - && is_array($GLOBALS['analyzed_sql'][0]['select_expr'])) { - foreach ($GLOBALS['analyzed_sql'][0]['select_expr'] - as $select_expr) { + && is_array($GLOBALS['analyzed_sql'][0]['select_expr'])) { + foreach ($GLOBALS['analyzed_sql'][0]['select_expr'] as $select_expr) { // need (string) === (string) // '' !== 0 but '' == 0 if ((string) $select_expr['alias'] === (string) $meta->name) { @@ -1980,18 +1970,18 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force $condition .= '= ' . $row[$i] . ' AND'; } elseif (($meta->type == 'blob' || $meta->type == 'string') // hexify only if this is a true not empty BLOB or a BINARY - && stristr($field_flags, 'BINARY') - && !empty($row[$i])) { - // do not waste memory building a too big condition - if (strlen($row[$i]) < 1000) { - // use a CAST if possible, to avoid problems - // if the field contains wildcard characters % or _ - $condition .= '= CAST(0x' . bin2hex($row[$i]) - . ' AS BINARY) AND'; - } else { - // this blob won't be part of the final condition - $condition = ''; - } + && stristr($field_flags, 'BINARY') + && !empty($row[$i])) { + // do not waste memory building a too big condition + if (strlen($row[$i]) < 1000) { + // use a CAST if possible, to avoid problems + // if the field contains wildcard characters % or _ + $condition .= '= CAST(0x' . bin2hex($row[$i]) + . ' AS BINARY) AND'; + } else { + // this blob won't be part of the final condition + $condition = ''; + } } elseif ($meta->type == 'bit') { $condition .= "= b'" . PMA_printable_bit_value($row[$i], $meta->length) . "' AND"; } else { @@ -2167,12 +2157,12 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, * Generate navigation for a list * * @todo use $pos from $_url_params - * @param integer number of elements in the list - * @param integer current position in the list - * @param array url parameters - * @param string script name for form target - * @param string target frame - * @param integer maximum number of elements to display from the list + * @param int $count number of elements in the list + * @param int $pos current position in the list + * @param array $_url_params url parameters + * @param string $script script name for form target + * @param string $frame target frame + * @param int $max_count maximum number of elements to display from the list * * @access public */ @@ -2354,10 +2344,11 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '' * Generates and returns an HTML dropdown * * @param string $select_name - * @param array $choices the choices values - * @param string $active_choice the choice to select by default - * @param string $id the id of the select element; can be different in case - * the dropdown is present more than once on the page + * @param array $choices choices values + * @param string $active_choice the choice to select by default + * @param string $id id of the select element; can be different in case + * the dropdown is present more than once on the page + * @return string * @todo support titles */ function PMA_generate_html_dropdown($select_name, $choices, $active_choice, $id) @@ -2492,8 +2483,8 @@ function PMA_clearUserCache() { /** * Verifies if something is cached in the session * - * @param string $var - * @param scalar $server + * @param string $var + * @param int|true $server * @return boolean */ function PMA_cacheExists($var, $server = 0) @@ -2507,8 +2498,8 @@ function PMA_cacheExists($var, $server = 0) /** * Gets cached information from the session * - * @param string $var - * @param scalar $server + * @param string $var + * @param int|true $server * @return mixed */ function PMA_cacheGet($var, $server = 0) @@ -2526,9 +2517,9 @@ function PMA_cacheGet($var, $server = 0) /** * Caches information in the session * - * @param string $var - * @param mixed $val - * @param integer $server + * @param string $var + * @param mixed $val + * @param int|true $server * @return mixed */ function PMA_cacheSet($var, $val = null, $server = 0) @@ -2542,8 +2533,8 @@ function PMA_cacheSet($var, $val = null, $server = 0) /** * Removes cached information from the session * - * @param string $var - * @param scalar $server + * @param string $var + * @param int|true $server */ function PMA_cacheUnset($var, $server = 0) { @@ -3130,6 +3121,7 @@ function PMA_getFunctionsForField($field, $insert_mode) * string, db name where to also check for privileges * @param mixed $tbl null, to only check global privileges * string, db name where to also check for privileges + * @return bool */ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null) { diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index 87fb98c..604efde 100644 --- a/libraries/db_links.inc.php +++ b/libraries/db_links.inc.php @@ -121,7 +121,7 @@ if (! $db_is_information_schema) { if ($is_superuser) { $tabs[] =& $tab_privileges; } - if (PMA_MYSQL_INT_VERSION >= 50002 && ! PMA_DRIZZLE) { + if (!PMA_DRIZZLE) { $tabs[] =& $tab_routines; } if (PMA_MYSQL_INT_VERSION >= 50106 && ! PMA_DRIZZLE) { @@ -129,7 +129,7 @@ if (! $db_is_information_schema) { $tabs[] =& $tab_events; } } - if (PMA_MYSQL_INT_VERSION >= 50002 && ! PMA_DRIZZLE) { + if (!PMA_DRIZZLE) { if (PMA_currentUserHasPrivilege('TRIGGER', $db)) { $tabs[] =& $tab_triggers; } diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 5f24800..4008fba 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -97,7 +97,7 @@ if(PMA_Tracker::isActive()) { $tabs['tracking']['text'] = __('Tracking'); $tabs['tracking']['link'] = 'tbl_tracking.php'; } -if (! $db_is_information_schema && PMA_MYSQL_INT_VERSION >= 50002 && ! PMA_DRIZZLE) { +if (!$db_is_information_schema && !PMA_DRIZZLE) { if (PMA_currentUserHasPrivilege('TRIGGER', $db, $table)) { $tabs['triggers']['link'] = 'tbl_triggers.php'; $tabs['triggers']['text'] = __('Triggers'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8275-gae78033
by Michal Čihař 13 Jul '11

13 Jul '11

The branch, master has been updated via ae780330e870052b1cd2ad84d0b7326074bef90a (commit) from 8eaaa70f21f455b23c1e24acd5064a0c2a269940 (commit) - Log ----------------------------------------------------------------- commit ae780330e870052b1cd2ad84d0b7326074bef90a Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jul 13 17:05:13 2011 +0200 Add missing semicolon ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 625e716..efda8d7 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -964,7 +964,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, switch($export_mode) { case 'create_table': - $dump .= PMA_exportComment(__('Table structure for table') . ' ' . $formatted_table_name) + $dump .= PMA_exportComment(__('Table structure for table') . ' ' . $formatted_table_name); $dump .= PMA_exportComment(); $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates); $dump .= PMA_getTableComments($db, $table, $crlf, $relation, $mime); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8274-g8eaaa70
by Rouslan Placella 13 Jul '11

13 Jul '11

The branch, master has been updated via 8eaaa70f21f455b23c1e24acd5064a0c2a269940 (commit) from b2d8e0b60ffdda22bbbc165674088094d26f31f1 (commit) - Log ----------------------------------------------------------------- commit 8eaaa70f21f455b23c1e24acd5064a0c2a269940 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Jul 13 14:33:05 2011 +0100 Changelog entries for support for events and triggers ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a137c4a..0889f7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,8 @@ phpMyAdmin - ChangeLog - bug #3354356 [interface] Timepicker does not work in AJAX dialogs + AJAX for table Structure Indexes Edit + AJAX for table Structure column Change ++ [interface] Improved support for events ++ [interface] Improved support for triggers 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes hooks/post-receive -- phpMyAdmin

1 0