Git April 2010

git@phpmyadmin.net

6 participants
240 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-90-g210b763

by Marc Delisle

The branch, QA_3_3 has been updated via 210b7631da5ddd30ae2d46e90226bc0b2c39d3a0 (commit) from 1f62ea1932a3b4d39cbc64d5b2dcaab81ead78d7 (commit) - Log ----------------------------------------------------------------- commit 210b7631da5ddd30ae2d46e90226bc0b2c39d3a0 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Apr 6 13:00:48 2010 -0400 3.3.3-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb437d1..354d1b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.3.0 (not yet released) + 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the MySQL version, thanks to Dieter Adriaenssens - ruleant diff --git a/Documentation.html b/Documentation.html index 34f1bbd..a33e865 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.2-dev - Documentation</title> + <title>phpMyAdmin 3.3.3-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.2-dev + 3.3.3-dev Documentation </h1> </div> diff --git a/README b/README index c462c54..19c8a90 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.2-dev + Version 3.3.3-dev ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 9430145..57d4964 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.2-dev'); + $this->set('PMA_VERSION', '3.3.3-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 034ed2b..ee017b6 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.2-dev - Official translators</title> + <title>phpMyAdmin 3.3.3-dev - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.2-dev + 3.3.3-dev official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_2, created. RELEASE_3_3_1RC1-90-ga0d1071

by Marc Delisle

The branch, MAINT_3_3_2 has been created at a0d1071ec314de73e162839b629e0285c96d606f (commit) - Log ----------------------------------------------------------------- commit a0d1071ec314de73e162839b629e0285c96d606f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Apr 6 12:52:41 2010 -0400 3.3.2-rc1 ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. 55e3d2740b3730d0bc352156113e666d6c37d161

by Michal Čihař

The branch, master has been updated via 55e3d2740b3730d0bc352156113e666d6c37d161 (commit) from 3355888e83296090c15db82964a4c21bc2b5c720 (commit) - Log ----------------------------------------------------------------- commit 55e3d2740b3730d0bc352156113e666d6c37d161 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Apr 6 13:58:45 2010 +0200 Fix message ID to avoid rejecting mail on sf.net side. ----------------------------------------------------------------------- Summary of changes: git-hooks/git-ciabot | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-hooks/git-ciabot b/git-hooks/git-ciabot index 92f0e3c..de4e240 100755 --- a/git-hooks/git-ciabot +++ b/git-hooks/git-ciabot @@ -98,7 +98,7 @@ ${logmessage} </message>" ${sendmail} << EOM -Message-ID: <${merged:0:12}.${author}@${project}> +Message-ID: <${merged:0:12}-${project}.${author}> To: ${to} Content-type: text/xml Subject: DeliverXML hooks/post-receive -- phpMyAdmin scripts

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1390-g99ee848

by Michal Čihař

The branch, master has been updated via 99ee848285591602ba54988415496b79a220981d (commit) from c7a6e4d2ada3119da7c7e1ecce2025eaad434a3d (commit) - Log ----------------------------------------------------------------- commit 99ee848285591602ba54988415496b79a220981d Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Apr 6 13:55:47 2010 +0200 Czech translation update. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/cs.po b/po/cs.po index 0ee24ad..baec2a0 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-04-02 13:41+0200\n" -"PO-Revision-Date: 2010-04-06 13:52+0200\n" +"PO-Revision-Date: 2010-04-06 13:55+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -7589,7 +7589,7 @@ msgstr "" #: setup/lib/messages.inc.php:361 msgid "List of trusted proxies for IP allow/deny" -msgstr "" +msgstr "Seznam důvěryhodných proxy pro ověření IP adresy" #: setup/lib/messages.inc.php:362 msgid "Directory on server where you can upload files for import" hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1389-gc7a6e4d

by Michal Čihař

