December 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24883-g5b62968
by Madhura Jayaratne 17 Dec '11

17 Dec '11

The branch, master has been updated via 5b62968f47093deea0576eaf4c7c0d1d1b081a62 (commit) via c65c51d5eeed9ec7c564eea18ef8b3efe4b8e840 (commit) from 3c246d2fb318c06f43cb1a02efab8d5974b244d1 (commit) - Log ----------------------------------------------------------------- commit 5b62968f47093deea0576eaf4c7c0d1d1b081a62 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Dec 17 23:28:12 2011 +0530 Swap odd, even in RTE commit c65c51d5eeed9ec7c564eea18ef8b3efe4b8e840 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Dec 17 23:04:22 2011 +0530 Proper row styles ----------------------------------------------------------------------- Summary of changes: js/rte/common.js | 4 ++-- libraries/rte/rte_list.lib.php | 2 +- server_privileges.php | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/js/rte/common.js b/js/rte/common.js index 781219d..e618151 100644 --- a/js/rte/common.js +++ b/js/rte/common.js @@ -185,7 +185,7 @@ $(document).ready(function () { */ var rowclass = ''; $('table.data').find('tr').has('td').each(function () { - rowclass = (ct % 2 === 0) ? 'even' : 'odd'; + rowclass = (ct % 2 === 0) ? 'odd' : 'even'; $(this).removeClass().addClass(rowclass); ct++; }); @@ -359,7 +359,7 @@ $(document).ready(function () { */ var rowclass = ''; $table.find('tr').has('td').each(function () { - rowclass = (ct % 2 === 0) ? 'even' : 'odd'; + rowclass = (ct % 2 === 0) ? 'odd' : 'even'; $(this).removeClass().addClass(rowclass); ct++; }); diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index f48c6ab..34556b4 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -75,7 +75,7 @@ function PMA_RTE_getList($type, $items) $retval .= " \n"; $ct = 0; foreach ($items as $item) { - $rowclass = ($ct % 2 == 0) ? 'even' : 'odd'; + $rowclass = ($ct % 2 == 0) ? 'odd' : 'even'; if ($GLOBALS['is_ajax_request']) { $rowclass .= ' ajaxInsert hide'; } diff --git a/server_privileges.php b/server_privileges.php index 14ad7e6..5f2bfca 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2351,7 +2351,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $user_form .= ' rowspan="' . count($current_privileges) . '"'; } $user_form .= '>' . htmlspecialchars($current_host) . '</td>' . "\n"; - foreach ($current_privileges as $current) { + for ($i = 0; $i < count($current_privileges); $i++) { + $current = $current_privileges[$i]; $user_form .= ' <td>' . "\n" . ' '; if (! isset($current['Db']) || $current['Db'] == '*') { @@ -2381,6 +2382,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs ); $user_form .= '</td>' . "\n" . ' </tr>' . "\n"; + if (($i + 1) < count($current_privileges)) { + $user_form .= '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">' . "\n"; + } } if (empty($row) && empty($row1) && empty($row2)) { break; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24881-g3c246d2
by Madhura Jayaratne 17 Dec '11

17 Dec '11

The branch, master has been updated via 3c246d2fb318c06f43cb1a02efab8d5974b244d1 (commit) via 41b956936bea5568392603efd01538d0611f8cc0 (commit) via 6e74bc172a8c33c98f3ab2ba1ca885dfe080c651 (commit) via 902074a314623398d5f87e8258faa441e02675b5 (commit) from a6c722ace0defb2368c294ae987c8fe8a6946967 (commit) - Log ----------------------------------------------------------------- commit 3c246d2fb318c06f43cb1a02efab8d5974b244d1 Merge: 41b9569 a6c722a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Dec 17 21:36:13 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 41b956936bea5568392603efd01538d0611f8cc0 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Dec 17 21:27:59 2011 +0530 Changes to facilitate more data in a page commit 6e74bc172a8c33c98f3ab2ba1ca885dfe080c651 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Dec 17 18:53:37 2011 +0530 Coding style improvements commit 902074a314623398d5f87e8258faa441e02675b5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Dec 17 18:44:33 2011 +0530 Avoid undefined variable notice ----------------------------------------------------------------------- Summary of changes: libraries/export/pdf.php | 70 +++++++++++++++++++++++++++------------------- 1 files changed, 41 insertions(+), 29 deletions(-) diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index 90f0a30..5f603e6 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -42,12 +42,13 @@ if (isset($plugin_list)) { var $tablewidths; var $headerset; - function checkPageBreak($h=0, $y='', $addpage=true) { + function checkPageBreak($h = 0, $y = '', $addpage = true) + { if ($this->empty_string($y)) { $y = $this->y; } $current_page = $this->page; - if ((($y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND ($this->AcceptPageBreak())) { + if ((($y + $h) > $this->PageBreakTrigger) AND (! $this->InFooter) AND ($this->AcceptPageBreak())) { if ($addpage) { //Automatic page break $x = $this->x; @@ -81,18 +82,22 @@ if (isset($plugin_list)) { { global $maxY; // Check if header for this page already exists - if (!isset($this->headerset[$this->page])) { + if (! isset($this->headerset[$this->page])) { $fullwidth = 0; foreach ($this->tablewidths as $width) { $fullwidth += $width; } - $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*3); + $this->SetY(($this->tMargin) - ($this->FontSizePt / $this->k) * 5); $this->cellFontSize = $this->FontSizePt ; $this->SetFont(PMA_PDF_FONT, '', ($this->titleFontSize ? $this->titleFontSize : $this->FontSizePt)); $this->Cell(0, $this->FontSizePt, $this->titleText, 0, 1, 'C'); $this->SetFont(PMA_PDF_FONT, '', $this->cellFontSize); - $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*1.5); - $this->Cell(0, $this->FontSizePt, __('Database') .': ' .$this->currentDb .', ' .__('Table') .': ' .$this->currentTable, 0, 1, 'L'); + $this->SetY(($this->tMargin) - ($this->FontSizePt / $this->k) * 2.5); + $this->Cell( + 0, $this->FontSizePt, + __('Database') . ': ' . $this->currentDb . ', ' . __('Table') . ': ' . $this->currentTable, + 0, 1, 'L' + ); $l = ($this->lMargin); foreach ($this->colTitles as $col => $txt) { $this->SetXY($l, ($this->tMargin)); @@ -225,6 +230,7 @@ if (isset($plugin_list)) { // loop through results header and set initial col widths/ titles/ alignment // if a col title is less than the starting col width, reduce that column size + $colFits = array(); for ($i = 0; $i < $this->numFields; $i++) { $stringWidth = $this->getstringwidth($this->fields[$i]->name) + 6 ; // save the real title's width @@ -282,13 +288,14 @@ if (isset($plugin_list)) { foreach ($colFits as $key => $val) { $stringWidth = $this->getstringwidth($row[$key]) + 6 ; if ($adjustingMode && ($stringWidth > $this->sColWidth)) { - // any column whose data's width is bigger than the start width is now discarded + // any column whose data's width is bigger than + // the start width is now discarded unset($colFits[$key]); } else { - // if data's width is bigger than the current column width, - // enlarge the column (but avoid enlarging it if the - // data's width is very big) - if ($stringWidth > $val && $stringWidth < ($this->sColWidth * 3)) { + // if data's width is bigger than the current column width, + // enlarge the column (but avoid enlarging it if the + // data's width is very big) + if ($stringWidth > $val && $stringWidth < ($this->sColWidth * 3)) { $colFits[$key] = $stringWidth ; } } @@ -328,6 +335,7 @@ if (isset($plugin_list)) { $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED); $this->setY($this->tMargin); $this->AddPage(); + $this->SetFont(PMA_PDF_FONT, '', 9); $this->morepagestable($this->FontSizePt); PMA_DBI_free_result($this->results); @@ -370,9 +378,9 @@ if (isset($plugin_list)) { $pdf->Open(); - $attr=array('titleFontSize' => 18, 'titleText' => $pdf_report_title); + $attr = array('titleFontSize' => 18, 'titleText' => $pdf_report_title); $pdf->setAttributes($attr); - $pdf->setTopMargin(45); + $pdf->setTopMargin(30); return true; } @@ -380,10 +388,11 @@ if (isset($plugin_list)) { /** * Outputs database header * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name * - * @access public + * @return bool Whether it suceeded + * + * @access public */ function PMA_exportDBHeader($db) { @@ -393,10 +402,11 @@ if (isset($plugin_list)) { /** * Outputs database footer * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name * - * @access public + * @return bool Whether it suceeded + * + * @access public */ function PMA_exportDBFooter($db) { @@ -406,10 +416,11 @@ if (isset($plugin_list)) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name * - * @access public + * @return bool Whether it suceeded + * + * @access public */ function PMA_exportDBCreate($db) { @@ -419,14 +430,15 @@ if (isset($plugin_list)) { /** * Outputs the content of a table in PDF format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * - * @access public + * @return bool Whether it suceeded + * + * @access public */ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24877-ga6c722a
by Marc Delisle 17 Dec '11

17 Dec '11

The branch, master has been updated via a6c722ace0defb2368c294ae987c8fe8a6946967 (commit) from 605be1d45bb12e050687859d758632b3e8553712 (commit) - Log ----------------------------------------------------------------- commit a6c722ace0defb2368c294ae987c8fe8a6946967 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 17 08:46:29 2011 -0500 Unused code ----------------------------------------------------------------------- Summary of changes: js/functions.js | 66 ------------------------------------------------------- 1 files changed, 0 insertions(+), 66 deletions(-) diff --git a/js/functions.js b/js/functions.js index d77c439..82d238a 100644 --- a/js/functions.js +++ b/js/functions.js @@ -521,72 +521,6 @@ function checkTableEditForm(theForm, fieldsCnt) return true; } // enf of the 'checkTableEditForm()' function - -/** - * Ensures the choice between 'transmit', 'zipped', 'gzipped' and 'bzipped' - * checkboxes is consistant - * - * @param object the form - * @param string a code for the action that causes this function to be run - * - * @return boolean always true - */ -function checkTransmitDump(theForm, theAction) -{ - var formElts = theForm.elements; - - // 'zipped' option has been checked - if (theAction == 'zip' && formElts['zip'].checked) { - if (!formElts['asfile'].checked) { - theForm.elements['asfile'].checked = true; - } - if (typeof(formElts['gzip']) != 'undefined' && formElts['gzip'].checked) { - theForm.elements['gzip'].checked = false; - } - if (typeof(formElts['bzip']) != 'undefined' && formElts['bzip'].checked) { - theForm.elements['bzip'].checked = false; - } - } - // 'gzipped' option has been checked - else if (theAction == 'gzip' && formElts['gzip'].checked) { - if (!formElts['asfile'].checked) { - theForm.elements['asfile'].checked = true; - } - if (typeof(formElts['zip']) != 'undefined' && formElts['zip'].checked) { - theForm.elements['zip'].checked = false; - } - if (typeof(formElts['bzip']) != 'undefined' && formElts['bzip'].checked) { - theForm.elements['bzip'].checked = false; - } - } - // 'bzipped' option has been checked - else if (theAction == 'bzip' && formElts['bzip'].checked) { - if (!formElts['asfile'].checked) { - theForm.elements['asfile'].checked = true; - } - if (typeof(formElts['zip']) != 'undefined' && formElts['zip'].checked) { - theForm.elements['zip'].checked = false; - } - if (typeof(formElts['gzip']) != 'undefined' && formElts['gzip'].checked) { - theForm.elements['gzip'].checked = false; - } - } - // 'transmit' option has been unchecked - else if (theAction == 'transmit' && !formElts['asfile'].checked) { - if (typeof(formElts['zip']) != 'undefined' && formElts['zip'].checked) { - theForm.elements['zip'].checked = false; - } - if ((typeof(formElts['gzip']) != 'undefined' && formElts['gzip'].checked)) { - theForm.elements['gzip'].checked = false; - } - if ((typeof(formElts['bzip']) != 'undefined' && formElts['bzip'].checked)) { - theForm.elements['bzip'].checked = false; - } - } - - return true; -} // end of the 'checkTransmitDump()' function - $(document).ready(function() { /** * Row marking in horizontal mode (use "live" so that it works also for hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24876-g605be1d
by Marc Delisle 17 Dec '11

17 Dec '11

The branch, master has been updated via 605be1d45bb12e050687859d758632b3e8553712 (commit) from c03228e7f72d9b92fdc0bb504f1e9c68be942c64 (commit) - Log ----------------------------------------------------------------- commit 605be1d45bb12e050687859d758632b3e8553712 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 17 08:12:50 2011 -0500 Unused code ----------------------------------------------------------------------- Summary of changes: js/functions.js | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/js/functions.js b/js/functions.js index f1e1277..d77c439 100644 --- a/js/functions.js +++ b/js/functions.js @@ -248,31 +248,6 @@ function confirmLink(theLink, theSqlQuery) return is_confirmed; } // end of the 'confirmLink()' function - -/** - * Displays a confirmation box before doing some action - * - * @param object the message to display - * - * @return boolean whether to run the query or not - * - * @todo used only by libraries/display_tbl.lib.php. figure out how it is used - * and replace with a jQuery equivalent - */ -function confirmAction(theMessage) -{ - // TODO: Confirmation is not required in the configuration file - // or browser is Opera (crappy js implementation) - if (typeof(window.opera) != 'undefined') { - return true; - } - - var is_confirmed = confirm(theMessage); - - return is_confirmed; -} // end of the 'confirmAction()' function - - /** * Displays an error message if a "DROP DATABASE" statement is submitted * while it isn't allowed, else confirms a "DROP/DELETE/ALTER" query before @@ -3735,4 +3710,4 @@ function toggleRowColors($start) $curr_row.removeClass('even').addClass('odd'); } } -} \ No newline at end of file +} hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24875-gc03228e
by Marc Delisle 16 Dec '11

16 Dec '11

The branch, master has been updated via c03228e7f72d9b92fdc0bb504f1e9c68be942c64 (commit) via 173d43d15bf58d09e06ed17fd4e3b0bd0734756b (commit) via a9d98907268ed1eb643e2c36780d45f360534500 (commit) via 797ec6faf0b6db8103bef1de06890fc357a6c521 (commit) via 7ef064f648fbaff787183b2d194981821d72054a (commit) via 9fc23c882467bca9809c6e05dd1dd38284b05abd (commit) via e43ed55b045dec9724e0695d7039b7a8aad90a99 (commit) from 07472a7f2a726580b02c2c14a7ab852b2ccac90d (commit) - Log ----------------------------------------------------------------- commit c03228e7f72d9b92fdc0bb504f1e9c68be942c64 Merge: 07472a7 173d43d Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Dec 16 12:06:10 2011 -0500 Fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/export/php_array.php | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85b0d54..62883ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ phpMyAdmin - ChangeLog 3.4.10.0 (not yet released) - bug #3460090 [interface] TextareaAutoSelect feature broken +- patch #3375984 [export] PHP Array export might generate invalid php code 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 32e9b6c..7716d98 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -75,7 +75,7 @@ if (isset($plugin_list)) { */ function PMA_exportDBHeader($db) { - PMA_exportOutputHandler('//' . $GLOBALS['crlf'] . '// Database "' . $db . '"' . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf']); + PMA_exportOutputHandler('//' . $GLOBALS['crlf'] . '// Database ' . PMA_backquote($db) . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf']); return true; } @@ -127,6 +127,19 @@ if (isset($plugin_list)) { } unset($i); + // fix variable names (based on http://www.php.net/manual/language.variables.basics.php) + if (preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $table) == false) { + // fix invalid chars in variable names by replacing them with underscores + $tablefixed = preg_replace('/[^a-zA-Z0-9_\x7f-\xff]/', '_', $table); + + // variable name must not start with a number or dash... + if (preg_match('/^[a-zA-Z_\x7f-\xff]/', $tablefixed) == false) { + $tablefixed = '_' . $tablefixed; + } + } else { + $tablefixed = $table; + } + $buffer = ''; $record_cnt = 0; while ($record = PMA_DBI_fetch_row($result)) { @@ -135,16 +148,15 @@ if (isset($plugin_list)) { // Output table name as comment if this is the first record of the table if ($record_cnt == 1) { - $buffer .= $crlf . '// ' . $db . '.' . $table . $crlf; - $buffer .= '$' . $table . ' = array(' . $crlf; + $buffer .= $crlf . '// ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $crlf; + $buffer .= '$' . $tablefixed . ' = array(' . $crlf; $buffer .= ' array('; } else { $buffer .= ',' . $crlf . ' array('; } - for ($i = 0; $i < $columns_cnt; $i++) { - $buffer .= "'" . $columns[$i]. "'=>" . var_export($record[$i], true) . (($i + 1 >= $columns_cnt) ? '' : ','); + $buffer .= var_export($columns[$i], true) . " => " . var_export($record[$i], true) . (($i + 1 >= $columns_cnt) ? '' : ','); } $buffer .= ')'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_9RC1-9-g173d43d
by Marc Delisle 16 Dec '11

16 Dec '11

The branch, QA_3_4 has been updated via 173d43d15bf58d09e06ed17fd4e3b0bd0734756b (commit) via a9d98907268ed1eb643e2c36780d45f360534500 (commit) via 797ec6faf0b6db8103bef1de06890fc357a6c521 (commit) via 7ef064f648fbaff787183b2d194981821d72054a (commit) via 9fc23c882467bca9809c6e05dd1dd38284b05abd (commit) via e43ed55b045dec9724e0695d7039b7a8aad90a99 (commit) from 5130615c0a94a3a13d9e97c3845c408732bfc019 (commit) - Log ----------------------------------------------------------------- commit 173d43d15bf58d09e06ed17fd4e3b0bd0734756b Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Dec 16 11:40:56 2011 -0500 patch #3375984 [export] PHP Array export might generate invalid php code commit a9d98907268ed1eb643e2c36780d45f360534500 Author: Sven Strickroth <email(a)cs-ware.de> Date: Wed Dec 14 16:16:31 2011 +0100 fixed typo Signed-off-by: Sven Strickroth <email(a)cs-ware.de> commit 797ec6faf0b6db8103bef1de06890fc357a6c521 Author: Sven Strickroth <email(a)cs-ware.de> Date: Sat Jul 23 04:04:41 2011 +0200 added spaces to improve look and feel of output Signed-off-by: Sven Strickroth <email(a)cs-ware.de> commit 7ef064f648fbaff787183b2d194981821d72054a Author: Sven Strickroth <email(a)cs-ware.de> Date: Sat Jul 23 04:04:23 2011 +0200 add backquotes to improve look and feel of output Signed-off-by: Sven Strickroth <email(a)cs-ware.de> commit 9fc23c882467bca9809c6e05dd1dd38284b05abd Author: Sven Strickroth <email(a)cs-ware.de> Date: Sat Jul 23 03:56:36 2011 +0200 escape single quotes in column names Column names like `id'` must be escaped in a PHP string Signed-off-by: Sven Strickroth <email(a)cs-ware.de> commit e43ed55b045dec9724e0695d7039b7a8aad90a99 Author: Sven Strickroth <email(a)cs-ware.de> Date: Sat Jul 23 03:55:13 2011 +0200 fix invalid PHP variable names Tables with names like `0-` are allowed in SQL, but not in PHP variable names Signed-off-by: Sven Strickroth <email(a)cs-ware.de> ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/export/php_array.php | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86b6965..c51c785 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 3.4.10.0 (not yet released) - bug #3460090 [interface] TextareaAutoSelect feature broken +- patch #3375984 [export] PHP Array export might generate invalid php code 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 983673c..5b5937d 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -87,7 +87,7 @@ function PMA_exportHeader() */ function PMA_exportDBHeader($db) { - PMA_exportOutputHandler('//' . $GLOBALS['crlf'] . '// Database "' . $db . '"' . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf']); + PMA_exportOutputHandler('//' . $GLOBALS['crlf'] . '// Database ' . PMA_backquote($db) . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf']); return true; } @@ -142,6 +142,19 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) } unset($i); + // fix variable names (based on http://www.php.net/manual/language.variables.basics.php) + if (preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $table) == false) { + // fix invalid chars in variable names by replacing them with underscores + $tablefixed = preg_replace('/[^a-zA-Z0-9_\x7f-\xff]/', '_', $table); + + // variable name must not start with a number or dash... + if (preg_match('/^[a-zA-Z_\x7f-\xff]/', $tablefixed) == false) { + $tablefixed = '_' . $tablefixed; + } + } else { + $tablefixed = $table; + } + $buffer = ''; $record_cnt = 0; while ($record = PMA_DBI_fetch_row($result)) { @@ -150,16 +163,15 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) // Output table name as comment if this is the first record of the table if ($record_cnt == 1) { - $buffer .= $crlf . '// ' . $db . '.' . $table . $crlf; - $buffer .= '$' . $table . ' = array(' . $crlf; + $buffer .= $crlf . '// ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $crlf; + $buffer .= '$' . $tablefixed . ' = array(' . $crlf; $buffer .= ' array('; } else { $buffer .= ',' . $crlf . ' array('; } - for ($i = 0; $i < $columns_cnt; $i++) { - $buffer .= "'" . $columns[$i]. "'=>" . var_export($record[$i], true) . (($i + 1 >= $columns_cnt) ? '' : ','); + $buffer .= var_export($columns[$i], true) . " => " . var_export($record[$i], true) . (($i + 1 >= $columns_cnt) ? '' : ','); } $buffer .= ')'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24868-g07472a7
by Michal Čihař 16 Dec '11

16 Dec '11

The branch, master has been updated via 07472a7f2a726580b02c2c14a7ab852b2ccac90d (commit) from bb1fd3c966b04d3ed8374d065ad804c6d58643d8 (commit) - Log ----------------------------------------------------------------- commit 07472a7f2a726580b02c2c14a7ab852b2ccac90d Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 16 15:40:04 2011 +0100 Make this test pass (it was built not to expect links to documentation) ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_formatSql_test.php | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php index ca1c567..809ebb1 100644 --- a/test/libraries/common/PMA_formatSql_test.php +++ b/test/libraries/common/PMA_formatSql_test.php @@ -53,7 +53,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeHtml_1(){ global $cfg; $cfg['SQP']['fmtType'] = 'html'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $sql = array ( 'raw' => 'SELECT 1;', @@ -87,7 +87,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeHtml_2(){ global $cfg; $cfg['SQP']['fmtType'] = 'html'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = "SELECT * from `tTable`;"; $sql = array ( @@ -134,7 +134,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeHtml_3(){ global $cfg; $cfg['SQP']['fmtType'] = 'html'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;'; $sql = array ( @@ -269,7 +269,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeText_1(){ global $cfg; $cfg['SQP']['fmtType'] = 'text'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $sql = array ( 'raw' => 'SELECT 1;', @@ -303,7 +303,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeText_2(){ global $cfg; $cfg['SQP']['fmtType'] = 'text'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = "SELECT * from `tTable`;"; $sql = array ( @@ -350,7 +350,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeText_3(){ global $cfg; $cfg['SQP']['fmtType'] = 'text'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;'; $sql = array ( @@ -484,7 +484,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeNone_1(){ global $cfg; $cfg['SQP']['fmtType'] = 'none'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $sql = array ( 'raw' => 'SELECT 1;', @@ -521,7 +521,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeNone_2(){ global $cfg; $cfg['SQP']['fmtType'] = 'none'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = "SELECT * from `tTable`;"; $sql = array ( @@ -571,7 +571,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeNone_3(){ global $cfg; $cfg['SQP']['fmtType'] = 'none'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;'; $sql = array ( @@ -708,7 +708,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLWithoutType(){ global $cfg; $cfg['SQP']['fmtType'] = ''; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $sql = array ( 'raw' => 'SELECT 1;', 0 => hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24867-gbb1fd3c
by Michal Čihař 16 Dec '11

16 Dec '11

The branch, master has been updated via bb1fd3c966b04d3ed8374d065ad804c6d58643d8 (commit) via 03f26421dc26f8b4cebe4851ab669e6c9088838e (commit) via 9502e57c347208ec3c42cdcbe8fef468b87b6fb1 (commit) from c296064614b6c31cf79b48a34d9308e5e7943588 (commit) - Log ----------------------------------------------------------------- commit bb1fd3c966b04d3ed8374d065ad804c6d58643d8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 16 15:36:06 2011 +0100 Expect token here as well commit 03f26421dc26f8b4cebe4851ab669e6c9088838e Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 16 15:35:57 2011 +0100 Load theme here, otherwise it pollutes cache in PMA_getImage commit 9502e57c347208ec3c42cdcbe8fef468b87b6fb1 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 16 15:35:35 2011 +0100 Whitespace cleanup ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 12 ++++++------ test/classes/Advisor_test.php | 1 + test/classes/PMA_Message_test.php | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 62e49ff..cd56d03 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2363,18 +2363,18 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, } } -/* +/* Add page numbers with "geometrically increasing" distances. This helps me a lot when navigating through giant tables. - + Test case: table with 2.28 million sets, 76190 pages. Page of interest is - between 72376 and 76190. + between 72376 and 76190. Selecting page 72376. - Now, old version enumerated only +/- 10 pages around 72376 and the + Now, old version enumerated only +/- 10 pages around 72376 and the percentage increment produced steps of about 3000. - The following code adds page numbers +/- 2,4,8,16,32,64,128,256 etc. + The following code adds page numbers +/- 2,4,8,16,32,64,128,256 etc. around the current page. */ @@ -2397,7 +2397,7 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, $pages[] = $i; } } - + // Since because of ellipsing of the current page some numbers may be double, // we unify our array: sort($pages); diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php index 1ef60b2..c57b367 100644 --- a/test/classes/Advisor_test.php +++ b/test/classes/Advisor_test.php @@ -20,6 +20,7 @@ class Advisor_test extends PHPUnit_Framework_TestCase { $_SESSION[' PMA_token '] = 'token'; $GLOBALS['lang'] = 'en'; + $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); } /** diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php index 5968594..72ab91a 100644 --- a/test/classes/PMA_Message_test.php +++ b/test/classes/PMA_Message_test.php @@ -256,7 +256,7 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase ), array( '[a@http://foo.bar/@Documentation]link[/a]', - '<a href="./url.php?url=http%3A%2F%2Ffoo.bar%2F&lang=en" target="Documentation">link</a>' + '<a href="./url.php?url=http%3A%2F%2Ffoo.bar%2F&lang=en&token=token" target="Documentation">link</a>' ), array( '[a@./non-existing@Documentation]link[/a]', @@ -277,6 +277,7 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase public function testDecodeBB($actual, $expected) { $GLOBALS['lang'] = 'en'; + $_SESSION[' PMA_token '] = 'token'; $this->assertEquals($expected, PMA_Message::decodeBB($actual)); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24864-gc296064
by Michal Čihař 16 Dec '11

16 Dec '11

The branch, master has been updated via c296064614b6c31cf79b48a34d9308e5e7943588 (commit) from 16290082b6fe75e3a473b4e9b0f7db3076ea801b (commit) - Log ----------------------------------------------------------------- commit c296064614b6c31cf79b48a34d9308e5e7943588 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 16 15:28:49 2011 +0100 Fix sort order ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.data.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 51ec346..cd9a5fc 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -465,9 +465,9 @@ $PMA_SQPdata_reserved_word = array ( 'FULL', 'FULLTEXT', 'FUNCTION', - 'GENERAL', 'GEMINI', 'GEMINI_SPIN_RETRIES', + 'GENERAL', 'GLOBAL', 'GRANT', 'GRANTS', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24863-g1629008
by Michal Čihař 16 Dec '11

16 Dec '11

The branch, master has been updated via 16290082b6fe75e3a473b4e9b0f7db3076ea801b (commit) via eafecac2e85d508d88d2c6f36e4b8a830d85956e (commit) from 6adcae41645646f1ff1ee7d44102449f37d4b7d9 (commit) - Log ----------------------------------------------------------------- commit 16290082b6fe75e3a473b4e9b0f7db3076ea801b Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 16 15:15:04 2011 +0100 Update reference commit eafecac2e85d508d88d2c6f36e4b8a830d85956e Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 16 15:14:33 2011 +0100 Add MySQL 5.5 reserved words ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.data.php | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 319fa63..51ec346 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -367,7 +367,7 @@ $PMA_SQPdata_column_attrib = array ( /** * words that are reserved by MySQL and may not be used as identifiers without quotes * - * @see http://dev.mysql.com/doc/refman/5.1/en/reserved-words.html + * @see http://dev.mysql.com/doc/refman/5.5/en/reserved-words.html * * @global array MySQL reserved words */ @@ -465,6 +465,7 @@ $PMA_SQPdata_reserved_word = array ( 'FULL', 'FULLTEXT', 'FUNCTION', + 'GENERAL', 'GEMINI', 'GEMINI_SPIN_RETRIES', 'GLOBAL', @@ -481,6 +482,7 @@ $PMA_SQPdata_reserved_word = array ( 'IDENTIFIED', 'IF', 'IGNORE', + 'IGNORE_SERVER_IDS', 'IN', 'INDEX', 'INDEXES', @@ -513,6 +515,7 @@ $PMA_SQPdata_reserved_word = array ( 'LOW_PRIORITY', 'MARIA', // 5.1 ? 'MASTER_CONNECT_RETRY', + 'MASTER_HEARTBEAT_PERIOD', 'MASTER_HOST', 'MASTER_LOG_FILE', 'MASTER_LOG_POS', @@ -520,6 +523,7 @@ $PMA_SQPdata_reserved_word = array ( 'MASTER_PORT', 'MASTER_USER', 'MATCH', + 'MAXVALUE', 'MAX_CONNECTIONS_PER_HOUR', 'MAX_QUERIES_PER_HOUR', 'MAX_ROWS', @@ -582,6 +586,7 @@ $PMA_SQPdata_reserved_word = array ( 'REPLACE', 'REPLICATION', 'RESET', + 'RESIGNAL', 'RESTORE', 'RESTRICT', 'RETURN', @@ -602,7 +607,9 @@ $PMA_SQPdata_reserved_word = array ( 'SHARE', 'SHOW', 'SHUTDOWN', + 'SIGNAL', 'SLAVE', + 'SLOW', 'SONAME', 'SOUNDS', // string-functions.html 'SQL', hooks/post-receive -- phpMyAdmin

1 0