- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-922-g21c014e
by Michal Čihař 30 Mar '10

30 Mar '10

The branch, master has been updated via 21c014ebf1d28ff56da37d7e6163c34425ed8197 (commit) from 0518ab3708586467227a9d1887b8c9530e8a356b (commit) - Log ----------------------------------------------------------------- commit 21c014ebf1d28ff56da37d7e6163c34425ed8197 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 14:08:37 2010 +0200 Mention gettext based usage rather than old select_lang. ----------------------------------------------------------------------- Summary of changes: Documentation.html | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 21a969d..e9c8ade 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1648,8 +1648,9 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <dt id="cfg_DefaultLang">$cfg['DefaultLang'] string</dt> <dd>Defines the default language to use, if not browser-defined or user-defined.<br /> - See the <i>select_lang.lib.php</i> script to know the valid values for - this setting.</dd> + The corresponding language file needs to be in + locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo. + </dd> <dt id="cfg_DefaultConnectionCollation">$cfg['DefaultConnectionCollation'] string</dt> <dd>Defines the default connection collation to use, if not @@ -1658,8 +1659,9 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> documentation</a> for list of possible values.</dd> <dt id="cfg_Lang">$cfg['Lang'] string</dt> - <dd>Force: always use this language (must be defined in the - <i>select_lang.lib.php</i> script).</dd> + <dd>Force language to use.<br /> + The corresponding language file needs to be in + locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo. <dt id="cfg_FilterLanguages">$cfg['FilterLanguages'] string</dt> <dd>Limit list of available languages to those matching the given regular hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. d0471b128a6608d8965e2b4799e773691ca7df35
by Michal Čihař 30 Mar '10

30 Mar '10

The branch, master has been updated via d0471b128a6608d8965e2b4799e773691ca7df35 (commit) from 5fc76a8f5a83c2561ac7725cfa0e819ec98afc83 (commit) - Log ----------------------------------------------------------------- commit d0471b128a6608d8965e2b4799e773691ca7df35 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 14:04:30 2010 +0200 Update translations count. ----------------------------------------------------------------------- Summary of changes: templates/index.tpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/index.tpl b/templates/index.tpl index cacff1f..f8c29e4 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -48,7 +48,7 @@ and Spanish. <p> To ease usage to a wide range of people, phpMyAdmin is translated into <a -href="${base_url}translations.${file_ext}">57 languages</a> and supports both LTR +href="${base_url}translations.${file_ext}">58 languages</a> and supports both LTR and RTL languages. </p> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-921-g0518ab3
by Michal Čihař 30 Mar '10

30 Mar '10

The branch, master has been updated via 0518ab3708586467227a9d1887b8c9530e8a356b (commit) from e2cb4133319c2e8bc8b37ceb336199fdee207228 (commit) - Log ----------------------------------------------------------------- commit 0518ab3708586467227a9d1887b8c9530e8a356b Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 14:04:39 2010 +0200 Update documentation to mention Telugu translation. ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- translators.html | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index fb465b9..21a969d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -139,7 +139,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <abbr title="Frequently Asked Questions">FAQ</abbr> 3.6)</a></li> <li>support mysqli, the improved MySQL extension <a href="#faq1_17"> (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17)</a></li> - <li>communicate in <a href="./translators.html">57 different languages</a> + <li>communicate in <a href="./translators.html">58 different languages</a> </li> <li>synchronize two databases residing on the same as well as remote servers <a href="#faq9_1">(see <abbr title="Frequently Asked Questions">FAQ</abbr> 9.1)</a> diff --git a/translators.html b/translators.html index fe8d659..b4acff5 100644 --- a/translators.html +++ b/translators.html @@ -422,6 +422,13 @@ </td> </tr> +<tr id="telugu"> + <td>Telugu</td> + <td> + veeven (veeven(a)gmail.com) + </td> +</tr> + <tr id="thai"> <td>Thai</td> <td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-920-ge2cb413
by Michal Čihař 30 Mar '10