The branch, master has been updated via c7a6e4d2ada3119da7c7e1ecce2025eaad434a3d (commit) from 71b2eea153d04f9018b049714080a5ba162b887b (commit) - Log ----------------------------------------------------------------- commit c7a6e4d2ada3119da7c7e1ecce2025eaad434a3d Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Apr 6 13:52:47 2010 +0200 Czech translation update. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index 40848a1..0ee24ad 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-04-02 13:41+0200\n" -"PO-Revision-Date: 2010-04-02 16:57+0200\n" +"PO-Revision-Date: 2010-04-06 13:52+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -7318,8 +7318,8 @@ msgid "" "See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types" "[/a] for an example" msgstr "" -"Příklad můžete nalézt na " -"[a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/a]" +"Příklad můžete nalézt na [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]" +"authentication types[/a]" #: setup/lib/messages.inc.php:301 msgid "Signon session name" @@ -7623,6 +7623,8 @@ msgid "" "Reading of version failed. Maybe you're offline or the upgrade server does " "not respond." msgstr "" +"Čtení verze selhalo. Možná nejste připojeni k internetu nebo server s " +"informace o verzích neodpověděl." #: setup/lib/messages.inc.php:369 msgid "Got invalid version string from server" hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1388-g71b2eea

by Michal Čihař

The branch, master has been updated via 71b2eea153d04f9018b049714080a5ba162b887b (commit) from 5ea8761692d2d9f23293f3cc335991976c299e36 (commit) - Log ----------------------------------------------------------------- commit 71b2eea153d04f9018b049714080a5ba162b887b Author: Crack <piotrprz(a)gmail.com> Date: Tue Apr 6 11:57:43 2010 +0200 Navigation frame styling Patch #2980495 - icon background (home, log out, ...) on mouse over now fills entire box - icon border changed from 0.05em to 1px, fixes display on Chrome (it was rounded to 0) - redesigned fast filter, resizes correctly with frame, reset button is better aligned - decreased margin on database tree - fixed list margin for RTL languages (that list is always in ltr so my change works) ----------------------------------------------------------------------- Summary of changes: themes/original/css/theme_left.css.php | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index a7e7657..e161f59 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -101,10 +101,12 @@ ul#databaseList { margin-bottom: 0.5em; padding-bottom: 0.5em; padding-<?php echo $left; ?>: 1.5em; + font-style: italic; } ul#databaseList a { display: block; + font-style: normal; } div#navidbpageselector a, @@ -113,6 +115,11 @@ ul#databaseList a { color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>; } +ul#databaseList ul { + padding-left: 1em; + padding-right: 0; +} + ul#databaseList a:hover { background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>; color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>; @@ -132,10 +139,10 @@ div#reloadlink a img, div#leftframelinks a img.icon { margin: 0; padding: 0.2em; - border: 0.05em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>; + border: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>; } -div#leftframelinks a:hover { +div#leftframelinks a:hover img { background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>; color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>; } hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1387-g5ea8761

by Michal Čihař

