gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-01-15 14:32:29 +01:00
commit 2f7ef7a83d
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_tracking.php
View File

@ -18,7 +18,7 @@ $scripts->addFile('db_structure.js');
/**
* If we are not in an Ajax request, then do the common work and show the links etc.
*/
include 'libraries/db_common.inc.php';
require 'libraries/db_common.inc.php';
$url_query .= '&goto=tbl_tracking.php&back=db_tracking.php';
// Get the database structure

2
libraries/display_change_password.lib.php
View File

@ -89,7 +89,7 @@ function PMA_getHtmlForChangePassword($username, $hostname) {
. '</table>'
. '</fieldset>'
. '<fieldset id="fieldset_change_password_footer" class="tblFooters">'
. '<input type="submit" name="change_pw" value="' . __('Go') . '" />'
. '<input type="submit" name="change_pw" value="' . __('Go') . '" />'
. '</fieldset>'
. '</form>';
return $html;

21
tbl_chart.php
View File

@ -15,20 +15,22 @@ require_once 'libraries/common.inc.php';
* Execute the query and return the result
*/
if(isset($_REQUEST['ajax_request']) && isset($_REQUEST['pos']) && isset($_REQUEST['session_max_rows'])) {
if (isset($_REQUEST['ajax_request'])
&& isset($_REQUEST['pos'])
&& isset($_REQUEST['session_max_rows'])
) {
$response = PMA_Response::getInstance();
if (strlen($GLOBALS['table']) && strlen($GLOBALS['db'])) {
include './libraries/tbl_common.inc.php';
}
else {
} else {
$response->isSuccess(false);
$response->addJSON('message', __('Error'));
exit;
}
$sql_limit_to_append = ' LIMIT ' . $_REQUEST['pos'] . ', ' . $_REQUEST['session_max_rows'] . " ";
$sql_limit_to_append = ' LIMIT ' . $_REQUEST['pos'] . ', '
. $_REQUEST['session_max_rows'] . " ";
$sql_query .= $sql_limit_to_append;
$data = array();
$result = PMA_DBI_try_query($sql_query);
@ -36,7 +38,7 @@ if(isset($_REQUEST['ajax_request']) && isset($_REQUEST['pos']) && isset($_REQUES
$data[] = $row;
}
if(empty($data)) {
if (empty($data)) {
$response->isSuccess(false);
$response->addJSON('message', __('No data to display'));
exit;
@ -171,9 +173,12 @@ url_query = '<?php echo $url_query;?>';
foreach ($keys as $idx => $key) {
if (in_array($fields_meta[$idx]->type, $numeric_types)) {
if ($idx == $yaxis) {
echo '<option value"' . htmlspecialchars($key) . '">' . htmlspecialchars($key) . '</option>';
echo '<option value"' . htmlspecialchars($key) . '">'
. htmlspecialchars($key) . '</option>';
} else {
echo '<option value"' . htmlspecialchars($key) . '" selected="selected">' . htmlspecialchars($key) . '</option>';
echo '<option value"' . htmlspecialchars($key)
. '" selected="selected">' . htmlspecialchars($key)
. '</option>';
}
}
}