Git

git@phpmyadmin.net

6 participants
38573 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-29-g6b50847
by Marc Delisle 29 Apr '10

29 Apr '10

The branch, QA_3_3 has been updated via 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 (commit) from ef2a411db9b005956705c4c3b577f2848189ec26 (commit) - Log ----------------------------------------------------------------- commit 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 29 12:54:25 2010 -0400 bug #2993970 Page numbering in Table of Contents ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + pdf_schema.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20e1fed..7772eb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [edit] Avoid selecting UNHEX function by default for a BLOB column for which editing is protected - bug #2994168 [structure] Show auto_increment in uppercase +- bug #2993970 [pdf schema] Page numbering in Table of Contents 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/pdf_schema.php b/pdf_schema.php index 552ee32..ce87e97 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -1127,7 +1127,7 @@ function PMA_RT_DOC($alltables) $pdf->PMA_links['doc'][$table]['-'] = $pdf->AddLink(); $pdf->SetX(10); // $pdf->Ln(1); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); $pdf->SetX(10); $pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']); // $pdf->Ln(1); @@ -1143,9 +1143,9 @@ function PMA_RT_DOC($alltables) } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); $pdf->SetX(10); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {00}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); $pdf->SetX(10); - $pdf->Cell(0, 6, $i . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell(0, 6, $i + 1 . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); $z = 0; foreach ($alltables AS $table) { $z++; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2099-g43d80c6
by Marc Delisle 29 Apr '10

29 Apr '10

The branch, master has been updated via 43d80c678b114478276f0a32d2a60627e1ff796c (commit) via 05a7a9f30724974df30925945cda99c1d25152fc (commit) via ef2a411db9b005956705c4c3b577f2848189ec26 (commit) from a7a986b84c473cd7ef199e652404cd19207dbc57 (commit) - Log ----------------------------------------------------------------- commit 43d80c678b114478276f0a32d2a60627e1ff796c Merge: 05a7a9f30724974df30925945cda99c1d25152fc a7a986b84c473cd7ef199e652404cd19207dbc57 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 29 12:34:32 2010 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 05a7a9f30724974df30925945cda99c1d25152fc Merge: 407054b6b147b2d877dc73a9f316045f3615172b ef2a411db9b005956705c4c3b577f2848189ec26 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 29 12:31:10 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_structure.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc81a36..278d923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ $Id$ - bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL - bug [edit] Avoid selecting UNHEX function by default for a BLOB column for which editing is protected +- bug #2994168 [structure] Show auto_increment in uppercase 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_structure.php b/tbl_structure.php index c44fa1a..af42e81 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -361,7 +361,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { else { echo '<i>' . $strNoneDefault . '</i>'; } ?></td> - <td nowrap="nowrap"><?php echo $row['Extra']; ?></td> + <td nowrap="nowrap"><?php echo strtoupper($row['Extra']); ?></td> <td align="center"> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote($strRows) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>"> <?php echo $titles['BrowseDistinctValues']; ?></a> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-28-gef2a411
by Marc Delisle 29 Apr '10

29 Apr '10

The branch, QA_3_3 has been updated via ef2a411db9b005956705c4c3b577f2848189ec26 (commit) from b76df0d6099704dad6414d4fe4aaccb6694b61a5 (commit) - Log ----------------------------------------------------------------- commit ef2a411db9b005956705c4c3b577f2848189ec26 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 29 12:30:59 2010 -0400 bug #2994168 Show auto_increment in uppercase ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_structure.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e5064bc..20e1fed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL - bug [edit] Avoid selecting UNHEX function by default for a BLOB column for which editing is protected +- bug #2994168 [structure] Show auto_increment in uppercase 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_structure.php b/tbl_structure.php index 0d966cc..fbe844d 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -346,7 +346,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { else { echo '<i>' . $strNoneDefault . '</i>'; } ?></td> - <td nowrap="nowrap"><?php echo $row['Extra']; ?></td> + <td nowrap="nowrap"><?php echo strtoupper($row['Extra']); ?></td> <td align="center"> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote($strRows) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>"> <?php echo $titles['BrowseDistinctValues']; ?></a> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2096-ga7a986b
by Michal Čihař 29 Apr '10

29 Apr '10