The branch, master has been updated via 5ea8761692d2d9f23293f3cc335991976c299e36 (commit) via 00774b14057eac08e7bbb038871652df426387fe (commit) via 18b435fed88308f5564cd9c8f8099e6e3656fa32 (commit) from 06bcb3ecfdf915d17b3bae247b268a1282b2b5f3 (commit) - Log ----------------------------------------------------------------- commit 5ea8761692d2d9f23293f3cc335991976c299e36 Author: Ruben Barkow <rubo77(a)users.sourceforge.net> Date: Tue Apr 6 09:39:37 2010 +0200 Add some more samples to config.sample.inc.php. rfe#2937840 commit 00774b14057eac08e7bbb038871652df426387fe Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Apr 6 09:32:36 2010 +0200 Whitespace cleanup. commit 18b435fed88308f5564cd9c8f8099e6e3656fa32 Author: Philip Frank <bananer(a)users.sourceforge.net> Date: Tue Apr 6 09:32:12 2010 +0200 Use jQuery to bind click events on table rows Patch #2982132 ----------------------------------------------------------------------- Summary of changes: config.sample.inc.php | 66 +++++++++++++++++++++++++++++++++++++++++++----- js/functions.js | 6 ++-- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/config.sample.inc.php b/config.sample.inc.php index f61b648..e044304 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -7,7 +7,6 @@ * All directives are explained in Documentation.html and on phpMyAdmin * wiki <http://wiki.phpmyadmin.net>. * - * @version $Id$ * @package phpMyAdmin */ @@ -70,31 +69,84 @@ $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; /** - * Defines whether a user should be displayed a "show all (records)" + * Defines whether a user should be displayed a "show all (records)" * button in browse mode or not. + * default = false */ -//$cfg['ShowAll'] = false; +//$cfg['ShowAll'] = true; /** - * Number of rows displayed when browsing a result set. If the result + * Number of rows displayed when browsing a result set. If the result * set contains more rows, "Previous" and "Next". + * default = 30 */ -//$cfg['MaxRows'] = 30; +//$cfg['MaxRows'] = 50; /** * Use graphically less intense menu tabs + * default = false */ -//$cfg['LightTabs'] = false; +//$cfg['LightTabs'] = true; + +/** + * default for 'ORDER BY' clause (valid values are 'ASC', 'DESC' or 'SMART' -ie + * descending order for fields of type TIME, DATE, DATETIME & TIMESTAMP, + * ascending order else-) + * default = ASC + */ +//$cfg['Order'] = 'SMART'; + +/** + * disallow editing of binary fields + * valid values are: + * false allow editing + * 'blob' allow editing except for BLOB fields + * 'all' disallow editing + * default = blob + */ +//$cfg['ProtectBinary'] = 'false'; + +/** + * Default language to use, if not browser-defined or user-defined + * (you find all languages in the file libraries/select_lang.lib.php) + * uncomment the desired line: + * default = 'en-utf-8' + */ +//$cfg['DefaultLang'] = 'en'; +//$cfg['DefaultLang'] = 'de'; + +/** + * default display direction (horizontal|vertical|horizontalflipped) + */ +//$cfg['DefaultDisplay'] = 'vertical'; + + +/** + * How many columns should be used for table display of a database? + * (a value larger than 1 results in some information being hidden) + * default = 1 + */ +//$cfg['PropertiesNumColumns'] = 2; /** * Set to true if you want DB-based query history.If false, this utilizes * JS-routines to display query history (lost by window close) * * This requires advanced features enabled, see above. + * default = false + */ +//$cfg['QueryHistoryDB'] = true; + +/** + * When using DB-based query history, how many entries should be kept? + * + * @global integer $cfg['QueryHistoryMax'] + * default = 25 */ -//$cfg['QueryHistoryDB'] = false; +//$cfg['QueryHistoryMax'] = 100; /* * You can find more configuration options in Documentation.html + * or here: http://wiki.phpmyadmin.net/pma/Config */ ?> diff --git a/js/functions.js b/js/functions.js index 5c577a7..6ea6ac7 100644 --- a/js/functions.js +++ b/js/functions.js @@ -833,14 +833,14 @@ function PMA_markRowsInit() { continue; } // ... and to mark the row on click ... - rows[i].onmousedown = function(event) { + $(rows[i]).bind('mousedown', function(event) { var unique_id; var checkbox; var table; // Somehow IE8 has this not set if (!event) var event = window.event - + checkbox = this.getElementsByTagName( 'input' )[0]; if ( checkbox && checkbox.type == 'checkbox' ) { unique_id = checkbox.name + checkbox.value; @@ -895,7 +895,7 @@ function PMA_markRowsInit() { table.lastClicked = this.rowIndex; } } - } + }); // ... and disable label ... var labeltag = rows[i].getElementsByTagName('label')[0]; hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1384-g06bcb3e

by Marc Delisle

