Git June 2011

git@phpmyadmin.net

7 participants
281 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 4432a9f800dad6f2e7387f621e29efca7195000f
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via 4432a9f800dad6f2e7387f621e29efca7195000f (commit) from 21e5c7b0df55f763eb737049d5ebe87f1a0bf662 (commit) - Log ----------------------------------------------------------------- commit 4432a9f800dad6f2e7387f621e29efca7195000f Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 11:51:37 2011 +0200 Update piwik tracking code ----------------------------------------------------------------------- Summary of changes: templates/_page.tpl | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/_page.tpl b/templates/_page.tpl index 81acca3..6b71705 100644 --- a/templates/_page.tpl +++ b/templates/_page.tpl @@ -75,12 +75,12 @@ var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.cihar document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); </script><script type="text/javascript"> try { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2); - piwikTracker.trackPageView(); - piwikTracker.enableLinkTracking(); +var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2); +piwikTracker.trackPageView(); +piwikTracker.enableLinkTracking(); } catch( err ) {} -</script> - +</script><noscript><p><img src="http://stats.cihar.com/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript> + </body> </html> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4491-gffc01b1
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via ffc01b199aa99744a4b21d7b3bdfb24c593bb314 (commit) via 76d4046858648eeed4d8fa880bf1216ea3bcdf57 (commit) from 4bbdebe22e5eb62cffbcfa0619713fff25c02734 (commit) - Log ----------------------------------------------------------------- commit ffc01b199aa99744a4b21d7b3bdfb24c593bb314 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 11:41:05 2011 +0200 Define subpackages for import modules commit 76d4046858648eeed4d8fa880bf1216ea3bcdf57 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 11:39:21 2011 +0200 Use subpackages for export formats ----------------------------------------------------------------------- Summary of changes: libraries/export/codegen.php | 6 ++++-- libraries/export/csv.php | 3 ++- libraries/export/excel.php | 3 ++- libraries/export/htmlword.php | 3 ++- libraries/export/json.php | 3 ++- libraries/export/latex.php | 3 ++- libraries/export/mediawiki.php | 3 ++- libraries/export/ods.php | 3 ++- libraries/export/odt.php | 3 ++- libraries/export/pdf.php | 6 ++++-- libraries/export/php_array.php | 3 ++- libraries/export/sql.php | 3 ++- libraries/export/texytext.php | 3 ++- libraries/export/xls.php | 3 ++- libraries/export/xlsx.php | 3 ++- libraries/export/xml.php | 3 ++- libraries/export/yaml.php | 3 ++- libraries/import/csv.php | 1 + libraries/import/docsql.php | 1 + libraries/import/ldi.php | 3 ++- libraries/import/ods.php | 2 +- libraries/import/sql.php | 7 ++++--- libraries/import/xls.php | 17 +++++++++-------- libraries/import/xlsx.php | 17 +++++++++-------- libraries/import/xml.php | 40 ++++++++++++++++++++-------------------- 25 files changed, 85 insertions(+), 60 deletions(-) diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 56c9d08..bb4510a 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -3,7 +3,8 @@ /** * Set of functions used to build NHibernate dumps of tables * - * @package phpMyAdmin-Export-Codegen + * @package phpMyAdmin-Export + * @subpackage Codegen */ if (! defined('PHPMYADMIN')) { exit; @@ -148,7 +149,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) /** * - * @package phpMyAdmin-Export-Codegen + * @package phpMyAdmin-Export + * @subpackage Codegen */ class TableProperty { diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 050db6c..62b1537 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -3,7 +3,8 @@ /** * CSV export code * - * @package phpMyAdmin-Export-CSV + * @package phpMyAdmin-Export + * @subpackage CSV */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/excel.php b/libraries/export/excel.php index 5afbd7e..df329de 100644 --- a/libraries/export/excel.php +++ b/libraries/export/excel.php @@ -3,7 +3,8 @@ /** * Set of functions used to build CSV dumps of tables for excel * - * @package phpMyAdmin-Export-CSV-Excel + * @package phpMyAdmin-Export + * @subpackage CSV-Excel */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 6598873..af5af76 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -3,7 +3,8 @@ /** * Set of functions used to build HTML dumps of tables * - * @package phpMyAdmin-Export-HTMLWord + * @package phpMyAdmin-Export + * @subpackage HTMLWord */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/json.php b/libraries/export/json.php index d45c01b..c9bba1e 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -3,7 +3,8 @@ /** * Set of functions used to build dumps of tables as JSON * - * @package phpMyAdmin-Export-JSON + * @package phpMyAdmin-Export + * @subpackage JSON */ */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 01e7ea1..565c29c 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -3,7 +3,8 @@ /** * Set of functions used to build LaTeX dumps of tables * - * @package phpMyAdmin-Export-Latex + * @package phpMyAdmin-Export + * @subpackage Latex */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index 2363979..538c31c 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -3,7 +3,8 @@ /** * Set of functions used to build MediaWiki dumps of tables * - * @package phpMyAdmin-Export-MediaWiki + * @package phpMyAdmin-Export + * @subpackage MediaWiki */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 0237627..699aa0f 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -3,7 +3,8 @@ /** * Set of functions used to build OpenDocument Spreadsheet dumps of tables * - * @package phpMyAdmin-Export-ODS + * @package phpMyAdmin-Export + * @subpackage ODS */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/odt.php b/libraries/export/odt.php index 2210a12..d3c42de 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -3,7 +3,8 @@ /** * Set of functions used to build OpenDocument Text dumps of tables * - * @package phpMyAdmin-Export-ODT + * @package phpMyAdmin-Export + * @subpackage ODT */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index fe9b46c..e864454 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -3,7 +3,8 @@ /** * Produce a PDF report (export) from a query * - * @package phpMyAdmin-Export-PDF + * @package phpMyAdmin-Export + * @subpackage PDF */ if (! defined('PHPMYADMIN')) { exit; @@ -39,7 +40,8 @@ require_once './libraries/tcpdf/tcpdf.php'; /** * Adapted from a LGPL script by Philip Clarke - * @package phpMyAdmin-Export-PDF + * @package phpMyAdmin-Export + * @subpackage PDF */ class PMA_PDF extends TCPDF { diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 2687eb7..66a0aa6 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -3,7 +3,8 @@ /** * Set of functions used to build dumps of tables as PHP Arrays * - * @package phpMyAdmin-Export-PHP + * @package phpMyAdmin-Export + * @subpackage PHP */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/sql.php b/libraries/export/sql.php index b1bd457..ed61a07 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -3,7 +3,8 @@ /** * Set of functions used to build SQL dumps of tables * - * @package phpMyAdmin-Export-SQL + * @package phpMyAdmin-Export + * @subpackage SQL */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index d15b43e..2b290f1 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -3,7 +3,8 @@ /** * Export to Texy! text. * - * @package phpMyAdmin-Export-Texy + * @package phpMyAdmin-Export + * @subpackage Texy */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/xls.php b/libraries/export/xls.php index 4461c2e..2a1f219 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -3,7 +3,8 @@ /** * Set of functions used to build dumps of tables as Excel files. * - * @package phpMyAdmin-Export-XLS + * @package phpMyAdmin-Export + * @subpackage XLS */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index db65add..487c2df 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -3,7 +3,8 @@ /** * Set of functions used to build dumps of tables as Excel 2007 files. * - * @package phpMyAdmin-Export-XLSX + * @package phpMyAdmin-Export + * @subpackage XLSX */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/xml.php b/libraries/export/xml.php index de2d12a..ba1e4fa 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -3,7 +3,8 @@ /** * Set of functions used to build XML dumps of tables * - * @package phpMyAdmin-Export-XML + * @package phpMyAdmin-Export + * @subpackage XML */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index 9d9f7e5..8c3fad0 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -3,7 +3,8 @@ /** * Set of functions used to build YAML dumps of tables * - * @package phpMyAdmin-Export-YAML + * @package phpMyAdmin-Export + * @subpackage YAML */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/import/csv.php b/libraries/import/csv.php index 6386333..49cff44 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -5,6 +5,7 @@ * * @todo add an option for handling NULL values * @package phpMyAdmin-Import + * @subpackage CSV */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php index f032e95..3ac799f 100644 --- a/libraries/import/docsql.php +++ b/libraries/import/docsql.php @@ -4,6 +4,7 @@ * DocSQL import plugin for phpMyAdmin * * @package phpMyAdmin-Import + * @subpackage DocSQL */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 979013d..56dabf9 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -1,9 +1,10 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * CSV import plugin for phpMyAdmin + * CSV import plugin for phpMyAdmin using LOAD DATA * * @package phpMyAdmin-Import + * @subpackage LDI */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 9d41bb4..29952f9 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -5,8 +5,8 @@ * * @todo Pretty much everything * @todo Importing of accented characters seems to fail - * @version 0.5-beta * @package phpMyAdmin-Import + * @subpackage ODS */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/sql.php b/libraries/import/sql.php index 4bb65d6..536df68 100644 --- a/libraries/import/sql.php +++ b/libraries/import/sql.php @@ -4,6 +4,7 @@ * SQL import plugin for phpMyAdmin * * @package phpMyAdmin-Import + * @subpackage SQL */ if (! defined('PHPMYADMIN')) { exit; @@ -37,8 +38,8 @@ if (isset($plugin_list)) { ), ), array( - 'type' => 'bool', - 'name' => 'no_auto_value_on_zero', + 'type' => 'bool', + 'name' => 'no_auto_value_on_zero', 'text' => __('Do not use <code>AUTO_INCREMENT</code> for zero values'), 'doc' => array( 'manual_MySQL_Database_Administration', @@ -234,7 +235,7 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) { } // Skip the rest $start_of_comment = $i; - // do not use PHP_EOL here instead of "\n", because the export + // do not use PHP_EOL here instead of "\n", because the export // file might have been produced on a different system $i = strpos($buffer, $ch == '/' ? '*/' : "\n", $i); // didn't we hit end of string? diff --git a/libraries/import/xls.php b/libraries/import/xls.php index 6d5c0e2..f7e3d33 100644 --- a/libraries/import/xls.php +++ b/libraries/import/xls.php @@ -5,6 +5,7 @@ * * @todo Pretty much everything * @package phpMyAdmin-Import + * @subpackage XLS */ if (! defined('PHPMYADMIN')) { @@ -54,26 +55,26 @@ $col_names = array(); for ($s = 0; $s < $num_sheets; ++$s) { $current_sheet = $objPHPExcel->getSheet($s); - + $num_rows = $current_sheet->getHighestRow(); $num_cols = PMA_getColumnNumberFromName($current_sheet->getHighestColumn()); - + if ($num_rows != 1 && $num_cols != 1) { for ($r = 1; $r <= $num_rows; ++$r) { for ($c = 0; $c < $num_cols; ++$c) { $cell = $current_sheet->getCellByColumnAndRow($c, $r)->getCalculatedValue(); - + if (! strcmp($cell, '')) { $cell = 'NULL'; } - + $tempRow[] = $cell; } - + $rows[] = $tempRow; $tempRow = array(); } - + if ($_REQUEST['xls_col_names']) { $col_names = array_splice($rows, 0, 1); $col_names = $col_names[0]; @@ -87,9 +88,9 @@ for ($s = 0; $s < $num_sheets; ++$s) { $col_names[] = PMA_getColumnAlphaName($n + 1); } } - + $tables[] = array($sheet_names[$s], $col_names, $rows); - + $col_names = array(); $rows = array(); } diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php index 5479623..2b5f628 100644 --- a/libraries/import/xlsx.php +++ b/libraries/import/xlsx.php @@ -5,6 +5,7 @@ * * @todo Pretty much everything * @package phpMyAdmin-Import + * @subpackage XLSX */ if (! defined('PHPMYADMIN')) { @@ -54,26 +55,26 @@ $col_names = array(); for ($s = 0; $s < $num_sheets; ++$s) { $current_sheet = $objPHPExcel->getSheet($s); - + $num_rows = $current_sheet->getHighestRow(); $num_cols = PMA_getColumnNumberFromName($current_sheet->getHighestColumn()); - + if ($num_rows != 1 && $num_cols != 1) { for ($r = 1; $r <= $num_rows; ++$r) { for ($c = 0; $c < $num_cols; ++$c) { $cell = $current_sheet->getCellByColumnAndRow($c, $r)->getCalculatedValue(); - + if (! strcmp($cell, '')) { $cell = 'NULL'; } - + $tempRow[] = $cell; } - + $rows[] = $tempRow; $tempRow = array(); } - + if ($_REQUEST['xlsx_col_names']) { $col_names = array_splice($rows, 0, 1); $col_names = $col_names[0]; @@ -87,9 +88,9 @@ for ($s = 0; $s < $num_sheets; ++$s) { $col_names[] = PMA_getColumnAlphaName($n + 1); } } - + $tables[] = array($sheet_names[$s], $col_names, $rows); - + $col_names = array(); $rows = array(); } diff --git a/libraries/import/xml.php b/libraries/import/xml.php index d3d17b2..8fe45d8 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -4,8 +4,8 @@ * XML import plugin for phpMyAdmin * * @todo Improve efficiency - * @version 0.5-beta * @package phpMyAdmin-Import + * @subpackage XML */ if (! defined('PHPMYADMIN')) { @@ -141,19 +141,19 @@ if (isset($namespaces['pma'])) { * Get structures for all tables */ $struct = $xml->children($namespaces['pma']); - + $create = array(); - + foreach ($struct as $tier1 => $val1) { foreach($val1 as $tier2 => $val2) { /* Need to select the correct database for the creation of tables, views, triggers, etc. */ /** - * @todo Generating a USE here blocks importing of a table - * into another database. + * @todo Generating a USE here blocks importing of a table + * into another database. */ $attrs = $val2->attributes(); $create[] = "USE " . PMA_backquote($attrs["name"]); - + foreach ($val2 as $val3) { /** * Remove the extra cosmetic spacing @@ -163,7 +163,7 @@ if (isset($namespaces['pma'])) { } } } - + $struct_present = true; } @@ -179,13 +179,13 @@ $data_present = false; */ if (@count($xml->children())) { $data_present = true; - + /** * Process all database content */ foreach ($xml as $k1 => $v1) { $tbl_attr = $v1->attributes(); - + $isInTables = false; for ($i = 0; $i < count($tables); ++$i) { if (! strcmp($tables[$i][TBL_NAME], (string)$tbl_attr['name'])) { @@ -193,11 +193,11 @@ if (@count($xml->children())) { break; } } - + if ($isInTables == false) { $tables[] = array((string)$tbl_attr['name']); } - + foreach ($v1 as $k2 => $v2) { $row_attr = $v2->attributes(); if (! array_search((string)$row_attr['name'], $tempRow)) @@ -206,17 +206,17 @@ if (@count($xml->children())) { } $tempCells[] = (string)$v2; } - + $rows[] = array((string)$tbl_attr['name'], $tempRow, $tempCells); - + $tempRow = array(); $tempCells = array(); } - + unset($tempRow); unset($tempCells); unset($xml); - + /** * Bring accumulated rows into the corresponding table */ @@ -227,17 +227,17 @@ if (@count($xml->children())) { if (! isset($tables[$i][COL_NAMES])) { $tables[$i][] = $rows[$j][COL_NAMES]; } - + $tables[$i][ROWS][] = $rows[$j][ROWS]; } } } - + unset($rows); - + if (! $struct_present) { $analyses = array(); - + $len = count($tables); for ($i = 0; $i < $len; ++$i) { $analyses[] = PMA_analyzeTable($tables[$i]); @@ -289,7 +289,7 @@ if (strlen($db)) { if ($db_name === NULL) { $db_name = 'XML_DB'; } - + /* Set database collation/charset */ $options = array( 'db_collation' => $collation, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4489-g4bbdebe
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via 4bbdebe22e5eb62cffbcfa0619713fff25c02734 (commit) from 40ddb5031e4c404a53c6f08ffbe16e073305d895 (commit) - Log ----------------------------------------------------------------- commit 4bbdebe22e5eb62cffbcfa0619713fff25c02734 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 11:34:06 2011 +0200 Add phpdoc ----------------------------------------------------------------------- Summary of changes: themes/svg_gradient.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/themes/svg_gradient.php b/themes/svg_gradient.php index a5d89c6..c8f9ae8 100644 --- a/themes/svg_gradient.php +++ b/themes/svg_gradient.php @@ -1,4 +1,9 @@ <?php +/** + * Theme based generator for SVG gradient. + * + * @package phpMyAdmin-theme + */ header('Content-Type: image/svg+xml'); header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4488-g40ddb50
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via 40ddb5031e4c404a53c6f08ffbe16e073305d895 (commit) from 657e492a222c9a48f77c0a36881633393556c14d (commit) - Log ----------------------------------------------------------------- commit 40ddb5031e4c404a53c6f08ffbe16e073305d895 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 11:31:42 2011 +0200 Docblocks and whitespace cleanup in export modules ----------------------------------------------------------------------- Summary of changes: libraries/export/csv.php | 2 ++ libraries/export/excel.php | 12 ++++++------ libraries/export/htmlword.php | 2 +- libraries/export/json.php | 3 +++ libraries/export/latex.php | 2 +- libraries/export/mediawiki.php | 13 ++++++------- libraries/export/php_array.php | 3 ++- libraries/export/xls.php | 38 +++++++++++++++++++------------------- libraries/export/xlsx.php | 2 +- libraries/export/xml.php | 1 - 10 files changed, 41 insertions(+), 37 deletions(-) diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 41c3cf3..050db6c 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -1,6 +1,8 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * CSV export code + * * @package phpMyAdmin-Export-CSV */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/excel.php b/libraries/export/excel.php index 08961eb..5afbd7e 100644 --- a/libraries/export/excel.php +++ b/libraries/export/excel.php @@ -1,9 +1,9 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Set of functions used to build CSV dumps of tables + * Set of functions used to build CSV dumps of tables for excel * - * @package phpMyAdmin-Export-CSV + * @package phpMyAdmin-Export-CSV-Excel */ if (! defined('PHPMYADMIN')) { exit; @@ -23,12 +23,12 @@ if (isset($plugin_list)) { array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove carriage return/line feed characters within columns')), array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array( - 'type' => 'select', - 'name' => 'edition', + 'type' => 'select', + 'name' => 'edition', 'values' => array( 'win' => 'Windows', - 'mac_excel2003' => 'Excel 2003 / Macintosh', - 'mac_excel2008' => 'Excel 2008 / Macintosh'), + 'mac_excel2003' => 'Excel 2003 / Macintosh', + 'mac_excel2008' => 'Excel 2008 / Macintosh'), 'text' => __('Excel edition:')), array('type' => 'hidden', 'name' => 'structure_or_data'), array('type' => 'end_group'), diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 7b54476..6598873 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Set of functions used to build CSV dumps of tables + * Set of functions used to build HTML dumps of tables * * @package phpMyAdmin-Export-HTMLWord */ diff --git a/libraries/export/json.php b/libraries/export/json.php index 6f70dd4..d45c01b 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -1,7 +1,10 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Set of functions used to build dumps of tables as JSON * + * @package phpMyAdmin-Export-JSON + */ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 9709dc4..01e7ea1 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Set of functions used to build dumps of tables + * Set of functions used to build LaTeX dumps of tables * * @package phpMyAdmin-Export-Latex */ diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index 386b63e..2363979 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -4,7 +4,6 @@ * Set of functions used to build MediaWiki dumps of tables * * @package phpMyAdmin-Export-MediaWiki - * @version $Id: mediawiki.php 12972 2009-09-14 06:21:04Z drummingds1 $ */ if (! defined('PHPMYADMIN')) { exit; @@ -112,7 +111,7 @@ function PMA_exportDBCreate($db) { function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { global $mediawiki_export_struct; global $mediawiki_export_data; - + $result = PMA_DBI_fetch_result("SHOW COLUMNS FROM `" . $db . "`.`" . $table . "`"); $row_cnt = count($result); @@ -127,7 +126,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } } $output .= "\n"; - + $output .= "|- style=\"background:#f9f9f9;\"\n"; $output .= "! style=\"background:#f2f2f2\" | Type\n"; for ($i = 0; $i < $row_cnt; ++$i) { @@ -137,7 +136,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } } $output .= "\n"; - + $output .= "|- style=\"background:#f9f9f9;\"\n"; $output .= "! style=\"background:#f2f2f2\" | Null\n"; for ($i = 0; $i < $row_cnt; ++$i) { @@ -147,7 +146,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } } $output .= "\n"; - + $output .= "|- style=\"background:#f9f9f9;\"\n"; $output .= "! style=\"background:#f2f2f2\" | Default\n"; for ($i = 0; $i < $row_cnt; ++$i) { @@ -157,7 +156,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } } $output .= "\n"; - + $output .= "|- style=\"background:#f9f9f9;\"\n"; $output .= "! style=\"background:#f2f2f2\" | Extra\n"; for ($i = 0; $i < $row_cnt; ++$i) { @@ -167,7 +166,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } } $output .= "\n"; - + $output .= "|}\n\n\n\n"; return PMA_exportOutputHandler($output); } diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 2c3b4e6..2687eb7 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -1,8 +1,9 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Set of functions used to build dumps of tables as PHP Arrays * - * @version 0.2b (20090704) + * @package phpMyAdmin-Export-PHP */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/xls.php b/libraries/export/xls.php index 01e2ae4..4461c2e 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * + * Set of functions used to build dumps of tables as Excel files. * * @package phpMyAdmin-Export-XLS */ @@ -56,19 +56,19 @@ function PMA_exportComment($text) { function PMA_exportFooter() { global $workbook; global $tmp_filename; - + $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xls_'); - + $workbookWriter = new PHPExcel_Writer_Excel5($workbook); $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir'])); $workbookWriter->save($tmp_filename); - + if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { return false; } - + unlink($tmp_filename); - + unset($GLOBALS['workbook']); unset($GLOBALS['sheet_index']); @@ -84,17 +84,17 @@ function PMA_exportFooter() { */ function PMA_exportHeader() { global $db; - + /* Initialize the workbook */ $GLOBALS['workbook'] = new PHPExcel(); $GLOBALS['sheet_index'] = 0; global $workbook; - + $workbook->getProperties()->setCreator('phpMyAdmin ' . PMA_VERSION); $workbook->getProperties()->setLastModifiedBy('phpMyAdmin ' . PMA_VERSION); $workbook->getProperties()->setTitle($db); $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLS Dump'); - + return true; } @@ -108,8 +108,8 @@ function PMA_exportHeader() { * @access public */ function PMA_exportDBHeader($db) { - - + + return true; } @@ -155,33 +155,33 @@ function PMA_exportDBCreate($db) { function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { global $workbook; global $sheet_index; - + /** * Get the data from the database using the original query */ $result = PMA_DBI_fetch_result($sql_query); $row_cnt = count($result); - + if ($row_cnt > 0) { $col_names = array_keys($result[0]); $fields_cnt = count($result[0]); $row_offset = 1; - + /* Only one sheet is created on workbook initialization */ if ($sheet_index > 0) { $workbook->createSheet(); } - + $workbook->setActiveSheetIndex($sheet_index); $workbook->getActiveSheet()->setTitle(substr($table, 0, 31)); - + if (isset($GLOBALS['xls_columns']) && $GLOBALS['xls_columns']) { for ($i = 0; $i < $fields_cnt; ++$i) { $workbook->getActiveSheet()->setCellValueByColumnAndRow($i, $row_offset, $col_names[$i]); } $row_offset++; } - + for ($r = 0; ($r < 65536) && ($r < $row_cnt); ++$r) { for ($c = 0; $c < $fields_cnt; ++$c) { if (!isset($result[$r][$col_names[$c]]) || is_null($result[$r][$col_names[$c]])) { @@ -196,10 +196,10 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } } } - + $sheet_index++; } - + return true; } diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 190cd2f..db65add 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * + * Set of functions used to build dumps of tables as Excel 2007 files. * * @package phpMyAdmin-Export-XLSX */ diff --git a/libraries/export/xml.php b/libraries/export/xml.php index e27bd2f..de2d12a 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -3,7 +3,6 @@ /** * Set of functions used to build XML dumps of tables * - * @todo * @package phpMyAdmin-Export-XML */ if (! defined('PHPMYADMIN')) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. 93e415c1d6bec1214f9649b41b57cafe33ad7648
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via 93e415c1d6bec1214f9649b41b57cafe33ad7648 (commit) from fbea5364d15281f394eede5a576787c0facd6f53 (commit) - Log ----------------------------------------------------------------- commit 93e415c1d6bec1214f9649b41b57cafe33ad7648 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jun 21 11:18:36 2011 +0200 Change working directory before run, docblox otherwise picks up css and js from phpMyAdmin instead of own ----------------------------------------------------------------------- Summary of changes: website/pma-docs | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/website/pma-docs b/website/pma-docs index a8a3e22..1eebbf9 100755 --- a/website/pma-docs +++ b/website/pma-docs @@ -9,9 +9,10 @@ tmpfile=`mktemp -t pmadoclogXXXXXXX` chmod 644 $tmpfile cd /home/pmaweb/pma/phpmyadmin/ git pull -q +cd ~ nice -19 \ docblox run \ - -d ./ \ + -d /home/pmaweb/pma/phpmyadmin/ \ -t $tmpdir \ -i libraries/PHPExcel/*,libraries/tcpdf/*,libraries/php-gettext/* \ --title 'phpMyAdmin documentation' \ hooks/post-receive -- phpMyAdmin scripts

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. fbea5364d15281f394eede5a576787c0facd6f53
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via fbea5364d15281f394eede5a576787c0facd6f53 (commit) from 95b423605337e53e1222c3dd5531c8e91782c6fd (commit) - Log ----------------------------------------------------------------- commit fbea5364d15281f394eede5a576787c0facd6f53 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jun 21 11:01:19 2011 +0200 Switch generating phpdoc to docblox, it seems to work nicer ----------------------------------------------------------------------- Summary of changes: website/pma-docs | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/website/pma-docs b/website/pma-docs index ce9f3e3..a8a3e22 100755 --- a/website/pma-docs +++ b/website/pma-docs @@ -10,13 +10,11 @@ chmod 644 $tmpfile cd /home/pmaweb/pma/phpmyadmin/ git pull -q nice -19 \ - phpdoc \ + docblox run \ -d ./ \ - -i lang/ \ - -dn 'phpMyAdmin' \ - -ti 'phpMyAdmin documentation' \ - -o HTML:frames:phphtmllib \ -t $tmpdir \ + -i libraries/PHPExcel/*,libraries/tcpdf/*,libraries/php-gettext/* \ + --title 'phpMyAdmin documentation' \ > $tmpfile if [ $? -eq 0 ] ; then rsync -az --delete $tmpdir/ web.sourceforge.net:htdocs/phpdoc/ hooks/post-receive -- phpMyAdmin scripts

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 21e5c7b0df55f763eb737049d5ebe87f1a0bf662
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via 21e5c7b0df55f763eb737049d5ebe87f1a0bf662 (commit) from 405496f24f34f13d2aad06123d9ad85fe7fdeba9 (commit) - Log ----------------------------------------------------------------- commit 21e5c7b0df55f763eb737049d5ebe87f1a0bf662 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 10:18:34 2011 +0200 Add 3.4.0 as a milestone ----------------------------------------------------------------------- Summary of changes: templates/about.tpl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/templates/about.tpl b/templates/about.tpl index 4b3443b..5d4f3b0 100644 --- a/templates/about.tpl +++ b/templates/about.tpl @@ -57,6 +57,7 @@ development in 2001. <li><a href="http://wiki.phpmyadmin.net/pma/phpMyAdmin_3.1.0">3.1.0</a> (November 28, 2008): Added support for BLOBStreaming, Swekey hardware authentication and rewritten setup script.</li> <li><a href="http://wiki.phpmyadmin.net/pma/phpMyAdmin_3.2">3.2.0</a> (June 9, 2009): Added many small features.</li> <li><a href="http://wiki.phpmyadmin.net/pma/phpMyAdmin_3.3">3.3.0</a> (March 7, 2010): Added new import and export modules, changes tracking, synchronization and support for replication configuration.</li> +<li>3.4.0 (May 11, 2011): AJAXification of some parts, charts, visual query builder, user preferences, ENUM/SET editor.</li> </ul> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4486-gf0b097d
by Madhura Jayaratne 21 Jun '11

21 Jun '11

The branch, master has been updated via f0b097d646656ce281ce5028ed0bc55f823221b2 (commit) from b261436a0306ac1abec69dd7e06dbd8336c67f5a (commit) - Log ----------------------------------------------------------------- commit f0b097d646656ce281ce5028ed0bc55f823221b2 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Jun 21 08:22:49 2011 +0530 ChangeLog entries for commits related to OpenGIS support for phpMyAdmin ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62a3329..e1288ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,9 @@ phpMyAdmin - ChangeLog - Patch #3316969 PMA_ajaxShowMessage() does not respect timeout + AJAX for Change on multiple rows in table Browse + [interface] Improved support for stored routines ++ [display] More options for browsing GIS data ++ [interface] Support for spatial indexes ++ [display] GIS data visualization 3.4.4.0 (not yet released) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4435-gd9304ef
by Rouslan Placella 21 Jun '11

21 Jun '11

The branch, master has been updated via d9304efed4efb23af5b9452f5250dbda87624bda (commit) via 387cb5c1fe09b423f70688bd73a65f69063372c7 (commit) via a5408b248b727cc1f6e98860760a401413fed4a7 (commit) from cf3930d29ff507a57a6aaa986a4a11391573f8a1 (commit) - Log ----------------------------------------------------------------- commit d9304efed4efb23af5b9452f5250dbda87624bda Merge: 387cb5c1fe09b423f70688bd73a65f69063372c7 cf3930d29ff507a57a6aaa986a4a11391573f8a1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Mon Jun 20 23:16:27 2011 +0100 Merge remote-tracking branch 'origin/master' commit 387cb5c1fe09b423f70688bd73a65f69063372c7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Mon Jun 20 23:16:12 2011 +0100 Temporarily hiding links to unfinished implementations of Triggers and Events functionalities commit a5408b248b727cc1f6e98860760a401413fed4a7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Mon Jun 20 23:11:48 2011 +0100 Updated the changeLog - Improved support for routines ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/db_links.inc.php | 6 ++++-- libraries/tbl_links.inc.php | 7 ++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9594ca..62a3329 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog + AJAX for Insert to a table from database Structure page - Patch #3316969 PMA_ajaxShowMessage() does not respect timeout + AJAX for Change on multiple rows in table Browse ++ [interface] Improved support for stored routines 3.4.4.0 (not yet released) diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index cb276d5..d1579e9 100644 --- a/libraries/db_links.inc.php +++ b/libraries/db_links.inc.php @@ -125,10 +125,12 @@ if (! $db_is_information_schema) { $tabs[] =& $tab_routines; } if (PMA_MYSQL_INT_VERSION >= 50106 && ! PMA_DRIZZLE) { - $tabs[] =& $tab_events; + // Temporarily hiding this unfinished feature + // $tabs[] =& $tab_events; } if (PMA_MYSQL_INT_VERSION >= 50002 && ! PMA_DRIZZLE) { - $tabs[] =& $tab_triggers; + // Temporarily hiding this unfinished feature + // $tabs[] =& $tab_triggers; } } if (PMA_Tracker::isActive()) { diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 66df327..6282097 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -98,9 +98,10 @@ if(PMA_Tracker::isActive()) { $tabs['tracking']['link'] = 'tbl_tracking.php'; } if (! $db_is_information_schema && PMA_MYSQL_INT_VERSION >= 50002 && ! PMA_DRIZZLE) { - $tabs['triggers']['link'] = 'tbl_triggers.php'; - $tabs['triggers']['text'] = __('Triggers'); - $tabs['triggers']['icon'] = 'b_triggers.png'; + // Temporarily hiding this unfinished feature + // $tabs['triggers']['link'] = 'tbl_triggers.php'; + // $tabs['triggers']['text'] = __('Triggers'); + // $tabs['triggers']['icon'] = 'b_triggers.png'; } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4432-gcf3930d
by Marc Delisle 20 Jun '11

20 Jun '11

The branch, master has been updated via cf3930d29ff507a57a6aaa986a4a11391573f8a1 (commit) from 61329e5c87cc7062eff02a71ee08084a8f2b9a12 (commit) - Log ----------------------------------------------------------------- commit cf3930d29ff507a57a6aaa986a4a11391573f8a1 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 20 16:25:11 2011 -0400 Complete the code change for form renaming (rowsDeleteForm to resultsForm) ----------------------------------------------------------------------- Summary of changes: js/sql.js | 6 +++--- libraries/display_tbl.lib.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/js/sql.js b/js/sql.js index 080a2e4..b89d48b 100644 --- a/js/sql.js +++ b/js/sql.js @@ -97,7 +97,7 @@ function appendInlineAnchor() { $cloned_tr.insertAfter($this_tr); }); - $('#rowsDeleteForm').find('tbody').find('th').each(function() { + $('#resultsForm').find('tbody').find('th').each(function() { var $this_th = $(this); if ($this_th.attr('rowspan') == 4) { $this_th.attr('rowspan', '5'); @@ -149,7 +149,7 @@ function appendInlineAnchor() { $this_td.after($cloned_anchor); }); - $('#rowsDeleteForm').find('thead, tbody').find('th').each(function() { + $('#resultsForm').find('thead, tbody').find('th').each(function() { var $this_th = $(this); if ($this_th.attr('colspan') == 4) { $this_th.attr('colspan', '5'); @@ -981,7 +981,7 @@ $(document).ready(function() { } } }) -rowsDeleteForm + /* * update the where_clause, remove the last appended ' AND ' * */ diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 16d3a9f..22aaf69 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -2287,11 +2287,11 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) $checkall_url = 'sql.php' . PMA_generate_common_url($_url_params); if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical') { - $checkall_params['onclick'] = 'if (setCheckboxes(\'rowsDeleteForm\', true)) return false;'; - $uncheckall_params['onclick'] = 'if (setCheckboxes(\'rowsDeleteForm\', false)) return false;'; + $checkall_params['onclick'] = 'if (setCheckboxes(\'resultsForm\', true)) return false;'; + $uncheckall_params['onclick'] = 'if (setCheckboxes(\'resultsForm\', false)) return false;'; } else { - $checkall_params['onclick'] = 'if (markAllRows(\'rowsDeleteForm\')) return false;'; - $uncheckall_params['onclick'] = 'if (unMarkAllRows(\'rowsDeleteForm\')) return false;'; + $checkall_params['onclick'] = 'if (markAllRows(\'resultsForm\')) return false;'; + $uncheckall_params['onclick'] = 'if (unMarkAllRows(\'resultsForm\')) return false;'; } $checkall_link = PMA_linkOrButton($checkall_url, __('Check All'), $checkall_params, false); $uncheckall_link = PMA_linkOrButton($uncheckall_url, __('Uncheck All'), $uncheckall_params, false); hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git June 2011