[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11684-gd553062
Michal Čihař
nijel at users.sourceforge.net
Fri Jul 22 10:14:27 CEST 2011
The branch, master has been updated
via d55306252b4a8b4389dfaa0245a3aab6ed0b6376 (commit)
from 3f8badd37f3e7ea78a718660e615ecf1c856e2f0 (commit)
- Log -----------------------------------------------------------------
commit d55306252b4a8b4389dfaa0245a3aab6ed0b6376
Author: Michal Čihař <mcihar at suse.cz>
Date: Fri Jul 22 10:08:22 2011 +0200
Replace tabs with spaces, cleanup identation
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 52 ++--
db_qbe.php | 2 +-
import_status.php | 4 +-
js/db_structure.js | 4 +-
js/server_status.js | 12 +-
js/tbl_chart.js | 2 +-
js/tbl_select.js | 2 +-
js/tbl_structure.js | 8 +-
libraries/StorageEngine.class.php | 30 ++--
libraries/Tracker.class.php | 2 +-
libraries/auth/http.auth.lib.php | 2 +-
libraries/auth/signon.auth.lib.php | 2 +-
libraries/common.inc.php | 4 +-
libraries/config.values.php | 8 +-
libraries/config/FormDisplay.class.php | 4 +-
libraries/config/config_functions.lib.php | 6 +-
libraries/config/setup.forms.php | 2 +-
libraries/config/validate.lib.php | 8 +-
libraries/display_import_ajax.lib.php | 8 +-
libraries/import/upload/apc.php | 2 +-
libraries/import/upload/noplugin.php | 2 +-
libraries/import/upload/uploadprogress.php | 2 +-
libraries/mult_submits.inc.php | 22 +-
libraries/replication.inc.php | 62 +++---
libraries/replication_gui.lib.php | 12 +-
libraries/rte/rte_main.inc.php | 6 +-
navigation.php | 12 +-
pmd_common.php | 6 +-
scripts/create-release.sh | 6 +-
server_privileges.php | 6 +-
server_status.php | 164 ++++++------
setup/frames/index.inc.php | 12 +-
setup/frames/menu.inc.php | 14 +-
setup/lib/form_processing.lib.php | 6 +-
setup/scripts.js | 8 +-
sql.php | 2 +-
tbl_chart.php | 2 +-
tbl_printview.php | 2 +-
.../common/PMA_localisedDateTimespan_test.php | 14 +-
.../libraries/common/PMA_stringOperations_test.php | 8 +-
test/selenium/PmaSeleniumTestCase.php | 6 +-
themes/pmahomme/css/theme_left.css.php | 24 +-
themes/pmahomme/css/theme_right.css.php | 264 ++++++++++----------
43 files changed, 413 insertions(+), 413 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 6a8d5dc..33bfa85 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -59,10 +59,10 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<ul><li><b>PHP</b>
<ul><li>You need PHP 5.2.0 or newer, with <tt>session</tt> support
(<a href="#faq1_31">see
- <abbr title="Frequently Asked Questions">FAQ</abbr> 1.31</a>)
- , the Standard PHP Library (SPL) extension and JSON support.
+ <abbr title="Frequently Asked Questions">FAQ</abbr> 1.31</a>)
+ , the Standard PHP Library (SPL) extension and JSON support.
</li>
- <li>To support uploading of ZIP files, you need the PHP <tt>zip</tt> extension.</li>
+ <li>To support uploading of ZIP files, you need the PHP <tt>zip</tt> extension.</li>
<li>For proper support of multibyte strings (eg. UTF-8, which is
currently the default), you should install the mbstring and ctype
extensions.
@@ -778,7 +778,7 @@ since this link provides funding for phpMyAdmin.
Please see the <a href="#setup">install section</a> on "Using authentication modes"
for more information.
- </dd>
+ </dd>
<dt id="servers_auth_http_realm">
<span id="cfg_Servers_auth_http_realm">$cfg['Servers'][$i]['auth_http_realm']</span> string<br />
</dt>
@@ -1244,10 +1244,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
</dd>
<dt><span id="cfg_Servers_AllowNoPassword">$cfg['Servers'][$i]['AllowNoPassword']</span>
boolean</dt>
- <dd>Whether to allow logins without a password. The default
- value of <tt>false</tt> for this parameter prevents unintended access
- to a MySQL server with was left with an empty password for root or
- on which an anonymous (blank) user is defined.
+ <dd>Whether to allow logins without a password. The default
+ value of <tt>false</tt> for this parameter prevents unintended access
+ to a MySQL server with was left with an empty password for root or
+ on which an anonymous (blank) user is defined.
</dd>
<dt id="servers_allowdeny_order">
<span id="cfg_Servers_AllowDeny_order">$cfg['Servers'][$i]['AllowDeny']['order']</span> string
@@ -2078,14 +2078,14 @@ $cfg['TrustedProxies'] =
This is needed for native MS Excel export, see
<a href="#faq6_23"><abbr title="Frequently Asked Questions">FAQ</abbr>
- 6.23</a> and to work around limitations of
- <tt>open_basedir</tt> for uploaded
+ 6.23</a> and to work around limitations of
+ <tt>open_basedir</tt> for uploaded
files, see <a href="#faq1_11"><abbr title="Frequently Asked Questions">FAQ</abbr>
1.11</a>.
<br /><br />
- If the directory where phpMyAdmin is installed is subject to an
- <tt>open_basedir</tt> restriction, you need to create a
+ If the directory where phpMyAdmin is installed is subject to an
+ <tt>open_basedir</tt> restriction, you need to create a
temporary directory in some directory accessible by the web
server. However for security reasons, this directory should be outside
the tree published by webserver. If you cannot avoid having this
@@ -3105,7 +3105,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
<p>
You can also disable the warning using the <a href="#cfg_SuhosinDisableWarning">
- <tt>SuhosinDisableWarning</tt> directive</a>.
+ <tt>SuhosinDisableWarning</tt> directive</a>.
</p>
<h4 id="faq1_39">
@@ -3120,7 +3120,7 @@ in your Apache configuration. See <a href="http://httpd.apache.org/docs/2.0/mod/
<a href="#faq1_40">1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work.</a></h4>
<p>To be able to use cookie auth Apache must know that it has to rewrite the set-cookie headers.<br />
- Example from the Apache 2.2 documentation:</p>
+ Example from the Apache 2.2 documentation:</p>
<pre>
ProxyPass /mirror/foo/ http://backend.example.com/
ProxyPassReverse /mirror/foo/ http://backend.example.com/
@@ -3129,9 +3129,9 @@ ProxyPassReverseCookiePath / /mirror/foo/
</pre>
<p>Note: if the backend url looks like http://host/~user/phpmyadmin,
- the tilde (~) must be url encoded as %7E in the ProxyPassReverse* lines.
- This is not specific to phpmyadmin, it's just the behavior of Apache.
- </p>
+ the tilde (~) must be url encoded as %7E in the ProxyPassReverse* lines.
+ This is not specific to phpmyadmin, it's just the behavior of Apache.
+ </p>
<pre>
ProxyPass /mirror/foo/ http://backend.example.com/~user/phpmyadmin
@@ -3140,12 +3140,12 @@ http://backend.example.com/%7Euser/phpmyadmin
ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo
</pre>
- <p>See <a href="http://httpd.apache.org/docs/2.2/mod/mod_proxy.html">http://httpd.apache.org/docs/2.2/mod/mod_proxy.html</a>
- for more details.</p>
+ <p>See <a href="http://httpd.apache.org/docs/2.2/mod/mod_proxy.html">http://httpd.apache.org/docs/2.2/mod/mod_proxy.html</a>
+ for more details.</p>
<h4 id="faq1_41">
- <a href="#faq1_41">1.41 When I view a database and ask to see its
- privileges, I get an error about an unknown column.</a></h4>
+ <a href="#faq1_41">1.41 When I view a database and ask to see its
+ privileges, I get an error about an unknown column.</a></h4>
<p> The MySQL server's privilege tables are not up to date, you need to run
the <tt>mysql_upgrade</tt> command on the server.</p>
@@ -4294,7 +4294,7 @@ chmod o+rwx tmp
ones is done whenever you enter Structure page for this table.</p>
<h4 id="faq6_25">
- <a href="#faq6_25">6.25 How does BLOB streaming work in phpMyAdmin?</a></h4>
+ <a href="#faq6_25">6.25 How does BLOB streaming work in phpMyAdmin?</a></h4>
<p> For general information about BLOB streaming on MySQL, visit <a href="http://blobstreaming.org">blobstreaming.org</a>. You need the following components:</p>
<ul>
@@ -4308,11 +4308,11 @@ chmod o+rwx tmp
<p>Here are details about configuration and operation:</p>
<ol>
- <li>In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully qualified domain name) instead of "localhost".</li>
+ <li>In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully qualified domain name) instead of "localhost".</li>
<li>Ensure that your target table is under the <tt>PBXT</tt> storage engine and has a <tt>LONGBLOB</tt> column (which must be nullable if you want to remove the BLOB reference from it).</li>
- <li>When you insert or update a row in this table, put a checkmark on the "Upload to BLOB repository" optional choice; otherwise, the upload will be done directly in your LONGBLOB column instead of the repository.</li>
- <li>Finally when you browse your table, you'll see in your column a link to stream your data, for example "View image". A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time.</li>
-</ol>
+ <li>When you insert or update a row in this table, put a checkmark on the "Upload to BLOB repository" optional choice; otherwise, the upload will be done directly in your LONGBLOB column instead of the repository.</li>
+ <li>Finally when you browse your table, you'll see in your column a link to stream your data, for example "View image". A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time.</li>
+</ol>
<h4 id="faq6_26">
<a href="#faq6_26">6.26 How can I select a range of rows?</a></h4>
diff --git a/db_qbe.php b/db_qbe.php
index 42f6123..2ab7f27 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -182,7 +182,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
if (isset($tab_designer['link'])) {
?>
<div id="visual_builder_anchor" class="notice hide">
- <span id="footnote_1">
+ <span id="footnote_1">
<?php echo __('Switch to') . ' <a href="' . $tab_designer['link'] . PMA_get_arg_separator('html') . 'query=1">' . __('visual builder') . '</a>'; ?>
</span>
</div>
diff --git a/import_status.php b/import_status.php
index d739009..7c77e31 100644
--- a/import_status.php
+++ b/import_status.php
@@ -18,7 +18,7 @@ if (isset($GLOBALS["message"]) && $GLOBALS["message"]) {
header('Content-type: text/html');
// wait 0.3 sec before we check for $_SESSION variable, which is set inside import.php
- usleep(300000);
+ usleep(300000);
// wait until message is available
while ($_SESSION['Import_message']['message'] == null) {
@@ -27,7 +27,7 @@ if (isset($GLOBALS["message"]) && $GLOBALS["message"]) {
echo $_SESSION['Import_message']['message'];
echo '<fieldset class="tblFooters">' . "\n";
- echo ' [ <a href="' . $_SESSION['Import_message']['go_back_url'] . '">' . __('Back') . '</a> ]' . "\n";
+ echo ' [ <a href="' . $_SESSION['Import_message']['go_back_url'] . '">' . __('Back') . '</a> ]' . "\n";
echo '</fieldset>'."\n";
} else {
diff --git a/js/db_structure.js b/js/db_structure.js
index efc8f2a..559819e 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -69,8 +69,8 @@ $(document).ready(function() {
if ($("#insert_table_dialog").length > 0) {
$("#insert_table_dialog").remove();
}
- var $div = $('<div id="insert_table_dialog"></div>');
- var target = "tbl_change.php";
+ var $div = $('<div id="insert_table_dialog"></div>');
+ var target = "tbl_change.php";
/**
* @var button_options Object that stores the options passed to jQueryUI
diff --git a/js/server_status.js b/js/server_status.js
index 4a61bfe..ed61204 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -406,7 +406,7 @@ $(function() {
}
}
}
- },
+ },
tooltip: {
formatter: function() {
return '<b>' + this.point.name + '</b><br/>' + Highcharts.numberFormat(this.y, 2) + '<br/>(' + Highcharts.numberFormat(this.percentage, 2) + ' %)';
@@ -1576,12 +1576,12 @@ $(function() {
if(data.numRows > 12) {
$('div#logTable').prepend(
'<fieldset id="logDataFilter">' +
- ' <legend>Filters</legend>' +
- ' <div class="formelement">' +
- ' <label for="filterQueryText">Filter queries by word/regexp:</label>' +
- ' <input name="filterQueryText" type="text" id="filterQueryText" style="vertical-align: baseline;" />' +
+ ' <legend>Filters</legend>' +
+ ' <div class="formelement">' +
+ ' <label for="filterQueryText">Filter queries by word/regexp:</label>' +
+ ' <input name="filterQueryText" type="text" id="filterQueryText" style="vertical-align: baseline;" />' +
((data.numRows > 250) ? ' <button name="startFilterQueryText" id="startFilterQueryText">Filter</button>' : '') +
- ' </div>' +
+ ' </div>' +
'</fieldset>'
);
diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index 3c406d9..16a83b0 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -22,7 +22,7 @@ $(document).ready(function() {
false
);
}
- });
+ });
var currentSettings = {
chart: {
diff --git a/js/tbl_select.js b/js/tbl_select.js
index 8d3049a..cb0c670 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -70,7 +70,7 @@ $(document).ready(function() {
$("#sqlqueryresults").trigger('makegrid');
$('#tbl_search_form')
// work around for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome.
- .slideToggle()
+ .slideToggle()
.hide();
$('#togglesearchformlink')
// always start with the Show message
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 2d7f471..69f872d 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -342,10 +342,10 @@ $(document).ready(function() {
/**
* Loads the append_fields_form to the Change dialog allowing users
* to change the columns
- * @param string action Variable which parses the name of the
- * destination file
- * @param string $url Variable which parses the data for the
- * post action
+ * @param string action Variable which parses the name of the
+ * destination file
+ * @param string $url Variable which parses the data for the
+ * post action
*/
function changeColumns(action,url) {
/*Remove the hidden dialogs if there are*/
diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php
index bf5de9d..e5c03b5 100644
--- a/libraries/StorageEngine.class.php
+++ b/libraries/StorageEngine.class.php
@@ -186,20 +186,20 @@ class PMA_StorageEngine
return $ret;
}
- /**
- * returns the engine specific handling for
- * PMA_ENGINE_DETAILS_TYPE_SIZE type variables.
- *
- * This function should be overridden when
- * PMA_ENGINE_DETAILS_TYPE_SIZE type needs to be
- * handled differently for a particular engine.
- *
- * @return string the formatted value and its unit
- */
- function resolveTypeSize($value)
- {
- return PMA_formatByteDown($value);
- }
+ /**
+ * returns the engine specific handling for
+ * PMA_ENGINE_DETAILS_TYPE_SIZE type variables.
+ *
+ * This function should be overridden when
+ * PMA_ENGINE_DETAILS_TYPE_SIZE type needs to be
+ * handled differently for a particular engine.
+ *
+ * @return string the formatted value and its unit
+ */
+ function resolveTypeSize($value)
+ {
+ return PMA_formatByteDown($value);
+ }
/**
* returns array with detailed info about engine specific server variables
@@ -276,7 +276,7 @@ class PMA_StorageEngine
}
} else {
$this->engine_init();
- }
+ }
}
/**
diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
index c82d0d9..947044a 100644
--- a/libraries/Tracker.class.php
+++ b/libraries/Tracker.class.php
@@ -472,7 +472,7 @@ class PMA_Tracker
* @param string $dbname name of database
* @param string $tablename name of table
* @param string $version version
- * @param string $type type of data(DDL || DML)
+ * @param string $type type of data(DDL || DML)
* @param string || array $new_data the new tracking data
*
* @return bool result of change
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
index f4157b6..b31d327 100644
--- a/libraries/auth/http.auth.lib.php
+++ b/libraries/auth/http.auth.lib.php
@@ -42,7 +42,7 @@ function PMA_auth()
header('WWW-Authenticate: Basic realm="' . $realm_message . '"');
header('HTTP/1.0 401 Unauthorized');
if (php_sapi_name() !== 'cgi-fcgi') {
- header('status: 401 Unauthorized');
+ header('status: 401 Unauthorized');
}
// Defines the charset to be used
diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
index e095829..a829faa 100644
--- a/libraries/auth/signon.auth.lib.php
+++ b/libraries/auth/signon.auth.lib.php
@@ -121,7 +121,7 @@ function PMA_auth_check()
}
}
if (isset($_SESSION['PMA_single_signon_host'])) {
- $single_signon_host = $_SESSION['PMA_single_signon_host'];
+ $single_signon_host = $_SESSION['PMA_single_signon_host'];
}
if (isset($_SESSION['PMA_single_signon_port'])) {
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index daf1173..53cde17 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -997,9 +997,9 @@ PMA_Tracker::enable();
* true
*/
if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
- $GLOBALS['is_ajax_request'] = true;
+ $GLOBALS['is_ajax_request'] = true;
} else {
- $GLOBALS['is_ajax_request'] = false;
+ $GLOBALS['is_ajax_request'] = false;
}
/**
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 0e72064..7f81924 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -68,10 +68,10 @@ $cfg_db['DefaultTabTable'] = array(
'tbl_change.php', // insert row page
'sql.php'); // browse page
$cfg_db['QueryWindowDefTab'] = array(
- 'sql', // SQL
- 'files', // Import files
- 'history', // SQL history
- 'full'); // All (SQL and SQL history)
+ 'sql', // SQL
+ 'files', // Import files
+ 'history', // SQL history
+ 'full'); // All (SQL and SQL history)
$cfg_db['InitialSlidersState'] = array('open' => __('Open'), 'closed' => __('Closed'));
$cfg_db['Import']['format'] = array(
'csv', // CSV
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 840d760..3725878 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -334,8 +334,8 @@ class FormDisplay
}
return;
case 'NULL':
- trigger_error("Field $system_path has no type", E_USER_WARNING);
- return;
+ trigger_error("Field $system_path has no type", E_USER_WARNING);
+ return;
}
// TrustedProxies requires changes before displaying
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index 8aac9ef..31d4305 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -67,9 +67,9 @@ function PMA_lang($lang_key)
function PMA_lang_name($canonical_path, $type = 'name', $default = 'key')
{
$lang_key = str_replace(
- array('Servers/1/', '/'),
- array('Servers/', '_'),
- $canonical_path) . '_' . $type;
+ array('Servers/1/', '/'),
+ array('Servers/', '_'),
+ $canonical_path) . '_' . $type;
return isset($GLOBALS["strConfig$lang_key"])
? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"])
: ($default == 'key' ? $lang_key : $default);
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 5598b93..5f3f729 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -224,7 +224,7 @@ $forms['Main_frame']['Tabs'] = array(
'DefaultTabServer',
'DefaultTabDatabase',
'DefaultTabTable',
- 'QueryWindowDefTab');
+ 'QueryWindowDefTab');
$forms['Import']['Import_defaults'] = array('Import' => array(
'format',
'charset',
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index bcd62ae..163ff87 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -132,7 +132,7 @@ function PMA_config_validate($validator_id, &$values, $isPostSource)
/**
* Empty error handler, used to temporarily restore PHP internal error handler
- *
+ *
* @return bool
*/
function PMA_null_error_handler()
@@ -337,8 +337,8 @@ function validate_trusted_proxies($path, $values)
$lines = array();
foreach ($values[$path] as $ip => $v) {
$lines[] = preg_match('/^-\d+$/', $ip)
- ? $v
- : $ip . ': ' . $v;
+ ? $v
+ : $ip . ': ' . $v;
}
} else {
// AJAX validation
@@ -441,7 +441,7 @@ function validate_by_regex($path, $values, $regex)
/**
* Validates upper bound for numeric inputs
- *
+ *
* @param string $path
* @param array $values
* @param int $max_value
diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php
index 1a3f9db..e10a9ea 100644
--- a/libraries/display_import_ajax.lib.php
+++ b/libraries/display_import_ajax.lib.php
@@ -27,10 +27,10 @@ $upload_id = uniqid("");
* list of available plugins
*/
$plugins = array(
- "uploadprogress",
- "apc",
- "noplugin"
- ); // available plugins. Each plugin has own checkfunction in display_import_ajax.lib.php and own file with functions in upload_#KEY#.php
+ "uploadprogress",
+ "apc",
+ "noplugin"
+ ); // available plugins. Each plugin has own checkfunction in display_import_ajax.lib.php and own file with functions in upload_#KEY#.php
// select available plugin
foreach ($plugins as $plugin) {
diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php
index 79d435b..a308b1b 100644
--- a/libraries/import/upload/apc.php
+++ b/libraries/import/upload/apc.php
@@ -30,7 +30,7 @@ function PMA_getUploadStatus($id) {
'percent' => 0,
'total' => 0,
'complete' => 0,
- 'plugin' => $ID_KEY
+ 'plugin' => $ID_KEY
);
}
$ret = $_SESSION[$SESSION_KEY][$id];
diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php
index 6cce9ad..a3cb19a 100644
--- a/libraries/import/upload/noplugin.php
+++ b/libraries/import/upload/noplugin.php
@@ -30,7 +30,7 @@ function PMA_getUploadStatus($id) {
'percent' => 0,
'total' => 0,
'complete' => 0,
- 'plugin' => $ID_KEY
+ 'plugin' => $ID_KEY
);
}
$ret = $_SESSION[$SESSION_KEY][$id];
diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php
index cc7eb27..797ade7 100644
--- a/libraries/import/upload/uploadprogress.php
+++ b/libraries/import/upload/uploadprogress.php
@@ -30,7 +30,7 @@ function PMA_getUploadStatus($id) {
'percent' => 0,
'total' => 0,
'complete' => 0,
- 'plugin' => $ID_KEY
+ 'plugin' => $ID_KEY
);
}
$ret = $_SESSION[$SESSION_KEY][$id];
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 1d3cbd5..3339aaf 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -278,17 +278,17 @@ if (!empty($submit_mult) && !empty($what)) {
<?php
}
else { ?>
- <fieldset class="confirmation">
- <legend><?php echo ($what == 'drop_db' ? __('You are about to DESTROY a complete database!') . ' ' : '') . __('Do you really want to '); ?>:</legend>
- <tt><?php echo $full_query; ?></tt>
- </fieldset>
- <fieldset class="tblFooters">
- <input type="submit" name="mult_btn" value="<?php echo __('Yes'); ?>" id="buttonYes" />
- <input type="submit" name="mult_btn" value="<?php echo __('No'); ?>" id="buttonNo" />
- </fieldset>
+ <fieldset class="confirmation">
+ <legend><?php echo ($what == 'drop_db' ? __('You are about to DESTROY a complete database!') . ' ' : '') . __('Do you really want to '); ?>:</legend>
+ <tt><?php echo $full_query; ?></tt>
+ </fieldset>
+ <fieldset class="tblFooters">
+ <input type="submit" name="mult_btn" value="<?php echo __('Yes'); ?>" id="buttonYes" />
+ <input type="submit" name="mult_btn" value="<?php echo __('No'); ?>" id="buttonNo" />
+ </fieldset>
<?php
- }
- require './libraries/footer.inc.php';
+ }
+ require './libraries/footer.inc.php';
} // end if
@@ -422,7 +422,7 @@ elseif ($mult_btn == __('Yes')) {
. (($i == $selected_cnt-1) ? ');' : '');
break;
- case 'add_prefix_tbl':
+ case 'add_prefix_tbl':
$newtablename = $add_prefix . $selected[$i];
$a_query = 'ALTER TABLE ' . PMA_backquote($selected[$i]) . ' RENAME ' . PMA_backquote($newtablename) ; // ADD PREFIX TO TABLE NAME
$run_parts = true;
diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
index 45fd07d..2b4309b 100644
--- a/libraries/replication.inc.php
+++ b/libraries/replication.inc.php
@@ -12,14 +12,14 @@ if (! defined('PHPMYADMIN')) {
/**
* get master replication from server
*/
-$server_master_replication = PMA_DBI_fetch_result('SHOW MASTER STATUS');
+$server_master_replication = PMA_DBI_fetch_result('SHOW MASTER STATUS');
/**
* get slave replication from server
*/
$server_slave_replication = PMA_DBI_fetch_result('SHOW SLAVE STATUS');
-/**
+/**
* replication types
*/
$replication_types = array('master', 'slave');
@@ -108,28 +108,28 @@ foreach ($replication_types as $type) {
if (${"server_{$type}_status"}) {
if ($type == "master") {
${"server_{$type}_Do_DB"} = explode(",", $server_master_replication[0]["Binlog_Do_DB"]);
- $replication_info[$type]['Do_DB'] = ${"server_{$type}_Do_DB"};
+ $replication_info[$type]['Do_DB'] = ${"server_{$type}_Do_DB"};
${"server_{$type}_Ignore_DB"} = explode(",", $server_master_replication[0]["Binlog_Ignore_DB"]);
- $replication_info[$type]['Ignore_DB'] = ${"server_{$type}_Ignore_DB"};
+ $replication_info[$type]['Ignore_DB'] = ${"server_{$type}_Ignore_DB"};
} elseif ($type == "slave") {
${"server_{$type}_Do_DB"} = explode(",", $server_slave_replication[0]["Replicate_Do_DB"]);
- $replication_info[$type]['Do_DB'] = ${"server_{$type}_Do_DB"};
+ $replication_info[$type]['Do_DB'] = ${"server_{$type}_Do_DB"};
${"server_{$type}_Ignore_DB"} = explode(",", $server_slave_replication[0]["Replicate_Ignore_DB"]);
- $replication_info[$type]['Ignore_DB'] = ${"server_{$type}_Ignore_DB"};
+ $replication_info[$type]['Ignore_DB'] = ${"server_{$type}_Ignore_DB"};
${"server_{$type}_Do_Table"} = explode(",", $server_slave_replication[0]["Replicate_Do_Table"]);
- $replication_info[$type]['Do_Table'] = ${"server_{$type}_Do_Table"};
+ $replication_info[$type]['Do_Table'] = ${"server_{$type}_Do_Table"};
${"server_{$type}_Ignore_Table"} = explode(",", $server_slave_replication[0]["Replicate_Ignore_Table"]);
- $replication_info[$type]['Ignore_Table'] = ${"server_{$type}_Ignore_Table"};
+ $replication_info[$type]['Ignore_Table'] = ${"server_{$type}_Ignore_Table"};
${"server_{$type}_Wild_Do_Table"} = explode(",", $server_slave_replication[0]["Replicate_Wild_Do_Table"]);
- $replication_info[$type]['Wild_Do_Table'] = ${"server_{$type}_Wild_Do_Table"};
+ $replication_info[$type]['Wild_Do_Table'] = ${"server_{$type}_Wild_Do_Table"};
${"server_{$type}_Wild_Ignore_Table"} = explode(",", $server_slave_replication[0]["Replicate_Wild_Ignore_Table"]);
- $replication_info[$type]['Wild_Ignore_Table'] = ${"server_{$type}_Wild_Ignore_Table"};
+ $replication_info[$type]['Wild_Ignore_Table'] = ${"server_{$type}_Wild_Ignore_Table"};
}
}
}
@@ -208,7 +208,7 @@ function PMA_replication_slave_change_master($user, $password, $host, $port, $po
* @param String $host - mysql server's hostname or IP
* @param int $port - mysql remote port
* @param String $socket - path to unix socket
- *
+ *
* @return mixed $link mysql link on success
*/
function PMA_replication_connect_to_master($user, $password, $host = null, $port = null, $socket = null) {
@@ -217,7 +217,7 @@ function PMA_replication_connect_to_master($user, $password, $host = null, $port
$server["port"] = $port;
$server["socket"] = $socket;
- // 5th parameter set to true means that it's an auxiliary connection
+ // 5th parameter set to true means that it's an auxiliary connection
// and we must not go back to login page if it fails
return PMA_DBI_connect($user, $password, false, $server, true);
}
@@ -239,7 +239,7 @@ function PMA_replication_slave_bin_log_master($link = null) {
/**
* Get list of replicated databases on master server
- *
+ *
* @param mixed mysql link
*
* @return array array of replicated databases
@@ -272,13 +272,13 @@ function PMA_replication_master_replicated_dbs($link = null) {
if (array_search($tmp_row[0], $do_db) !== false) {
$dblist[] = $tmp_row[0];
}
- }
+ }
} // end while
return $link;
}
/**
- * This function provides synchronization of structure and data between two mysql servers.
+ * This function provides synchronization of structure and data between two mysql servers.
* TODO: improve code sharing between the function and synchronization
*
* @param String $db - name of database, which should be synchronized
@@ -300,8 +300,8 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true)
$target_tables_num = sizeof($trg_tables);
/**
- * initializing arrays to save table names
- */
+ * initializing arrays to save table names
+ */
$unmatched_num_src = 0;
$source_tables_uncommon = array();
$unmatched_num_trg = 0;
@@ -313,7 +313,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true)
* Criterion for matching tables is just their names.
* Finding the uncommon tables for the source database
* BY comparing the matching tables with all the tables in the source database
- */
+ */
PMA_getMatchingTables($trg_tables, $src_tables, $matching_tables, $source_tables_uncommon);
/**
@@ -323,10 +323,10 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true)
PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, $target_tables_uncommon);
/**
- *
- * Comparing Data In the Matching Tables
- * It is assumed that the matching tables are structurally
- * and typely exactly the same
+ *
+ * Comparing Data In the Matching Tables
+ * It is assumed that the matching tables are structurally
+ * and typely exactly the same
*/
$fields_num = array();
$matching_tables_fields = array();
@@ -344,7 +344,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true)
}
for ($j = 0; $j < sizeof($source_tables_uncommon); $j++) {
PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $j, $row_count);
- }
+ }
/**
* INTEGRATION OF STRUCTURE DIFFERENCE CODE
@@ -354,7 +354,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true)
$target_columns = array();
$alter_str_array = array(array());
$add_column_array = array(array());
- $uncommon_columns = array();
+ $uncommon_columns = array();
$target_tables_keys = array();
$source_indexes = array();
$target_indexes = array();
@@ -364,11 +364,11 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true)
for ($counter = 0; $counter < $matching_tables_num; $counter++) {
PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns,
- $target_columns, $alter_str_array, $add_column_array, $uncommon_columns, $criteria, $target_tables_keys, $counter);
+ $target_columns, $alter_str_array, $add_column_array, $uncommon_columns, $criteria, $target_tables_keys, $counter);
PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_indexes, $target_indexes,
- $add_indexes_array, $alter_indexes_array,$remove_indexes_array, $counter);
- }
+ $add_indexes_array, $alter_indexes_array,$remove_indexes_array, $counter);
+ }
$matching_table_data_diff = array();
$matching_table_structure_diff = array();
@@ -377,14 +377,14 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true)
$uncommon_tables = $source_tables_uncommon;
/**
- * Generating Create Table query for all the non-matching tables present in Source but not in Target and populating tables.
- */
- for($q = 0; $q < sizeof($source_tables_uncommon); $q++) {
+ * Generating Create Table query for all the non-matching tables present in Source but not in Target and populating tables.
+ */
+ for($q = 0; $q < sizeof($source_tables_uncommon); $q++) {
if (isset($uncommon_tables[$q])) {
PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, false);
}
if (isset($row_count[$q]) && $data) {
- PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, false);
+ PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, false);
}
}
}
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index ac80467..3e8e687 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -113,8 +113,8 @@ function PMA_replication_print_status_table($type, $hidden = false, $title = tru
echo ' <table id="server' . $type . 'replicationsummary" class="data"> ';
echo ' <thead>';
echo ' <tr>';
- echo ' <th>' . __('Variable') . '</th>';
- echo ' <th>' . __('Value') . '</th>';
+ echo ' <th>' . __('Variable') . '</th>';
+ echo ' <th>' . __('Value') . '</th>';
echo ' </tr>';
echo ' </thead>';
echo ' <tbody>';
@@ -239,11 +239,11 @@ function PMA_replication_gui_master_addslaveuser() {
echo PMA_generate_common_hidden_inputs('', '');
echo '<fieldset id="fieldset_add_user_login">'
. '<legend>'.__('Add slave replication user').'</legend>'
- . '<input type="hidden" name="grant_count" value="25" />'
- . '<input type="hidden" name="createdb" id="createdb_0" value="0" />'
+ . '<input type="hidden" name="grant_count" value="25" />'
+ . '<input type="hidden" name="createdb" id="createdb_0" value="0" />'
. '<input id="checkbox_Repl_slave_priv" type="hidden" title="Needed for the replication slaves." value="Y" name="Repl_slave_priv"/>'
. '<input id="checkbox_Repl_client_priv" type="hidden" title="Needed for the replication slaves." value="Y" name="Repl_client_priv"/>'
- . ''
+ . ''
. '<input type="hidden" name="sr_take_action" value="true" />'
. '<div class="item">'
. '<label for="select_pred_username">'
@@ -305,7 +305,7 @@ function PMA_replication_gui_master_addslaveuser() {
. ' <option value="localhost"'
. ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'localhost')
? ' selected="selected"' : '') . '>' . __('Local')
- . '</option>';
+ . '</option>';
if (!empty($thishost)) {
echo ' <option value="thishost"'
diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php
index d2950bf..988cf6b 100644
--- a/libraries/rte/rte_main.inc.php
+++ b/libraries/rte/rte_main.inc.php
@@ -79,13 +79,13 @@ $errors = array();
switch ($_PMA_RTE) {
case 'RTN':
PMA_RTN_main();
- break;
+ break;
case 'TRI':
PMA_TRI_main();
- break;
+ break;
case 'EVN':
PMA_EVN_main();
- break;
+ break;
}
/**
diff --git a/navigation.php b/navigation.php
index 966f5f2..0c5668b 100644
--- a/navigation.php
+++ b/navigation.php
@@ -41,12 +41,12 @@ if (! isset($_SESSION['tmp_user_values']['table_limit_offset']) || $_SESSION['tm
$_SESSION['tmp_user_values']['table_limit_offset_db'] = $db;
}
if (isset($_REQUEST['pos'])) {
- if (isset($_REQUEST['tpos'])) {
- $_SESSION['tmp_user_values']['table_limit_offset'] = (int) $_REQUEST['pos'];
- }
- else {
- $_SESSION['tmp_user_values']['navi_limit_offset'] = (int) $_REQUEST['pos'];
- }
+ if (isset($_REQUEST['tpos'])) {
+ $_SESSION['tmp_user_values']['table_limit_offset'] = (int) $_REQUEST['pos'];
+ }
+ else {
+ $_SESSION['tmp_user_values']['navi_limit_offset'] = (int) $_REQUEST['pos'];
+ }
}
$pos = $_SESSION['tmp_user_values']['navi_limit_offset'];
$tpos = $_SESSION['tmp_user_values']['table_limit_offset'];
diff --git a/pmd_common.php b/pmd_common.php
index 7ca134b..6593762 100644
--- a/pmd_common.php
+++ b/pmd_common.php
@@ -203,12 +203,12 @@ function get_script_tabs()
'<script type="text/javascript">' . "\n" .
'// <![CDATA[' . "\n" .
'var j_tabs = new Array();' . "\n" .
- 'var h_tabs = new Array();' . "\n" ;
+ 'var h_tabs = new Array();' . "\n" ;
for ($i = 0, $cnt = count($GLOBALS['PMD']['TABLE_NAME']); $i < $cnt; $i++) {
$script_tabs .= "j_tabs['" . $GLOBALS['PMD_URL']['TABLE_NAME'][$i] . "'] = '"
. (PMA_foreignkey_supported($GLOBALS['PMD']['TABLE_TYPE'][$i]) ? '1' : '0') . "';\n";
- $script_tabs .="h_tabs['" . $GLOBALS['PMD_URL']['TABLE_NAME'][$i] . "'] = 1;"."\n" ;
- }
+ $script_tabs .="h_tabs['" . $GLOBALS['PMD_URL']['TABLE_NAME'][$i] . "'] = 1;"."\n" ;
+ }
$script_tabs .=
'// ]]>' . "\n" .
'</script>' . "\n";
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 0589c28..d411a67 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -156,10 +156,10 @@ cd ..
# Prepare all kits
for kit in $KITS ; do
# Copy all files
- name=phpMyAdmin-$version-$kit
- cp -r phpMyAdmin-$version $name
+ name=phpMyAdmin-$version-$kit
+ cp -r phpMyAdmin-$version $name
- # Cleanup translations
+ # Cleanup translations
cd phpMyAdmin-$version-$kit
scripts/lang-cleanup.sh $kit
rm -f scripts/lang-cleanup.sh
diff --git a/server_privileges.php b/server_privileges.php
index ba114fb..00073e8 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1070,7 +1070,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
if (! PMA_DBI_try_query($q)) {
$message = PMA_Message::rawError(PMA_DBI_getError());
}
- break;
+ break;
case '3' :
// Grant all privileges on the specified database to the new user
$q = 'GRANT ALL PRIVILEGES ON '
@@ -2138,9 +2138,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
. '</fieldset>' . "\n"
. '</form>' . "\n";
- }
+ }
- // Provide a line with links to the relevant database and table
+ // Provide a line with links to the relevant database and table
if (isset($dbname) && empty($dbname_is_wildcard)) {
echo '[ ' . __('Database')
. ' <a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?'
diff --git a/server_status.php b/server_status.php
index c88ccdd..9065fce 100644
--- a/server_status.php
+++ b/server_status.php
@@ -47,12 +47,12 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) {
$value = PMA_sqlAddslashes($_REQUEST['varValue']);
if (!is_numeric($value)) $value="'".$value."'";
-
+
if (!preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']))
PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = '.$value);
-
+
}
-
+
$loggingVars = PMA_DBI_fetch_result(
"SHOW GLOBAL VARIABLES WHERE Variable_name IN (
'general_log', 'slow_query_log', 'long_query_time', 'log_output')", 0, 1);
@@ -74,7 +74,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
);
exit(json_encode($ret));
-
+
case 'queries':
$queries = PMA_DBI_fetch_result(
"SHOW GLOBAL STATUS
@@ -94,7 +94,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
);
exit(json_encode($ret));
-
+
case 'traffic':
$traffic = PMA_DBI_fetch_result(
"SHOW GLOBAL STATUS
@@ -108,12 +108,12 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
);
exit(json_encode($ret));
-
+
case 'chartgrid':
$ret = json_decode($_REQUEST['requiredData'], true);
$statusVars = array();
$sysinfo = $cpuload = $memory = 0;
-
+
foreach ($ret as $chart_id => $chartNodes) {
foreach ($chartNodes as $node_id => $node) {
switch ($node['dataType']) {
@@ -122,12 +122,12 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if (!preg_match('/[^a-zA-Z_]+/',$node['name']))
$statusVars[] = $node['name'];
break;
-
+
case 'proc':
$result = PMA_DBI_query('SHOW PROCESSLIST');
$ret[$chart_id][$node_id]['y'] = PMA_DBI_num_rows($result);
break;
-
+
case 'cpu':
if (!$sysinfo) {
require_once('libraries/sysinfo.lib.php');
@@ -135,13 +135,13 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
}
if (!$cpuload)
$cpuload = $sysinfo->loadavg();
-
+
if (PHP_OS == 'Linux') {
$ret[$chart_id][$node_id]['idle'] = $cpuload['idle'];
$ret[$chart_id][$node_id]['busy'] = $cpuload['busy'];
- } else
+ } else
$ret[$chart_id][$node_id]['y'] = $cpuload['loadavg'];
-
+
break;
case 'memory':
@@ -151,7 +151,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
}
if (!$memory)
$memory = $sysinfo->memory();
-
+
$ret[$chart_id][$node_id]['y'] = $memory[$node['name']];
break;
}
@@ -168,71 +168,71 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$ret[$chart_id][$node_id]['y'] = $vars[$node['name']];
}
}
-
+
$ret['x'] = microtime(true)*1000;
-
+
exit(json_encode($ret));
}
}
-
+
if (isset($_REQUEST['log_data'])) {
$start = intval($_REQUEST['time_start']);
$end = intval($_REQUEST['time_end']);
-
+
if ($_REQUEST['type'] == 'slow') {
$q = 'SELECT SUM(query_time) AS TIME(query_time), SUM(lock_time) as lock_time, '.
'SUM(rows_sent) AS rows_sent, SUM(rows_examined) AS rows_examined, sql_text, COUNT(sql_text) AS \'#\' '.
'FROM `mysql`.`slow_log` WHERE event_time > FROM_UNIXTIME('.$start.') '.
'AND event_time < FROM_UNIXTIME('.$end.') GROUP BY sql_text';
-
+
$result = PMA_DBI_try_query($q);
-
+
$return = array('rows' => array(), 'sum' => array());
$type = '';
-
+
while ($row = PMA_DBI_fetch_assoc($result)) {
$type = substr($row['sql_text'],0,strpos($row['sql_text'],' '));
$return['sum'][$type]++;
$return['rows'][] = $row;
}
-
+
$return['sum']['TOTAL'] = array_sum($return['sum']);
-
+
PMA_DBI_free_result($result);
exit(json_encode($return));
}
-
+
if ($_REQUEST['type'] == 'general') {
$q = 'SELECT TIME(event_time) as event_time, user_host, thread_id, server_id, argument, count(argument) as \'#\' FROM `mysql`.`general_log` WHERE command_type=\'Query\' '.
'AND event_time > FROM_UNIXTIME('.$start.') AND event_time < FROM_UNIXTIME('.$end.') '.
'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' GROUP by argument'; // HAVING count > 1';
-
+
$result = PMA_DBI_try_query($q);
-
+
$return = array('rows' => array(), 'sum' => array());
$type = '';
$insertTables = array();
$insertTablesFirst = -1;
$i = 0;
-
+
while ($row = PMA_DBI_fetch_assoc($result)) {
preg_match('/^(\w+)\s/',$row['argument'],$match);
$type = strtolower($match[1]);
// Ignore undefined index warning, just increase counter by one
@$return['sum'][$type] += $row['#'];
-
+
if ($type=='insert' || $type=='update') {
// Group inserts if selected
if ($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) {
$insertTables[$matches[2]]++;
if ($insertTables[$matches[2]] > 1) {
$return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]];
-
+
// Add a ... to the end of this query to indicate that there's been other queries
if ($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.')
- $return['rows'][$insertTablesFirst]['argument'] .= '<br/>...';
-
+ $return['rows'][$insertTablesFirst]['argument'] .= '<br/>...';
+
// Group this value, thus do not add to the result list
continue;
} else {
@@ -240,22 +240,22 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$insertTables[$matches[2]] += $row['#'] - 1;
}
}
-
+
// Cut off big selects, but append byte count therefor
if (strlen($row['argument']) > 180) {
- $row['argument'] = substr($row['argument'],0,160) . '... [' .
+ $row['argument'] = substr($row['argument'],0,160) . '... [' .
PMA_formatByteDown(strlen($row['argument']), 2).']';
}
}
$return['rows'][] = $row;
$i++;
}
-
+
$return['sum']['TOTAL'] = array_sum($return['sum']);
- $return['numRows'] = count($return['rows']);
-
+ $return['numRows'] = count($return['rows']);
+
PMA_DBI_free_result($result);
-
+
exit(json_encode($return));
}
}
@@ -559,7 +559,7 @@ require './libraries/server_links.inc.php';
$server = 1;
if (isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']);
-$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost'
+$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost'
|| $cfg['Servers'][$server]['host'] == '127.0.0.1'
|| $cfg['Servers'][$server]['host'] == '::1';
@@ -688,7 +688,7 @@ echo __('Runtime Information');
<?php printVariablesTable(); ?>
</div>
</div>
-
+
<div id="statustabs_charting">
<?php printMonitor(); ?>
</div>
@@ -706,7 +706,7 @@ function printQueryStatistics() {
?>
<h3 id="serverstatusqueries">
- <?php
+ <?php
/* l10n: Questions is the name of a MySQL Status variable */
echo sprintf(__('Questions since startup: %s'),PMA_formatNumber($total_queries, 0)) . ' ';
echo PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_Questions');
@@ -714,17 +714,17 @@ function printQueryStatistics() {
<br>
<span>
<?php
- echo 'ø '.__('per hour').': ';
+ echo 'ø '.__('per hour').': ';
echo PMA_formatNumber($total_queries * $hour_factor, 0);
echo '<br>';
-
- echo 'ø '.__('per minute').': ';
- echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0);
+
+ echo 'ø '.__('per minute').': ';
+ echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0);
echo '<br>';
-
+
if ($total_queries / $server_status['Uptime'] >= 1) {
echo 'ø '.__('per second').': ';
- echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0);
+ echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0);
}
?>
</span>
@@ -1289,33 +1289,33 @@ function printMonitor() {
?>
<div class="monitorLinks">
<a href="#pauseCharts">
- <img src="themes/dot.gif" class="icon ic_play" alt="" />
+ <img src="themes/dot.gif" class="icon ic_play" alt="" />
<?php echo __('Start Monitor'); ?>
</a>
<a href="#settingsPopup" rel="popupLink" style="display:none;">
- <img src="themes/dot.gif" class="icon ic_s_cog" alt="" />
+ <img src="themes/dot.gif" class="icon ic_s_cog" alt="" />
<?php echo __('Settings'); ?>
</a>
<a href="#monitorInstructionsDialog">
- <img src="themes/dot.gif" class="icon ic_b_help" alt="" />
+ <img src="themes/dot.gif" class="icon ic_b_help" alt="" />
<?php echo __('Instructions/Setup'); ?>
</a>
<a href="#endChartEditMode" style="display:none;">
- <img src="themes/dot.gif" class="icon ic_s_okay" alt="" />
+ <img src="themes/dot.gif" class="icon ic_s_okay" alt="" />
<?php echo __('Done rearranging/editing charts'); ?>
</a>
</div>
-
+
<div class="popupContent settingsPopup">
<a href="#addNewChart">
- <img src="themes/dot.gif" class="icon ic_b_chart" alt="" />
+ <img src="themes/dot.gif" class="icon ic_b_chart" alt="" />
<?php echo __('Add chart'); ?>
- </a> |
+ </a> |
<a href="#rearrangeCharts"> <?php echo __('Rearrange/edit charts'); ?></a><br>
<p>
<?php echo __('Refresh rate:'); refreshList('gridChartRefresh'); ?><br>
</p>
- <p>
+ <p>
<?php echo __('Chart columns:'); ?>
<select name="chartColumns">
<option>1</option>
@@ -1332,11 +1332,11 @@ function printMonitor() {
</p>
<a href="#clearMonitorConfig"><?php echo __('Clear monitor config'); ?></a>
</div>
-
+
<div id="monitorInstructionsDialog" title="<?php echo __('Monitor Instructions'); ?>" style="display:none;">
<?php echo __('The phpMyAdmin Monitor can assist you in optimizing the server configuration and track down time intensive
queries. For the latter you will need to set log_output to \'TABLE\' and have either the slow_query_log or general_log enabled. Note however, that the
- general_log produces a lot of data and increases server load by up to 15%'); ?>
+ general_log produces a lot of data and increases server load by up to 15%'); ?>
<p></p>
<img class="ajaxIcon" src="<?php echo $GLOBALS['pmaThemeImage']; ?>ajax_clock_small.gif" alt="Loading">
<div class="ajaxContent">
@@ -1350,31 +1350,31 @@ function printMonitor() {
<p>When you get to see a sudden spike in activity, select the relevant time span on any chart by holding down the
left mouse button and panning over the chart. This will load statistics from the logs helping you find what caused the
activity spike.</p>');
- ?>
- <p>
- <img class="icon ic_s_attention" src="themes/dot.gif" alt="">
- <?php echo __('<b>Please note:</b>
- Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a
+ ?>
+ <p>
+ <img class="icon ic_s_attention" src="themes/dot.gif" alt="">
+ <?php echo __('<b>Please note:</b>
+ Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a
load intensive task, so it is advisable to select only a small time span and to disable the general_log and empty its table once monitoring is not required any more.
'); ?>
- </p>
+ </p>
</div>
</div>
-
+
<div id="addChartDialog" title="Add chart" style="display:none;">
<div id="tabGridVariables">
<p><input type="text" name="chartTitle" value="<?php echo __('Chart Title'); ?>" /></p>
<?php if ($server_db_isLocal) { ?>
- <input type="radio" name="chartType" value="cpu" id="chartCPU">
+ <input type="radio" name="chartType" value="cpu" id="chartCPU">
<label for="chartCPU"><?php echo __('CPU Usage'); ?></label><br/>
-
- <input type="radio" name="chartType" value="memory" id="chartMemory">
+
+ <input type="radio" name="chartType" value="memory" id="chartMemory">
<label for="chartMemory"><?php echo __('Memory Usage'); ?></label><br/>
-
- <input type="radio" name="chartType" value="swap" id="chartSwap">
+
+ <input type="radio" name="chartType" value="swap" id="chartSwap">
<label for="chartSwap"><?php echo __('Swap Usage'); ?></label><br/>
<?php } ?>
- <input type="radio" name="chartType" value="variable" id="chartStatusVar" checked="checked">
+ <input type="radio" name="chartType" value="variable" id="chartStatusVar" checked="checked">
<label for="chartStatusVar"><?php echo __('Status variable(s)'); ?></label><br/>
<div id="chartVariableSettings">
<label for="chartSeries"><?php echo __('Select series:'); ?></label><br>
@@ -1394,26 +1394,26 @@ function printMonitor() {
<option>Select_full_join</option>
<option>Slow_queries</option>
</select><br>
- <label for="variableInput"><?php echo __('or type variable name:'); ?> </label>
+ <label for="variableInput"><?php echo __('or type variable name:'); ?> </label>
<input type="text" name="variableInput" id="variableInput" />
<p></p>
- <input type="checkbox" name="differentialValue" id="differentialValue" value="differential" checked="checked" />
+ <input type="checkbox" name="differentialValue" id="differentialValue" value="differential" checked="checked" />
<label for="differentialValue"><?php echo __('Display as differential value'); ?></label><br>
- <input type="checkbox" id="useDivisor" name="useDivisor" value="1" />
+ <input type="checkbox" id="useDivisor" name="useDivisor" value="1" />
<label for="useDivisor"><?php echo __('Apply a divisor'); ?></label>
<span class="divisorInput" style="display:none;">
- <input type="text" name="valueDivisor" size="4" value="1">
+ <input type="text" name="valueDivisor" size="4" value="1">
(<a href="#kibDivisor"><?php echo __('KiB'); ?></a>, <a href="#mibDivisor"><?php echo __('MiB'); ?></a>)
</span><br>
-
- <input type="checkbox" id="useUnit" name="useUnit" value="1" />
+
+ <input type="checkbox" id="useUnit" name="useUnit" value="1" />
<label for="useUnit"><?php echo __('Append unit to data values'); ?></label>
-
+
<span class="unitInput" style="display:none;">
<input type="text" name="valueUnit" size="4" value="">
</span>
<p>
- <a href="#submitAddSeries"><b><?php echo __('Add this series'); ?></b></a>
+ <a href="#submitAddSeries"><b><?php echo __('Add this series'); ?></b></a>
<span id="clearSeriesLink" style="display:none;">
| <a href="#submitClearSeries"><?php echo __('Clear series'); ?></a>
</span>
@@ -1425,21 +1425,21 @@ function printMonitor() {
</div>
</div>
</div>
-
+
<div id="loadingLogsDialog" title="<?php echo __('Loading logs'); ?>" style="display:none;">
</div>
-
+
<div id="logAnalyseDialog" title="<?php echo __('Log statistics'); ?>">
-
+
</div>
-
+
<table border="0" class="clearfloat" id="chartGrid">
</table>
<div id="logTable">
<br/>
</div>
-
+
<script type="text/javascript">
variableNames = [ <?php
$i=0;
@@ -1461,7 +1461,7 @@ function refreshList($name,$defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20,
<?php
foreach ($refreshRates as $rate) {
$selected = ($rate == $defaultRate)?' selected="selected"':'';
-
+
if ($rate<60)
echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d second', '%d seconds', $rate), $rate).'</option>';
else
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index ea88aa7..83c6684 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -88,12 +88,12 @@ if (!$is_https) {
<?php
// Check for done action info and set notice message if present
switch ($action_done) {
- case 'config_saved':
- messages_set('notice', 'config_saved', __('Configuration saved.'),
- PMA_lang(__('Configuration saved to file config/config.inc.php in phpMyAdmin top level directory, copy it to top level one and delete directory config to use it.')));
- break;
- default:
- break;
+ case 'config_saved':
+ messages_set('notice', 'config_saved', __('Configuration saved.'),
+ PMA_lang(__('Configuration saved to file config/config.inc.php in phpMyAdmin top level directory, copy it to top level one and delete directory config to use it.')));
+ break;
+ default:
+ break;
}
?>
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index 4a1ae9c..978a47b 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -12,11 +12,11 @@ if (!defined('PHPMYADMIN')) {
$separator = PMA_get_arg_separator('html');
?>
<ul>
- <li><a href="index.php"><?php echo __('Overview') ?></a></li>
- <li><a href="?page=form<?php echo $separator ?>formset=Features"><?php echo __('Features') ?></a></li>
- <li><a href="?page=form<?php echo $separator ?>formset=Sql_queries"><?php echo __('SQL queries') ?></a></li>
- <li><a href="?page=form<?php echo $separator ?>formset=Left_frame"><?php echo __('Navigation frame') ?></a></li>
- <li><a href="?page=form<?php echo $separator ?>formset=Main_frame"><?php echo __('Main frame') ?></a></li>
- <li><a href="?page=form<?php echo $separator ?>formset=Import"><?php echo __('Import') ?></a></li>
- <li><a href="?page=form<?php echo $separator ?>formset=Export"><?php echo __('Export') ?></a></li>
+ <li><a href="index.php"><?php echo __('Overview') ?></a></li>
+ <li><a href="?page=form<?php echo $separator ?>formset=Features"><?php echo __('Features') ?></a></li>
+ <li><a href="?page=form<?php echo $separator ?>formset=Sql_queries"><?php echo __('SQL queries') ?></a></li>
+ <li><a href="?page=form<?php echo $separator ?>formset=Left_frame"><?php echo __('Navigation frame') ?></a></li>
+ <li><a href="?page=form<?php echo $separator ?>formset=Main_frame"><?php echo __('Main frame') ?></a></li>
+ <li><a href="?page=form<?php echo $separator ?>formset=Import"><?php echo __('Import') ?></a></li>
+ <li><a href="?page=form<?php echo $separator ?>formset=Export"><?php echo __('Export') ?></a></li>
</ul>
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 17f58a6..d54fd80 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -12,7 +12,7 @@
* @param FormDisplay $form_display
*/
function process_formset(FormDisplay $form_display) {
- if (filter_input(INPUT_GET, 'mode') == 'revert') {
+ if (filter_input(INPUT_GET, 'mode') == 'revert') {
// revert erroneous fields to their default values
$form_display->fixErrors();
// drop post data
@@ -33,8 +33,8 @@ function process_formset(FormDisplay $form_display) {
$formset = $formset ? "{$separator}formset=$formset" : '';
$id = filter_input(INPUT_GET, 'id', FILTER_VALIDATE_INT);
if ($id === null && $page == 'servers') {
- // we've just added a new server, get it's id
- $id = ConfigFile::getInstance()->getServerCount();
+ // we've just added a new server, get it's id
+ $id = ConfigFile::getInstance()->getServerCount();
}
$id = $id ? "{$separator}id=$id" : '';
?>
diff --git a/setup/scripts.js b/setup/scripts.js
index f223e04..b4e97dc 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -57,7 +57,7 @@ $.extend(true, validators, {
}
return true;
},
- /**
+ /**
* TrustedProxies field
*
* @param {boolean} isKeyUp
@@ -121,7 +121,7 @@ $.extend(true, validators, {
* @param {Object} values values hash {element1_id: value, ...}
*/
function ajaxValidate(parent, id, values) {
- parent = $(parent);
+ parent = $(parent);
// ensure that parent is a fieldset
if (parent.attr('tagName') != 'FIELDSET') {
parent = parent.closest('fieldset');
@@ -131,7 +131,7 @@ function ajaxValidate(parent, id, values) {
}
if (parent.data('ajax') != null) {
- parent.data('ajax').abort();
+ parent.data('ajax').abort();
}
parent.data('ajax', $.ajax({
@@ -155,7 +155,7 @@ function ajaxValidate(parent, id, values) {
error[parent.id] = [response['error']];
} else {
for (var key in response) {
- var value = response[key];
+ var value = response[key];
error[key] = jQuery.isArray(value) ? value : [value];
}
}
diff --git a/sql.php b/sql.php
index 657311c..7ce5b24 100644
--- a/sql.php
+++ b/sql.php
@@ -927,7 +927,7 @@ else {
}
if (isset($profiling_results)) {
- // pma_token/url_query needed for chart export
+ // pma_token/url_query needed for chart export
?>
<script type="text/javascript">
pma_token = '<?php echo $_SESSION[' PMA_token ']; ?>';
diff --git a/tbl_chart.php b/tbl_chart.php
index b3589e3..ac4bed8 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -93,7 +93,7 @@ url_query = '<?php echo $url_query;?>';
<br>
<input type="text" name="chartTitle" value="<?php echo __('Chart title'); ?>">
<?php $keys = array_keys($data[0]);
- $yaxis=-1;
+ $yaxis=-1;
if (count($keys)>1) {
echo '<br>';
echo __('X-Axis:'); ?> <select name="chartXAxis">
diff --git a/tbl_printview.php b/tbl_printview.php
index 6bfe3be..2e40587 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -276,7 +276,7 @@ foreach ($the_tables as $key => $table) {
if ($nonisam == false) {
// Gets some sizes
- $mergetable = PMA_Table::isMerge($db, $table);
+ $mergetable = PMA_Table::isMerge($db, $table);
list($data_size, $data_unit) = PMA_formatByteDown($showtable['Data_length']);
if ($mergetable == false) {
diff --git a/test/libraries/common/PMA_localisedDateTimespan_test.php b/test/libraries/common/PMA_localisedDateTimespan_test.php
index 7ec0364..92f980c 100644
--- a/test/libraries/common/PMA_localisedDateTimespan_test.php
+++ b/test/libraries/common/PMA_localisedDateTimespan_test.php
@@ -25,10 +25,10 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase
*/
protected $tmpSession;
- /**
- * temporary variable for timezone info
- */
- protected $tmpTimezone;
+ /**
+ * temporary variable for timezone info
+ */
+ protected $tmpTimezone;
/**
* storing globals and session
@@ -37,8 +37,8 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase
$this->tmpGlobals = $GLOBALS;
$this->tmpSession = $_SESSION;
- $this->tmpTimezone = date_default_timezone_get();
- date_default_timezone_set('Europe/London');
+ $this->tmpTimezone = date_default_timezone_get();
+ date_default_timezone_set('Europe/London');
}
/**
@@ -48,7 +48,7 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase
$GLOBALS = $this->tmpGlobals;
$_SESSION = $this->tmpSession;
- date_default_timezone_set($this->tmpTimezone);
+ date_default_timezone_set($this->tmpTimezone);
}
diff --git a/test/libraries/common/PMA_stringOperations_test.php b/test/libraries/common/PMA_stringOperations_test.php
index f57a2b4..ca43335 100644
--- a/test/libraries/common/PMA_stringOperations_test.php
+++ b/test/libraries/common/PMA_stringOperations_test.php
@@ -36,9 +36,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase
global $GLOBALS, $_SESSION;
$this->tmpGlobals = $GLOBALS;
$this->tmpSession = $_SESSION;
-
+
}
-
+
/**
* data provider for flipstring test
*/
@@ -110,8 +110,8 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase
return array(
array('test', 'test'),
array("\r\ntest", "\n\r\ntest"),
- array("\ntest", "\ntest"),
- array("\n\r\ntest", "\n\r\ntest")
+ array("\ntest", "\ntest"),
+ array("\n\r\ntest", "\n\r\ntest")
);
}
diff --git a/test/selenium/PmaSeleniumTestCase.php b/test/selenium/PmaSeleniumTestCase.php
index 7bf7a61..90da642 100644
--- a/test/selenium/PmaSeleniumTestCase.php
+++ b/test/selenium/PmaSeleniumTestCase.php
@@ -42,8 +42,8 @@ class PmaSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
}
/**
- * perform a login
- */
+ * perform a login
+ */
public function doLogin()
{
$this->open(TESTSUITE_PHPMYADMIN_URL);
@@ -58,7 +58,7 @@ class PmaSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
}
/*
- * Just a dummy to show some example statements
+ * Just a dummy to show some example statements
*
public function mockTest()
{
diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php
index cd1eadf..ae504ea 100644
--- a/themes/pmahomme/css/theme_left.css.php
+++ b/themes/pmahomme/css/theme_left.css.php
@@ -34,7 +34,7 @@ body {
font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
<?php } ?>
background: url(./themes/pmahomme/img/left_nav_bg.png) repeat-y right 0% #f3f3f3;
- border-right: 1px solid #aaa;
+ border-right: 1px solid #aaa;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin: 0;
padding: 0;
@@ -84,14 +84,14 @@ button {
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>iconsprites.png) no-repeat top left;
}
-.ic_b_home { background-position: -357px 0; }
-.ic_b_selboard { background-position: -754px 0; }
-.ic_b_docs { background-position: -136px 0; }
-.ic_b_sqlhelp { background-position: -856px 0; }
-.ic_s_reload { background-position: -1761px 0; }
-.ic_s_loggoff { background-position: -1698px 0; }
-.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; }
-.ic_b_view { background-position: -1077px 0; }
+.ic_b_home { background-position: -357px 0; }
+.ic_b_selboard { background-position: -754px 0; }
+.ic_b_docs { background-position: -136px 0; }
+.ic_b_sqlhelp { background-position: -856px 0; }
+.ic_s_reload { background-position: -1761px 0; }
+.ic_s_loggoff { background-position: -1698px 0; }
+.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; }
+.ic_b_view { background-position: -1077px 0; }
/******************************************************************************/
/* classes */
@@ -121,7 +121,7 @@ div#pmalogo,
div#leftframelinks,
div#databaseList {
text-align: center;
- margin: 5px 10px 0px 10px;
+ margin: 5px 10px 0px 10px;
}
ul#databaseList {
@@ -155,7 +155,7 @@ ul#databaseList li{ list-style:none;text-indent:20px; margin:0px;
padding:0px;}
ul#databaseList a:hover {
- background:url(./themes/pmahomme/img/database.png) no-repeat 0% 50% #e4e4e4;
+ background:url(./themes/pmahomme/img/database.png) no-repeat 0% 50% #e4e4e4;
}
ul#databaseList li.selected a {
@@ -330,4 +330,4 @@ div#left_tableList ul ul {
#fast_filter {
width: 85%;
padding: 0.1em;
-}
\ No newline at end of file
+}
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index ac4f5d8..a151563 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -55,9 +55,9 @@ h1 {
h2 {
font-size: 2em;
font-weight: normal;
- text-shadow: 0px 1px 0px #fff;
- padding: 10px 0 10px 3px;
- color: #777;
+ text-shadow: 0px 1px 0px #fff;
+ padding: 10px 0 10px 3px;
+ color: #777;
}
/* Hiding icons in the page titles */
@@ -210,7 +210,7 @@ input[type=submit]{
<?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?>
}
-input[type=submit]:hover{ position: relative;
+input[type=submit]:hover{position: relative;
background-image: url(./themes/svg_gradient.php?from=cccccc&to=dddddd);
background-size: 100% 100%;
background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd));
@@ -220,7 +220,7 @@ input[type=submit]:hover{ position: relative;
cursor:pointer;
}
-input[type=submit]:active{ position: relative;
+input[type=submit]:active{position: relative;
top: 1px;
left: 1px;
}
@@ -330,129 +330,129 @@ select[multiple] {
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>iconsprites.png) no-repeat top left;
}
-.ic_asc_order, .ic_s_desc { background-position: 0 0; }
-.ic_b_bookmark { background-position: -17px 0; }
-.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; }
-.ic_b_calendar { background-position: -51px 0; }
-.ic_b_chart, .ic_b_dbstatistics { background-position: -68px 0; }
-.ic_b_close { background-position: -85px 0; }
-.ic_b_comment { background-position: -102px 0; }
-.ic_b_deltbl { background-position: -119px 0; }
-.ic_b_docs { background-position: -136px 0; }
-.ic_b_docsql { background-position: -153px 0; }
-.ic_b_drop { background-position: -170px 0; }
-.ic_b_edit { background-position: -187px 0; }
-.ic_b_empty { background-position: -204px 0; }
-.ic_b_engine { background-position: -221px 0; }
-.ic_b_event_add { background-position: -238px 0; }
-.ic_b_events { background-position: -255px 0; }
-.ic_b_export, .ic_b_tblexport { background-position: -272px 0; }
-.ic_b_firstpage { background-position: -289px 0; }
-.ic_b_ftext { background-position: -306px 0; }
-.ic_b_globe { background-position: -323px 0; }
-.ic_b_help { background-position: -340px 0; }
-.ic_b_help_s { background-position: -340px 0; }
-.ic_b_home { background-position: -357px 0; }
-.ic_b_import, .ic_b_tblimport { background-position: -374px 0; }
-.ic_b_index { background-position: -391px 0; }
-.ic_b_info { background-position: -408px 0; width: 11px; height: 11px; }
-.ic_b_inline_edit { background-position: -420px 0; }
-.ic_b_insrow { background-position: -437px 0; }
-.ic_b_lastpage { background-position: -454px 0; }
-.ic_b_minus { background-position: -471px 0; }
-.ic_b_more, .ic_col_drop { background-position: -488px 0; }
-.ic_b_newdb { background-position: -505px 0; }
-.ic_b_newtbl { background-position: -522px 0; }
-.ic_b_nextpage, .ic_play { background-position: -539px 0; }
-.ic_b_pdfdoc { background-position: -556px 0; }
-.ic_b_plus { background-position: -573px 0; }
-.ic_b_prevpage { background-position: -590px 0; }
-.ic_b_primary { background-position: -607px 0; }
-.ic_b_print { background-position: -624px 0; }
-.ic_b_props { background-position: -641px 0; }
-.ic_b_relations { background-position: -658px 0; }
-.ic_b_routine_add { background-position: -675px 0; }
-.ic_b_routines { background-position: -692px 0; }
-.ic_b_save { background-position: -709px 0; }
-.ic_b_sdb { background-position: -726px 0; width: 10px; height: 10px; }
-.ic_b_search { background-position: -737px 0; }
-.ic_b_selboard { background-position: -754px 0; }
-.ic_b_select { background-position: -771px 0; }
-.ic_b_snewtbl { background-position: -788px 0; }
-.ic_b_spatial { background-position: -805px 0; }
-.ic_b_sql { background-position: -822px 0; }
-.ic_b_sqldoc { background-position: -839px 0; }
-.ic_b_sqlhelp { background-position: -856px 0; }
-.ic_b_tblanalyse { background-position: -873px 0; }
-.ic_b_tblops { background-position: -890px 0; }
-.ic_b_tbloptimize { background-position: -907px 0; }
-.ic_b_tipp { background-position: -924px 0; }
-.ic_b_trigger_add { background-position: -941px 0; }
-.ic_b_triggers { background-position: -958px 0; }
-.ic_b_unique { background-position: -975px 0; }
-.ic_b_usradd { background-position: -992px 0; }
-.ic_b_usrcheck { background-position: -1009px 0; }
-.ic_b_usrdrop { background-position: -1026px 0; }
-.ic_b_usredit { background-position: -1043px 0; }
-.ic_b_usrlist { background-position: -1060px 0; }
-.ic_b_view { background-position: -1077px 0; }
-.ic_b_views, .ic_s_views { background-position: -1094px 0; }
-.ic_bd_browse { background-position: -1111px 0; }
-.ic_bd_deltbl { background-position: -1128px 0; }
-.ic_bd_drop { background-position: -1145px 0; }
-.ic_bd_edit { background-position: -1162px 0; }
-.ic_bd_empty { background-position: -1179px 0; }
-.ic_bd_export { background-position: -1196px 0; }
-.ic_bd_firstpage { background-position: -1213px 0; width: 16px; height: 13px; }
-.ic_bd_ftext { background-position: -1230px 0; }
-.ic_bd_index { background-position: -1247px 0; }
-.ic_bd_insrow { background-position: -1264px 0; }
-.ic_bd_lastpage { background-position: -1281px 0; width: 16px; height: 13px; }
-.ic_bd_nextpage { background-position: -1298px 0; width: 8px; height: 13px; }
-.ic_bd_prevpage { background-position: -1307px 0; width: 8px; height: 13px; }
-.ic_bd_primary { background-position: -1316px 0; }
-.ic_bd_sbrowse { background-position: -1333px 0; width: 10px; height: 10px; }
-.ic_bd_select { background-position: -1344px 0; }
-.ic_bd_spatial { background-position: -1361px 0; }
-.ic_bd_unique { background-position: -1378px 0; }
-.ic_database, .ic_s_db { background-position: -1395px 0; }
-.ic_eye { background-position: -1412px 0; }
-.ic_eye_grey { background-position: -1429px 0; }
-.ic_item { background-position: -1446px 0; width: 9px; height: 9px; }
-.ic_item_ltr { background-position: -1456px 0; width: 5px; height: 9px; }
-.ic_item_rtl { background-position: -1462px 0; width: 5px; height: 9px; }
-.ic_more { background-position: -1468px 0; width: 13px; height: 8px; }
-.ic_pause { background-position: -1482px 0; }
-.ic_php_sym { background-position: -1499px 0; }
-.ic_s_asc { background-position: -1516px 0; }
-.ic_s_asci { background-position: -1533px 0; }
-.ic_s_attention, .ic_s_notice { background-position: -1550px 0; }
-.ic_s_cancel { background-position: -1567px 0; }
-.ic_s_cancel2 { background-position: -1584px 0; }
-.ic_s_cog { background-position: -1601px 0; }
-.ic_s_error { background-position: -1618px 0; }
-.ic_s_error2 { background-position: -1635px 0; width: 11px; height: 11px; }
-.ic_s_host { background-position: -1647px 0; }
-.ic_s_info { background-position: -1664px 0; }
-.ic_s_lang { background-position: -1681px 0; }
-.ic_s_loggoff { background-position: -1698px 0; }
-.ic_s_okay { background-position: -1715px 0; }
-.ic_s_passwd { background-position: -1732px 0; }
-.ic_s_really { background-position: -1749px 0; width: 11px; height: 11px; }
-.ic_s_reload { background-position: -1761px 0; }
-.ic_s_replication { background-position: -1778px 0; }
-.ic_s_rights { background-position: -1795px 0; }
-.ic_s_sortable { background-position: -1812px 0; }
-.ic_s_status { background-position: -1829px 0; }
-.ic_s_success { background-position: -1846px 0; }
-.ic_s_sync { background-position: -1863px 0; }
-.ic_s_tbl { background-position: -1880px 0; }
-.ic_s_theme { background-position: -1897px 0; }
-.ic_s_vars { background-position: -1914px 0; }
-.ic_window-new { background-position: -1931px 0; }
+.ic_asc_order, .ic_s_desc { background-position: 0 0; }
+.ic_b_bookmark { background-position: -17px 0; }
+.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; }
+.ic_b_calendar { background-position: -51px 0; }
+.ic_b_chart, .ic_b_dbstatistics { background-position: -68px 0; }
+.ic_b_close { background-position: -85px 0; }
+.ic_b_comment { background-position: -102px 0; }
+.ic_b_deltbl { background-position: -119px 0; }
+.ic_b_docs { background-position: -136px 0; }
+.ic_b_docsql { background-position: -153px 0; }
+.ic_b_drop { background-position: -170px 0; }
+.ic_b_edit { background-position: -187px 0; }
+.ic_b_empty { background-position: -204px 0; }
+.ic_b_engine { background-position: -221px 0; }
+.ic_b_event_add { background-position: -238px 0; }
+.ic_b_events { background-position: -255px 0; }
+.ic_b_export, .ic_b_tblexport { background-position: -272px 0; }
+.ic_b_firstpage { background-position: -289px 0; }
+.ic_b_ftext { background-position: -306px 0; }
+.ic_b_globe { background-position: -323px 0; }
+.ic_b_help { background-position: -340px 0; }
+.ic_b_help_s { background-position: -340px 0; }
+.ic_b_home { background-position: -357px 0; }
+.ic_b_import, .ic_b_tblimport { background-position: -374px 0; }
+.ic_b_index { background-position: -391px 0; }
+.ic_b_info { background-position: -408px 0; width: 11px; height: 11px; }
+.ic_b_inline_edit { background-position: -420px 0; }
+.ic_b_insrow { background-position: -437px 0; }
+.ic_b_lastpage { background-position: -454px 0; }
+.ic_b_minus { background-position: -471px 0; }
+.ic_b_more, .ic_col_drop { background-position: -488px 0; }
+.ic_b_newdb { background-position: -505px 0; }
+.ic_b_newtbl { background-position: -522px 0; }
+.ic_b_nextpage, .ic_play { background-position: -539px 0; }
+.ic_b_pdfdoc { background-position: -556px 0; }
+.ic_b_plus { background-position: -573px 0; }
+.ic_b_prevpage { background-position: -590px 0; }
+.ic_b_primary { background-position: -607px 0; }
+.ic_b_print { background-position: -624px 0; }
+.ic_b_props { background-position: -641px 0; }
+.ic_b_relations { background-position: -658px 0; }
+.ic_b_routine_add { background-position: -675px 0; }
+.ic_b_routines { background-position: -692px 0; }
+.ic_b_save { background-position: -709px 0; }
+.ic_b_sdb { background-position: -726px 0; width: 10px; height: 10px; }
+.ic_b_search { background-position: -737px 0; }
+.ic_b_selboard { background-position: -754px 0; }
+.ic_b_select { background-position: -771px 0; }
+.ic_b_snewtbl { background-position: -788px 0; }
+.ic_b_spatial { background-position: -805px 0; }
+.ic_b_sql { background-position: -822px 0; }
+.ic_b_sqldoc { background-position: -839px 0; }
+.ic_b_sqlhelp { background-position: -856px 0; }
+.ic_b_tblanalyse { background-position: -873px 0; }
+.ic_b_tblops { background-position: -890px 0; }
+.ic_b_tbloptimize { background-position: -907px 0; }
+.ic_b_tipp { background-position: -924px 0; }
+.ic_b_trigger_add { background-position: -941px 0; }
+.ic_b_triggers { background-position: -958px 0; }
+.ic_b_unique { background-position: -975px 0; }
+.ic_b_usradd { background-position: -992px 0; }
+.ic_b_usrcheck { background-position: -1009px 0; }
+.ic_b_usrdrop { background-position: -1026px 0; }
+.ic_b_usredit { background-position: -1043px 0; }
+.ic_b_usrlist { background-position: -1060px 0; }
+.ic_b_view { background-position: -1077px 0; }
+.ic_b_views, .ic_s_views { background-position: -1094px 0; }
+.ic_bd_browse { background-position: -1111px 0; }
+.ic_bd_deltbl { background-position: -1128px 0; }
+.ic_bd_drop { background-position: -1145px 0; }
+.ic_bd_edit { background-position: -1162px 0; }
+.ic_bd_empty { background-position: -1179px 0; }
+.ic_bd_export { background-position: -1196px 0; }
+.ic_bd_firstpage { background-position: -1213px 0; width: 16px; height: 13px; }
+.ic_bd_ftext { background-position: -1230px 0; }
+.ic_bd_index { background-position: -1247px 0; }
+.ic_bd_insrow { background-position: -1264px 0; }
+.ic_bd_lastpage { background-position: -1281px 0; width: 16px; height: 13px; }
+.ic_bd_nextpage { background-position: -1298px 0; width: 8px; height: 13px; }
+.ic_bd_prevpage { background-position: -1307px 0; width: 8px; height: 13px; }
+.ic_bd_primary { background-position: -1316px 0; }
+.ic_bd_sbrowse { background-position: -1333px 0; width: 10px; height: 10px; }
+.ic_bd_select { background-position: -1344px 0; }
+.ic_bd_spatial { background-position: -1361px 0; }
+.ic_bd_unique { background-position: -1378px 0; }
+.ic_database, .ic_s_db { background-position: -1395px 0; }
+.ic_eye { background-position: -1412px 0; }
+.ic_eye_grey { background-position: -1429px 0; }
+.ic_item { background-position: -1446px 0; width: 9px; height: 9px; }
+.ic_item_ltr { background-position: -1456px 0; width: 5px; height: 9px; }
+.ic_item_rtl { background-position: -1462px 0; width: 5px; height: 9px; }
+.ic_more { background-position: -1468px 0; width: 13px; height: 8px; }
+.ic_pause { background-position: -1482px 0; }
+.ic_php_sym { background-position: -1499px 0; }
+.ic_s_asc { background-position: -1516px 0; }
+.ic_s_asci { background-position: -1533px 0; }
+.ic_s_attention, .ic_s_notice { background-position: -1550px 0; }
+.ic_s_cancel { background-position: -1567px 0; }
+.ic_s_cancel2 { background-position: -1584px 0; }
+.ic_s_cog { background-position: -1601px 0; }
+.ic_s_error { background-position: -1618px 0; }
+.ic_s_error2 { background-position: -1635px 0; width: 11px; height: 11px; }
+.ic_s_host { background-position: -1647px 0; }
+.ic_s_info { background-position: -1664px 0; }
+.ic_s_lang { background-position: -1681px 0; }
+.ic_s_loggoff { background-position: -1698px 0; }
+.ic_s_okay { background-position: -1715px 0; }
+.ic_s_passwd { background-position: -1732px 0; }
+.ic_s_really { background-position: -1749px 0; width: 11px; height: 11px; }
+.ic_s_reload { background-position: -1761px 0; }
+.ic_s_replication { background-position: -1778px 0; }
+.ic_s_rights { background-position: -1795px 0; }
+.ic_s_sortable { background-position: -1812px 0; }
+.ic_s_status { background-position: -1829px 0; }
+.ic_s_success { background-position: -1846px 0; }
+.ic_s_sync { background-position: -1863px 0; }
+.ic_s_tbl { background-position: -1880px 0; }
+.ic_s_theme { background-position: -1897px 0; }
+.ic_s_vars { background-position: -1914px 0; }
+.ic_window-new { background-position: -1931px 0; }
/* Same as ic_b_help, but applied to place where width=11, height=11 attributes were used */
-.ic_b_help_s { background-position: -340px 0; }
+.ic_b_help_s { background-position: -340px 0; }
/* Same as ic_s_sortable */
img.sortableIcon { background-position: -1812px 0; }
@@ -944,12 +944,12 @@ form.login label {
/* specific elements */
/* topmenu */
-#topmenu a {
- text-shadow:0px 1px 0px #fff;
+#topmenu a {
+ text-shadow:0px 1px 0px #fff;
}
-#topmenu .error {
- background:#eee;border:0px !important;color:#aaa;
+#topmenu .error {
+ background:#eee;border:0px !important;color:#aaa;
}
ul#topmenu, ul#topmenu2, ul.tabs {
@@ -977,7 +977,7 @@ ul#topmenu li, ul#topmenu2 li {
vertical-align:-3px;
}
-#topmenucontainer{
+#topmenucontainer{
background:url(./themes/pmahomme/img/tab_bg.png) repeat-x;
border-top:1px solid #aaa;
}
@@ -1316,7 +1316,7 @@ h3#serverstatusqueries span {
img.sortableIcon {
float:right;
background-repeat:no-repeat;
- margin:0;
+ margin:0;
}
.buttonlinks {
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list