Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents f9a0537 + 1536df7 commit 30f142abd57fd2c877d695296d78fdccf8e9df36 @zixtor zixtor committed May 18, 2012
Showing with 57,749 additions and 44,555 deletions.
  1. +1 −0 ChangeLog
  2. +9 −1 Documentation.html
  3. +57 −0 js/navigation.js
  4. +11 −11 libraries/common.lib.php
  5. +26 −0 libraries/config.default.php
  6. +74 −53 libraries/config/ConfigFile.class.php
  7. +6 −6 libraries/config/Form.class.php
  8. +73 −61 libraries/config/FormDisplay.class.php
  9. +1 −0 libraries/config/messages.inc.php
  10. +1 −0 libraries/config/user_preferences.forms.php
  11. +7 −6 libraries/config/validate.lib.php
  12. +26 −1 libraries/database_interface.lib.php
  13. +1 −1 libraries/display_change_password.lib.php
  14. +2 −2 libraries/header_http.inc.php
  15. +2 −0 libraries/select_lang.lib.php
  16. +11 −0 navigation.php
  17. +648 −640 po/af.po
  18. +644 −634 po/ar.po
  19. +647 −639 po/az.po
  20. +652 −640 po/be.po
  21. +652 −642 po/be@latin.po
  22. +684 −659 po/bg.po
  23. +644 −634 po/bn.po
  24. +648 −640 po/br.po
  25. +652 −642 po/bs.po
  26. +644 −634 po/ca.po
  27. +12,538 −0 po/ckb.po
  28. +660 −643 po/cs.po
  29. +649 −641 po/cy.po
  30. +666 −657 po/da.po
  31. +644 −634 po/de.po
  32. +644 −634 po/el.po
  33. +779 −756 po/en_GB.po
  34. +645 −638 po/es.po
  35. +643 −638 po/et.po
  36. +642 −634 po/eu.po
  37. +647 −639 po/fa.po
  38. +644 −634 po/fi.po
  39. +644 −637 po/fr.po
  40. +644 −634 po/gl.po
  41. +648 −640 po/he.po
  42. +645 −635 po/hi.po
  43. +654 −644 po/hr.po
  44. +644 −634 po/hu.po
  45. +640 −634 po/hy.po
  46. +644 −634 po/id.po
  47. +644 −634 po/it.po
  48. +690 −664 po/ja.po
  49. +647 −637 po/ka.po
  50. +644 −638 po/kk.po
  51. +642 −634 po/ko.po
  52. +644 −634 po/lt.po
  53. +650 −640 po/lv.po
  54. +650 −643 po/mk.po
  55. +641 −635 po/ml.po
  56. +642 −634 po/mn.po
  57. +649 −640 po/ms.po
  58. +654 −644 po/nb.po
  59. +644 −634 po/nl.po
  60. +640 −634 po/phpmyadmin.pot
  61. +776 −719 po/pl.po
  62. +687 −725 po/pt.po
  63. +660 −655 po/pt_BR.po
  64. +668 −649 po/ro.po
  65. +650 −641 po/ru.po
  66. +644 −634 po/si.po
  67. +648 −639 po/sk.po
  68. +645 −638 po/sl.po
  69. +650 −642 po/sq.po
  70. +652 −642 po/sr.po
  71. +653 −643 po/sr@latin.po
  72. +645 −638 po/sv.po
  73. +640 −634 po/ta.po
  74. +647 −639 po/te.po
  75. +642 −634 po/th.po
  76. +641 −635 po/tk.po
  77. +645 −639 po/tr.po
  78. +650 −640 po/tt.po
  79. +645 −637 po/ug.po
  80. +657 −647 po/uk.po
  81. +648 −638 po/ur.po
  82. +676 −667 po/uz.po
  83. +644 −634 po/uz@latin.po
  84. +644 −634 po/zh_CN.po
  85. +678 −671 po/zh_TW.po
  86. +1 −1 scripts/compress-js
  87. +0 −202 scripts/google-javascript-compiler/COPYING
  88. +0 −261 scripts/google-javascript-compiler/README
  89. BIN scripts/google-javascript-compiler/compiler.jar
  90. +8 −4 setup/frames/index.inc.php
  91. +1 −1 setup/index.php
  92. +294 −100 setup/styles.css
  93. +3 −2 tbl_zoom_select.php
  94. +125 −32 test/classes/PMA_Message_test.php
  95. +8 −4 themes/original/css/theme_left.css.php
  96. +6 −3 themes/pmahomme/css/theme_left.css.php