30 Mar '10

The branch, master has been updated via e2cb4133319c2e8bc8b37ceb336199fdee207228 (commit) via b068e5d7b537c3550f0a46405e925fba15442f57 (commit) from ebd574c385138fe32449c10bd198d993e51305ea (commit) - Log ----------------------------------------------------------------- commit e2cb4133319c2e8bc8b37ceb336199fdee207228 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 14:00:19 2010 +0200 This is not needed with gettext. commit b068e5d7b537c3550f0a46405e925fba15442f57 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 13:59:40 2010 +0200 Fix typo. ----------------------------------------------------------------------- Summary of changes: scripts/check_lang.php | 61 ------------------------------------------------ scripts/generate-mo | 2 +- 2 files changed, 1 insertions(+), 62 deletions(-) delete mode 100644 scripts/check_lang.php diff --git a/scripts/check_lang.php b/scripts/check_lang.php deleted file mode 100644 index 4ecf907..0000000 --- a/scripts/check_lang.php +++ /dev/null @@ -1,61 +0,0 @@ -<?php -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * This test script checks all the language files to ensure there is no errors - * inside and nothing is displayed on screen (eg no extra no blank line). - * - * @version $Id$ - * @package phpMyAdmin-test - */ - -/** - * - */ -$failed = array(); -$passed = array(); - -// 1. Do check -$languageDirectory = dir('../lang'); -while ($name = $languageDirectory->read()) { - if (strpos($name, '.inc.php')) { - // 1.1 Checks parse errors and extra blank line - include '../lang/' . $name; - header('X-Ping: pong'); - // 1.1 Checks "^M" - $content = fread(fopen('../lang/' . $name, 'r'), filesize('../lang/' . $name)); - if ($pos = strpos(' ' . $content, "\015")) { - $failed[] = $name; - } else { - $passed[] = $name; - } - } // end if -} // end while -$languageDirectory->close(); - -// 2. Checking results -$start = ''; -$failed_cnt = count($failed); -sort($failed); -$passed_cnt = count($passed); -sort($passed); -echo ($failed_cnt + $passed_cnt) . ' language files were checked.<br /><br />' . "\n"; -if ($failed_cnt) { - echo '  1. ' . $failed_cnt . ' contain(s) some "^M":<br />' . "\n"; - for ($i = 0; $i < $failed_cnt; $i++) { - echo '    - ' . $failed[$i] . '<br />' . "\n"; - } // end for - if ($passed_cnt) { - echo '<br />' . "\n"; - echo '  2. ' . $passed_cnt . ' seems right:<br />' . "\n"; - $start = '  '; - } -} // end if -if ($passed_cnt) { - if (!$failed_cnt) { - echo 'They all passed checkings:<br />' . "\n"; - } - for ($i = 0; $i < $passed_cnt; $i++) { - echo $start . '  - ' . $passed[$i] . '<br />' . "\n"; - } // end for -} // end if -?> diff --git a/scripts/generate-mo b/scripts/generate-mo index e26575b..c0e2945 100755 --- a/scripts/generate-mo +++ b/scripts/generate-mo @@ -7,7 +7,7 @@ fi for x in po/*.po ; do lang=`echo $x | sed 's@po/$.*$\.po@\1@'` - if [ ! -z "$stas" ] ; then + if [ ! -z "$stats" ] ; then echo -n "$lang: " fi mkdir -p locale/$lang/LC_MESSAGES hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-918-gebd574c
by Michal Čihař 30 Mar '10

30 Mar '10

