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 2017-06-30 19:38:49 +02:00
commit b46a08eb85
92 changed files with 236 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_central_columns.php
View File

@ -148,7 +148,7 @@ $response->addHTML('</table>');
$tablefooter = PMA_getCentralColumnsTableFooter($pmaThemeImage, $text_dir);
$response->addHTML($tablefooter);
$response->addHTML('</form></div>');
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
sprintf(__('Showing rows %1$s - %2$s.'), ($pos + 1), ($pos + count($result)))
);
if (isset($tmp_msg) && $tmp_msg !== true) {

2
db_export.php
View File

@ -48,7 +48,7 @@ $export_page_title = __('View dump (schema) of database');
// exit if no tables in db found
if ($num_tables < 1) {
PMA\libraries\Message::error(__('No tables found in database.'))->display();
PhpMyAdmin\Message::error(__('No tables found in database.'))->display();
exit;
} // end if

12
db_operations.php
View File

@ -47,9 +47,9 @@ if (strlen($GLOBALS['db']) > 0
}
if (! isset($_REQUEST['newname']) || strlen($_REQUEST['newname']) === 0) {
$message = PMA\libraries\Message::error(__('The database name is empty!'));
$message = PhpMyAdmin\Message::error(__('The database name is empty!'));
} else if($_REQUEST['newname'] === $_REQUEST['db']) {
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__('Cannot copy database to the same name. Change the name and try again.')
);
} else {
@ -138,7 +138,7 @@ if (strlen($GLOBALS['db']) > 0
$sql_query .= "\n" . $local_query;
$GLOBALS['dbi']->query($local_query);
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__('Database %1$s has been renamed to %2$s.')
);
$message->addParam($GLOBALS['db']);
@ -150,13 +150,13 @@ if (strlen($GLOBALS['db']) > 0
PMA_AdjustPrivileges_copyDB($GLOBALS['db'], $_REQUEST['newname']);
}
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__('Database %1$s has been copied to %2$s.')
);
$message->addParam($GLOBALS['db']);
$message->addParam($_REQUEST['newname']);
} else {
$message = PMA\libraries\Message::error();
$message = PhpMyAdmin\Message::error();
}
$reload = true;
@ -276,7 +276,7 @@ if (!$is_information_schema) {
if (! $cfgRelation['allworks']
&& $cfg['PmaNoRelation_DisableWarning'] == false
) {
$message = PMA\libraries\Message::notice(
$message = PhpMyAdmin\Message::notice(
__(
'The phpMyAdmin configuration storage has been deactivated. ' .
'%sFind out why%s.'

4
db_qbe.php
View File

@ -123,7 +123,7 @@ list(
) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
if ($message_to_display) {
PMA\libraries\Message::error(
PhpMyAdmin\Message::error(
__('You have to choose at least one column to display!')
)
->display();
@ -140,7 +140,7 @@ $url = 'db_designer.php' . URL::getCommon(
)
);
$response->addHTML(
PMA\libraries\Message::notice(
PhpMyAdmin\Message::notice(
sprintf(
__('Switch to %svisual builder%s'),
'<a href="' . $url . '">',

8
db_tracking.php
View File

@ -49,14 +49,14 @@ list(
if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) {
Tracker::deleteTracking($GLOBALS['db'], $_REQUEST['table']);
PMA\libraries\Message::success(
PhpMyAdmin\Message::success(
__('Tracking data deleted successfully.')
)->display();
} elseif (isset($_REQUEST['submit_create_version'])) {
PMA_createTrackingForMultipleTables($_REQUEST['selected']);
PMA\libraries\Message::success(
PhpMyAdmin\Message::success(
sprintf(
__(
'Version %1$s was created for selected tables,'
@ -74,7 +74,7 @@ if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) {
foreach ($_REQUEST['selected_tbl'] as $table) {
Tracker::deleteTracking($GLOBALS['db'], $table);
}
PMA\libraries\Message::success(
PhpMyAdmin\Message::success(
__('Tracking data deleted successfully.')
)->display();
@ -89,7 +89,7 @@ if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) {
exit;
}
} else {
PMA\libraries\Message::notice(
PhpMyAdmin\Message::notice(
__('No tables selected.')
)->display();
}

4
error_report.php
View File

@ -86,9 +86,9 @@ if (isset($_REQUEST['send_error_report'])
/* Create message object */
if ($success) {
$msg = PMA\libraries\Message::notice($msg);
$msg = PhpMyAdmin\Message::notice($msg);
} else {
$msg = PMA\libraries\Message::error($msg);
$msg = PhpMyAdmin\Message::error($msg);
}
/* Add message to response */

2
export.php
View File

@ -373,7 +373,7 @@ if ($save_on_server) {
if ($export_type == 'database') {
$num_tables = count($tables);
if ($num_tables == 0) {
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__('No tables found in database.')
);
$active_page = 'db_export.php';

22
import.php
View File

@ -192,7 +192,7 @@ if (! empty($sql_query)) {
// If we didn't get any parameters, either user called this directly, or
// upload limit has been reached, let's assume the second possibility.
if ($_POST == array() && $_GET == array()) {
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__(
'You probably tried to upload a file that is too large. Please refer ' .
'to %sdocumentation%s for a workaround for this limit.'
@ -364,7 +364,7 @@ if (! empty($_REQUEST['id_bookmark'])) {
$bookmark = Bookmark::get($db, $id_bookmark);
$import_text = $bookmark->getQuery();
if ($response->isAjax()) {
$message = PMA\libraries\Message::success(__('Showing bookmark'));
$message = PhpMyAdmin\Message::success(__('Showing bookmark'));
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message);
$response->addJSON('sql_query', $import_text);
@ -379,7 +379,7 @@ if (! empty($_REQUEST['id_bookmark'])) {
if (! empty($bookmark)) {
$bookmark->delete();
if ($response->isAjax()) {
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__('The bookmark has been deleted.')
);
$response->setRequestStatus($message->isSuccess());
@ -472,7 +472,7 @@ if ($import_file != 'none' && ! $error) {
}
} elseif (! $error) {
if (! isset($import_text) || empty($import_text)) {
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__(
'No data was received to import. Either no file name was ' .
'submitted, or the file size exceeded the maximum size permitted ' .
@ -525,7 +525,7 @@ if (! $error) {
$import_type
);
if ($import_plugin == null) {
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__('Could not load import plugins, please check your installation!')
);
PMA_stopImport($message);
@ -561,11 +561,11 @@ if ($reset_charset) {
// Show correct message
if (! empty($id_bookmark) && $_REQUEST['action_bookmark'] == 2) {
$message = PMA\libraries\Message::success(__('The bookmark has been deleted.'));
$message = PhpMyAdmin\Message::success(__('The bookmark has been deleted.'));
$display_query = $import_text;
$error = false; // unset error marker, it was used just to skip processing
} elseif (! empty($id_bookmark) && $_REQUEST['action_bookmark'] == 1) {
$message = PMA\libraries\Message::notice(__('Showing bookmark'));
$message = PhpMyAdmin\Message::notice(__('Showing bookmark'));
} elseif ($bookmark_created) {
$special_message = '[br]' . sprintf(
__('Bookmark %s has been created.'),
@ -575,7 +575,7 @@ if (! empty($id_bookmark) && $_REQUEST['action_bookmark'] == 2) {
// Do not display the query with message, we do it separately
$display_query = ';';
if ($import_type != 'query') {
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
'<em>'
. _ngettext(
'Import has been successfully finished, %d query executed.',
@ -607,7 +607,7 @@ if ($timeout_passed) {
$importUrl = $err_url = $goto . URL::getCommon($urlparams);
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__(
'Script timeout passed, if you want to finish import,'
. ' please %sresubmit the same file%s and import will resume.'
@ -752,14 +752,14 @@ if ($go_sql) {
}
$response->setRequestStatus(true);
$response->addJSON('message', PMA\libraries\Message::success($msg));
$response->addJSON('message', PhpMyAdmin\Message::success($msg));
$response->addJSON(
'sql_query',
PMA\libraries\Util::getMessage($msg, $sql_query, 'success')
);
} else if ($result == false) {
$response->setRequestStatus(false);
$response->addJSON('message', PMA\libraries\Message::error($msg));
$response->addJSON('message', PhpMyAdmin\Message::error($msg));
} else {
$active_page = $goto;
include '' . $goto;

2
import_status.php
View File

@ -103,7 +103,7 @@ if (isset($_GET["message"]) && $_GET["message"]) {
session_start();
if ((time() - $timestamp) > $maximumTime) {
$_SESSION['Import_message']['message'] = PMA\libraries\Message::error(
$_SESSION['Import_message']['message'] = PhpMyAdmin\Message::error(
__('Could not load the progress of the import.')
)->getDisplay();
break;

4
index.php
View File

@ -9,7 +9,7 @@
use PhpMyAdmin\Charsets;
use PhpMyAdmin\Core;
use PhpMyAdmin\LanguageManager;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\RecentFavoriteTable;
use PMA\libraries\Response;
use PMA\libraries\Sanitize;
@ -572,7 +572,7 @@ if ($server > 0) {
. 'to set it up there.'
);
}
$msg = PMA\libraries\Message::notice($msg_text);
$msg = PhpMyAdmin\Message::notice($msg_text);
$msg->addParamHtml('<a href="./chk_rel.php' . $common_url_query . '">');
$msg->addParamHtml('</a>');
/* Show error if user has configured something, notice elsewhere */

2
libraries/Sql.php
View File

@ -16,7 +16,7 @@ use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DisplayResults;
use PhpMyAdmin\Index;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Table;
use PMA\libraries\Transformations;

1
libraries/Table.php
View File

@ -9,6 +9,7 @@ namespace PMA\libraries;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Index;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\export\ExportSql;
use PhpMyAdmin\SqlParser\Components\Expression;
use PhpMyAdmin\SqlParser\Components\OptionsArray;

12
libraries/central_columns.lib.php
View File

@ -6,7 +6,7 @@
* @package PhpMyAdmin
*/
use PhpMyAdmin\Charsets;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Util;
use PMA\libraries\URL;
@ -211,7 +211,7 @@ function PMA_getInsertQuery($column, $def, $db, $central_list_table)
* @param string $table if $isTable is false,
* then table name to which columns belong
*
* @return true|PMA\libraries\Message
* @return true|PhpMyAdmin\Message
*/
function PMA_syncUniqueColumns($field_select, $isTable=true, $table=null)
{
@ -316,7 +316,7 @@ function PMA_syncUniqueColumns($field_select, $isTable=true, $table=null)
* selected list of columns to remove from central list
* @param bool $isTable if passed array is of tables or columns
*
* @return true|PMA\libraries\Message
* @return true|PhpMyAdmin\Message
*/
function PMA_deleteColumnsFromList($field_select, $isTable=true)
{
@ -399,7 +399,7 @@ function PMA_deleteColumnsFromList($field_select, $isTable=true)
* @param string $db current database
* @param array $selected_tables list of selected tables.
*
* @return true|PMA\libraries\Message
* @return true|PhpMyAdmin\Message
*/
function PMA_makeConsistentWithList($db, $selected_tables)
{
@ -508,7 +508,7 @@ function PMA_getCentralColumnsFromTable($db, $table, $allFields=false)
* @param string $col_extra new column extra property
* @param string $col_default new column default value
*
* @return true|PMA\libraries\Message
* @return true|PhpMyAdmin\Message
*/
function PMA_updateOneColumn($db, $orig_col_name, $col_name, $col_type,
$col_attribute,$col_length, $col_isNull, $collation, $col_extra, $col_default
@ -556,7 +556,7 @@ function PMA_updateOneColumn($db, $orig_col_name, $col_name, $col_type,
/**
* Update Multiple column in central columns list if a chnage is requested
*
* @return true|PMA\libraries\Message
* @return true|PhpMyAdmin\Message
*/
function PMA_updateMultipleColumn()
{

2
libraries/classes/Core.php
View File

@ -10,7 +10,7 @@
namespace PhpMyAdmin;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Sanitize;
use PMA\libraries\Template;

2
libraries/classes/DisplayResults.php
View File

@ -11,7 +11,7 @@ use PhpMyAdmin\SqlParser\Utils\Query;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Index;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\transformations\Text_Plain_Link;
use PMA\libraries\Response;
use PMA\libraries\Sanitize;

2
libraries/classes/Error.php
View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin;
use Exception;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
/**
* a single error

2
libraries/classes/File.php
View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin;
use PMA\libraries\config\ConfigFile;
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Util;
use PMA\libraries\ZipExtension;

2
libraries/classes/Footer.php
View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin;
use PhpMyAdmin\Config;
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Sanitize;
use PMA\libraries\Scripts;

4
libraries/classes/Header.php
View File

@ -10,8 +10,8 @@ namespace PhpMyAdmin;
use PhpMyAdmin\Config;
use PhpMyAdmin\Console;
use PhpMyAdmin\Core;
use PMA\libraries\Menu;
use PMA\libraries\Message;
use PhpMyAdmin\Menu;
use PhpMyAdmin\Message;
use PMA\libraries\navigation\Navigation;
use PMA\libraries\RecentFavoriteTable;
use PMA\libraries\Sanitize;

2
libraries/classes/Index.php
View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin;
use PhpMyAdmin\IndexColumn;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Sanitize;
use PMA\libraries\URL;
use PMA\libraries\Util;

2
libraries/Logging.php → libraries/classes/Logging.php
View File

@ -7,7 +7,7 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries;
namespace PhpMyAdmin;
use PhpMyAdmin\Core;

4
libraries/Menu.php → libraries/classes/Menu.php
View File

@ -5,10 +5,12 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries;
namespace PhpMyAdmin;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\Tracker;
use PMA\libraries\URL;
use PMA\libraries\Util;
/**
* Class for generating the top menu

4
libraries/Message.php → libraries/classes/Message.php
View File

@ -5,9 +5,10 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries;
namespace PhpMyAdmin;
use PMA\libraries\Sanitize;
use PMA\libraries\Util;
/**
* a single message
@ -812,6 +813,5 @@ class Message
}
$message = Message::notice(Util::getImage($image)) . " " . $message;
return $message;
}
}

4
libraries/common.inc.php
View File

@ -35,7 +35,7 @@ use PhpMyAdmin\Config;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\ErrorHandler;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\AuthenticationPlugin;
use PhpMyAdmin\DbList;
use PMA\libraries\ThemeManager;
@ -44,7 +44,7 @@ use PMA\libraries\Response;
use PMA\libraries\TypesMySQL;
use PMA\libraries\Util;
use PhpMyAdmin\LanguageManager;
use PMA\libraries\Logging;
use PhpMyAdmin\Logging;
/**
* block attempts to directly run this script

2
libraries/config/PageSettings.php
View File

@ -8,7 +8,7 @@
namespace PMA\libraries\config;
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
require_once 'libraries/user_preferences.lib.php';

2
libraries/controllers/database/DatabaseStructureController.php
View File

@ -13,7 +13,7 @@ use PMA\libraries\config\PageSettings;
use PMA\libraries\controllers\DatabaseController;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\RecentFavoriteTable;
use PMA\libraries\Response;
use PMA\libraries\Template;

2
libraries/controllers/server/ServerBinlogController.php
View File

@ -11,7 +11,7 @@ namespace PMA\libraries\controllers\server;
use PMA\libraries\controllers\Controller;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Util;
use PMA\libraries\Template;
use PMA\libraries\URL;

2
libraries/controllers/server/ServerDatabasesController.php
View File

@ -11,7 +11,7 @@ namespace PMA\libraries\controllers\server;
use PMA\libraries\controllers\Controller;
use PhpMyAdmin\Charsets;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Template;
use PMA\libraries\Util;

2
libraries/controllers/server/ServerVariablesController.php
View File

@ -10,7 +10,7 @@
namespace PMA\libraries\controllers\server;
use PMA\libraries\controllers\Controller;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Template;
use PMA\libraries\Util;

2
libraries/controllers/table/TableChartController.php
View File

@ -10,7 +10,7 @@
namespace PMA\libraries\controllers\table;
use PMA\libraries\controllers\TableController;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Template;
use PMA\libraries\Util;

2
libraries/controllers/table/TableGisVisualizationController.php
View File

@ -11,7 +11,7 @@ namespace PMA\libraries\controllers\table;
use PMA\libraries\controllers\TableController;
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Template;
use PMA\libraries\gis\GISVisualization;
use PMA\libraries\URL;

2
libraries/controllers/table/TableIndexesController.php
View File

@ -11,7 +11,7 @@ namespace PMA\libraries\controllers\table;
use PMA\libraries\controllers\TableController;
use PhpMyAdmin\Index;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Template;
use PMA\libraries\Util;
use PMA\libraries\Response;

2
libraries/controllers/table/TableStructureController.php
View File

@ -16,7 +16,7 @@ use PMA\libraries\config\PageSettings;
use PMA\libraries\controllers\TableController;
use PhpMyAdmin\Core;
use PhpMyAdmin\Index;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Sql;
use PMA\libraries\Table;
use PMA\libraries\Template;

2
libraries/db_common.inc.php
View File

@ -7,7 +7,7 @@
*/
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\URL;
use PMA\libraries\Util;

2
libraries/db_designer.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\SchemaPlugin;
if (! defined('PHPMYADMIN')) {

2
libraries/db_table_exists.inc.php
View File

@ -8,7 +8,7 @@
*/
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\URL;

2
libraries/display_change_password.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\URL;
/**

2
libraries/display_export.lib.php
View File

@ -9,7 +9,7 @@
use PhpMyAdmin\Core;
use PhpMyAdmin\Encoding;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\Response;
use PMA\libraries\Table;

2
libraries/display_import.lib.php
View File

@ -12,7 +12,7 @@
use PhpMyAdmin\Charsets;
use PhpMyAdmin\Core;
use PhpMyAdmin\Encoding;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\ImportPlugin;
use PMA\libraries\URL;
use PMA\libraries\Sanitize;

2
libraries/export.lib.php
View File

@ -7,7 +7,7 @@
* @package PhpMyAdmin
*/
use PhpMyAdmin\Encoding;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\Table;
use PMA\libraries\ZipFile;

6
libraries/import.lib.php
View File

@ -6,7 +6,7 @@
* @package PhpMyAdmin-Import
*/
use PhpMyAdmin\Encoding;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Table;
use PMA\libraries\Util;
@ -1299,7 +1299,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
/**
* Stops the import on (mostly upload/file related) error
*
* @param PMA\libraries\Message $error_message The error message
* @param PhpMyAdmin\Message $error_message The error message
*
* @return void
* @access public
@ -1323,7 +1323,7 @@ function PMA_stopImport( Message $error_message )
$response = Response::getInstance();
$response->setRequestStatus(false);
$response->addJSON('message', PMA\libraries\Message::error($msg));
$response->addJSON('message', PhpMyAdmin\Message::error($msg));
exit;
}

2
libraries/insert_edit.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\TransformationsPlugin;
use PMA\libraries\Response;
use PMA\libraries\Sanitize;

2
libraries/mult_submits.inc.php
View File

@ -6,7 +6,7 @@
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Sql;

2
libraries/navigation/Navigation.php
View File

@ -9,7 +9,7 @@
namespace PMA\libraries\navigation;
use PMA\libraries\config\PageSettings;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Util;
use PMA\libraries\URL;

2
libraries/normalization.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Transformations;
use PMA\libraries\URL;
use PMA\libraries\Util;

2
libraries/operations.lib.php
View File

@ -8,7 +8,7 @@
use PMA\libraries\engines\Innodb;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Partition;
use PMA\libraries\plugins\export\ExportSql;
use PMA\libraries\Response;

2
libraries/plugins/auth/AuthenticationCookie.php
View File

@ -10,7 +10,7 @@ namespace PMA\libraries\plugins\auth;
use phpseclib\Crypt;
use PhpMyAdmin\LanguageManager;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\AuthenticationPlugin;
use PMA\libraries\Response;
use PMA\libraries\Util;

2
libraries/plugins/auth/AuthenticationHttp.php
View File

@ -10,7 +10,7 @@
namespace PMA\libraries\plugins\auth;
use PMA\libraries\plugins\AuthenticationPlugin;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PhpMyAdmin\Config;
use PhpMyAdmin\Core;

31
libraries/plugins/import/ImportCsv.php
View File

@ -9,9 +9,10 @@
*/
namespace PMA\libraries\plugins\import;
use PhpMyAdmin\Message;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PMA\libraries\Util;
/**
* Handles the import for the CSV format
@ -65,7 +66,7 @@ class ImportCsv extends AbstractImportCsv
);
$generalOptions->addProperty($leaf);
} else {
$hint = new PMA\libraries\Message(
$hint = new Message(
__(
'If the data in each row of the file is not'
. ' in the same order as in the database, list the corresponding'
@ -75,7 +76,7 @@ class ImportCsv extends AbstractImportCsv
);
$leaf = new TextPropertyItem(
"columns",
__('Column names: ') . PMA\libraries\Util::showHint($hint)
__('Column names: ') . Util::showHint($hint)
);
$generalOptions->addProperty($leaf);
}
@ -114,7 +115,7 @@ class ImportCsv extends AbstractImportCsv
$param_error = false;
if (strlen($csv_terminated) === 0) {
$message = PMA\libraries\Message::error(
$message = Message::error(
__('Invalid parameter for CSV import: %s')
);
$message->addParam(__('Columns terminated with'));
@ -129,7 +130,7 @@ class ImportCsv extends AbstractImportCsv
// But the parser won't work correctly with strings so we allow just
// one character.
} elseif (mb_strlen($csv_enclosed) > 1) {
$message = PMA\libraries\Message::error(
$message = Message::error(
__('Invalid parameter for CSV import: %s')
);
$message->addParam(__('Columns enclosed with'));
@ -140,7 +141,7 @@ class ImportCsv extends AbstractImportCsv
// But the parser won't work correctly with strings so we allow just
// one character.
} elseif (mb_strlen($csv_escaped) > 1) {
$message = PMA\libraries\Message::error(
$message = Message::error(
__('Invalid parameter for CSV import: %s')
);
$message->addParam(__('Columns escaped with'));
@ -149,7 +150,7 @@ class ImportCsv extends AbstractImportCsv
} elseif (mb_strlen($csv_new_line) != 1
&& $csv_new_line != 'auto'
) {
$message = PMA\libraries\Message::error(
$message = Message::error(
__('Invalid parameter for CSV import: %s')
);
$message->addParam(__('Lines terminated with'));
@ -160,7 +161,7 @@ class ImportCsv extends AbstractImportCsv
// If there is an error in the parameters entered,
// indicate that immediately.
if ($param_error) {
PMA\libraries\Util::mysqlDie(
Util::mysqlDie(
$message->getMessage(),
'',
false,
@ -176,7 +177,7 @@ class ImportCsv extends AbstractImportCsv
if (isset($_POST['csv_ignore'])) {
$sql_template .= ' IGNORE';
}
$sql_template .= ' INTO ' . PMA\libraries\Util::backquote($table);
$sql_template .= ' INTO ' . Util::backquote($table);
$tmp_fields = $GLOBALS['dbi']->getColumns($db, $table);
@ -200,7 +201,7 @@ class ImportCsv extends AbstractImportCsv
}
}
if (!$found) {
$message = PMA\libraries\Message::error(
$message = Message::error(
__(
'Invalid column (%s) specified! Ensure that columns'
. ' names are spelled correctly, separated by commas'
@ -212,7 +213,7 @@ class ImportCsv extends AbstractImportCsv
break;
}
$fields[] = $field;
$sql_template .= PMA\libraries\Util::backquote($val);
$sql_template .= Util::backquote($val);
}
$sql_template .= ') ';
}
@ -296,7 +297,7 @@ class ImportCsv extends AbstractImportCsv
while ($i < $len) {
// Deadlock protection
if ($lasti == $i && $lastlen == $len) {
$message = PMA\libraries\Message::error(
$message = Message::error(
__('Invalid format of CSV input on line %d.')
);
$message->addParam($line);
@ -526,7 +527,7 @@ class ImportCsv extends AbstractImportCsv
if ($values[count($values) - 1] == ';') {
unset($values[count($values) - 1]);
} else {
$message = PMA\libraries\Message::error(
$message = Message::error(
__(
'Invalid column count in CSV input'
. ' on line %d.'
@ -558,7 +559,7 @@ class ImportCsv extends AbstractImportCsv
if (isset($_POST['csv_replace'])) {
$sql .= " ON DUPLICATE KEY UPDATE ";
foreach ($fields as $field) {
$fieldName = PMA\libraries\Util::backquote(
$fieldName = Util::backquote(
$field['Field']
);
$sql .= $fieldName . " = VALUES(" . $fieldName
@ -657,7 +658,7 @@ class ImportCsv extends AbstractImportCsv
PMA_importRunQuery('', '', $sql_data);
if (count($values) != 0 && !$error) {
$message = PMA\libraries\Message::error(
$message = Message::error(
__('Invalid format of CSV input on line %d.')
);
$message->addParam($line);

11
libraries/plugins/import/ImportLdi.php
View File

@ -8,10 +8,11 @@
*/
namespace PMA\libraries\plugins\import;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\import\AbstractImportCsv;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PMA\libraries\Util;
if (!defined('PHPMYADMIN')) {
exit;
@ -107,7 +108,7 @@ class ImportLdi extends AbstractImportCsv
|| $charset_conversion
) {
// We handle only some kind of data!
$GLOBALS['message'] = PMA\libraries\Message::error(
$GLOBALS['message'] = Message::error(
__('This plugin does not support compressed imports!')
);
$GLOBALS['error'] = true;
@ -126,7 +127,7 @@ class ImportLdi extends AbstractImportCsv
} elseif (isset($ldi_ignore)) {
$sql .= ' IGNORE';
}
$sql .= ' INTO TABLE ' . PMA\libraries\Util::backquote($table);
$sql .= ' INTO TABLE ' . Util::backquote($table);
if (strlen($ldi_terminated) > 0) {
$sql .= ' FIELDS TERMINATED BY \'' . $ldi_terminated . '\'';
@ -161,7 +162,7 @@ class ImportLdi extends AbstractImportCsv
$sql .= ', ';
}
/* Trim also `, if user already included backquoted fields */
$sql .= PMA\libraries\Util::backquote(
$sql .= Util::backquote(
trim($tmp[$i], " \t\r\n\0\x0B`")
);
} // end for

2
libraries/plugins/import/ImportMediawiki.php
View File

@ -271,7 +271,7 @@ class ImportMediawiki extends ImportPlugin
} else {
// If it's none of the above, then the current line has a bad
// format
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__('Invalid format of mediawiki input on line: <br />%s.')
);
$message->addParam($cur_buffer_line);

4
libraries/plugins/import/ImportOds.php
View File

@ -146,7 +146,7 @@ class ImportOds extends ImportPlugin
if ($xml === false) {
$sheets = array();
$GLOBALS['message'] = PMA\libraries\Message::error(
$GLOBALS['message'] = PhpMyAdmin\Message::error(
__(
'The XML file specified was either malformed or incomplete.'
. ' Please correct the issue and try again.'
@ -158,7 +158,7 @@ class ImportOds extends ImportPlugin
$root = $xml->children('office', true)->{'body'}->{'spreadsheet'};
if (empty($root)) {
$sheets = array();
$GLOBALS['message'] = PMA\libraries\Message::error(
$GLOBALS['message'] = PhpMyAdmin\Message::error(
__('Could not parse OpenDocument Spreadsheet!')
);
$GLOBALS['error'] = true;

8
libraries/plugins/import/ImportShp.php
View File

@ -74,7 +74,7 @@ class ImportShp extends ImportPlugin
&& ZipExtension::getNumberOfFiles($import_file) > 1
) {
if ($GLOBALS['import_handle']->openZip('/^.*\.shp$/i') === false) {
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__('There was an error importing the ESRI shape file: "%s".')
);
$message->addParam($GLOBALS['import_handle']->getError());
@ -147,7 +147,7 @@ class ImportShp extends ImportPlugin
$shp->loadFromFile('');
if ($shp->lastError != "") {
$error = true;
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__('There was an error importing the ESRI shape file: "%s".')
);
$message->addParam($shp->lastError);
@ -177,7 +177,7 @@ class ImportShp extends ImportPlugin
break;
default:
$error = true;
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__('MySQL Spatial Extension does not support ESRI type "%s".')
);
$message->addParam($shp->getShapeName());
@ -224,7 +224,7 @@ class ImportShp extends ImportPlugin
if (count($rows) == 0) {
$error = true;
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__('The imported file does not contain any data!')
);

4
libraries/plugins/import/ImportXml.php
View File

@ -105,7 +105,7 @@ class ImportXml extends ImportPlugin
* The XML was malformed
*/
if ($xml === false) {
PMA\libraries\Message::error(
PhpMyAdmin\Message::error(
__(
'The XML file specified was either malformed or incomplete.'
. ' Please correct the issue and try again.'
@ -170,7 +170,7 @@ class ImportXml extends ImportPlugin
* The XML was malformed
*/
if ($db_name === null) {
PMA\libraries\Message::error(
PhpMyAdmin\Message::error(
__(
'The XML file specified was either malformed or incomplete.'
. ' Please correct the issue and try again.'

2
libraries/relation.lib.php
View File

@ -7,7 +7,7 @@
*/
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Table;
use PMA\libraries\RecentFavoriteTable;
use PMA\libraries\URL;

2
libraries/replication_gui.lib.php
View File

@ -7,7 +7,7 @@
*/
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\URL;

6
libraries/rte/rte_events.lib.php
View File

@ -133,7 +133,7 @@ function PMA_EVN_handleEditor()
$errors
);
} else {
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__('Event %1$s has been modified.')
);
$message->addParam(
@ -153,7 +153,7 @@ function PMA_EVN_handleEditor()
. '<br /><br />'
. __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
} else {
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__('Event %1$s has been created.')
);
$message->addParam(
@ -165,7 +165,7 @@ function PMA_EVN_handleEditor()
}
if (count($errors)) {
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
'<b>'
. __(
'One or more errors have occurred while processing your request:'

2
libraries/rte/rte_export.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
if (! defined('PHPMYADMIN')) {

2
libraries/rte/rte_general.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
if (! defined('PHPMYADMIN')) {

12
libraries/rte/rte_routines.lib.php
View File

@ -7,7 +7,7 @@
*/
use PhpMyAdmin\Charsets;
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Util;
use PMA\libraries\URL;
@ -257,7 +257,7 @@ function PMA_RTN_handleRequestCreateOrEdit($errors, $db)
. '<br /><br />'
. __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
} else {
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__('Routine %1$s has been created.')
);
$message->addParam(
@ -269,7 +269,7 @@ function PMA_RTN_handleRequestCreateOrEdit($errors, $db)
}
if (count($errors)) {
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__(
'One or more errors have occurred while'
. ' processing your request:'
@ -422,7 +422,7 @@ function PMA_RTN_createRoutine(
*
* @param bool $flushPrivileges Flush privileges
*
* @return PMA\libraries\Message
* @return PhpMyAdmin\Message
*/
function PMA_RTN_flushPrivileges($flushPrivileges)
{
@ -431,13 +431,13 @@ function PMA_RTN_flushPrivileges($flushPrivileges)
$flushPrivQuery = 'FLUSH PRIVILEGES;';
$GLOBALS['dbi']->query($flushPrivQuery);
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__(
'Routine %1$s has been modified. Privileges have been adjusted.'
)
);
} else {
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__('Routine %1$s has been modified.')
);
}

6
libraries/rte/rte_triggers.lib.php
View File

@ -109,7 +109,7 @@ function PMA_TRI_handleEditor()
$errors
);
} else {
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__('Trigger %1$s has been modified.')
);
$message->addParam(
@ -129,7 +129,7 @@ function PMA_TRI_handleEditor()
. '<br /><br />'
. __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
} else {
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__('Trigger %1$s has been created.')
);
$message->addParam(
@ -141,7 +141,7 @@ function PMA_TRI_handleEditor()
}
if (count($errors)) {
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
'<b>'
. __(
'One or more errors have occurred while processing your request:'

2
libraries/server_privileges.lib.php
View File

@ -8,7 +8,7 @@
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Template;
use PMA\libraries\Util;

2
libraries/server_status_processes.lib.php
View File

@ -7,7 +7,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\ServerStatusData;
use PMA\libraries\Util;
use PMA\libraries\URL;

2
libraries/tracking.lib.php
View File

@ -7,7 +7,7 @@
*/
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Tracker;
use PMA\libraries\URL;

2
libraries/twig/MessageExtension.php
View File

@ -9,7 +9,7 @@ namespace PMA\libraries\twig;
use Twig_Extension;
use Twig_SimpleFunction;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
/**
* Class MessageExtension

2
libraries/user_preferences.inc.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Sanitize;
if (!defined('PHPMYADMIN')) {

4
libraries/user_preferences.lib.php
View File

@ -7,7 +7,7 @@
*/
use PMA\libraries\config\ConfigFile;
use PhpMyAdmin\Core;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\URL;
if (! defined('PHPMYADMIN')) {
@ -81,7 +81,7 @@ function PMA_loadUserprefs()
*
* @param array $config_array configuration array
*
* @return true|PMA\libraries\Message
* @return true|PhpMyAdmin\Message
*/
function PMA_saveUserprefs(array $config_array)
{

2
navigation.php
View File

@ -18,7 +18,7 @@ $response = Response::getInstance();
$navigation = new Navigation();
if (! $response->isAjax()) {
$response->addHTML(
PMA\libraries\Message::error(
PhpMyAdmin\Message::error(
__('Fatal error: The navigation can only be accessed via AJAX')
)
);

2
prefs_manage.php
View File

@ -9,7 +9,7 @@ use PMA\libraries\config\ConfigFile;
use PMA\libraries\config\FormDisplay;
use PhpMyAdmin\Core;
use PhpMyAdmin\File;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\Util;
use PMA\libraries\URL;

10
server_privileges.php
View File

@ -132,7 +132,7 @@ if (!$GLOBALS['is_superuser'] && !$GLOBALS['is_grantuser']
) {
$response->addHTML(PMA_getHtmlForSubPageHeader('privileges', '', false));
$response->addHTML(
PMA\libraries\Message::error(__('No Privileges'))
PhpMyAdmin\Message::error(__('No Privileges'))
->getDisplay()
);
exit;
@ -146,7 +146,7 @@ if (isset($_REQUEST['change_copy']) && $username == $_REQUEST['old_username']
&& $hostname == $_REQUEST['old_hostname']
) {
$response->addHTML(
PMA\libraries\Message::error(
PhpMyAdmin\Message::error(
__(
"Username and hostname didn't change. "
. "If you only want to change the password, "
@ -237,7 +237,7 @@ if (! empty($_REQUEST['changeUserGroup']) && $cfgRelation['menuswork']
&& $GLOBALS['is_superuser'] && $GLOBALS['is_createuser']
) {
PMA_setUserGroup($username, $_REQUEST['userGroup']);
$message = PMA\libraries\Message::success();
$message = PhpMyAdmin\Message::success();
}
/**
@ -283,7 +283,7 @@ if (isset($_REQUEST['delete'])
*/
if (isset($_REQUEST['change_copy'])) {
$queries = PMA_getDataForQueries($queries, $queries_for_display);
$message = PMA\libraries\Message::success();
$message = PhpMyAdmin\Message::success();
$sql_query = join("\n", $queries);
}
@ -318,7 +318,7 @@ if ($response->isAjax()
(isset($username) ? $username : '')
);
if (! empty($message) && $message instanceof PMA\libraries\Message) {
if (! empty($message) && $message instanceof PhpMyAdmin\Message) {
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message);
$response->addJSON($extra_data);

2
server_replication.php
View File

@ -31,7 +31,7 @@ $scripts->addFile('vendor/zxcvbn.js');
*/
if (! $is_superuser) {
$html = PMA_getHtmlForSubPageHeader('replication');
$html .= PMA\libraries\Message::error(__('No Privileges'))->getDisplay();
$html .= PhpMyAdmin\Message::error(__('No Privileges'))->getDisplay();
$response->addHTML($html);
exit;
}

2
server_status.php
View File

@ -6,7 +6,7 @@
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\ServerStatusData;

2
server_status_advisor.php
View File

@ -6,7 +6,7 @@
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\Response;
use PMA\libraries\ServerStatusData;

4
server_status_processes.php
View File

@ -30,12 +30,12 @@ if ($response->isAjax() && !empty($_REQUEST['kill'])) {
$kill = intval($_REQUEST['kill']);
$query = $GLOBALS['dbi']->getKillQuery($kill);
if ($GLOBALS['dbi']->tryQuery($query)) {
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__('Thread %s was successfully killed.')
);
$response->setRequestStatus(true);
} else {
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__(
'phpMyAdmin was unable to kill thread %s.'
. ' It probably has already been closed.'

2
server_status_queries.php
View File

@ -8,7 +8,7 @@
*/
use PMA\libraries\Response;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\ServerStatusData;
require_once 'libraries/common.inc.php';

2
server_status_variables.php
View File

@ -7,7 +7,7 @@
*/
use PMA\libraries\Response;
use PMA\libraries\Message;
use PhpMyAdmin\Message;
use PMA\libraries\ServerStatusData;
require_once 'libraries/common.inc.php';

2
server_user_groups.php
View File

@ -26,7 +26,7 @@ $scripts->addFile('server_user_groups.js');
*/
if (! $GLOBALS['is_superuser']) {
$response->addHTML(
PMA\libraries\Message::error(__('No Privileges'))
PhpMyAdmin\Message::error(__('No Privileges'))
->getDisplay()
);
exit;

2
tbl_addfield.php
View File

@ -90,7 +90,7 @@ if (isset($_REQUEST['do_save_data'])) {
}
// Go back to the structure sub-page
$message = PMA\libraries\Message::success(
$message = PhpMyAdmin\Message::success(
__('Table %1$s has been altered successfully.')
);
$message->addParam($table);

2
tbl_export.php
View File

@ -118,7 +118,7 @@ if (! empty($sql_query)) {
$sql_query = PhpMyAdmin\SqlParser\TokensList::build($tokens);
}
echo PMA\libraries\Util::getMessage(PMA\libraries\Message::success());
echo PMA\libraries\Util::getMessage(PhpMyAdmin\Message::success());
}
require_once 'libraries/display_export.lib.php';

12
tbl_operations.php
View File

@ -235,11 +235,11 @@ unset($reread_info);
if (isset($result) && empty($message_to_show)) {
if (empty($_message)) {
if (empty($sql_query)) {
$_message = PMA\libraries\Message::success(__('No change'));
$_message = PhpMyAdmin\Message::success(__('No change'));
} else {
$_message = $result
? PMA\libraries\Message::success()
: PMA\libraries\Message::error();
? PhpMyAdmin\Message::success()
: PhpMyAdmin\Message::error();
}
if ($response->isAjax()) {
@ -254,12 +254,12 @@ if (isset($result) && empty($message_to_show)) {
}
} else {
$_message = $result
? PMA\libraries\Message::success($_message)
: PMA\libraries\Message::error($_message);
? PhpMyAdmin\Message::success($_message)
: PhpMyAdmin\Message::error($_message);
}
if (! empty($warning_messages)) {
$_message = new PMA\libraries\Message;
$_message = new PhpMyAdmin\Message;
$_message->addMessagesString($warning_messages);
$_message->isError(true);
if ($response->isAjax()) {

6
tbl_replace.php
View File

@ -313,7 +313,7 @@ if ($is_insert && count($value_sets) > 0) {
// No change -> move back to the calling script
//
// Note: logic passes here for inline edit
$message = PMA\libraries\Message::success(__('No change'));
$message = PhpMyAdmin\Message::success(__('No change'));
// Avoid infinite recursion
if ($goto_include == 'tbl_replace.php') {
$goto_include = 'tbl_change.php';
@ -338,12 +338,12 @@ list ($url_params, $total_affected_rows, $last_messages, $warning_messages,
= PMA_executeSqlQuery($url_params, $query);
if ($is_insert && (count($value_sets) > 0 || $row_skipped)) {
$message = PMA\libraries\Message::getMessageForInsertedRows(
$message = PhpMyAdmin\Message::getMessageForInsertedRows(
$total_affected_rows
);
$unsaved_values = array_values($unsaved_values);
} else {
$message = PMA\libraries\Message::getMessageForAffectedRows(
$message = PhpMyAdmin\Message::getMessageForAffectedRows(
$total_affected_rows
);
}

8
tbl_tracking.php
View File

@ -31,7 +31,7 @@ if (Tracker::isActive()
&& ! (isset($_REQUEST['report_export'])
&& $_REQUEST['export_type'] == 'sqldumpfile')
) {
$msg = PMA\libraries\Message::notice(
$msg = PhpMyAdmin\Message::notice(
sprintf(
__('Tracking of %s is activated.'),
htmlspecialchars($GLOBALS["db"] . '.' . $GLOBALS["table"])
@ -101,12 +101,12 @@ if (isset($_REQUEST['submit_mult'])) {
foreach ($_REQUEST['selected_versions'] as $version) {
PMA_deleteTrackingVersion($version);
}
$html .= PMA\libraries\Message::success(
$html .= PhpMyAdmin\Message::success(
__('Tracking versions deleted successfully.')
)->getDisplay();
}
} else {
$html .= PMA\libraries\Message::notice(
$html .= PhpMyAdmin\Message::notice(
__('No versions selected.')
)->getDisplay();
}
@ -138,7 +138,7 @@ if (isset($_REQUEST['toggle_activation'])
// Export as SQL execution
if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'execution') {
$sql_result = PMA_exportAsSQLExecution($entries);
$msg = PMA\libraries\Message::success(__('SQL statements executed.'));
$msg = PhpMyAdmin\Message::success(__('SQL statements executed.'));
$html .= $msg->getDisplay();
}

2
test/classes/MenuTest.php
View File

@ -10,7 +10,7 @@
* Include to test.
*/
use PhpMyAdmin\Core;
use PMA\libraries\Menu;
use PhpMyAdmin\Menu;
use PMA\libraries\Theme;
require_once 'libraries/database_interface.inc.php';

102
test/classes/MessageTest.php
View File

@ -6,9 +6,7 @@
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
use PhpMyAdmin\Message;
use PMA\libraries\Theme;
require_once 'test/PMATestCase.php';
@ -21,7 +19,7 @@ require_once 'test/PMATestCase.php';
class MessageTest extends PMATestCase
{
/**
* @var PMA\libraries\Message
* @var PhpMyAdmin\Message
* @access protected
*/
protected $object;
@ -35,7 +33,7 @@ class MessageTest extends PMATestCase
*/
protected function setUp()
{
$this->object = new PMA\libraries\Message;
$this->object = new Message;
}
/**
@ -67,11 +65,11 @@ class MessageTest extends PMATestCase
*/
public function testSuccess()
{
$this->object = new PMA\libraries\Message('test<&>', PMA\libraries\Message::SUCCESS);
$this->assertEquals($this->object, PMA\libraries\Message::success('test<&>'));
$this->object = new Message('test<&>', Message::SUCCESS);
$this->assertEquals($this->object, Message::success('test<&>'));
$this->assertEquals(
'Your SQL query has been executed successfully.',
PMA\libraries\Message::success()->getString()
Message::success()->getString()
);
}
@ -82,9 +80,9 @@ class MessageTest extends PMATestCase
*/
public function testError()
{
$this->object = new PMA\libraries\Message('test<&>', PMA\libraries\Message::ERROR);
$this->assertEquals($this->object, PMA\libraries\Message::error('test<&>'));
$this->assertEquals('Error', PMA\libraries\Message::error()->getString());
$this->object = new Message('test<&>', Message::ERROR);
$this->assertEquals($this->object, Message::error('test<&>'));
$this->assertEquals('Error', Message::error()->getString());
}
/**
@ -94,8 +92,8 @@ class MessageTest extends PMATestCase
*/
public function testNotice()
{
$this->object = new PMA\libraries\Message('test<&>', PMA\libraries\Message::NOTICE);
$this->assertEquals($this->object, PMA\libraries\Message::notice('test<&>'));
$this->object = new Message('test<&>', Message::NOTICE);
$this->assertEquals($this->object, Message::notice('test<&>'));
}
/**
@ -105,11 +103,11 @@ class MessageTest extends PMATestCase
*/
public function testRawError()
{
$this->object = new PMA\libraries\Message('', PMA\libraries\Message::ERROR);
$this->object = new Message('', Message::ERROR);
$this->object->setMessage('test<&>');
$this->object->setBBCode(false);
$this->assertEquals($this->object, PMA\libraries\Message::rawError('test<&>'));
$this->assertEquals($this->object, Message::rawError('test<&>'));
}
/**
@ -119,11 +117,11 @@ class MessageTest extends PMATestCase
*/
public function testRawNotice()
{
$this->object = new PMA\libraries\Message('', PMA\libraries\Message::NOTICE);
$this->object = new Message('', Message::NOTICE);
$this->object->setMessage('test<&>');
$this->object->setBBCode(false);
$this->assertEquals($this->object, PMA\libraries\Message::rawNotice('test<&>'));
$this->assertEquals($this->object, Message::rawNotice('test<&>'));
}
/**
@ -133,11 +131,11 @@ class MessageTest extends PMATestCase
*/
public function testRawSuccess()
{
$this->object = new PMA\libraries\Message('', PMA\libraries\Message::SUCCESS);
$this->object = new Message('', Message::SUCCESS);
$this->object->setMessage('test<&>');
$this->object->setBBCode(false);
$this->assertEquals($this->object, PMA\libraries\Message::rawSuccess('test<&>'));
$this->assertEquals($this->object, Message::rawSuccess('test<&>'));
}
/**
@ -208,19 +206,19 @@ class MessageTest extends PMATestCase
*/
public function testAddParam()
{
$this->object->addParam(PMA\libraries\Message::notice('test'));
$this->object->addParam(Message::notice('test'));
$this->assertEquals(
array(PMA\libraries\Message::notice('test')),
array(Message::notice('test')),
$this->object->getParams()
);
$this->object->addParam('test');
$this->assertEquals(
array(PMA\libraries\Message::notice('test'), 'test'),
array(Message::notice('test'), 'test'),
$this->object->getParams()
);
$this->object->addParam('test');
$this->assertEquals(
array(PMA\libraries\Message::notice('test'), 'test', PMA\libraries\Message::notice('test')),
array(Message::notice('test'), 'test', Message::notice('test')),
$this->object->getParams()
);
}
@ -251,15 +249,15 @@ class MessageTest extends PMATestCase
{
$this->object->addText('test', '*');
$this->assertEquals(
array('*', PMA\libraries\Message::notice('test')),
array('*', Message::notice('test')),
$this->object->getAddedMessages()
);
$this->object->addText('test', '');
$this->assertEquals(
array(
'*',
PMA\libraries\Message::notice('test'),
PMA\libraries\Message::notice('test')
Message::notice('test'),
Message::notice('test')
),
$this->object->getAddedMessages()
);
@ -274,19 +272,19 @@ class MessageTest extends PMATestCase
{
$this->object->addText('test<>', '');
$this->assertEquals(
array(PMA\libraries\Message::notice('test&lt;&gt;')),
array(Message::notice('test&lt;&gt;')),
$this->object->getAddedMessages()
);
$this->object->addHtml('<b>test</b>');
$this->assertEquals(
array(
PMA\libraries\Message::notice('test&lt;&gt;'),
Message::notice('test&lt;&gt;'),
' ',
PMA\libraries\Message::rawNotice('<b>test</b>')
Message::rawNotice('<b>test</b>')
),
$this->object->getAddedMessages()
);
$this->object->addMessage(PMA\libraries\Message::notice('test<>'));
$this->object->addMessage(Message::notice('test<>'));
$this->assertEquals(
'test&lt;&gt; <b>test</b> test<>',
$this->object->getMessage()
@ -301,16 +299,16 @@ class MessageTest extends PMATestCase
public function testAddMessages()
{
$messages = array();
$messages[] = new PMA\libraries\Message("Test1");
$messages[] = new PMA\libraries\Message("PMA_Test2", PMA\libraries\Message::ERROR);
$messages[] = new PMA\libraries\Message("Test3");
$messages[] = new Message("Test1");
$messages[] = new Message("PMA_Test2", Message::ERROR);
$messages[] = new Message("Test3");
$this->object->addMessages($messages, '');
$this->assertEquals(
array(
PMA\libraries\Message::notice('Test1'),
PMA\libraries\Message::error("PMA_Test2"),
PMA\libraries\Message::notice('Test3')
Message::notice('Test1'),
Message::error("PMA_Test2"),
Message::notice('Test3')
),
$this->object->getAddedMessages()
);
@ -328,9 +326,9 @@ class MessageTest extends PMATestCase
$this->assertEquals(
array(
PMA\libraries\Message::notice('test1'),
PMA\libraries\Message::notice('test&lt;b&gt;'),
PMA\libraries\Message::notice('test2')
Message::notice('test1'),
Message::notice('test&lt;b&gt;'),
Message::notice('test2')
),
$this->object->getAddedMessages()
);
@ -364,11 +362,11 @@ class MessageTest extends PMATestCase
$this->object->setString('test&string<>', false);
$this->assertEquals(
'test&amp;string&lt;&gt;',
PMA\libraries\Message::sanitize($this->object)
Message::sanitize($this->object)
);
$this->assertEquals(
array('test&amp;string&lt;&gt;', 'test&amp;string&lt;&gt;'),
PMA\libraries\Message::sanitize(array($this->object, $this->object))
Message::sanitize(array($this->object, $this->object))
);
}
@ -428,7 +426,7 @@ class MessageTest extends PMATestCase
{
unset($GLOBALS['server']);
unset($GLOBALS['collation_connection']);
$this->assertEquals($expected, PMA\libraries\Message::decodeBB($actual));
$this->assertEquals($expected, Message::decodeBB($actual));
}
/**
@ -440,19 +438,19 @@ class MessageTest extends PMATestCase
{
$this->assertEquals(
'test string',
PMA\libraries\Message::format('test string')
Message::format('test string')
);
$this->assertEquals(
'test string',
PMA\libraries\Message::format('test string', 'a')
Message::format('test string', 'a')
);
$this->assertEquals(
'test string',
PMA\libraries\Message::format('test string', array())
Message::format('test string', array())
);
$this->assertEquals(
'test string',
PMA\libraries\Message::format('%s string', array('test'))
Message::format('%s string', array('test'))
);
}
@ -467,7 +465,7 @@ class MessageTest extends PMATestCase
$this->object->setString('<&>test', false);
$this->object->setMessage('<&>test', false);
$this->assertEquals(
md5(PMA\libraries\Message::NOTICE . '<&>test<&>test'),
md5(Message::NOTICE . '<&>test<&>test'),
$this->object->getHash()
);
}
@ -527,9 +525,9 @@ class MessageTest extends PMATestCase
public function testGetLevel()
{
$this->assertEquals('notice', $this->object->getLevel());
$this->object->setNumber(PMA\libraries\Message::SUCCESS);
$this->object->setNumber(Message::SUCCESS);
$this->assertEquals('success', $this->object->getLevel());
$this->object->setNumber(PMA\libraries\Message::ERROR);
$this->object->setNumber(Message::ERROR);
$this->assertEquals('error', $this->object->getLevel());
}
@ -617,7 +615,7 @@ class MessageTest extends PMATestCase
*/
public function testAffectedRows($rows, $output)
{
$this->object = new PMA\libraries\Message();
$this->object = new Message();
$msg = $this->object->getMessageForAffectedRows($rows);
echo $this->object->addMessage($msg);
$this->expectOutputString($output);
@ -662,7 +660,7 @@ class MessageTest extends PMATestCase
*/
public function testInsertedRows($rows, $output)
{
$this->object = new PMA\libraries\Message();
$this->object = new Message();
$msg = $this->object->getMessageForInsertedRows($rows);
echo $this->object->addMessage($msg);
$this->expectOutputString($output);
@ -707,7 +705,7 @@ class MessageTest extends PMATestCase
*/
public function testDeletedRows($rows, $output)
{
$this->object = new PMA\libraries\Message();
$this->object = new Message();
$msg = $this->object->getMessageForDeletedRows($rows);
echo $this->object->addMessage($msg);
$this->expectOutputString($output);

2
test/classes/controllers/TableIndexesControllerTest.php
View File

@ -176,7 +176,7 @@ class TableIndexesControllerTest extends PMATestCase
);
$doc_html = PMA\libraries\Util::showHint(
PMA\libraries\Message::notice(
PhpMyAdmin\Message::notice(
__(
'"PRIMARY" <b>must</b> be the name of'
. ' and <b>only of</b> a primary key!'

6
test/libraries/PMA_central_columns_test.php
View File

@ -250,11 +250,11 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
// when column does not exist in the central column list
$this->assertInstanceOf(
'PMA\libraries\Message', PMA_deleteColumnsFromList(array('column1'), false)
'PhpMyAdmin\Message', PMA_deleteColumnsFromList(array('column1'), false)
);
$this->assertInstanceOf(
'PMA\libraries\Message', PMA_deleteColumnsFromList(array('PMA_table'))
'PhpMyAdmin\Message', PMA_deleteColumnsFromList(array('PMA_table'))
);
}
@ -559,7 +559,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
public function testPMAConfigErrorMessage()
{
$this->assertInstanceOf(
'PMA\libraries\Message',
'PhpMyAdmin\Message',
PMA_configErrorMessage()
);
}

8
test/libraries/PMA_insert_edit_test.php
View File

@ -2060,12 +2060,12 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
);
$this->assertInstanceOf(
'PMA\libraries\Message',
'PhpMyAdmin\Message',
$result[2][0]
);
$msg = $result[2][0];
$reflectionMsg = new ReflectionProperty('PMA\libraries\Message', 'params');
$reflectionMsg = new ReflectionProperty('PhpMyAdmin\Message', 'params');
$reflectionMsg->setAccessible(true);
$this->assertEquals(
@ -2146,12 +2146,12 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
);
$this->assertInstanceOf(
'PMA\libraries\Message',
'PhpMyAdmin\Message',
$result[2][0]
);
$msg = $result[2][0];
$reflectionMsg = new ReflectionProperty('PMA\libraries\Message', 'params');
$reflectionMsg = new ReflectionProperty('PhpMyAdmin\Message', 'params');
$reflectionMsg->setAccessible(true);
$this->assertEquals(

2
test/libraries/PMA_normalization_test.php
View File

@ -430,7 +430,7 @@ class PMA_Normalization_Test extends PHPUnit_Framework_TestCase
$this->assertArrayHasKey('queryError', $result);
$this->assertArrayHasKey('message', $result);
$this->assertInstanceOf(
'PMA\libraries\Message', $result['message']
'PhpMyAdmin\Message', $result['message']
);
}

2
test/libraries/stubs/ResponseStub.php
View File

@ -13,7 +13,7 @@
namespace PMA\Test\Stubs;
use PhpMyAdmin\Header;
use PMA\libraries\Message;
use PhpMyAdmin\Message;

8
user_password.php
View File

@ -35,7 +35,7 @@ if (! $GLOBALS['cfg']['ShowChgPassword']) {
$GLOBALS['cfg']['ShowChgPassword'] = $GLOBALS['dbi']->selectDb('mysql');
}
if ($cfg['Server']['auth_type'] == 'config' || ! $cfg['ShowChgPassword']) {
PMA\libraries\Message::error(
PhpMyAdmin\Message::error(
__('You don\'t have sufficient privileges to be here right now!')
)->display();
exit;
@ -114,14 +114,14 @@ function PMA_getChangePassMessage($change_password_message, $sql_query = '')
function PMA_setChangePasswordMsg()
{
$error = false;
$message = PMA\libraries\Message::success(__('The profile has been updated.'));
$message = PhpMyAdmin\Message::success(__('The profile has been updated.'));
if (($_REQUEST['nopass'] != '1')) {
if (strlen($_REQUEST['pma_pw']) === 0 || strlen($_REQUEST['pma_pw2']) === 0) {
$message = PMA\libraries\Message::error(__('The password is empty!'));
$message = PhpMyAdmin\Message::error(__('The password is empty!'));
$error = true;
} elseif ($_REQUEST['pma_pw'] !== $_REQUEST['pma_pw2']) {
$message = PMA\libraries\Message::error(
$message = PhpMyAdmin\Message::error(
__('The passwords aren\'t the same!')
);
$error = true;

10
view_create.php
View File

@ -47,7 +47,7 @@ if (empty($sql_query)) {
if (isset($_REQUEST['view']['name'])
&& empty($_REQUEST['view']['name'])
) {
$message = PMA\libraries\Message::error(__('View name can not be empty!'));
$message = PhpMyAdmin\Message::error(__('View name can not be empty!'));
$response->addJSON(
'message',
$message
@ -111,13 +111,13 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
if (!$GLOBALS['dbi']->tryQuery($sql_query)) {
if (! isset($_REQUEST['ajax_dialog'])) {
$message = PMA\libraries\Message::rawError($GLOBALS['dbi']->getError());
$message = PhpMyAdmin\Message::rawError($GLOBALS['dbi']->getError());
return;
}
$response->addJSON(
'message',
PMA\libraries\Message::error(
PhpMyAdmin\Message::error(
"<i>" . htmlspecialchars($sql_query) . "</i><br /><br />"
. $GLOBALS['dbi']->getError()
)
@ -158,13 +158,13 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
unset($pma_transformation_data);
if (! isset($_REQUEST['ajax_dialog'])) {
$message = PMA\libraries\Message::success();
$message = PhpMyAdmin\Message::success();
include 'tbl_structure.php';
} else {
$response->addJSON(
'message',
PMA\libraries\Util::getMessage(
PMA\libraries\Message::success(),
PhpMyAdmin\Message::success(),
$sql_query
)
);

2
view_operations.php
View File

@ -39,7 +39,7 @@ $url_params['goto'] = $url_params['back'] = 'view_operations.php';
/**
* Updates if required
*/
$_message = new PMA\libraries\Message;
$_message = new PhpMyAdmin\Message;
$_type = 'success';
if (isset($_REQUEST['submitoptions'])) {