Git

git@phpmyadmin.net

8 participants
38199 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5822-ga1e1e44
by Michal Čihař 21 Jul '10

21 Jul '10

The branch, master has been updated via a1e1e44149a3b31e279e7256f2082c3811f8aa29 (commit) from 95fe228814fa36a64c01224ea557216b695605b2 (commit) - Log ----------------------------------------------------------------- commit a1e1e44149a3b31e279e7256f2082c3811f8aa29 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 13:50:33 2010 +0200 Cleanup SQL validator documentation. ----------------------------------------------------------------------- Summary of changes: Documentation.html | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Documentation.html b/Documentation.html index f76f33c..c35cfae 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4108,26 +4108,34 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); <a href="#faqsqlvalidator">6.14 How do I set up the <abbr title="structured query language">SQL</abbr> Validator?</a></h4> -<p> To use it, you need a very recent version of PHP, 4.3.0 recommended, with +<p> + To use SQL Validator, you need PHP with <abbr title="Extensible Markup Language">XML</abbr>, <abbr title="Perl Compatible Regular Expressions">PCRE</abbr> and <abbr title="PHP Extension and Application Repository">PEAR</abbr> support. - You either need a SOAP PHP extension or install PEAR SOAP module. - On your system command line, run <tt>"pear install Net_Socket Net_URL - HTTP_Request Mail_Mime Net_DIME SOAP"</tt> to get the necessary - <abbr title="PHP Extension and Application Repository">PEAR</abbr> modules - for usage.<br /> - On a more recent pear version, I had problems with the state of Net_DIME - being beta, so this single command - <tt>"pear -d preferred_state=beta install -a SOAP"</tt> installed all the - needed modules.<br /> + In addition you need a <abbr title="Simple Object Access + Protocol">SOAP</abbr> support, either as a PHP extension or as a PEAR SOAP + module. +</p> + +<p> + To install <abbr title="PHP Extension and Application + Repository">PEAR</abbr> <abbr title="Simple Object Access + Protocol">SOAP</abbr> module, run <tt>"pear install Net_Socket Net_URL + HTTP_Request Mail_Mime Net_DIME SOAP"</tt> to get the necessary <abbr + title="PHP Extension and Application Repository">PEAR</abbr> modules for + usage. +</p> + +<p> If you use the Validator, you should be aware that any <abbr title="structured query language">SQL</abbr> statement you submit will be stored anonymously (database/table/column names, strings, numbers replaced with generic values). The Mimer <abbr title="structured query language">SQL</abbr> Validator itself, is © 2001 Upright Database Technology. - We utilize it as free SOAP service.</p> + We utilize it as free SOAP service. +</p> <h4 id="faq6_15"> <a href="#faq6_15">6.15 I want to add a BLOB column and put an index on hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5821-g95fe228
by Michal Čihař 21 Jul '10

21 Jul '10