The branch, master has been updated via ebd574c385138fe32449c10bd198d993e51305ea (commit) via 86cd86fc513aa79eafdf9910b60976ac5750d4eb (commit) via e20e693316852f0e8efb728b512c766d0ca4be52 (commit) from 968f1f9d2da9bfcfcd7c8119222f9ebf5eba011b (commit) - Log ----------------------------------------------------------------- commit ebd574c385138fe32449c10bd198d993e51305ea Merge: e20e693316852f0e8efb728b512c766d0ca4be52 86cd86fc513aa79eafdf9910b60976ac5750d4eb Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 13:49:16 2010 +0200 Merge branch 'QA_3_3' commit e20e693316852f0e8efb728b512c766d0ca4be52 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 13:45:18 2010 +0200 Update generating of bookmarkable url to jQuery. ----------------------------------------------------------------------- Summary of changes: index.php | 1 + js/helper.js | 9 +++++---- libraries/common.inc.php | 1 + libraries/select_lang.lib.php | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index 34842ec..ca284ff 100644 --- a/index.php +++ b/index.php @@ -160,6 +160,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']); // ]]> </script> <script src="./js/mootools.js" type="text/javascript"></script> +<script src="./js/jquery/jquery-1.4.2-min.js" type="text/javascript"></script> <script src="./js/helper.js" type="text/javascript"></script> <script src="./js/common.js" type="text/javascript"></script> </head> diff --git a/js/helper.js b/js/helper.js index b7f6211..0a3fbf1 100644 --- a/js/helper.js +++ b/js/helper.js @@ -1,6 +1,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Various helper scripts, using mootools. + * Various helper scripts, using jQuery. * * @version $Id$ */ @@ -14,7 +14,7 @@ var hash_init_done = 0; * one. */ function setURLHash(hash) { - if (Browser.Engine.webkit) { + if (jQuery.browser.webkit) { /* * Setting hash leads to reload in webkit: * http://www.quirksmode.org/bugreports/archives/2005/05/Safari_13_visual_anom… @@ -25,7 +25,8 @@ function setURLHash(hash) { window.parent.setURLHash(hash); } else { /* Do not set if we're not updating frameset */ - if (window.location.pathname.substring(-9, 9) != "index.php") { + var path = window.location.pathname; + if (path.substring(path.length - 9, path.length) != "index.php") { return; } if (hash_init_done) { @@ -40,7 +41,7 @@ function setURLHash(hash) { * Handler for changing url according to the hash part, which is updated * on each page to allow bookmarks. */ -window.addEvent('load', function() { +jQuery(document).ready(function(){ /* Don't do anything if we're not root Window */ if (window.parent != window && window.parent.setURLHash) { return; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 5a4afc4..fd4f3d1 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -546,6 +546,7 @@ $_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], ''); */ $GLOBALS['js_include'] = array(); $GLOBALS['js_include'][] = 'mootools.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; $GLOBALS['js_include'][] = 'helper.js'; /** diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index be1ce37..4c16df7 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -129,7 +129,7 @@ function PMA_langSet(&$lang) * * @access private */ -function PMA_langDetect(&$str, $envType) +function PMA_langDetect($str, $envType) { if (empty($str)) { return false; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-79-g86cd86f
by Michal Čihař 30 Mar '10

30 Mar '10

The branch, QA_3_3 has been updated via 86cd86fc513aa79eafdf9910b60976ac5750d4eb (commit) from a78fc120480240f8bbd7492b250215530978c396 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- 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 6ee5bec..c1589c4 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -129,7 +129,7 @@ function PMA_langSet(&$lang) * * @access private */ -function PMA_langDetect(&$str, $envType) +function PMA_langDetect($str, $envType) { if (empty($str)) { return false; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-915-g968f1f9
by Michal Čihař 30 Mar '10

30 Mar '10

The branch, master has been updated via 968f1f9d2da9bfcfcd7c8119222f9ebf5eba011b (commit) via a78fc120480240f8bbd7492b250215530978c396 (commit) from a5c73c5a9a9eb6e18b7aa1f9a3fe429ed80a05b8 (commit) - Log ----------------------------------------------------------------- commit 968f1f9d2da9bfcfcd7c8119222f9ebf5eba011b Merge: a5c73c5a9a9eb6e18b7aa1f9a3fe429ed80a05b8 a78fc120480240f8bbd7492b250215530978c396 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 13:27:16 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/Table.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 9e80660..81184a9 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -248,7 +248,7 @@ class PMA_Table * @return boolean true if it is a merge table * @access public */ - public function isMerge($db = null, $table = null) + static public function isMerge($db = null, $table = null) { // if called static, with parameters if (! empty($db) && ! empty($table)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-78-ga78fc12
by Michal Čihař 30 Mar '10

30 Mar '10

The branch, QA_3_3 has been updated via a78fc120480240f8bbd7492b250215530978c396 (commit) from a4ca1638e95cb7892c878394440a103d015be6fa (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/Table.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index de2cfe2..ceed355 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -248,7 +248,7 @@ class PMA_Table * @return boolean true if it is a merge table * @access public */ - public function isMerge($db = null, $table = null) + static public function isMerge($db = null, $table = null) { // if called static, with parameters if (! empty($db) && ! empty($table)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-913-ga5c73c5
by Michal Čihař 30 Mar '10

30 Mar '10

The branch, master has been updated via a5c73c5a9a9eb6e18b7aa1f9a3fe429ed80a05b8 (commit) via a4ca1638e95cb7892c878394440a103d015be6fa (commit) from e68305febd52c7d357a02d21b273423887d2783f (commit) - Log ----------------------------------------------------------------- commit a5c73c5a9a9eb6e18b7aa1f9a3fe429ed80a05b8 Merge: e68305febd52c7d357a02d21b273423887d2783f a4ca1638e95cb7892c878394440a103d015be6fa Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 13:06:53 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + pdf_schema.php | 56 ++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a1717f..b1243f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2972232 [menu] Import menu tab not present on main page - patch #2976790 [menu] Go to the upper level after table DROP, thanks to Kaarel Nummert - kaarelnu +- patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_ 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/pdf_schema.php b/pdf_schema.php index 1e81c3b..99a9b33 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -510,8 +510,19 @@ class PMA_RT_Table { var $height_cell = 6; var $x, $y; var $primary = array(); + var $show_info = false; /** + * Returns title of the current table, + * title can have the dimensions of the table + * + * @access private + */ + function getTitle() + { + return ($this->show_info ? sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->height) : '') . ' ' . $this->table_name; + } // end of the "getTitle" function + /** * Sets the width of the table * * @param integer $ The font size @@ -521,8 +532,6 @@ class PMA_RT_Table { */ function PMA_RT_Table_setWidth($ff) { - // this looks buggy to me... does it really work if - // there are fields that require wider cells than the name of the table? global $pdf; foreach ($this->fields AS $field) { @@ -530,7 +539,11 @@ class PMA_RT_Table { } $this->width += $pdf->GetStringWidth(' '); $pdf->SetFont($ff, 'B'); - $this->width = max($this->width, $pdf->GetStringWidth(' ' . $this->table_name)); + // it is unknown what value must be added, because + // table title is affected by the tabe width value + while ($this->width < $pdf->GetStringWidth($this->getTitle())) { + $this->width += 5; + } $pdf->SetFont($ff, ''); } // end of the "PMA_RT_Table_setWidth()" method /** @@ -545,7 +558,6 @@ class PMA_RT_Table { /** * Do draw the table * - * @param boolean $ Whether to display table position or not * @param integer $ The font size * @param boolean $ Whether to display color * @param integer $ The max. with among tables @@ -553,7 +565,7 @@ class PMA_RT_Table { * @access private * @see PMA_PDF */ - function PMA_RT_Table_draw($show_info, $ff, $setcolor = 0) + function PMA_RT_Table_draw($ff, $setcolor = 0) { global $pdf, $with_doc; @@ -569,11 +581,7 @@ class PMA_RT_Table { $pdf->PMA_links['doc'][$this->table_name]['-'] = ''; } - if ($show_info) { - $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->height) . ' ' . $this->table_name, 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); - } else { - $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, $this->table_name, 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); - } + $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, $this->getTitle(), 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); $pdf->PMA_PDF_setXScale($this->x); $pdf->SetFont($ff, ''); $pdf->SetTextColor(0); @@ -608,6 +616,8 @@ class PMA_RT_Table { * @param string $ The table name * @param integer $ The font size * @param integer $ The max. with among tables + * @param boolean $ Whether to display keys or not + * @param boolean $ Whether to display table position or not * @global object The current PDF document * @global integer The current page number (from the * $cfg['Servers'][$i]['table_coords'] table) @@ -617,7 +627,7 @@ class PMA_RT_Table { * @see PMA_PDF, PMA_RT_Table::PMA_RT_Table_setWidth, PMA_RT_Table::PMA_RT_Table_setHeight */ - function __construct($table_name, $ff, &$same_wide_width, $show_keys) + function __construct($table_name, $ff, &$same_wide_width, $show_keys = false, $show_info = false) { global $pdf, $pdf_page_number, $cfgRelation, $db; @@ -641,9 +651,14 @@ class PMA_RT_Table { $this->fields[] = $row[0]; } } + + $this->show_info = $show_info; + // height and width - $this->PMA_RT_Table_setWidth($ff); $this->PMA_RT_Table_setHeight(); + // setWidth must me after setHeight, because title + // can include table height which changes table width + $this->PMA_RT_Table_setWidth($ff); if ($same_wide_width < $this->width) { $same_wide_width = $this->width; } @@ -847,17 +862,18 @@ class PMA_RT { * @param string $ The relation field in the master table * @param string $ The foreign table name * @param string $ The relation field in the foreign table + * @param boolean $ Whether to display table position or not * @access private * @see PMA_RT_setMinMax */ - function PMA_RT_addRelation($master_table, $master_field, $foreign_table, $foreign_field) + function PMA_RT_addRelation($master_table, $master_field, $foreign_table, $foreign_field, $show_info) { if (!isset($this->tables[$master_table])) { - $this->tables[$master_table] = new PMA_RT_Table($master_table, $this->ff, $this->tablewidth); + $this->tables[$master_table] = new PMA_RT_Table($master_table, $this->ff, $this->tablewidth, false, $show_info); $this->PMA_RT_setMinMax($this->tables[$master_table]); } if (!isset($this->tables[$foreign_table])) { - $this->tables[$foreign_table] = new PMA_RT_Table($foreign_table, $this->ff, $this->tablewidth); + $this->tables[$foreign_table] = new PMA_RT_Table($foreign_table, $this->ff, $this->tablewidth, false, $show_info); $this->PMA_RT_setMinMax($this->tables[$foreign_table]); } $this->relations[] = new PMA_RT_Relation($this->tables[$master_table], $master_field, $this->tables[$foreign_table], $foreign_field); @@ -915,10 +931,10 @@ class PMA_RT { * @access private * @see PMA_RT_Table::PMA_RT_Table_draw() */ - function PMA_RT_drawTables($show_info, $draw_color = 0) + function PMA_RT_drawTables($draw_color = 0) { foreach ($this->tables AS $table) { - $table->PMA_RT_Table_draw($show_info, $this->ff, $draw_color); + $table->PMA_RT_Table_draw($this->ff, $draw_color); } } // end of the "PMA_RT_drawTables()" method /** @@ -1026,7 +1042,7 @@ class PMA_RT { foreach ($alltables AS $table) { if (!isset($this->tables[$table])) { - $this->tables[$table] = new PMA_RT_Table($table, $this->ff, $this->tablewidth, $show_keys); + $this->tables[$table] = new PMA_RT_Table($table, $this->ff, $this->tablewidth, $show_keys, $show_info); } if ($this->same_wide) { @@ -1071,7 +1087,7 @@ class PMA_RT { // (do not use array_search() because we would have to // to do a === FALSE and this is not PHP3 compatible) if (in_array($rel['foreign_table'], $alltables)) { - $this->PMA_RT_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field']); + $this->PMA_RT_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field'], $show_info); } } // end while } // end if @@ -1089,7 +1105,7 @@ class PMA_RT { $this->PMA_RT_drawRelations($change_color); } - $this->PMA_RT_drawTables($show_info, $change_color); + $this->PMA_RT_drawTables($change_color); $this->PMA_RT_showRt(); } // end of the "PMA_RT()" method hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-77-ga4ca163
by Michal Čihař 30 Mar '10

30 Mar '10

The branch, QA_3_3 has been updated via a4ca1638e95cb7892c878394440a103d015be6fa (commit) from 589504fe8a423b794797f72cf61b60fc8b770b3e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + pdf_schema.php | 56 ++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 807fe76..f4da7a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2972232 [menu] Import menu tab not present on main page - patch #2976790 [menu] Go to the upper level after table DROP, thanks to Kaarel Nummert - kaarelnu +- patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_ 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/pdf_schema.php b/pdf_schema.php index 82a07c1..086301a 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -511,8 +511,19 @@ class PMA_RT_Table { var $height_cell = 6; var $x, $y; var $primary = array(); + var $show_info = false; /** + * Returns title of the current table, + * title can have the dimensions of the table + * + * @access private + */ + function getTitle() + { + return ($this->show_info ? sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->height) : '') . ' ' . $this->table_name; + } // end of the "getTitle" function + /** * Sets the width of the table * * @param integer $ The font size @@ -522,8 +533,6 @@ class PMA_RT_Table { */ function PMA_RT_Table_setWidth($ff) { - // this looks buggy to me... does it really work if - // there are fields that require wider cells than the name of the table? global $pdf; foreach ($this->fields AS $field) { @@ -531,7 +540,11 @@ class PMA_RT_Table { } $this->width += $pdf->GetStringWidth(' '); $pdf->SetFont($ff, 'B'); - $this->width = max($this->width, $pdf->GetStringWidth(' ' . $this->table_name)); + // it is unknown what value must be added, because + // table title is affected by the tabe width value + while ($this->width < $pdf->GetStringWidth($this->getTitle())) { + $this->width += 5; + } $pdf->SetFont($ff, ''); } // end of the "PMA_RT_Table_setWidth()" method /** @@ -546,7 +559,6 @@ class PMA_RT_Table { /** * Do draw the table * - * @param boolean $ Whether to display table position or not * @param integer $ The font size * @param boolean $ Whether to display color * @param integer $ The max. with among tables @@ -554,7 +566,7 @@ class PMA_RT_Table { * @access private * @see PMA_PDF */ - function PMA_RT_Table_draw($show_info, $ff, $setcolor = 0) + function PMA_RT_Table_draw($ff, $setcolor = 0) { global $pdf, $with_doc; @@ -570,11 +582,7 @@ class PMA_RT_Table { $pdf->PMA_links['doc'][$this->table_name]['-'] = ''; } - if ($show_info) { - $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->height) . ' ' . $this->table_name, 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); - } else { - $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, $this->table_name, 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); - } + $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, $this->getTitle(), 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); $pdf->PMA_PDF_setXScale($this->x); $pdf->SetFont($ff, ''); $pdf->SetTextColor(0); @@ -611,6 +619,8 @@ class PMA_RT_Table { * @param string $ The table name * @param integer $ The font size * @param integer $ The max. with among tables + * @param boolean $ Whether to display keys or not + * @param boolean $ Whether to display table position or not * @global object The current PDF document * @global integer The current page number (from the * $cfg['Servers'][$i]['table_coords'] table) @@ -620,7 +630,7 @@ class PMA_RT_Table { * @see PMA_PDF, PMA_RT_Table::PMA_RT_Table_setWidth, PMA_RT_Table::PMA_RT_Table_setHeight */ - function __construct($table_name, $ff, &$same_wide_width, $show_keys) + function __construct($table_name, $ff, &$same_wide_width, $show_keys = false, $show_info = false) { global $pdf, $pdf_page_number, $cfgRelation, $db; @@ -644,9 +654,14 @@ class PMA_RT_Table { $this->fields[] = $row[0]; } } + + $this->show_info = $show_info; + // height and width - $this->PMA_RT_Table_setWidth($ff); $this->PMA_RT_Table_setHeight(); + // setWidth must me after setHeight, because title + // can include table height which changes table width + $this->PMA_RT_Table_setWidth($ff); if ($same_wide_width < $this->width) { $same_wide_width = $this->width; } @@ -850,17 +865,18 @@ class PMA_RT { * @param string $ The relation field in the master table * @param string $ The foreign table name * @param string $ The relation field in the foreign table + * @param boolean $ Whether to display table position or not * @access private * @see PMA_RT_setMinMax */ - function PMA_RT_addRelation($master_table, $master_field, $foreign_table, $foreign_field) + function PMA_RT_addRelation($master_table, $master_field, $foreign_table, $foreign_field, $show_info) { if (!isset($this->tables[$master_table])) { - $this->tables[$master_table] = new PMA_RT_Table($master_table, $this->ff, $this->tablewidth); + $this->tables[$master_table] = new PMA_RT_Table($master_table, $this->ff, $this->tablewidth, false, $show_info); $this->PMA_RT_setMinMax($this->tables[$master_table]); } if (!isset($this->tables[$foreign_table])) { - $this->tables[$foreign_table] = new PMA_RT_Table($foreign_table, $this->ff, $this->tablewidth); + $this->tables[$foreign_table] = new PMA_RT_Table($foreign_table, $this->ff, $this->tablewidth, false, $show_info); $this->PMA_RT_setMinMax($this->tables[$foreign_table]); } $this->relations[] = new PMA_RT_Relation($this->tables[$master_table], $master_field, $this->tables[$foreign_table], $foreign_field); @@ -918,10 +934,10 @@ class PMA_RT { * @access private * @see PMA_RT_Table::PMA_RT_Table_draw() */ - function PMA_RT_drawTables($show_info, $draw_color = 0) + function PMA_RT_drawTables($draw_color = 0) { foreach ($this->tables AS $table) { - $table->PMA_RT_Table_draw($show_info, $this->ff, $draw_color); + $table->PMA_RT_Table_draw($this->ff, $draw_color); } } // end of the "PMA_RT_drawTables()" method /** @@ -1029,7 +1045,7 @@ class PMA_RT { foreach ($alltables AS $table) { if (!isset($this->tables[$table])) { - $this->tables[$table] = new PMA_RT_Table($table, $this->ff, $this->tablewidth, $show_keys); + $this->tables[$table] = new PMA_RT_Table($table, $this->ff, $this->tablewidth, $show_keys, $show_info); } if ($this->same_wide) { @@ -1075,7 +1091,7 @@ class PMA_RT { // (do not use array_search() because we would have to // to do a === FALSE and this is not PHP3 compatible) if (in_array($rel['foreign_table'], $alltables)) { - $this->PMA_RT_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field']); + $this->PMA_RT_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field'], $show_info); } } // end while } // end if @@ -1093,7 +1109,7 @@ class PMA_RT { $this->PMA_RT_drawRelations($change_color); } - $this->PMA_RT_drawTables($show_info, $change_color); + $this->PMA_RT_drawTables($change_color); $this->PMA_RT_showRt(); } // end of the "PMA_RT()" method hooks/post-receive -- phpMyAdmin

1 0