Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 107fc46

Browse files
CybotTMCybotTM
committed
make use of PMA_Message
1 parent 86acb74 commit 107fc46

14 files changed

Lines changed: 103 additions & 91 deletions

‎db_create.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,18 @@
3535
$result = PMA_DBI_try_query($sql_query);
3636

3737
if (! $result) {
38-
$message = PMA_DBI_getError();
38+
$message = PMA_Message::rawError(PMA_DBI_getError());
3939
// avoid displaying the not-created db name in header or navi panel
4040
$GLOBALS['db'] = '';
4141
$GLOBALS['table'] = '';
4242
require_once './libraries/header.inc.php';
4343
require_once './main.php';
4444
} else {
45-
$message = $strDatabase . ' ' . htmlspecialchars($db) . ' ' . $strHasBeenCreated;
45+
$message = PMA_Message::success();
46+
$message->setMessage($strDatabase . ' ' . htmlspecialchars($db) . ' ' . $strHasBeenCreated);
47+
//$message = PMA_Message::success('strDatabaseHasBeenCreated');
48+
//$message->addParam($db);
49+
4650
require_once './libraries/header.inc.php';
4751
require_once './' . $cfg['DefaultTabDatabase'];
4852
}

‎export.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
// Does export require to be into file?
6060
if (isset($export_list[$type]['force_file']) && ! $asfile) {
61-
$message = new PMA_Message('strExportMustBeFile', PMA_Message::ERROR);
61+
$message = PMA_Message::error('strExportMustBeFile');
6262
$GLOBALS['js_include'][] = 'functions.js';
6363
require_once './libraries/header.inc.php';
6464
if ($export_type == 'server') {
@@ -300,16 +300,16 @@ function PMA_exportOutputHandler($line)
300300
$save_filename = PMA_userDir($cfg['SaveDir']) . preg_replace('@[/\\\\]@', '_', $filename);
301301
unset($message);
302302
if (file_exists($save_filename) && empty($onserverover)) {
303-
$message = new PMA_Message('strFileAlreadyExists', PMA_Message::ERROR, $save_filename);
304-
$GLOBALS['show_error_header'] = true;
303+
$message = PMA_Message::error('strFileAlreadyExists');
304+
$message->addParam($save_filename);
305305
} else {
306306
if (is_file($save_filename) && !is_writable($save_filename)) {
307-
$message = new PMA_Message('strNoPermission', PMA_Message::ERROR, $save_filename);
308-
$GLOBALS['show_error_header'] = true;
307+
$message = PMA_Message::error('strNoPermission');
308+
$message->addParam($save_filename);
309309
} else {
310310
if (!$file_handle = @fopen($save_filename, 'w')) {
311-
$message = new PMA_Message('strNoPermission', PMA_Message::ERROR, $save_filename);
312-
$GLOBALS['show_error_header'] = true;
311+
$message = PMA_Message::error('strNoPermission');
312+
$message->addParam($save_filename);
313313
}
314314
}
315315
}
@@ -360,7 +360,7 @@ function PMA_exportOutputHandler($line)
360360
if ($export_type == 'database') {
361361
$num_tables = count($tables);
362362
if ($num_tables == 0) {
363-
$message = new PMA_Message('strNoTablesFound', PMA_Message::ERROR);
363+
$message = PMA_Message::error('strNoTablesFound');
364364
$GLOBALS['js_include'][] = 'functions.js';
365365
require_once './libraries/header.inc.php';
366366
$active_page = 'db_export.php';

‎import.php‎

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -251,26 +251,25 @@
251251
// Handle file compression
252252
$compression = PMA_detectCompression($import_file);
253253
if ($compression === FALSE) {
254-
$message = $strFileCouldNotBeRead;
255-
$show_error_header = TRUE;
254+
$message = PMA_Message::error('strFileCouldNotBeRead');
256255
$error = TRUE;
257256
} else {
258257
switch ($compression) {
259258
case 'application/bzip2':
260259
if ($cfg['BZipDump'] && @function_exists('bzopen')) {
261260
$import_handle = @bzopen($import_file, 'r');
262261
} else {
263-
$message = sprintf($strUnsupportedCompressionDetected, $compression);
264-
$show_error_header = TRUE;
262+
$message = PMA_Message::error('strUnsupportedCompressionDetected');
263+
$message->addParam($compression);
265264
$error = TRUE;
266265
}
267266
break;
268267
case 'application/gzip':
269268
if ($cfg['GZipDump'] && @function_exists('gzopen')) {
270269
$import_handle = @gzopen($import_file, 'r');
271270
} else {
272-
$message = sprintf($strUnsupportedCompressionDetected, $compression);
273-
$show_error_header = TRUE;
271+
$message = PMA_Message::error('strUnsupportedCompressionDetected');
272+
$message->addParam($compression);
274273
$error = TRUE;
275274
}
276275
break;
@@ -280,43 +279,39 @@
280279
$import_handle = new SimpleUnzip();
281280
$import_handle->ReadFile($import_file);
282281
if ($import_handle->Count() == 0) {
283-
$message = $strNoFilesFoundInZip;
284-
$show_error_header = TRUE;
282+
$message = PMA_Message::error('strNoFilesFoundInZip');
285283
$error = TRUE;
286284
} elseif ($import_handle->GetError(0) != 0) {
287-
$message = $strErrorInZipFile . ' ' . $import_handle->GetErrorMsg(0);
288-
$show_error_header = TRUE;
285+
$message = PMA_Message::rawError($strErrorInZipFile . ' ' . $import_handle->GetErrorMsg(0));
289286
$error = TRUE;
290287
} else {
291288
$import_text = $import_handle->GetData(0);
292289
}
293290
// We don't need to store it further
294291
$import_handle = '';
295292
} else {
296-
$message = sprintf($strUnsupportedCompressionDetected, $compression);
297-
$show_error_header = TRUE;
293+
$message = PMA_Message::error('strUnsupportedCompressionDetected');
294+
$message->addParam($compression);
298295
$error = TRUE;
299296
}
300297
break;
301298
case 'none':
302299
$import_handle = @fopen($import_file, 'r');
303300
break;
304301
default:
305-
$message = sprintf($strUnsupportedCompressionDetected, $compression);
306-
$show_error_header = TRUE;
302+
$message = PMA_Message::error('strUnsupportedCompressionDetected');
303+
$message->addParam($compression);
307304
$error = TRUE;
308305
break;
309306
}
310307
}
311308
if (!$error && $import_handle === FALSE) {
312-
$message = $strFileCouldNotBeRead;
313-
$show_error_header = TRUE;
309+
$message = PMA_Message::error('strFileCouldNotBeRead');
314310
$error = TRUE;
315311
}
316312
} elseif (!$error) {
317313
if (!isset($import_text) || empty($import_text)) {
318-
$message = $strNoDataReceived;
319-
$show_error_header = TRUE;
314+
$message = PMA_Message::error('strNoDataReceived');
320315
$error = TRUE;
321316
}
322317
}
@@ -349,8 +344,7 @@
349344
// Check for file existance
350345
if (!file_exists('./libraries/import/' . $format . '.php')) {
351346
$error = TRUE;
352-
$message = $strCanNotLoadImportPlugins;
353-
$show_error_header = TRUE;
347+
$message = PMA_Message::error('strCanNotLoadImportPlugins');
354348
} else {
355349
// Do the real import
356350
$plugin_param = $import_type;
@@ -371,26 +365,27 @@
371365

372366
// Show correct message
373367
if (!empty($id_bookmark) && $action_bookmark == 2) {
374-
$message = $strBookmarkDeleted;
368+
$message = PMA_Message::success('strBookmarkDeleted');
375369
$display_query = $import_text;
376370
$error = FALSE; // unset error marker, it was used just to skip processing
377371
} elseif (!empty($id_bookmark) && $action_bookmark == 1) {
378-
$message = $strShowingBookmark;
372+
$message = PMA_Message::notice('strShowingBookmark');
379373
} elseif ($bookmark_created) {
380374
$special_message = '[br]' . sprintf($strBookmarkCreated, htmlspecialchars($bkm_label));
381375
} elseif ($finished && !$error) {
382376
if ($import_type == 'query') {
383-
$message = $strSuccess;
377+
$message = PMA_Message::success();
384378
} else {
385-
$message = sprintf($strImportSuccessfullyFinished, $executed_queries);
379+
$message = PMA_Message::success('strImportSuccessfullyFinished');
380+
$message->addParam($executed_queries);
386381
}
387382
}
388383

389384
// Did we hit timeout? Tell it user.
390385
if ($timeout_passed) {
391-
$message = $strTimeoutPassed;
386+
$message = PMA_Message::error('strTimeoutPassed');
392387
if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) {
393-
$message .= ' ' . $strTimeoutNothingParsed;
388+
$message->addString('strTimeoutNothingParsed');
394389
}
395390
}
396391

‎server_databases.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
4848
&& ($is_superuser || $cfg['AllowUserDropDatabase'])) {
4949
if (! isset($_REQUEST['selected_dbs']) && ! isset($_REQUEST['query_type'])) {
50-
$message = $strNoDatabasesSelected;
50+
$message = PMA_Message::error('strNoDatabasesSelected');
5151
} else {
5252
$action = 'server_databases.php';
5353
$submit_mult = 'drop_db' ;
@@ -58,7 +58,7 @@
5858
require './libraries/mult_submits.inc.php';
5959
unset($action, $submit_mult, $err_url, $selected_db);
6060
if (empty($message)) {
61-
$message = new PMA_Message('strDatabasesDropped');
61+
$message = PMA_Message::success('strDatabasesDropped');
6262
if ($mult_btn == $strYes) {
6363
$message->addParam(count($selected));
6464
} else {

‎server_privileges.php‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@
7070
. PMA_getIcon('b_usrlist.png')
7171
. $GLOBALS['strPrivileges'] . "\n"
7272
. '</h2>' . "\n";
73-
$message = new PMA_Message('strNoPrivileges', PMA_Message::ERROR);
74-
$message->display();
73+
PMA_Message::error('strNoPrivileges')->display();
7574
require_once './libraries/footer.inc.php';
7675
}
7776

@@ -815,7 +814,7 @@ function PMA_displayLoginInformationFields($mode = 'new')
815814
. " WHERE `User` = '" . PMA_sqlAddslashes($username) . "'"
816815
. " AND `Host` = '" . PMA_sqlAddslashes($hostname) . "';";
817816
if (PMA_DBI_fetch_value($sql) == 1) {
818-
$message = new PMA_Message('strUserAlreadyExists', PMA_Message::ERROR);
817+
$message = PMA_Message::error('strUserAlreadyExists');
819818
$message->addParam('[i]\'' . $username . '\'@\'' . $hostname . '\'[/i]');
820819
$_REQUEST['adduser'] = true;
821820
} else {
@@ -1200,7 +1199,7 @@ function PMA_displayLoginInformationFields($mode = 'new')
12001199
}
12011200
if (empty($_REQUEST['change_copy'])) {
12021201
if (empty($queries)) {
1203-
$message = new PMA_Message('strDeleteNoUsersSelected', PMA_Message::ERROR);
1202+
$message = PMA_Message::error('strDeleteNoUsersSelected');
12041203
} else {
12051204
if ($_REQUEST['mode'] == 3) {
12061205
$queries[] = '# ' . $GLOBALS['strReloadingThePrivileges'] . ' ...';
@@ -1216,8 +1215,7 @@ function PMA_displayLoginInformationFields($mode = 'new')
12161215
}
12171216
$sql_query = join("\n", $queries);
12181217
if (! empty($drop_user_error)) {
1219-
$message = PMA_Message::error();
1220-
$message->setMessage($drop_user_error);
1218+
$message = PMA_Message::rawError($drop_user_error);
12211219
} else {
12221220
$message = PMA_Message::success('strUsersDeleted');
12231221
}
@@ -1243,7 +1241,7 @@ function PMA_displayLoginInformationFields($mode = 'new')
12431241
}
12441242
$tmp_count++;
12451243
}
1246-
$message = new PMA_Message('strSuccess', PMA_Message::SUCCESS);
1244+
$message = PMA_Message::success();
12471245
$sql_query = join("\n", $queries);
12481246
}
12491247

@@ -1254,7 +1252,7 @@ function PMA_displayLoginInformationFields($mode = 'new')
12541252
if (isset($_REQUEST['flush_privileges'])) {
12551253
$sql_query = 'FLUSH PRIVILEGES;';
12561254
PMA_DBI_query($sql_query);
1257-
$message = new PMA_Message('strPrivilegesReloaded', PMA_Message::SUCCESS);
1255+
$message = PMA_Message::success('strPrivilegesReloaded');
12581256
}
12591257

12601258

‎server_processlist.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
*/
2222
if (!empty($kill)) {
2323
if (PMA_DBI_try_query('KILL ' . $kill . ';')) {
24-
$message = sprintf($strThreadSuccessfullyKilled, $kill);
24+
$message = PMA_Message::success('strThreadSuccessfullyKilled');
2525
} else {
26-
$message = sprintf($strCouldNotKill, $kill);
26+
$message = PMA_Message::error('strCouldNotKill');
2727
}
28+
$message->addParam($kill);
2829
}
2930

3031

‎sql.php‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
$table = '';
312312
}
313313
$active_page = $goto;
314-
$message = PMA_Message::raw($error, PMA_Message::ERROR);
314+
$message = PMA_Message::rawError($error);
315315
require './' . PMA_securePath($goto);
316316
} else {
317317
require_once './libraries/header.inc.php';
@@ -464,21 +464,27 @@
464464
// No rows returned -> move back to the calling page
465465
if ($num_rows < 1 || $is_affected) {
466466
if ($is_delete) {
467-
$message = $strDeletedRows . '&nbsp;' . $num_rows;
467+
$message = PMA_Message::success('strDeletedRows');
468+
$message->addMessage($num_rows);
468469
} elseif ($is_insert) {
469470
if ($is_replace) {
470471
/* For replace we get DELETED + INSERTED row count, so we have to call it affected */
471-
$message = $strAffectedRows . '&nbsp;' . $num_rows;
472+
$message = PMA_Message::success('strAffectedRows');
473+
$message->addMessage($num_rows);
472474
} else {
473-
$message = $strInsertedRows . '&nbsp;' . $num_rows;
475+
$message = PMA_Message::success('strInsertedRows');
476+
$message->addMessage($num_rows);
474477
}
475478
$insert_id = PMA_DBI_insert_id();
476479
if ($insert_id != 0) {
477480
// insert_id is id of FIRST record inserted in one insert, so if we inserted multiple rows, we had to increment this
478-
$message .= '[br]'.$strInsertedRowId . '&nbsp;' . ($insert_id + $num_rows - 1);
481+
$message->addMessage('[br]');
482+
$message->addString('strInsertedRowId');
483+
$message->addMessage($insert_id + $num_rows - 1);
479484
}
480485
} elseif ($is_affected) {
481-
$message = $strAffectedRows . '&nbsp;' . $num_rows;
486+
$message = PMA_Message::success('strAffectedRows');
487+
$message->addMessage($num_rows);
482488

483489
// Ok, here is an explanation for the !$is_select.
484490
// The form generated by sql_query_form.lib.php
@@ -489,19 +495,25 @@
489495
// the form should not have priority over
490496
// errors like $strEmptyResultSet
491497
} elseif (!empty($zero_rows) && !$is_select) {
492-
$message = $zero_rows;
498+
$message = PMA_Message::rawSuccess($zero_rows);
493499
} elseif (!empty($GLOBALS['show_as_php'])) {
494-
$message = $strShowingPhp;
500+
$message = PMA_Message::success('strShowingPhp');
495501
} elseif (isset($GLOBALS['show_as_php'])) {
496502
/* User disable showing as PHP, query is only displayed */
497-
$message = $strShowingSQL;
503+
$message = PMA_Message::notice('strShowingSQL');
498504
} elseif (!empty($GLOBALS['validatequery'])) {
499-
$message = $strValidateSQL;
505+
$message = PMA_Message::notice('strValidateSQL');
500506
} else {
501-
$message = $strEmptyResultSet;
507+
$message = PMA_Message::success('strEmptyResultSet');
502508
}
503509

504-
$message .= ' ' . (isset($GLOBALS['querytime']) ? '(' . sprintf($strQueryTime, $GLOBALS['querytime']) . ')' : '');
510+
if (isset($GLOBALS['querytime'])) {
511+
$_querytime = PMA_Message::notice('strQueryTime');
512+
$_querytime->addParam($GLOBALS['querytime']);
513+
$message->addMessage('(');
514+
$message->addMessage($_querytime);
515+
$message->addMessage(')');
516+
}
505517

506518
if ($is_gotofile) {
507519
$goto = PMA_securePath($goto);

‎tbl_addfield.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@
180180
// Go back to the structure sub-page
181181
$sql_query = $sql_query_cpy;
182182
unset($sql_query_cpy);
183-
$message = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenAltered;
183+
$message = PMA_Message::success('strTableAlteredSuccessfully');
184+
$message->addParam($table);
184185
$active_page = 'tbl_structure.php';
185186
require './tbl_structure.php';
186187
} else {

‎tbl_create.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,12 @@
217217
}
218218
}
219219

220-
$message = $strTable . ' '
221-
. htmlspecialchars(PMA_backquote($db) . '.' . PMA_backquote($table))
222-
. ' ' . $strHasBeenCreated;
220+
//$message = PMA_Message::success('strTableCreatedSuccessfully');
221+
//$message->addParam(PMA_backquote($db) . '.' . PMA_backquote($table));
222+
$message = PMA_Message::success('strTable');
223+
$message->addMessage(htmlspecialchars(PMA_backquote($db) . '.' . PMA_backquote($table)));
224+
$message->addString('strHasBeenCreated');
225+
223226
$display_query = $sql_query;
224227
$sql_query = '';
225228

‎tbl_export.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
}
109109
}
110110
}
111-
$message = $GLOBALS['strSuccess'];
111+
$message = PMA_Message::success();
112112
}
113113

114114
/**

0 commit comments

Comments
 (0)