The branch, master has been updated via 95fe228814fa36a64c01224ea557216b695605b2 (commit) from 06cf763358f9c6cda440538fb2148b9f7f3a9f4f (commit) - Log ----------------------------------------------------------------- commit 95fe228814fa36a64c01224ea557216b695605b2 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 13:46:20 2010 +0200 Adjust formatting for darkblue theme as well. ----------------------------------------------------------------------- Summary of changes: themes/darkblue_orange/css/theme_right.css.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index cf54378..b6fe2a2 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -1201,7 +1201,7 @@ label.desc { float: <?php echo $left; ?>; } -code.sql { +code.sql, div.sqlvalidate { display: block; padding: 0.3em; margin-top: 0; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5820-g06cf763
by Michal Čihař 21 Jul '10

21 Jul '10

The branch, master has been updated via 06cf763358f9c6cda440538fb2148b9f7f3a9f4f (commit) from 2490329af1d4f2a676512135db9b71222307326c (commit) - Log ----------------------------------------------------------------- commit 06cf763358f9c6cda440538fb2148b9f7f3a9f4f Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 13:45:32 2010 +0200 [interface] Better formatting for SQL validator results. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.lib.php | 12 ++++++++++-- themes/original/css/theme_right.css.php | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 165e091..bc2ec78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ $Id$ + [code] Centralized format string expansion, @VARIABLES@ are recommended way now. + [validator] SQL validator works also with SOAP PHP extension. +- [interface] Better formatting for SQL validator results. 3.3.6.0 (not yet released) - bug #3031705 [core] Do not use CONCAT for DECIMAL fields. diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 61bb709..7e79faf 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1250,7 +1250,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view $validate_link = ''; } //validator - echo '<code class="sql">'; + if (!empty($GLOBALS['validatequery'])) { + echo '<div class="sqlvalidate">'; + } else { + echo '<code class="sql">'; + } if ($query_too_big) { echo $shortened_query_base; } else { @@ -1261,7 +1265,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view if (! empty($GLOBALS['show_as_php'])) { echo '";'; } - echo '</code>'; + if (!empty($GLOBALS['validatequery'])) { + echo '</div>'; + } else { + echo '</code>'; + } echo '<div class="tools">'; // avoid displaying a Profiling checkbox that could diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 4cd48ea..53f0f23 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1152,7 +1152,7 @@ label.desc { float: <?php echo $left; ?>; } -code.sql { +code.sql, div.sqlvalidate { display: block; padding: 0.3em; margin-top: 0; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5819-g2490329
by Michal Čihař 21 Jul '10

21 Jul '10

The branch, master has been updated via 2490329af1d4f2a676512135db9b71222307326c (commit) from 43d5ad370af8b77f80e698e81d82d18672370257 (commit) - Log ----------------------------------------------------------------- commit 2490329af1d4f2a676512135db9b71222307326c Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 13:40:40 2010 +0200 Remove obsolete comments. ----------------------------------------------------------------------- Summary of changes: libraries/sqlvalidator.class.php | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index 5a44c2b..8d1aac6 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -13,17 +13,8 @@ * Make sure you have a really recent PHP with PEAR support * run this: "pear install Mail_Mime Net_DIME SOAP" * - * If you got this file from somewhere other than phpMyAdmin - * please be aware that the latest copy will always be in the - * phpMyAdmin subversion tree as - * - * This code that also used to depend on the PHP overload module, but that has been - * removed now. - * * @access public * - * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { @@ -134,19 +125,13 @@ if (!$GLOBALS['sqlvalidator_error']) { "a_connectionTechnologyVersion" => $connection_technology_version, "a_interactive" => $interactive, ); + if ($GLOBALS['sqlvalidator_soap'] == 'PHP') { $ret = $obj->__soapCall("openSession", $use_array); } else { $ret = $obj->call("openSession", $use_array); } - // This is the old version that needed the overload extension - /* $ret = $obj->openSession($username, $password, - $calling_program, $calling_program_version, - $target_dbms, $target_dbms_version, - $connection_technology, $connection_technology_version, - $interactive); */ - return $ret; } // end of the "_openSession()" function @@ -171,14 +156,13 @@ if (!$GLOBALS['sqlvalidator_error']) { "a_SQL" => $sql, "a_resultType" => $this->output_type, ); + if ($GLOBALS['sqlvalidator_soap'] == 'PHP') { $res = $obj->__soapCall("validateSQL", $use_array); } else { $res = $obj->call("validateSQL", $use_array); } - // This is the old version that needed the overload extension - // $res = $obj->validateSQL($session->sessionId, $session->sessionKey, $sql, $this->output_type); return $res; } // end of the "validateSQL()" function hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5818-g43d5ad3
by Michal Čihař 21 Jul '10

21 Jul '10

The branch, master has been updated via 43d5ad370af8b77f80e698e81d82d18672370257 (commit) from f5aa40b02f3cb363256f2983a092ede845c305de (commit) - Log ----------------------------------------------------------------- commit 43d5ad370af8b77f80e698e81d82d18672370257 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 13:35:43 2010 +0200 Use real version when talking to validator. ----------------------------------------------------------------------- Summary of changes: libraries/sqlvalidator.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index 0a70158..5a44c2b 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -222,7 +222,7 @@ if (!$GLOBALS['sqlvalidator_error']) { $this->username = 'anonymous'; $this->password = ''; $this->calling_program = 'PHP_SQLValidator'; - $this->calling_program_version = '$Revision$'; + $this->calling_program_version = PMA_VERSION; $this->target_dbms = 'N/A'; $this->target_dbms_version = 'N/A'; $this->connection_technology = 'PHP'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5817-gf5aa40b
by Michal Čihař 21 Jul '10

21 Jul '10

The branch, master has been updated via f5aa40b02f3cb363256f2983a092ede845c305de (commit) from ec18488499312fb3d4a3678f52c8aed77a35662c (commit) - Log ----------------------------------------------------------------- commit f5aa40b02f3cb363256f2983a092ede845c305de Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 13:32:26 2010 +0200 Catch error when connection to validator service fails. ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index a8c32fc..61bb709 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1130,7 +1130,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view if (! empty($GLOBALS['show_as_php'])) { $query_base = '$sql = "' . $query_base; } elseif (! empty($GLOBALS['validatequery'])) { - $query_base = PMA_validateSQL($query_base); + try { + $query_base = PMA_validateSQL($query_base); + } catch (Exception $e) { + PMA_Message::error(__('Failed to connect to SQL validator!'))->display(); + } } elseif (isset($parsed_sql)) { $query_base = PMA_formatSql($parsed_sql, $query_base); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5816-gec18488
by Michal Čihař 21 Jul '10

21 Jul '10

The branch, master has been updated via ec18488499312fb3d4a3678f52c8aed77a35662c (commit) via 49a3bf45b7cbe158ed3d6fe3956870c61ca1f0aa (commit) via 7d9bdc4754177450d96dd327b91f3fe1d00e68ae (commit) from 1faec011d012ba37af49965a87840c071f75a4d1 (commit) - Log ----------------------------------------------------------------- commit ec18488499312fb3d4a3678f52c8aed77a35662c Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 13:20:58 2010 +0200 Fix documentation. commit 49a3bf45b7cbe158ed3d6fe3956870c61ca1f0aa Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 13:20:29 2010 +0200 Coding style. commit 7d9bdc4754177450d96dd327b91f3fe1d00e68ae Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 13:19:19 2010 +0200 Make sure sqlvalidator_error is always defined. ----------------------------------------------------------------------- Summary of changes: libraries/sqlvalidator.class.php | 21 +++++++++++++++++++-- libraries/sqlvalidator.lib.php | 4 ++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index 0f9a6f3..0a70158 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -34,11 +34,13 @@ if (! defined('PHPMYADMIN')) { * Load SOAP client. */ if (class_exists('SOAPClient')) { + $GLOBALS['sqlvalidator_error'] = false; $GLOBALS['sqlvalidator_soap'] = 'PHP'; } else { @include_once 'SOAP/Client.php'; if (class_exists('SOAP_Client')) { $GLOBALS['sqlvalidator_soap'] = 'PEAR'; + $GLOBALS['sqlvalidator_error'] = false; } else { $GLOBALS['sqlvalidator_soap'] = 'NONE'; $GLOBALS['sqlvalidator_error'] = TRUE; @@ -121,7 +123,17 @@ if (!$GLOBALS['sqlvalidator_error']) { $connection_technology, $connection_technology_version, $interactive) { - $use_array = array("a_userName" => $username, "a_password" => $password, "a_callingProgram" => $calling_program, "a_callingProgramVersion" => $calling_program_version, "a_targetDbms" => $target_dbms, "a_targetDbmsVersion" => $target_dbms_version, "a_connectionTechnology" => $connection_technology, "a_connectionTechnologyVersion" => $connection_technology_version, "a_interactive" => $interactive); + $use_array = array( + "a_userName" => $username, + "a_password" => $password, + "a_callingProgram" => $calling_program, + "a_callingProgramVersion" => $calling_program_version, + "a_targetDbms" => $target_dbms, + "a_targetDbmsVersion" => $target_dbms_version, + "a_connectionTechnology" => $connection_technology, + "a_connectionTechnologyVersion" => $connection_technology_version, + "a_interactive" => $interactive, + ); if ($GLOBALS['sqlvalidator_soap'] == 'PHP') { $ret = $obj->__soapCall("openSession", $use_array); } else { @@ -153,7 +165,12 @@ if (!$GLOBALS['sqlvalidator_error']) { */ function _validateSQL($obj, $session, $sql, $method) { - $use_array = array("a_sessionId" => $session->sessionId, "a_sessionKey" => $session->sessionKey, "a_SQL" => $sql, "a_resultType" => $this->output_type); + $use_array = array( + "a_sessionId" => $session->sessionId, + "a_sessionKey" => $session->sessionKey, + "a_SQL" => $sql, + "a_resultType" => $this->output_type, + ); if ($GLOBALS['sqlvalidator_soap'] == 'PHP') { $res = $obj->__soapCall("validateSQL", $use_array); } else { diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php index 2e965f8..aaa79c0 100644 --- a/libraries/sqlvalidator.lib.php +++ b/libraries/sqlvalidator.lib.php @@ -22,8 +22,8 @@ * run this: "pear install Mail_Mime Net_DIME SOAP" * * Enable the SQL Validator options in the configuration file - * $cfg['SQLQuery']['Validate'] = TRUE; - * $cfg['SQLValidator']['use'] = FALSE; + * $cfg['SQLQuery']['Validate'] = true; + * $cfg['SQLValidator']['use'] = true; * * Also set a username and password if you have a private one * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5813-g1faec01
by Michal Čihař 21 Jul '10

21 Jul '10

The branch, master has been updated via 1faec011d012ba37af49965a87840c071f75a4d1 (commit) from bc4dc6b9bd6c8e53b12043a7f5d16cbe97a6330e (commit) - Log ----------------------------------------------------------------- commit 1faec011d012ba37af49965a87840c071f75a4d1 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 13:17:15 2010 +0200 SQL validator works also with SOAP PHP extension. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + Documentation.html | 1 + libraries/sqlvalidator.class.php | 39 +++++++++++++++++++++++++++++-------- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b48497..165e091 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ $Id$ navigation. + [code] Centralized format string expansion, @VARIABLES@ are recommended way now. ++ [validator] SQL validator works also with SOAP PHP extension. 3.3.6.0 (not yet released) - bug #3031705 [core] Do not use CONCAT for DECIMAL fields. diff --git a/Documentation.html b/Documentation.html index 7574c09..f76f33c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4112,6 +4112,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); <abbr title="Extensible Markup Language">XML</abbr>, <abbr title="Perl Compatible Regular Expressions">PCRE</abbr> and <abbr title="PHP Extension and Application Repository">PEAR</abbr> support. + You either need a SOAP PHP extension or install PEAR SOAP module. On your system command line, run <tt>"pear install Net_Socket Net_URL HTTP_Request Mail_Mime Net_DIME SOAP"</tt> to get the necessary <abbr title="PHP Extension and Application Repository">PEAR</abbr> modules diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index 3b6847c..0f9a6f3 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -7,9 +7,9 @@ * http://www.orbis-terrarum.net/?l=people.robbat2 * * All data is transported over HTTP-SOAP - * And uses the PEAR SOAP Module + * And uses either the PEAR SOAP Module or PHP SOAP extension * - * Install instructions for PEAR SOAP + * Install instructions for PEAR SOAP: * Make sure you have a really recent PHP with PEAR support * run this: "pear install Mail_Mime Net_DIME SOAP" * @@ -33,11 +33,20 @@ if (! defined('PHPMYADMIN')) { /** * Load SOAP client. */ -@include_once 'SOAP/Client.php'; - -if (!function_exists('class_exists') || !class_exists('SOAP_Client')) { - $GLOBALS['sqlvalidator_error'] = TRUE; +if (class_exists('SOAPClient')) { + $GLOBALS['sqlvalidator_soap'] = 'PHP'; } else { + @include_once 'SOAP/Client.php'; + if (class_exists('SOAP_Client')) { + $GLOBALS['sqlvalidator_soap'] = 'PEAR'; + } else { + $GLOBALS['sqlvalidator_soap'] = 'NONE'; + $GLOBALS['sqlvalidator_error'] = TRUE; + PMA_warnMissingExtension('soap'); + } +} + +if (!$GLOBALS['sqlvalidator_error']) { // Ok, we have SOAP Support, so let's use it! /** @@ -79,7 +88,11 @@ if (!function_exists('class_exists') || !class_exists('SOAP_Client')) { */ function _openService($url) { - $obj = new SOAP_Client($url, TRUE); + if ($GLOBALS['sqlvalidator_soap'] == 'PHP') { + $obj = new SOAPClient($url); + } else { + $obj = new SOAP_Client($url, TRUE); + } return $obj; } // end of the "openService()" function @@ -109,7 +122,11 @@ if (!function_exists('class_exists') || !class_exists('SOAP_Client')) { $interactive) { $use_array = array("a_userName" => $username, "a_password" => $password, "a_callingProgram" => $calling_program, "a_callingProgramVersion" => $calling_program_version, "a_targetDbms" => $target_dbms, "a_targetDbmsVersion" => $target_dbms_version, "a_connectionTechnology" => $connection_technology, "a_connectionTechnologyVersion" => $connection_technology_version, "a_interactive" => $interactive); - $ret = $obj->call("openSession", $use_array); + if ($GLOBALS['sqlvalidator_soap'] == 'PHP') { + $ret = $obj->__soapCall("openSession", $use_array); + } else { + $ret = $obj->call("openSession", $use_array); + } // This is the old version that needed the overload extension /* $ret = $obj->openSession($username, $password, @@ -137,7 +154,11 @@ if (!function_exists('class_exists') || !class_exists('SOAP_Client')) { function _validateSQL($obj, $session, $sql, $method) { $use_array = array("a_sessionId" => $session->sessionId, "a_sessionKey" => $session->sessionKey, "a_SQL" => $sql, "a_resultType" => $this->output_type); - $res = $obj->call("validateSQL", $use_array); + if ($GLOBALS['sqlvalidator_soap'] == 'PHP') { + $res = $obj->__soapCall("validateSQL", $use_array); + } else { + $res = $obj->call("validateSQL", $use_array); + } // This is the old version that needed the overload extension // $res = $obj->validateSQL($session->sessionId, $session->sessionKey, $sql, $this->output_type); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5809-g709c97d
by Michal Čihař 21 Jul '10

21 Jul '10

The branch, master has been updated via 709c97dee355421046069a6cc550017b671f7e64 (commit) from e5e340e525f51a318def41e087301b015c661ff1 (commit) - Log ----------------------------------------------------------------- commit 709c97dee355421046069a6cc550017b671f7e64 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 10:17:35 2010 +0200 Chagelog update. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c075c2..1b48497 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,8 @@ $Id$ + [core] Dropped AllowAnywhereRecoding configuration variable. - rfe #3016457 [interface] Define tab order in SQL form to allow easier tab navigation. ++ [code] Centralized format string expansion, @VARIABLES@ are recommended way + now. 3.3.6.0 (not yet released) - bug #3031705 [core] Do not use CONCAT for DECIMAL fields. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5808-ge5e340e
by Michal Čihař 21 Jul '10

21 Jul '10

The branch, master has been updated via e5e340e525f51a318def41e087301b015c661ff1 (commit) via cb6716c4814ba7e8031ea2a0a5f5a8d7ab78068d (commit) via b1cf628bd7809c58af73391f3b9949f89c11a386 (commit) via 38171b9e239d68b4116d08ef46749a554a32e485 (commit) via 7a788a52b9931c317611b3c14b8795a999cc736a (commit) via 906d7bc6325cd9b186db6eb24c4252e27c9aa8fe (commit) via dba7151245ac841a02a6733eef3f05c00d9d3794 (commit) via 2040be9611832190e07c001e19b8755c13399589 (commit) via 9b2aa3c40d65d40a293c433dc581f0aa0c2bc354 (commit) via 715f2f04f6170265d2ea9f9d0b507bc4dae40557 (commit) via 7415caa4e4cbc576b9425cb96a04c0928307e8fb (commit) via 32910a9b285eac3ab7d6d3a52c26757019bf9570 (commit) via b24a566ebaa1b73944c23703cae00b56447ad049 (commit) from 40aaa768dd3529b05563f7c0193c1a70661574fd (commit) - Log ----------------------------------------------------------------- commit e5e340e525f51a318def41e087301b015c661ff1 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 10:16:30 2010 +0200 Proper propagating of overrided values. commit cb6716c4814ba7e8031ea2a0a5f5a8d7ab78068d Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 10:11:35 2010 +0200 Documentation in LaTeX format strings. commit b1cf628bd7809c58af73391f3b9949f89c11a386 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 10:10:06 2010 +0200 Support for phpMyAdmin documentation in plugin library. commit 38171b9e239d68b4116d08ef46749a554a32e485 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 10:08:48 2010 +0200 Move documentation link to better place. commit 7a788a52b9931c317611b3c14b8795a999cc736a Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 10:07:03 2010 +0200 Document why __VAR__ is there. commit 906d7bc6325cd9b186db6eb24c4252e27c9aa8fe Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 10:06:16 2010 +0200 By default use new format strings. commit dba7151245ac841a02a6733eef3f05c00d9d3794 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 10:05:55 2010 +0200 Document new format strings. commit 2040be9611832190e07c001e19b8755c13399589 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 09:56:05 2010 +0200 Documentation. commit 9b2aa3c40d65d40a293c433dc581f0aa0c2bc354 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 09:55:13 2010 +0200 Indentation. commit 715f2f04f6170265d2ea9f9d0b507bc4dae40557 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 09:54:04 2010 +0200 Move messages to place where they are used. commit 7415caa4e4cbc576b9425cb96a04c0928307e8fb Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 09:51:24 2010 +0200 LaTeX export uses PMA_expandUserString. commit 32910a9b285eac3ab7d6d3a52c26757019bf9570 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 09:43:38 2010 +0200 Cleanup in PMA_expandUserString. commit b24a566ebaa1b73944c23703cae00b56447ad049 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jul 21 09:36:28 2010 +0200 Export uses same expanding as title. ----------------------------------------------------------------------- Summary of changes: Documentation.html | 47 +++++++++++++++--------- export.php | 4 +-- libraries/common.lib.php | 69 ++++++++++++++++++++++++----------- libraries/config.default.php | 10 +++--- libraries/display_export.lib.php | 7 ++-- libraries/export/latex.php | 47 +++++++++++++----------- libraries/plugin_interface.lib.php | 2 + libraries/select_lang.lib.php | 4 -- 8 files changed, 114 insertions(+), 76 deletions(-) diff --git a/Documentation.html b/Documentation.html index 67f9ff1..7574c09 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2150,24 +2150,8 @@ setfacl -d -m "g:www-data:rwx" tmp <dt id="cfg_TitleDatabase">$cfg['TitleDatabase'] string</dt> <dt id="cfg_TitleServer">$cfg['TitleServer'] string</dt> <dt id="cfg_TitleDefault">$cfg['TitleDefault'] string</dt> - <dd>Allows you to specify window's title bar. Following magic string can - be used to get special values: - <dl> - <dt><code>@HTTP_HOST@</code></dt> - <dd>HTTP host that runs phpMyAdmin</dd> - <dt><code>@SERVER@</code></dt> - <dd>MySQL server name</dd> - <dt><code>@VERBOSE@</code></dt> - <dd>Verbose MySQL server name as defined in <a href="#cfg_Servers_verbose">server configuration</a></dd> - <dt><code>@VSERVER@</code></dt> - <dd>Verbose MySQL server name if set, otherwise normal</dd> - <dt><code>@DATABASE@</code></dt> - <dd>Currently opened database</dd> - <dt><code>@TABLE@</code></dt> - <dd>Currently opened table</dd> - <dt><code>@PHPMYADMIN@</code></dt> - <dd>phpMyAdmin with version</dd> - </dl> + <dd>Allows you to specify window's title bar. You can use + <a href="#faq6_27">format string expansion</a>. </dd> <dt id="cfg_ErrorIconic">$cfg['ErrorIconic'] boolean</dt> @@ -4330,6 +4314,33 @@ chmod o+rwx tmp <p> Click the first row of the range, hold the shift key and click the last row of the range. This works everywhere you see rows, for example in Browse mode or on the Structure page.</p> +<h4 id="faq6_27"> + <a href="#faq6_27">6.27 What format strings can I use?</a></h4> + +<p> + In all places where phpMyAdmin accepts format strings, you can use + <code>@VARIABLE@</code> expansion and + <a href="http://php.net/strftime">strftime</a> format strings. The + expanded variables depend on a context (eg. if you don't have chosen + table, you can not get table name), but following variables can be used: +</p> +<dl> + <dt><code>@HTTP_HOST@</code></dt> + <dd>HTTP host that runs phpMyAdmin</dd> + <dt><code>@SERVER@</code></dt> + <dd>MySQL server name</dd> + <dt><code>@VERBOSE@</code></dt> + <dd>Verbose MySQL server name as defined in <a href="#cfg_Servers_verbose">server configuration</a></dd> + <dt><code>@VSERVER@</code></dt> + <dd>Verbose MySQL server name if set, otherwise normal</dd> + <dt><code>@DATABASE@</code></dt> + <dd>Currently opened database</dd> + <dt><code>@TABLE@</code></dt> + <dd>Currently opened table</dd> + <dt><code>@PHPMYADMIN@</code></dt> + <dd>phpMyAdmin with version</dd> +</dl> + <h3 id="faqproject">phpMyAdmin project</h3> <h4 id="faq7_1"> diff --git a/export.php b/export.php index 43c37ce..2db992d 100644 --- a/export.php +++ b/export.php @@ -247,18 +247,16 @@ if ($asfile) { if (isset($remember_template)) { $GLOBALS['PMA_Config']->setCookie('pma_server_filename_template', $filename_template); } - $filename = str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template)); } elseif ($export_type == 'database') { if (isset($remember_template)) { $GLOBALS['PMA_Config']->setCookie('pma_db_filename_template', $filename_template); } - $filename = str_replace('__DB__', $db, str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template))); } else { if (isset($remember_template)) { $GLOBALS['PMA_Config']->setCookie('pma_table_filename_template', $filename_template); } - $filename = str_replace('__TABLE__', $table, str_replace('__DB__', $db, str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template)))); } + $filename = PMA_expandUserString($filename_template); // convert filename to iso-8859-1, it is safer $filename = PMA_convert_string($charset, 'iso-8859-1', $filename); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index e2af6d9..a8c32fc 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2828,28 +2828,53 @@ $mapping = array( } /** - * Formats user string, expading @VARIABLES@. + * Formats user string, expading @VARIABLES@, accepting strftime format string. + * + * @param string Text where to do expansion. + * @param function Function to call for escaping variable values. + * @param array Array with overrides for default parameters (obtained from GLOBALS). */ -function PMA_expandUserString($string) { - return str_replace( - array( - '@HTTP_HOST@', - '@SERVER@', - '@VERBOSE@', - '@VSERVER@', - '@DATABASE@', - '@TABLE@', - '@PHPMYADMIN@', - ), - array( - PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '', - $GLOBALS['cfg']['Server']['host'], - $GLOBALS['cfg']['Server']['verbose'], - !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host'], - $GLOBALS['db'], - $GLOBALS['table'], - 'phpMyAdmin ' . PMA_VERSION, - ), - $string); +function PMA_expandUserString($string, $escape = NULL, $updates = array()) { + /* Content */ + $vars['http_host'] = PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : ''; + $vars['server_name'] = $GLOBALS['cfg']['Server']['host']; + $vars['server_verbose'] = $GLOBALS['cfg']['Server']['verbose']; + $vars['server_verbose_or_name'] = !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host']; + $vars['database'] = $GLOBALS['db']; + $vars['table'] = $GLOBALS['table']; + $vars['phpmyadmin_version'] = 'phpMyAdmin ' . PMA_VERSION; + + /* Update forced variables */ + foreach($updates as $key => $val) { + $vars[$key] = $val; + } + + /* Replacement mapping */ + /* + * The __VAR__ ones are for backward compatibility, because user + * might still have it in cookies. + */ + $replace = array( + '@HTTP_HOST@' => $vars['http_host'], + '@SERVER@' => $vars['server_name'], + '__SERVER__' => $vars['server_name'], + '@VERBOSE@' => $vars['server_verbose'], + '@VSERVER@' => $vars['server_verbose_or_name'], + '@DATABASE@' => $vars['database'], + '__DB__' => $vars['database'], + '@TABLE@' => $vars['table'], + '__TABLE__' => $vars['table'], + '@PHPMYADMIN@' => $vars['phpmyadmin_version'], + ); + + /* Optional escaping */ + if (!is_null($escape)) { + foreach($replace as $key => $val) { + $replace[$key] = $escape($val); + } + } + + /* Do the replacement */ + return str_replace(array_keys($replace), array_values($replace), strftime($string)); } ?> diff --git a/libraries/config.default.php b/libraries/config.default.php index 4b6bd96..7ec7c5d 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1116,21 +1116,21 @@ $cfg['Export']['remember_file_template'] = true; * * @global string $cfg['Export']['file_template_table'] */ -$cfg['Export']['file_template_table'] = '__TABLE__'; +$cfg['Export']['file_template_table'] = '@TABLE@'; /** * * * @global string $cfg['Export']['file_template_database'] */ -$cfg['Export']['file_template_database'] = '__DB__'; +$cfg['Export']['file_template_database'] = '@DB@'; /** * * * @global string $cfg['Export']['file_template_server'] */ -$cfg['Export']['file_template_server'] = '__SERVER__'; +$cfg['Export']['file_template_server'] = '@SERVER@'; /** * @@ -1431,14 +1431,14 @@ $cfg['Export']['latex_data_continued_caption'] = 'strLatexContent strLatexContin * * @global string $cfg['Export']['latex_data_label'] */ -$cfg['Export']['latex_data_label'] = 'tab:__TABLE__-data'; +$cfg['Export']['latex_data_label'] = 'tab:@TABLE@-data'; /** * * * @global string $cfg['Export']['latex_structure_label'] */ -$cfg['Export']['latex_structure_label'] = 'tab:__TABLE__-structure'; +$cfg['Export']['latex_structure_label'] = 'tab:@TABLE@-structure'; /** * diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index ae099e0..afa6435 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -147,13 +147,13 @@ echo PMA_pluginGetJavascript($export_list); echo __('File name template'); $trans = new PMA_Message; - $trans->addMessage('__SERVER__/'); + $trans->addMessage('@SERVER@/'); $trans->addString(__('server name')); if ($export_type == 'database' || $export_type == 'table') { - $trans->addMessage('__DB__/'); + $trans->addMessage('@DB@/'); $trans->addString(__('database name')); if ($export_type == 'table') { - $trans->addMessage('__TABLE__/'); + $trans->addMessage('@TABLE@/'); $trans->addString(__('table name')); } } @@ -193,6 +193,7 @@ echo PMA_pluginGetJavascript($export_list); ?> /> + <?php echo PMA_showDocu('faq6_27'); ?> ( <input type="checkbox" name="remember_template" id="checkbox_remember_template" diff --git a/libraries/export/latex.php b/libraries/export/latex.php index ccf87e9..056b69f 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -9,6 +9,11 @@ if (! defined('PHPMYADMIN')) { exit; } +/* Messages used in default captions */ +$GLOBALS['strLatexContent'] = __('Content of table @TABLE@'); +$GLOBALS['strLatexContinued'] = __('(continued)'); +$GLOBALS['strLatexStructure'] = __('Structure of table @TABLE@'); + /** * */ @@ -31,11 +36,11 @@ if (isset($plugin_list)) { $plugin_list['latex']['options'][] = array('type' => 'bgroup', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data'); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption')); + array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27'); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Continued table caption')); + array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Continued table caption'), 'doc' => 'faq6_27'); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key')); + array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key'), 'doc' => 'faq6_27'); if (!empty($GLOBALS['cfgRelation']['relation'])) { $plugin_list['latex']['options'][] = array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations')); @@ -55,11 +60,11 @@ if (isset($plugin_list)) { $plugin_list['latex']['options'][] = array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption')); + array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27'); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Continued table caption')); + array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Continued table caption'), 'doc' => 'faq6_27'); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key')); + array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key'), 'doc' => 'faq6_27'); $plugin_list['latex']['options'][] = array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')); $plugin_list['latex']['options'][] = @@ -76,12 +81,12 @@ if (isset($plugin_list)) { * @access private */ function PMA_texEscape($string) { - $escape = array('$', '%', '{', '}', '&', '#', '_', '^'); - $cnt_escape = count($escape); - for ($k=0; $k < $cnt_escape; $k++) { - $string = str_replace($escape[$k], '\\' . $escape[$k], $string); - } - return $string; + $escape = array('$', '%', '{', '}', '&', '#', '_', '^'); + $cnt_escape = count($escape); + for ($k=0; $k < $cnt_escape; $k++) { + $string = str_replace($escape[$k], '\\' . $escape[$k], $string); + } + return $string; } /** @@ -207,8 +212,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { $buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf; if (isset($GLOBALS['latex_caption'])) { - $buffer .= ' \\caption{' . str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_data_caption']) - . '} \\label{' . str_replace('__TABLE__', $table, $GLOBALS['latex_data_label']) . '} \\\\'; + $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) + . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\'; } if (!PMA_exportOutputHandler($buffer)) { return FALSE; @@ -226,7 +231,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { return FALSE; } if (isset($GLOBALS['latex_caption'])) { - if (!PMA_exportOutputHandler('\\caption{' . str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_data_continued_caption']) . '} \\\\ ')) return FALSE; + if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ')) return FALSE; } if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) { return FALSE; @@ -289,7 +294,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { * * @access public */ - // @@@ Table structure + // @@@ Table structure function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy) { global $cfgRelation; @@ -373,14 +378,14 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals // Table caption for first page and label if (isset($GLOBALS['latex_caption'])) { - $buffer .= ' \\caption{'. str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_structure_caption']) - . '} \\label{' . str_replace('__TABLE__', $table, $GLOBALS['latex_structure_label']) + $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) + . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\' . $crlf; } $buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf; // Table caption on next pages if (isset($GLOBALS['latex_caption'])) { - $buffer .= ' \\caption{'. str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_structure_continued_caption']) + $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ' . $crlf; } $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf; @@ -425,8 +430,8 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $field_name = $row['Field']; - $local_buffer = $field_name . "\000" . $type . "\000" - . (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes')) + $local_buffer = $field_name . "\000" . $type . "\000" + . (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes')) . "\000" . (isset($row['Default']) ? $row['Default'] : ''); if ($do_relation && $have_rel) { diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index da52b83..b2c441b 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -274,6 +274,8 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) if (isset($opt['doc'])) { if (count($opt['doc']) == 3) { $ret .= PMA_showMySQLDocu($opt['doc'][0], $opt['doc'][1], false, $opt['doc'][2]); + } elseif (count($opt['doc']) == 1) { + $ret .= PMA_showDocu($opt['doc'][0]); } else { $ret .= PMA_showMySQLDocu($opt['doc'][0], $opt['doc'][1]); } diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index f750d81..ca8c7cc 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -480,10 +480,6 @@ $charset = 'utf-8'; /* l10n: Text direction, use either ltr or rtl */ $text_dir = __('ltr'); -$strLatexContent = __('Content of table __TABLE__'); -$strLatexContinued = __('(continued)'); -$strLatexStructure = __('Structure of table __TABLE__'); - // now, that we have loaded the language strings we can send the errors if ($GLOBALS['lang_failed_cfg']) { trigger_error( 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