The branch, master has been updated via a7a986b84c473cd7ef199e652404cd19207dbc57 (commit) from 4692e81e24adecc403135a86d62d3d900203bbdf (commit) - Log ----------------------------------------------------------------- commit a7a986b84c473cd7ef199e652404cd19207dbc57 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 29 14:36:54 2010 +0200 Fix param names. ----------------------------------------------------------------------- Summary of changes: pdf_schema.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pdf_schema.php b/pdf_schema.php index 80972aa..2306a15 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -99,11 +99,11 @@ class PMA_PDF extends TCPDF { /** * Sets the scaling factor, defines minimum coordinates and margins * - * @param double $ The scaling factor - * @param double $ The minimum X coordinate - * @param double $ The minimum Y coordinate - * @param double $ The left margin - * @param double $ The top margin + * @param double scale The scaling factor + * @param double x_min The minimum X coordinate + * @param double y_min The minimum Y coordinate + * @param double l_marg The left margin + * @param double t_marg The top margin * @access public */ function PMA_PDF_setScale($scale = 1, $x_min = 0, $y_min = 0, $l_marg = -1, $t_marg = -1) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2095-g4692e81
by Michal Čihař 29 Apr '10

29 Apr '10

The branch, master has been updated via 4692e81e24adecc403135a86d62d3d900203bbdf (commit) from fc328be03071efe8b8712dd46e906d7e37cfdf40 (commit) - Log ----------------------------------------------------------------- commit 4692e81e24adecc403135a86d62d3d900203bbdf Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 29 14:35:42 2010 +0200 Correct type. ----------------------------------------------------------------------- Summary of changes: db_qbe.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/db_qbe.php b/db_qbe.php index 5b8c817..ace4ab1 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -141,7 +141,7 @@ $realwidth = $form_column_width . 'ex'; * Enter description here... * * @param array $columns - * @param numeric $column_number + * @param integer $column_number * @param string $selected */ function showColumnSelectCell($columns, $column_number, $selected = '') hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2094-gfc328be
by Michal Čihař 29 Apr '10

29 Apr '10

The branch, master has been updated via fc328be03071efe8b8712dd46e906d7e37cfdf40 (commit) from e4a399fc6a61ce9641c80c8096bccd1271f506a2 (commit) - Log ----------------------------------------------------------------- commit fc328be03071efe8b8712dd46e906d7e37cfdf40 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 29 14:11:06 2010 +0200 Fix references. ----------------------------------------------------------------------- Summary of changes: libraries/select_lang.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 25ba464..a6efb2c 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -139,7 +139,7 @@ function PMA_langSet(&$lang) * * @return bool true on success, otherwise false * - * @global array $available_languages + * @uses $GLOBALS['available_languages'] to check $lang * * @access private */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2093-ge4a399f
by Michal Čihař 29 Apr '10

29 Apr '10

The branch, master has been updated via e4a399fc6a61ce9641c80c8096bccd1271f506a2 (commit) from a5750bb3bfd699cb235bba90f234e7302f05a54d (commit) - Log ----------------------------------------------------------------- commit e4a399fc6a61ce9641c80c8096bccd1271f506a2 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 29 14:10:11 2010 +0200 Add docs. ----------------------------------------------------------------------- Summary of changes: libraries/import/upload/apc.php | 13 +++++++++---- libraries/import/upload/noplugin.php | 7 ++++++- libraries/import/upload/uploadprogress.php | 19 ++++++++++++------- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php index d997e2c..6b50aeb 100644 --- a/libraries/import/upload/apc.php +++ b/libraries/import/upload/apc.php @@ -12,10 +12,15 @@ if (! defined('PHPMYADMIN')) { $ID_KEY = 'APC_UPLOAD_PROGRESS'; +/** + * Returns upload status. + * + * This is implementation for APC extension. + */ function PMA_getUploadStatus($id) { global $SESSION_KEY; global $ID_KEY; - + if (trim($id) == "") { return; } @@ -30,7 +35,7 @@ function PMA_getUploadStatus($id) { ); } $ret = $_SESSION[$SESSION_KEY][$id]; - + if (! PMA_import_apcCheck() || $ret['finished']) { return $ret; } @@ -40,7 +45,7 @@ function PMA_getUploadStatus($id) { $ret['finished'] = (bool)$status['done']; $ret['total'] = $status['total']; $ret['complete'] = $status['current']; - + if ($ret['total'] > 0) { $ret['percent'] = $ret['complete'] / $ret['total'] * 100; } @@ -51,7 +56,7 @@ function PMA_getUploadStatus($id) { $_SESSION[$SESSION_KEY][$id] = $ret; } - + return $ret; } diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php index af55d76..b3baf70 100644 --- a/libraries/import/upload/noplugin.php +++ b/libraries/import/upload/noplugin.php @@ -12,10 +12,15 @@ if (! defined('PHPMYADMIN')) { $ID_KEY = 'noplugin'; +/** + * Returns upload status. + * + * This is implementation when no webserver support exists, so it returns just zeroes. + */ function PMA_getUploadStatus($id) { global $SESSION_KEY; global $ID_KEY; - + if (trim($id) == "") { return; } diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php index b1530a9..ce4c476 100644 --- a/libraries/import/upload/uploadprogress.php +++ b/libraries/import/upload/uploadprogress.php @@ -11,14 +11,19 @@ if (! defined('PHPMYADMIN')) { $ID_KEY = "UPLOAD_IDENTIFIER"; +/** + * Returns upload status. + * + * This is implementation for uploadprogress extension. + */ function PMA_getUploadStatus($id) { global $SESSION_KEY; global $ID_KEY; - + if (trim($id) == "") { return; } - + if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) { $_SESSION[$SESSION_KEY][$id] = array( 'id' => $id, @@ -30,11 +35,11 @@ function PMA_getUploadStatus($id) { ); } $ret = $_SESSION[$SESSION_KEY][$id]; - + if (! PMA_import_uploadprogressCheck() || $ret['finished']) { return $ret; } - + $status = uploadprogress_get_info($id); if ($status) { @@ -45,7 +50,7 @@ function PMA_getUploadStatus($id) { } $ret['total'] = $status['bytes_total']; $ret['complete'] = $status['bytes_uploaded']; - + if ($ret['total'] > 0) { $ret['percent'] = $ret['complete'] / $ret['total'] * 100; } @@ -59,9 +64,9 @@ function PMA_getUploadStatus($id) { 'plugin' => $ID_KEY ); } - + $_SESSION[$SESSION_KEY][$id] = $ret; - + return $ret; } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2092-ga5750bb
by Michal Čihař 29 Apr '10

29 Apr '10

The branch, master has been updated via a5750bb3bfd699cb235bba90f234e7302f05a54d (commit) from d6fa1d8595b3a1f2d0a5f5ea933d6e6fd96ceb9d (commit) - Log ----------------------------------------------------------------- commit a5750bb3bfd699cb235bba90f234e7302f05a54d Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 29 14:08:03 2010 +0200 Add missing docs. ----------------------------------------------------------------------- Summary of changes: libraries/logging.lib.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php index a531ba3..a52098f 100644 --- a/libraries/logging.lib.php +++ b/libraries/logging.lib.php @@ -9,6 +9,9 @@ * @package phpMyAdmin */ +/** + * Logs user information to webserver logs. + */ function PMA_log_user($user, $status = 'ok'){ if (function_exists('apache_note')) { apache_note('userID', $user); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2091-gd6fa1d8
by Michal Čihař 29 Apr '10

29 Apr '10

The branch, master has been updated via d6fa1d8595b3a1f2d0a5f5ea933d6e6fd96ceb9d (commit) from 382ce6e7add4d92ce5809fe15f5bb659fadd33a3 (commit) - Log ----------------------------------------------------------------- commit d6fa1d8595b3a1f2d0a5f5ea933d6e6fd96ceb9d Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 29 14:02:30 2010 +0200 Add docblock, whitespace leanup. ----------------------------------------------------------------------- Summary of changes: db_tracking.php | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/db_tracking.php b/db_tracking.php index c2dde64..46f2544 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -5,7 +5,9 @@ * @package phpMyAdmin */ -// Run common work +/** + * Run common work + */ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; @@ -95,7 +97,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { $table_query = ' SELECT * FROM ' . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - ' WHERE `db_name` = \'' . PMA_sqlAddslashes($_REQUEST['db']) . '\' AND `table_name` = \'' . PMA_sqlAddslashes($table_name) . '\' AND `version` = \'' . $version_number . '\''; + ' WHERE `db_name` = \'' . PMA_sqlAddslashes($_REQUEST['db']) . '\' AND `table_name` = \'' . PMA_sqlAddslashes($table_name) . '\' AND `version` = \'' . $version_number . '\''; $table_result = PMA_query_as_controluser($table_query); $version_data = PMA_DBI_fetch_array($table_result); @@ -122,7 +124,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { </tr> <?php if ($style == 'even') { - $style = 'odd'; + $style = 'odd'; } else { $style = 'even'; } @@ -177,7 +179,7 @@ if (isset($my_tables)) { </tr> <?php if ($style == 'even') { - $style = 'odd'; + $style = 'odd'; } else { $style = 'even'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2090-g382ce6e
by Michal Čihař 29 Apr '10

29 Apr '10

The branch, master has been updated via 382ce6e7add4d92ce5809fe15f5bb659fadd33a3 (commit) from 407054b6b147b2d877dc73a9f316045f3615172b (commit) - Log ----------------------------------------------------------------- commit 382ce6e7add4d92ce5809fe15f5bb659fadd33a3 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 29 14:00:42 2010 +0200 Remove phpdoc here. ----------------------------------------------------------------------- Summary of changes: config.sample.inc.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/config.sample.inc.php b/config.sample.inc.php index 562ba52..575e965 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -132,7 +132,6 @@ $cfg['SaveDir'] = ''; /** * When using DB-based query history, how many entries should be kept? * - * @global integer $cfg['QueryHistoryMax'] * default = 25 */ //$cfg['QueryHistoryMax'] = 100; hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git