View
@@ -49,6 +49,7 @@ VerboseMultiSubmit, ReplaceHelpImg
- bug [GUI] Invalid HTML code on transformation_overview.php
- bug #3522930 [browse] Missing validation in Ajax mode
- bug Fix popup message on build SQL of import
+- bug #3523499 [core] Make X-WebKit-CSP work better
3.5.1.0 (2012-05-03)
- bug #3510784 [edit] Limit clause ignored when sort order is remembered
View
@@ -1349,7 +1349,15 @@ <h2 id="config">Configuration</h2>
redirected after logout (doesn't affect config authentication method).
Should be absolute including protocol.
</dd>
-
+ <dt><span id="cfg_Servers_StatusCacheDatabases">$cfg['Servers'][$i]['StatusCacheDatabases']</span> array of strings</dt>
+ <dd>Enables caching of <code>TABLE STATUS</code> outputs for specific databases on this server (in some cases <code>TABLE STATUS</code> can be very slow, so you may want to cache it). APC is used (if the PHP extension is available, if not, this setting is ignored silently). You have to provide <a href="#cfg_Servers_StatusCacheLifetime" class="configrule">StatusCacheLifetime</a>.<br />
+ Takes effect only if
+ <a href="#cfg_Servers_DisableIS" class="configrule">DisableIS</a>
+ is <code>true</code>.
+ </dd>
+ <dt><span id="cfg_Servers_StatusCacheLifetime">$cfg['Servers'][$i]['StatusCacheLifetime']</span> integer</dt>
+ <dd>Lifetime in seconds of the <code>TABLE STATUS</code> cache if <a href="#cfg_Servers_StatusCacheDatabases" class="configrule">StatusCacheDatabases</a> is used.
+ </dd>
<dt id="cfg_ServerDefault">$cfg['ServerDefault'] integer</dt>
<dd>If you have more than one server configured, you can set
<code>$cfg['ServerDefault']</code> to any one of them to autoconnect to
View
@@ -203,6 +203,37 @@ function clear_fast_filter()
}
/**
+ * hide all LI elements with second A tag which doesn`t contain requested value
+ *
+ * @param string value requested value
+ *
+ */
+function fast_db_filter(value)
+{
+ var lowercase_value = value.toLowerCase();
+
+ $('#databaseList li a').each(function(idx, elem) {
+ var $elem = $(elem);
+ if (value && $elem.html().toLowerCase().indexOf(lowercase_value) == -1) {
+ $elem.parent().hide();
+ } else {
+ $elem.parents('li').show();
+ }
+ });
+
+}
+
+/**
+ * Clears fast database filter.
+ */
+function clear_fast_db_filter()
+{
+ var $elm = $('#fast_db_filter');
+ $elm.val('');
+ fast_db_filter('');
+}
+
+/**
* Reloads the recent tables list.
*/
function PMA_reloadRecentTable()
@@ -251,6 +282,32 @@ $(function(){
}
});
+ /* Fast database filter */
+ var txtDb = $('#fast_db_filter').val();
+
+ $('#fast_db_filter.gray').live('focus', function() {
+ $(this).removeClass('gray');
+ clear_fast_db_filter();
+ });
+
+ $('#fast_db_filter:not(.gray)').live('focusout', function() {
+ var $input = $(this);
+ if ($input.val() == '') {
+ $input
+ .addClass('gray')
+ .val(txtDb);
+ }
+ });
+
+ $('#clear_fast_db_filter').click(function() {
+ clear_fast_db_filter();
+ $('#fast_db_filter').focus();
+ });
+
+ $('#fast_db_filter').keyup(function(evt) {
+ fast_db_filter($(this).val());
+ });
+
/* Jump to recent table */
$('#recentTable').change(function() {
if (this.value != '') {
View
@@ -953,7 +953,7 @@ function PMA_reloadNavigation($jsonly = false)
'',
'&'
);
- if (!$jsonly) {
+ if (! $jsonly) {
echo '<script type="text/javascript">' . PHP_EOL;
}
echo '//<![CDATA[' . PHP_EOL;
@@ -963,7 +963,7 @@ function PMA_reloadNavigation($jsonly = false)
echo ' window.parent.goTo("' . $reload_url . '");' . PHP_EOL;
echo '}' . PHP_EOL;
echo '//]]>' . PHP_EOL;
- if (!$jsonly) {
+ if (! $jsonly) {
echo '</script>' . PHP_EOL;
}
@@ -1370,11 +1370,11 @@ function PMA_profilingSupported()
}
/**
- * Displays a form with the Profiling checkbox
+ * Returns HTML for the form with the Profiling checkbox
*
* @param string $sql_query sql query
*
- * @return void
+ * @return string HTML for the form with the Profiling checkbox
*
* @access public
*/
@@ -1869,7 +1869,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
$displayed_message = '';
// Add text if not already added
if (stristr($message, '<img')
- && (!$strip_img || $GLOBALS['cfg']['PropertiesIconic'] === true)
+ && (! $strip_img || $GLOBALS['cfg']['PropertiesIconic'] === true)
&& strip_tags($message)==$message
) {
$displayed_message = '<span>'
@@ -2599,14 +2599,14 @@ function PMA_externalBug($functionality, $component, $minimum_version, $bugref)
}
/**
- * Generates and echoes an HTML checkbox
+ * Returns an HTML checkbox
*
* @param string $html_field_name the checkbox HTML field
* @param string $label label for checkbox
* @param boolean $checked is it initially checked?
* @param boolean $onclick should it submit the form on click?
*
- * @return void
+ * @return string HTML for the checkbox
*/
function PMA_getCheckbox($html_field_name, $label, $checked, $onclick)
{
@@ -3091,7 +3091,7 @@ function PMA_replaceBinaryContents($content)
* @param binary $data GIS data
* @param bool $includeSRID Add SRID to the WKT
*
- * @return GIS data in Well Know Text format
+ * @return string GIS data in Well Know Text format
*/
function PMA_asWKT($data, $includeSRID = false)
{
@@ -3281,7 +3281,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
// At this point, other headers might have been sent;
// even if $GLOBALS['is_header_sent'] is true,
// we have to send these additional headers.
- if (!defined('TESTSUITE')) {
+ if (! defined('TESTSUITE')) {
header('Cache-Control: no-cache');
header("Content-Type: application/json");
}
@@ -3303,7 +3303,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
*/
function PMA_browseUploadFile($max_upload_size)
{
- if ($GLOBALS['is_upload'] && !empty($GLOBALS['cfg']['UploadDir'])) {
+ if ($GLOBALS['is_upload'] && ! empty($GLOBALS['cfg']['UploadDir'])) {
echo '<label for="radio_import_file">';
} else {
echo '<label for="input_import_file">';
@@ -3516,7 +3516,7 @@ function PMA_getGISDatatypes($upper_case = false)
*
* @param string $gis_string GIS string
*
- * @return GIS data enclosed in 'GeomFromText' function
+ * @return string GIS data enclosed in 'GeomFromText' function
*/
function PMA_createGISData($gis_string)
{
@@ -518,6 +518,24 @@
$cfg['Servers'][$i]['tracking_add_drop_database'] = true;
/**
+ * Enables caching of TABLE STATUS outputs for specific databases on this server
+ * (in some cases TABLE STATUS can be very slow, so you may want to cache it).
+ * APC is used (if the PHP extension is available, if not, this setting is ignored
+ * silently). You have to provide StatusCacheLifetime.
+ * Takes effect only if DisableIS is true.
+ *
+ * @global array $cfg['Servers'][$i]['StatusCacheDatabases']
+ */
+$cfg['Servers'][$i]['StatusCacheDatabases'] = array();
+
+/**
+ * Lifetime in seconds of the TABLE STATUS cache if StatusCacheDatabases is used
+ *
+ * @global integer $cfg['Servers'][$i]['StatusCacheLifetime']
+ */
+$cfg['Servers'][$i]['StatusCacheLifetime'] = 0;
+
+/**
* Default server (0 = no default server)
*
* If you have more than one server configured, you can set $cfg['ServerDefault']
@@ -884,6 +902,14 @@
$cfg['DisplayDatabasesList'] = 'auto';
/**
+ * display a JavaScript database filter in the left frame
+ * when more then x databases are present
+ *
+ * @global boolean $cfg['LeftDisplayDatabaseFilterMinimum']
+ */
+$cfg['LeftDisplayDatabaseFilterMinimum'] = 30;
+
+/**
* target of the navigation panel quick access icon
*
* Possible values:
Oops, something went wrong.

0 comments on commit 30f142a

Please sign in to comment.