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 2015-07-25 09:36:53 +02:00
commit 95a2bf8b97
8 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db_datadict.php
View File

@ -67,7 +67,8 @@ foreach ($tables as $table) {
/**
* Gets table information
*/
$show_comment = $GLOBALS['dbi']->getTable($db, $table)->sGetStatusInfo('TABLE_COMMENT');
$show_comment = $GLOBALS['dbi']->getTable($db, $table)
->sGetStatusInfo('TABLE_COMMENT');
/**
* Gets table keys and retains them

11
db_designer.php
View File

@ -94,8 +94,8 @@ if (isset($_REQUEST['operation'])) {
&& $GLOBALS['cfgRelation']['designersettingswork']
) {
$orig_data_query = 'SELECT ' . PMA_Util::backquote('settings_data')
. ' FROM `' . $cfgDesigner['db'] . '`.`' . $cfgDesigner['table'] . '` WHERE '
. PMA_Util::backquote('username') . ' = "'
. ' FROM `' . $cfgDesigner['db'] . '`.`' . $cfgDesigner['table']
. '` WHERE ' . PMA_Util::backquote('username') . ' = "'
. $cfgDesigner['user'] . '"';
$orig_data = $GLOBALS['dbi']->fetchSingleRow($orig_data_query);
@ -113,8 +113,8 @@ if (isset($_REQUEST['operation'])) {
$save_query = 'UPDATE `' . $cfgDesigner['db'] . '`.`'
. $cfgDesigner['table'] . '` SET '
. PMA_Util::backquote('settings_data') . ' = \''
. $orig_data . '\' WHERE ' . PMA_Util::backquote('username') . ' = "'
. $cfgDesigner['user'] . '";';
. $orig_data . '\' WHERE ' . PMA_Util::backquote('username')
. ' = "' . $cfgDesigner['user'] . '";';
$success = $GLOBALS['dbi']->query($save_query);
} else {
@ -122,7 +122,8 @@ if (isset($_REQUEST['operation'])) {
$query = 'INSERT INTO ' . PMA_Util::backquote($cfgDesigner['db'])
. '.' . PMA_Util::backquote($cfgDesigner['table'])
. ' VALUES("' . PMA_Util::sqlAddSlashes($cfgDesigner['user']) . '", \''
. ' VALUES("' . PMA_Util::sqlAddSlashes($cfgDesigner['user'])
. '", \''
. PMA_Util::sqlAddSlashes(json_encode($save_data)) . '\');';
$success = $GLOBALS['dbi']->query($query);

18
db_export.php
View File

@ -44,7 +44,8 @@ if (isset($_GET['structure_or_data_forced'])) {
} else {
$force_val = 0;
}
$multi_values .= '<input type="hidden" name="structure_or_data_forced" value="' . $force_val . '">';
$multi_values .= '<input type="hidden" name="structure_or_data_forced" value="'
. $force_val . '">';
$multi_values .= '<table class="export_table_select">'
. '<thead><tr><th></th>'
. '<th>' . __('Tables') . '</th>'
@ -53,8 +54,10 @@ $multi_values .= '<table class="export_table_select">'
. '</tr><tr>'
. '<td></td>'
. '<td class="export_table_name all">' . __('Select all') . '</td>'
. '<td class="export_structure all"><input type="checkbox" id="table_structure_all" /></td>'
. '<td class="export_data all"><input type="checkbox" id="table_data_all" /></td>'
. '<td class="export_structure all">'
. '<input type="checkbox" id="table_structure_all" /></td>'
. '<td class="export_data all"><input type="checkbox" id="table_data_all" />'
. '</td>'
. '</tr></thead>'
. '<tbody>';
$multi_values .= "\n";
@ -103,10 +106,13 @@ foreach ($tables as $each_table) {
$multi_values .= '<tr>';
$multi_values .= '<td><input type="checkbox" name="table_select[]"'
. ' value="' . $table_html . '"' . $is_checked . ' /></td>';
$multi_values .= '<td class="export_table_name">' . str_replace(' ', '&nbsp;', $table_html) . '</td>';
$multi_values .= '<td class="export_structure"><input type="checkbox" name="table_structure[]"'
$multi_values .= '<td class="export_table_name">'
. str_replace(' ', '&nbsp;', $table_html) . '</td>';
$multi_values .= '<td class="export_structure">'
. '<input type="checkbox" name="table_structure[]"'
. ' value="' . $table_html . '"' . $structure_checked . ' /></td>';
$multi_values .= '<td class="export_data"><input type="checkbox" name="table_data[]"'
$multi_values .= '<td class="export_data">'
. '<input type="checkbox" name="table_data[]"'
. ' value="' . $table_html . '"' . $data_checked . ' /></td>';
$multi_values .= '</tr>';
} // end for

5
db_operations.php
View File

@ -270,7 +270,10 @@ if (!$is_information_schema) {
&& $cfg['PmaNoRelation_DisableWarning'] == false
) {
$message = PMA_Message::notice(
__('The phpMyAdmin configuration storage has been deactivated. %sFind out why%s.')
__(
'The phpMyAdmin configuration storage has been deactivated. ' .
'%sFind out why%s.'
)
);
$message->addParam(
'<a href="' . $cfg['PmaAbsoluteUri']

3
index.php
View File

@ -618,7 +618,8 @@ if (isset($GLOBALS['dbi'])
sprintf(
__(
'Your PHP MySQL library version %s differs from your ' .
'MySQL server version %s. This may cause unpredictable behavior.'
'MySQL server version %s. This may cause unpredictable ' .
'behavior.'
),
$_client_info,
substr(

13
libraries/controllers/TableSearchController.class.php
View File

@ -1,4 +1,10 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Holds the PMA\Controllers\Table\TableSearchController
*
* @package PMA\Controllers\Table
*/
namespace PMA\Controllers\Table;
@ -15,8 +21,11 @@ require_once 'libraries/sql.lib.php';
require_once 'libraries/bookmark.lib.php';
require_once 'libraries/controllers/TableController.class.php';
/**
* Class TableSearchController
*
* @package PhpMyAdmin
*/
class TableSearchController extends TableController
{
/**

4
tbl_find_replace.php
View File

@ -20,7 +20,9 @@ use PMA\DI;
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\Table\TableSearchController');
$container->alias('TableSearchController', 'PMA\Controllers\Table\TableSearchController');
$container->alias(
'TableSearchController', 'PMA\Controllers\Table\TableSearchController'
);
$dependency_definitions = array(
'searchType' => 'replace',

4
tbl_select.php
View File

@ -21,7 +21,9 @@ use PMA\DI;
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\Table\TableSearchController');
$container->alias('TableSearchController', 'PMA\Controllers\Table\TableSearchController');
$container->alias(
'TableSearchController', 'PMA\Controllers\Table\TableSearchController'
);
/* Define dependencies for the concerned controller */
$dependency_definitions = array(