The branch, master has been updated via 06bcb3ecfdf915d17b3bae247b268a1282b2b5f3 (commit) from 6c1b328ef29c1b35474db1209fa4e4e0bb67ed91 (commit) - Log ----------------------------------------------------------------- commit 06bcb3ecfdf915d17b3bae247b268a1282b2b5f3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 5 17:00:42 2010 -0400 author names removal ----------------------------------------------------------------------- Summary of changes: js/functions.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/functions.js b/js/functions.js index 8dea75d..5c577a7 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1588,7 +1588,7 @@ function pdfPaperSize(format, axis) { } /** - * rajk - for playing media from the BLOB repository + * for playing media from the BLOB repository * * @param var * @param var url_params main purpose is to pass the token @@ -1612,7 +1612,7 @@ function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_heigh } /** - * rajk - popups a request for changing MIME types for files in the BLOB repository + * popups a request for changing MIME types for files in the BLOB repository * * @param var db database name * @param var table table name @@ -1634,7 +1634,7 @@ function requestMIMETypeChange(db, table, reference, current_mime_type) } /** - * rajk - changes MIME types for files in the BLOB repository + * changes MIME types for files in the BLOB repository * * @param var db database name * @param var table table name hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1383-g6c1b328

by Marc Delisle

The branch, master has been updated via 6c1b328ef29c1b35474db1209fa4e4e0bb67ed91 (commit) from 6e68e2d149a90e4207a85730f425ad06930d8272 (commit) - Log ----------------------------------------------------------------- commit 6c1b328ef29c1b35474db1209fa4e4e0bb67ed91 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 5 10:26:21 2010 -0400 XHTML compliance ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Documentation.html b/Documentation.html index 9f915f7..a472524 100644 --- a/Documentation.html +++ b/Documentation.html @@ -396,9 +396,7 @@ rm -rf config # remove not needed directory In cookie mode, the password is stored, encrypted with the blowfish algorithm, in a temporary cookie.</li> - <a name="pmausr"></a> - - <li>Note: starting with phpMyAdmin 2.6.1, this section is only applicable if + <li id="pmausr">Note: starting with phpMyAdmin 2.6.1, this section is only applicable if your MySQL server is running with <tt>--skip-show-database</tt>.<br /><br /> For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie' hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1382-g6e68e2d

by Marc Delisle

The branch, master has been updated via 6e68e2d149a90e4207a85730f425ad06930d8272 (commit) from 3ca82375d57cb84e37064c82e4291f06b5e4cce6 (commit) - Log ----------------------------------------------------------------- commit 6e68e2d149a90e4207a85730f425ad06930d8272 Author: Brian Douglass <bhdouglass(a)users.sourceforge.net> Date: Mon Apr 5 10:06:36 2010 -0400 Patch #2981165 Optionally disable the Type column ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 6 ++++++ libraries/config.default.php | 7 +++++++ tbl_change.php | 38 ++++++++++++++++++++++++++++---------- 4 files changed, 43 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index a87c0ca..f50e8bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,8 @@ $Id$ - [core] Provide way for vendors to easily change paths to config files. + patch #2979922, rfe #2804874 [interface] Add inline query editing, thanks to Muhammd Adnan. - bug #2966752 [setup] Allow to configure changes tracking in setup script. ++ patch #2981165 [edit] Optionally disable the Type column, + thanks to Brian Douglass - bhdouglass 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/Documentation.html b/Documentation.html index 4a4a360..9f915f7 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1551,6 +1551,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> displayed in edit/insert mode. Since version 2.10, the user can toggle this setting from the interface. </dd> + + <dt id="cfg_ShowFieldTypesInDataEditView">$cfg['ShowFieldTypesInDataEditView'] boolean</dt> + <dd>Defines whether or not type fields should be initially + displayed in edit/insert mode. The user can + toggle this setting from the interface. + </dd> <dt id="cfg_CharEditing">$cfg['CharEditing'] string</dt> <dd>Defines which type of editing controls should be used for CHAR and diff --git a/libraries/config.default.php b/libraries/config.default.php index 377d828..2d1ca1c 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -920,6 +920,13 @@ $cfg['ProtectBinary'] = 'blob'; $cfg['ShowFunctionFields'] = true; /** + * Display the type fields in edit/insert mode + * + * @global boolean $cfg['ShowFieldTypesInDataEditView'] + */ +$cfg['ShowFieldTypesInDataEditView'] = true; + +/** * Which editor should be used for CHAR/VARCHAR fields: * input - allows limiting of input length * textarea - allows newlines in fields diff --git a/tbl_change.php b/tbl_change.php index cbeda52..835ccf6 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -41,6 +41,9 @@ if (isset($_REQUEST['sql_query'])) { if (isset($_REQUEST['ShowFunctionFields'])) { $cfg['ShowFunctionFields'] = $_REQUEST['ShowFunctionFields']; } +if (isset($_REQUEST['ShowFieldTypesInDataEditView'])) { + $cfg['ShowFieldTypesInDataEditView'] = $_REQUEST['ShowFieldTypesInDataEditView']; +} /** * load relation data, foreign keys @@ -268,10 +271,18 @@ if (! empty($sql_query)) { $url_params['sql_query'] = $sql_query; } +if (! $cfg['ShowFunctionFields'] || ! $cfg['ShowFieldTypesInDataEditView']) { + echo $strShow; +} if (! $cfg['ShowFunctionFields']) { $this_url_params = array_merge($url_params, - array('ShowFunctionFields' => 1, 'goto' => 'sql.php')); - echo $strShow . ' : <a href="tbl_change.php' . PMA_generate_common_url($this_url_params) . '">' . $strFunction . '</a>' . "\n"; + array('ShowFunctionFields' => 1, 'ShowFieldTypesInDataEditView' => $cfg['ShowFieldTypesInDataEditView'], 'goto' => 'sql.php')); + echo ' : <a href="tbl_change.php' . PMA_generate_common_url($this_url_params) . '">' . $strFunction . '</a>' . "\n"; +} +if (! $cfg['ShowFieldTypesInDataEditView']) { + $this_other_url_params = array_merge($url_params, + array('ShowFieldTypesInDataEditView' => 1, 'ShowFunctionFields' => $cfg['ShowFunctionFields'], 'goto' => 'sql.php')); + echo ' : <a href="tbl_change.php' . PMA_generate_common_url($this_other_url_params) . '">' . $strType . '</a>' . "\n"; } foreach ($rows as $row_id => $vrow) { @@ -293,11 +304,17 @@ foreach ($rows as $row_id => $vrow) { <thead> <tr> <th><?php echo $strField; ?></th> - <th><?php echo $strType; ?></th> -<?php + + <?php + if ($cfg['ShowFieldTypesInDataEditView']) { + $this_url_params = array_merge($url_params, + array('ShowFieldTypesInDataEditView' => 0, 'ShowFunctionFields' => $cfg['ShowFunctionFields'], 'goto' => 'sql.php')); + echo ' <th><a href="tbl_change.php' . PMA_generate_common_url($this_url_params) . '" title="' . $strHide . '">' . $strType . '</a></th>' . "\n"; + } + if ($cfg['ShowFunctionFields']) { $this_url_params = array_merge($url_params, - array('ShowFunctionFields' => 0, 'goto' => 'sql.php')); + array('ShowFunctionFields' => 0, 'ShowFieldTypesInDataEditView' => $cfg['ShowFieldTypesInDataEditView'], 'goto' => 'sql.php')); echo ' <th><a href="tbl_change.php' . PMA_generate_common_url($this_url_params) . '" title="' . $strHide . '">' . $strFunction . '</a></th>' . "\n"; } ?> @@ -418,11 +435,12 @@ foreach ($rows as $row_id => $vrow) { <?php echo $field['Field_title']; ?> <input type="hidden" name="fields_name<?php echo $field_name_appendix; ?>" value="<?php echo $field['Field_html']; ?>"/> </td> - <td align="center"<?php echo $field['wrap']; ?>> - <?php echo $field['pma_type']; ?> - </td> - - <?php +<?php if ($cfg['ShowFieldTypesInDataEditView']) { ?> + <td align="center"<?php echo $field['wrap']; ?>> + <?php echo $field['pma_type']; ?> + </td> + + <?php } //End if // Prepares the field value $real_null_value = FALSE; hooks/post-receive -- phpMyAdmin

14 years, 5 months

← Newer
1
...
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git April 2010