Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
5ff65c4b54
@ -1,7 +1,14 @@
|
||||
phpMyAdmin - ChangeLog
|
||||
======================
|
||||
|
||||
3.4.0.0 (not yet released)
|
||||
3.5.0.0 (not yet released)
|
||||
+ rfe #2021981 [interface] Add support for mass prefix change.
|
||||
+ "up to date" message on main page when current version is up to date
|
||||
|
||||
3.4.1.0 (not yet released)
|
||||
- bug #3301108 [interface] Synchronize and already configured host
|
||||
|
||||
3.4.0.0 (2011-05-11)
|
||||
+ rfe #2890226 [view] Enable VIEW rename
|
||||
+ rfe #838637 [privileges] Export a user's privileges
|
||||
- [core] Updated mootools to fix some glitches with Safari.
|
||||
|
||||
@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
|
||||
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title>phpMyAdmin 3.4.0-rc3-dev - Documentation</title>
|
||||
<title>phpMyAdmin 3.5.0-dev - Documentation</title>
|
||||
<link rel="stylesheet" type="text/css" href="docs.css" />
|
||||
</head>
|
||||
|
||||
@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
|
||||
<div id="header">
|
||||
<h1>
|
||||
<a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
|
||||
3.4.0-rc3-dev
|
||||
3.5.0-dev
|
||||
Documentation
|
||||
</h1>
|
||||
</div>
|
||||
|
||||
2
README
2
README
@ -1,7 +1,7 @@
|
||||
phpMyAdmin - Readme
|
||||
===================
|
||||
|
||||
Version 3.4.0-rc3-dev
|
||||
Version 3.5.0-dev
|
||||
|
||||
A set of PHP-scripts to manage MySQL over the web.
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ $foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE
|
||||
|
||||
$override_total = TRUE;
|
||||
|
||||
if (!isset($pos)) {
|
||||
if (! isset($pos)) {
|
||||
$pos = 0;
|
||||
}
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*/
|
||||
require_once './libraries/common.inc.php';
|
||||
|
||||
if (!isset($selected_tbl)) {
|
||||
if (! isset($selected_tbl)) {
|
||||
require_once './libraries/header.inc.php';
|
||||
}
|
||||
|
||||
@ -220,7 +220,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
|
||||
if ($zerofill) {
|
||||
$attribute = 'UNSIGNED ZEROFILL';
|
||||
}
|
||||
if (!isset($row['Default'])) {
|
||||
if (! isset($row['Default'])) {
|
||||
if ($row['Null'] != 'NO') {
|
||||
$row['Default'] = '<i>NULL</i>';
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
|
||||
$move = false;
|
||||
}
|
||||
|
||||
if (!isset($newname) || !strlen($newname)) {
|
||||
if (! isset($newname) || ! strlen($newname)) {
|
||||
$message = PMA_Message::error(__('The database name is empty!'));
|
||||
} else {
|
||||
$sql_query = ''; // in case target db exists
|
||||
@ -561,7 +561,7 @@ echo __('Remove database');
|
||||
. '</form></div>' . "\n";
|
||||
|
||||
if ($num_tables > 0
|
||||
&& !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
|
||||
&& ! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
|
||||
$message = PMA_Message::notice(__('The phpMyAdmin configuration storage has been deactivated. To find out why click %shere%s.'));
|
||||
$message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', false);
|
||||
$message->addParam('</a>', false);
|
||||
|
||||
@ -52,7 +52,7 @@ if ($cfg['SkipLockedTables'] == true) {
|
||||
$result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
|
||||
if ($result != false && PMA_DBI_num_rows($result) > 0) {
|
||||
while ($tmp = PMA_DBI_fetch_row($result)) {
|
||||
if (!isset($sot_cache[$tmp[0]])) {
|
||||
if (! isset($sot_cache[$tmp[0]])) {
|
||||
$sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . addslashes($tmp[0]) . '\';');
|
||||
$sts_tmp = PMA_DBI_fetch_assoc($sts_result);
|
||||
$tables[] = $sts_tmp;
|
||||
|
||||
41
db_qbe.php
41
db_qbe.php
@ -18,26 +18,29 @@ $cfgRelation = PMA_getRelationsParam();
|
||||
|
||||
|
||||
/**
|
||||
* A query has been submitted -> execute it, else display the headers
|
||||
* A query has been submitted -> (maybe) execute it
|
||||
*/
|
||||
$message_to_display = false;
|
||||
if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) {
|
||||
$goto = 'db_sql.php';
|
||||
$message_to_show = htmlspecialchars(__('Your SQL query has been executed successfully'));
|
||||
require './sql.php';
|
||||
exit;
|
||||
} else {
|
||||
$sub_part = '_qbe';
|
||||
require './libraries/db_common.inc.php';
|
||||
$url_query .= '&goto=db_qbe.php';
|
||||
$url_params['goto'] = 'db_qbe.php';
|
||||
require './libraries/db_info.inc.php';
|
||||
if (! preg_match('@^SELECT@i', $sql_query)) {
|
||||
$message_to_display = true;
|
||||
} else {
|
||||
$goto = 'db_sql.php';
|
||||
require './sql.php';
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_REQUEST['submit_sql'])
|
||||
&& ! preg_match('@^SELECT@i', $sql_query)) {
|
||||
$sub_part = '_qbe';
|
||||
require './libraries/db_common.inc.php';
|
||||
$url_query .= '&goto=db_qbe.php';
|
||||
$url_params['goto'] = 'db_qbe.php';
|
||||
require './libraries/db_info.inc.php';
|
||||
|
||||
if ($message_to_display) {
|
||||
PMA_Message::error(__('You have to choose at least one column to display'))->display();
|
||||
}
|
||||
|
||||
unset($message_to_display);
|
||||
|
||||
/**
|
||||
* Initialize some variables
|
||||
@ -336,7 +339,7 @@ for ($x = 0; $x < $col; $x++) {
|
||||
if (isset($criteria[$x])) {
|
||||
$tmp_criteria = $criteria[$x];
|
||||
}
|
||||
if ((empty($prev_criteria) || !isset($prev_criteria[$x]))
|
||||
if ((empty($prev_criteria) || ! isset($prev_criteria[$x]))
|
||||
|| $prev_criteria[$x] != htmlspecialchars($tmp_criteria)) {
|
||||
$curCriteria[$z] = $tmp_criteria;
|
||||
} else {
|
||||
@ -494,7 +497,7 @@ for ($y = 0; $y <= $row; $y++) {
|
||||
|
||||
echo "\n";
|
||||
$or = 'Or' . $y;
|
||||
if (!isset(${$or})) {
|
||||
if (! isset(${$or})) {
|
||||
${$or} = '';
|
||||
}
|
||||
if (!empty(${$or}) && isset(${$or}[$x])) {
|
||||
@ -664,7 +667,7 @@ foreach ($tbl_names as $key => $val) {
|
||||
<?php
|
||||
// 1. SELECT
|
||||
$last_select = 0;
|
||||
if (!isset($qry_select)) {
|
||||
if (! isset($qry_select)) {
|
||||
$qry_select = '';
|
||||
}
|
||||
for ($x = 0; $x < $col; $x++) {
|
||||
@ -889,7 +892,7 @@ if ($criteria_cnt > 1) {
|
||||
$qry_where = '(' . $qry_where . ')';
|
||||
}
|
||||
// OR rows ${'cur' . $or}[$x]
|
||||
if (!isset($curAndOrRow)) {
|
||||
if (! isset($curAndOrRow)) {
|
||||
$curAndOrRow = array();
|
||||
}
|
||||
for ($y = 0; $y <= $row; $y++) {
|
||||
@ -926,7 +929,7 @@ if (!empty($qry_where) && $qry_where != '()') {
|
||||
|
||||
// 4. ORDER BY
|
||||
$last_orderby = 0;
|
||||
if (!isset($qry_orderby)) {
|
||||
if (! isset($qry_orderby)) {
|
||||
$qry_orderby = '';
|
||||
}
|
||||
for ($x = 0; $x < $col; $x++) {
|
||||
|
||||
@ -517,6 +517,12 @@ if (!$db_is_information_schema) {
|
||||
. __('Repair table') . '</option>' . "\n";
|
||||
echo ' <option value="analyze_tbl" >'
|
||||
. __('Analyze table') . '</option>' . "\n";
|
||||
echo ' <option value="add_prefix_tbl" >'
|
||||
. __('Add prefix to table') . '</option>' . "\n";
|
||||
echo ' <option value="replace_prefix_tbl" >'
|
||||
. __('Replace table prefix') . '</option>' . "\n";
|
||||
echo ' <option value="copy_tbl_change_prefix" >'
|
||||
. __('Copy table with prefix') . '</option>' . "\n";
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
|
||||
@ -21,7 +21,7 @@ $export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $exp
|
||||
$type = $what;
|
||||
|
||||
// Check export type
|
||||
if (!isset($export_list[$type])) {
|
||||
if (! isset($export_list[$type])) {
|
||||
die('Bad type!');
|
||||
}
|
||||
|
||||
@ -451,7 +451,7 @@ if ($export_type == 'server') {
|
||||
// Walk over databases
|
||||
foreach ($GLOBALS['pma']->databases as $current_db) {
|
||||
if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))
|
||||
|| !isset($tmp_select)) {
|
||||
|| ! isset($tmp_select)) {
|
||||
if (!PMA_exportDBHeader($current_db)) {
|
||||
break 2;
|
||||
}
|
||||
|
||||
@ -332,7 +332,7 @@ if ($import_file != 'none' && !$error) {
|
||||
$error = TRUE;
|
||||
}
|
||||
} elseif (!$error) {
|
||||
if (!isset($import_text) || empty($import_text)) {
|
||||
if (! isset($import_text) || empty($import_text)) {
|
||||
$message = PMA_Message::error(__('No data was received to import. Either no file name was submitted, or the file size exceeded the maximum size permitted by your PHP configuration. See [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a].'));
|
||||
$error = TRUE;
|
||||
}
|
||||
|
||||
@ -90,19 +90,23 @@ function parseVersionString (str) {
|
||||
* Indicates current available version on main page.
|
||||
*/
|
||||
function PMA_current_version() {
|
||||
var current = parseVersionString('3.4.0'/*pmaversion*/);
|
||||
var current = parseVersionString(pmaversion);
|
||||
var latest = parseVersionString(PMA_latest_version);
|
||||
$('#li_pma_version').append(PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version);
|
||||
var version_information_message = PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version;
|
||||
if (latest > current) {
|
||||
var message = $.sprintf(PMA_messages['strNewerVersion'], PMA_latest_version, PMA_latest_date);
|
||||
if (Math.floor(latest / 10000) == Math.floor(current / 10000)) {
|
||||
/* Security update */
|
||||
klass = 'warning';
|
||||
klass = 'error';
|
||||
} else {
|
||||
klass = 'notice';
|
||||
}
|
||||
$('#maincontainer').after('<div class="' + klass + '">' + message + '</div>');
|
||||
}
|
||||
if (latest == current) {
|
||||
version_information_message = ' (' + PMA_messages['strUpToDate'] + ')';
|
||||
}
|
||||
$('#li_pma_version').append(version_information_message);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1118,7 +1122,7 @@ function changeMIMEType(db, table, reference, mime_type)
|
||||
* Jquery Coding for inline editing SQL_QUERY
|
||||
*/
|
||||
$(document).ready(function(){
|
||||
$(".inline_edit").click( function(){
|
||||
$(".inline_edit_sql").click( function(){
|
||||
var db = $(this).prev().find("input[name='db']").val();
|
||||
var table = $(this).prev().find("input[name='table']").val();
|
||||
var token = $(this).prev().find("input[name='token']").val();
|
||||
@ -1269,7 +1273,7 @@ function PMA_ajaxShowMessage(message, timeout) {
|
||||
.hide();
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
return $("#loading");
|
||||
}
|
||||
|
||||
@ -1442,7 +1446,7 @@ $(document).ready(function() {
|
||||
open: PMA_verifyTypeOfAllColumns,
|
||||
buttons : button_options
|
||||
}); // end dialog options
|
||||
}
|
||||
}
|
||||
PMA_ajaxRemoveMessage($msgbox);
|
||||
}) // end $.get()
|
||||
|
||||
@ -1583,7 +1587,7 @@ $(document).ready(function() {
|
||||
$("#create_table_div").html(data);
|
||||
}
|
||||
PMA_verifyTypeOfAllColumns();
|
||||
PMA_ajaxRemoveMessage($msgbox);
|
||||
PMA_ajaxRemoveMessage($msgbox);
|
||||
}) //end $.post()
|
||||
|
||||
}) // end create table form (add fields)
|
||||
@ -1733,7 +1737,7 @@ $(document).ready(function() {
|
||||
.dialog({
|
||||
title: PMA_messages['strChangePassword'],
|
||||
width: 600,
|
||||
close: function(ev,ui) {$(this).remove();},
|
||||
close: function(ev,ui) {$(this).remove();},
|
||||
buttons : button_options,
|
||||
beforeClose: function(ev,ui){ $('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax')}
|
||||
})
|
||||
@ -1772,7 +1776,7 @@ $(document).ready(function() {
|
||||
$("#change_password_dialog").hide().remove();
|
||||
$("#edit_user_dialog").dialog("close").remove();
|
||||
$('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax');
|
||||
PMA_ajaxRemoveMessage($msgbox);
|
||||
PMA_ajaxRemoveMessage($msgbox);
|
||||
}
|
||||
else {
|
||||
PMA_ajaxShowMessage(data.error);
|
||||
@ -2278,3 +2282,64 @@ $(document).ready(function() {
|
||||
|
||||
}) // end of $(document).ready()
|
||||
|
||||
/**
|
||||
* Attach Ajax event handlers for Drop Table.
|
||||
*
|
||||
* @uses $.PMA_confirm()
|
||||
* @uses PMA_ajaxShowMessage()
|
||||
* @uses window.parent.refreshNavigation()
|
||||
* @uses window.parent.refreshMain()
|
||||
* @see $cfg['AjaxEnable']
|
||||
*/
|
||||
$(document).ready(function() {
|
||||
$("#drop_tbl_anchor").live('click', function(event) {
|
||||
event.preventDefault();
|
||||
|
||||
//context is top.frame_content, so we need to use window.parent.db to access the db var
|
||||
/**
|
||||
* @var question String containing the question to be asked for confirmation
|
||||
*/
|
||||
var question = PMA_messages['strDropTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\n' + 'DROP TABLE ' + window.parent.table;
|
||||
|
||||
$(this).PMA_confirm(question, $(this).attr('href') ,function(url) {
|
||||
|
||||
PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
|
||||
$.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) {
|
||||
//Database deleted successfully, refresh both the frames
|
||||
window.parent.refreshNavigation();
|
||||
window.parent.refreshMain();
|
||||
}) // end $.get()
|
||||
}); // end $.PMA_confirm()
|
||||
}); //end of Drop Table Ajax action
|
||||
}) // end of $(document).ready() for Drop Table
|
||||
|
||||
/**
|
||||
* Attach Ajax event handlers for Truncate Table.
|
||||
*
|
||||
* @uses $.PMA_confirm()
|
||||
* @uses PMA_ajaxShowMessage()
|
||||
* @uses window.parent.refreshNavigation()
|
||||
* @uses window.parent.refreshMain()
|
||||
* @see $cfg['AjaxEnable']
|
||||
*/
|
||||
$(document).ready(function() {
|
||||
$("#truncate_tbl_anchor").live('click', function(event) {
|
||||
event.preventDefault();
|
||||
|
||||
//context is top.frame_content, so we need to use window.parent.db to access the db var
|
||||
/**
|
||||
* @var question String containing the question to be asked for confirmation
|
||||
*/
|
||||
var question = PMA_messages['strTruncateTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\n' + 'TRUNCATE TABLE ' + window.parent.table;
|
||||
|
||||
$(this).PMA_confirm(question, $(this).attr('href') ,function(url) {
|
||||
|
||||
PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
|
||||
$.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) {
|
||||
//Database deleted successfully, refresh both the frames
|
||||
window.parent.refreshNavigation();
|
||||
window.parent.refreshMain();
|
||||
}) // end $.get()
|
||||
}); // end $.PMA_confirm()
|
||||
}); //end of Drop Table Ajax action
|
||||
}) // end of $(document).ready() for Drop Table
|
||||
|
||||
@ -29,6 +29,8 @@ $js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements are disabled
|
||||
/* For confirmations */
|
||||
$js_messages['strDoYouReally'] = __('Do you really want to ');
|
||||
$js_messages['strDropDatabaseStrongWarning'] = __('You are about to DESTROY a complete database!');
|
||||
$js_messages['strDropTableStrongWarning'] = __('You are about to DESTROY a complete table!');
|
||||
$js_messages['strTruncateTableStrongWarning'] = __('You are about to TRUNCATE a complete table!');
|
||||
$js_messages['strDroppingEvent'] = __('Dropping Event');
|
||||
$js_messages['strDroppingProcedure'] = __('Dropping Procedure');
|
||||
$js_messages['strDeleteTrackingData'] = __('Delete tracking data for this table');
|
||||
@ -101,6 +103,7 @@ $js_messages['strSelectReferencedKey'] = __('Select referenced key');
|
||||
$js_messages['strSelectForeignKey'] = __('Select Foreign Key');
|
||||
$js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key');
|
||||
$js_messages['strChangeDisplay'] = __('Choose column to display');
|
||||
$js_messages['strLeavingDesigner'] = __('You haven\'t saved the changes in the layout. They will be lost if you don\'t save them.Do you want to continue?');
|
||||
|
||||
/* Visual query builder (pmd/scripts/move.js) */
|
||||
$js_messages['strAddOption'] = __('Add an option for column ');
|
||||
@ -117,6 +120,7 @@ $js_messages['strMore'] = __('More');
|
||||
$js_messages['strNewerVersion'] = __('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.');
|
||||
/* l10n: Latest available phpMyAdmin version */
|
||||
$js_messages['strLatestAvailable'] = __(', latest stable version:');
|
||||
$js_messages['strUpToDate'] = __('up to date');
|
||||
|
||||
echo "var PMA_messages = new Array();\n";
|
||||
foreach ($js_messages as $name => $js_message) {
|
||||
|
||||
@ -96,7 +96,7 @@ class PMA_Config
|
||||
*/
|
||||
function checkSystem()
|
||||
{
|
||||
$this->set('PMA_VERSION', '3.4.0-rc3-dev');
|
||||
$this->set('PMA_VERSION', '3.5.0-dev');
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
@ -148,7 +148,7 @@ class PMA_Config
|
||||
{
|
||||
if (PMA_getenv('HTTP_USER_AGENT')) {
|
||||
$HTTP_USER_AGENT = PMA_getenv('HTTP_USER_AGENT');
|
||||
} elseif (!isset($HTTP_USER_AGENT)) {
|
||||
} elseif (! isset($HTTP_USER_AGENT)) {
|
||||
$HTTP_USER_AGENT = '';
|
||||
}
|
||||
|
||||
@ -441,7 +441,7 @@ class PMA_Config
|
||||
if ($server > 0 && !defined('PMA_MINIMUM_COMMON')) {
|
||||
$config_mtime = max($this->default_source_mtime, $this->source_mtime);
|
||||
// cache user preferences, use database only when needed
|
||||
if (!isset($_SESSION['cache'][$cache_key]['userprefs'])
|
||||
if (! isset($_SESSION['cache'][$cache_key]['userprefs'])
|
||||
|| $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime) {
|
||||
// load required libraries
|
||||
require_once './libraries/user_preferences.lib.php';
|
||||
@ -451,7 +451,7 @@ class PMA_Config
|
||||
$_SESSION['cache'][$cache_key]['userprefs_type'] = $prefs['type'];
|
||||
$_SESSION['cache'][$cache_key]['config_mtime'] = $config_mtime;
|
||||
}
|
||||
} else if ($server == 0 || !isset($_SESSION['cache'][$cache_key]['userprefs'])) {
|
||||
} else if ($server == 0 || ! isset($_SESSION['cache'][$cache_key]['userprefs'])) {
|
||||
$this->set('user_preferences', false);
|
||||
return;
|
||||
}
|
||||
@ -476,7 +476,7 @@ class PMA_Config
|
||||
// save theme
|
||||
$tmanager = $_SESSION['PMA_Theme_Manager'];
|
||||
if ($tmanager->getThemeCookie() || isset($_REQUEST['set_theme'])) {
|
||||
if ((!isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original')
|
||||
if ((! isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original')
|
||||
|| isset($config_data['ThemeDefault']) && $config_data['ThemeDefault'] != $tmanager->theme->getId()) {
|
||||
// new theme was set in common.inc.php
|
||||
$this->setUserValue(null, 'ThemeDefault', $tmanager->theme->getId(), 'original');
|
||||
@ -491,14 +491,14 @@ class PMA_Config
|
||||
}
|
||||
|
||||
// save font size
|
||||
if ((!isset($config_data['fontsize']) && $org_fontsize != '82%')
|
||||
if ((! isset($config_data['fontsize']) && $org_fontsize != '82%')
|
||||
|| isset($config_data['fontsize']) && $org_fontsize != $config_data['fontsize']) {
|
||||
$this->setUserValue(null, 'fontsize', $org_fontsize, '82%');
|
||||
}
|
||||
|
||||
// save language
|
||||
if (isset($_COOKIE['pma_lang']) || isset($_POST['lang'])) {
|
||||
if ((!isset($config_data['lang']) && $GLOBALS['lang'] != 'en')
|
||||
if ((! isset($config_data['lang']) && $GLOBALS['lang'] != 'en')
|
||||
|| isset($config_data['lang']) && $GLOBALS['lang'] != $config_data['lang']) {
|
||||
$this->setUserValue(null, 'lang', $GLOBALS['lang'], 'en');
|
||||
}
|
||||
@ -511,7 +511,7 @@ class PMA_Config
|
||||
|
||||
// save connection collation
|
||||
if (isset($_COOKIE['pma_collation_connection']) || isset($_POST['collation_connection'])) {
|
||||
if ((!isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci')
|
||||
if ((! isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci')
|
||||
|| isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != $config_data['collation_connection']) {
|
||||
$this->setUserValue(null, 'collation_connection', $GLOBALS['collation_connection'], 'utf8_general_ci');
|
||||
}
|
||||
@ -678,7 +678,7 @@ class PMA_Config
|
||||
*/
|
||||
function set($setting, $value)
|
||||
{
|
||||
if (!isset($this->settings[$setting]) || $this->settings[$setting] != $value) {
|
||||
if (! isset($this->settings[$setting]) || $this->settings[$setting] != $value) {
|
||||
$this->settings[$setting] = $value;
|
||||
$this->set_mtime = time();
|
||||
}
|
||||
|
||||
@ -47,15 +47,15 @@ class PMA_Error extends PMA_Message
|
||||
*/
|
||||
static public $errorlevel = array (
|
||||
E_ERROR => 'error',
|
||||
E_WARNING => 'warning',
|
||||
E_WARNING => 'error',
|
||||
E_PARSE => 'error',
|
||||
E_NOTICE => 'notice',
|
||||
E_CORE_ERROR => 'error',
|
||||
E_CORE_WARNING => 'warning',
|
||||
E_CORE_WARNING => 'error',
|
||||
E_COMPILE_ERROR => 'error',
|
||||
E_COMPILE_WARNING => 'warning',
|
||||
E_COMPILE_WARNING => 'error',
|
||||
E_USER_ERROR => 'error',
|
||||
E_USER_WARNING => 'warning',
|
||||
E_USER_WARNING => 'error',
|
||||
E_USER_NOTICE => 'notice',
|
||||
E_STRICT => 'notice',
|
||||
E_DEPRECATED => 'notice',
|
||||
|
||||
@ -498,7 +498,7 @@ require_once './libraries/List.class.php';
|
||||
if (isset($tmp_mydbs[$tmp_db]) && $tmp_mydbs[$tmp_db] == 1) {
|
||||
$dblist[] = $tmp_db;
|
||||
$tmp_mydbs[$tmp_db] = 0;
|
||||
} elseif (!isset($dblist[$tmp_db])) {
|
||||
} elseif (! isset($dblist[$tmp_db])) {
|
||||
foreach ($tmp_mydbs as $tmp_matchpattern => $tmp_value) {
|
||||
// fixed bad regexp
|
||||
// TODO: db names may contain characters
|
||||
|
||||
@ -889,7 +889,7 @@ class PMA_Table
|
||||
} else {
|
||||
// we are copying
|
||||
// Create new entries as duplicates from old PMA DBs
|
||||
if ($what != 'dataonly' && !isset($maintain_relations)) {
|
||||
if ($what != 'dataonly' && ! isset($maintain_relations)) {
|
||||
if ($GLOBALS['cfgRelation']['commwork']) {
|
||||
// Get all comments and MIME-Types for current table
|
||||
$comments_copy_query = 'SELECT
|
||||
|
||||
@ -464,6 +464,51 @@ class PMA_Tracker
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Changes tracking data of a table.
|
||||
*
|
||||
* @static
|
||||
*
|
||||
* @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 || array $new_data the new tracking data
|
||||
*
|
||||
* @return bool result of change
|
||||
*/
|
||||
static public function changeTrackingData($dbname, $tablename, $version, $type, $new_data)
|
||||
{
|
||||
if ($type == 'DDL')
|
||||
$save_to = 'schema_sql';
|
||||
elseif ($type == 'DML')
|
||||
$save_to = 'data_sql';
|
||||
else
|
||||
return false;
|
||||
|
||||
$date = date('Y-m-d H:i:s');
|
||||
|
||||
$new_data_processed = '';
|
||||
if (is_array($new_data)) {
|
||||
foreach ($new_data as $data) {
|
||||
$new_data_processed .= '# log ' . $date . ' ' . $data['username'] . PMA_sqlAddslashes($data['statement']) . "\n";
|
||||
}
|
||||
} else {
|
||||
$new_data_processed = $new_data;
|
||||
}
|
||||
|
||||
$sql_query =
|
||||
" UPDATE " . self::$pma_table .
|
||||
" SET `" . $save_to . "` = '" . $new_data_processed . "' " .
|
||||
" WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' " .
|
||||
" AND `table_name` = '" . PMA_sqlAddslashes($tablename) . "' " .
|
||||
" AND `version` = '" . PMA_sqlAddslashes($version) . "' ";
|
||||
|
||||
$result = PMA_query_as_controluser($sql_query);
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Activates tracking of a table.
|
||||
*
|
||||
|
||||
@ -104,7 +104,7 @@ function PMA_chart_results($data, &$chartSettings)
|
||||
// default for muti series
|
||||
$chartSettings['multi'] = false;
|
||||
|
||||
if (!isset($data[0])) {
|
||||
if (! isset($data[0])) {
|
||||
// empty data
|
||||
return __('No data found for the chart.');
|
||||
}
|
||||
@ -192,7 +192,7 @@ function PMA_chart_results($data, &$chartSettings)
|
||||
// the value os for this serie
|
||||
$chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = (int)$row[$yAxisKey];
|
||||
}
|
||||
else if (!isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) {
|
||||
else if (! isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) {
|
||||
// if the value for this serie is not set, set it to 0
|
||||
$chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = 0;
|
||||
}
|
||||
|
||||
@ -608,7 +608,7 @@ $GLOBALS['server'] = 0;
|
||||
* @todo merge into PMA_Config
|
||||
*/
|
||||
// Do we have some server?
|
||||
if (!isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
|
||||
if (! isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
|
||||
// No server => create one with defaults
|
||||
$cfg['Servers'] = array(1 => $default_server);
|
||||
} else {
|
||||
@ -664,7 +664,7 @@ if (! isset($_SESSION['PMA_Theme_Manager'])) {
|
||||
}
|
||||
|
||||
// for the theme per server feature
|
||||
if (isset($_REQUEST['server']) && !isset($_REQUEST['set_theme'])) {
|
||||
if (isset($_REQUEST['server']) && ! isset($_REQUEST['set_theme'])) {
|
||||
$GLOBALS['server'] = $_REQUEST['server'];
|
||||
$tmp = $_SESSION['PMA_Theme_Manager']->getThemeCookie();
|
||||
if (empty($tmp)) {
|
||||
|
||||
@ -301,7 +301,7 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '')
|
||||
return htmlspecialchars($parsed_sql['raw']);
|
||||
}
|
||||
// then check for an array
|
||||
if (!is_array($parsed_sql)) {
|
||||
if (! is_array($parsed_sql)) {
|
||||
// We don't so just return the input directly
|
||||
// This is intended to be used for when the SQL Parser is turned off
|
||||
$formatted_sql = '<pre>' . "\n"
|
||||
@ -663,7 +663,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
|
||||
if ($exit) {
|
||||
/**
|
||||
* If in an Ajax request
|
||||
* - avoid displaying a Back link
|
||||
* - avoid displaying a Back link
|
||||
* - use PMA_ajaxResponse() to transmit the message and exit
|
||||
*/
|
||||
if($GLOBALS['is_ajax_request'] == true) {
|
||||
@ -781,12 +781,12 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
|
||||
$group_name = $parts[$i] . $sep;
|
||||
$group_name_full .= $group_name;
|
||||
|
||||
if (!isset($group[$group_name])) {
|
||||
if (! isset($group[$group_name])) {
|
||||
$group[$group_name] = array();
|
||||
$group[$group_name]['is' . $sep . 'group'] = true;
|
||||
$group[$group_name]['tab' . $sep . 'count'] = 1;
|
||||
$group[$group_name]['tab' . $sep . 'group'] = $group_name_full;
|
||||
} elseif (!isset($group[$group_name]['is' . $sep . 'group'])) {
|
||||
} elseif (! isset($group[$group_name]['is' . $sep . 'group'])) {
|
||||
$table = $group[$group_name];
|
||||
$group[$group_name] = array();
|
||||
$group[$group_name][$group_name] = $table;
|
||||
@ -801,7 +801,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
|
||||
$i++;
|
||||
}
|
||||
} else {
|
||||
if (!isset($table_groups[$table_name])) {
|
||||
if (! isset($table_groups[$table_name])) {
|
||||
$table_groups[$table_name] = array();
|
||||
}
|
||||
$group =& $table_groups;
|
||||
@ -963,7 +963,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
|
||||
* in a string. In some special cases on sql.php, buffering has to be disabled
|
||||
* and hence we check with $GLOBALS['buffer_message']
|
||||
*/
|
||||
if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) {
|
||||
if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
|
||||
ob_start();
|
||||
}
|
||||
global $cfg;
|
||||
@ -1255,7 +1255,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
|
||||
|
||||
// in the tools div, only display the Inline link when not in ajax
|
||||
// mode because 1) it currently does not work and 2) we would
|
||||
// have two similar mechanisms on the page for the same goal
|
||||
// have two similar mechanisms on the page for the same goal
|
||||
if ($is_select || $GLOBALS['is_ajax_request'] === false) {
|
||||
// see in js/functions.js the jQuery code attached to id inline_edit
|
||||
// document.write conflicts with jQuery, hence used $().append()
|
||||
@ -1263,7 +1263,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
|
||||
"//<![CDATA[\n" .
|
||||
"$('.tools form').last().after('[<a href=\"#\" title=\"" .
|
||||
PMA_escapeJsString(__('Inline edit of this query')) .
|
||||
"\" class=\"inline_edit\">" .
|
||||
"\" class=\"inline_edit_sql\">" .
|
||||
PMA_escapeJsString(__('Inline')) .
|
||||
"</a>]');\n" .
|
||||
"//]]>\n" .
|
||||
@ -1280,7 +1280,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
|
||||
// If we are in an Ajax request, we have most probably been called in
|
||||
// PMA_ajaxResponse(). Hence, collect the buffer contents and return it
|
||||
// to PMA_ajaxResponse(), which will encode it for JSON.
|
||||
if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) {
|
||||
if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
|
||||
$buffer_contents = ob_get_contents();
|
||||
ob_end_clean();
|
||||
return $buffer_contents;
|
||||
@ -2001,7 +2001,7 @@ function PMA_checkParameters($params, $die = true, $request = true)
|
||||
{
|
||||
global $checked_special;
|
||||
|
||||
if (!isset($checked_special)) {
|
||||
if (! isset($checked_special)) {
|
||||
$checked_special = false;
|
||||
}
|
||||
|
||||
@ -2014,7 +2014,7 @@ function PMA_checkParameters($params, $die = true, $request = true)
|
||||
$checked_special = true;
|
||||
}
|
||||
|
||||
if (!isset($GLOBALS[$param])) {
|
||||
if (! isset($GLOBALS[$param])) {
|
||||
$error_message .= $reported_script_name
|
||||
. ': Missing parameter: ' . $param
|
||||
. PMA_showDocu('faqmissingparameters')
|
||||
@ -2112,7 +2112,7 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
|
||||
. PMA_backquote($meta->orgname) . ' ';
|
||||
} // end if... else...
|
||||
|
||||
if (!isset($row[$i]) || is_null($row[$i])) {
|
||||
if (! isset($row[$i]) || is_null($row[$i])) {
|
||||
$condition .= 'IS NULL AND';
|
||||
} else {
|
||||
// timestamp is numeric on some MySQL 4.1
|
||||
@ -2434,8 +2434,8 @@ function PMA_userDir($dir)
|
||||
*/
|
||||
function PMA_getDbLink($database = null)
|
||||
{
|
||||
if (!strlen($database)) {
|
||||
if (!strlen($GLOBALS['db'])) {
|
||||
if (! strlen($database)) {
|
||||
if (! strlen($GLOBALS['db'])) {
|
||||
return '';
|
||||
}
|
||||
$database = $GLOBALS['db'];
|
||||
|
||||
@ -386,7 +386,7 @@ function PMA_array_merge_recursive()
|
||||
break;
|
||||
case 2 :
|
||||
$args = func_get_args();
|
||||
if (!is_array($args[0]) || !is_array($args[1])) {
|
||||
if (! is_array($args[0]) || ! is_array($args[1])) {
|
||||
return $args[1];
|
||||
}
|
||||
foreach ($args[1] as $key2 => $value2) {
|
||||
@ -603,7 +603,7 @@ function PMA_array_read($path, $array, $default = null)
|
||||
$keys = explode('/', $path);
|
||||
$value =& $array;
|
||||
foreach ($keys as $key) {
|
||||
if (!isset($value[$key])) {
|
||||
if (! isset($value[$key])) {
|
||||
return $default;
|
||||
}
|
||||
$value =& $value[$key];
|
||||
@ -624,7 +624,7 @@ function PMA_array_write($path, &$array, $value)
|
||||
$last_key = array_pop($keys);
|
||||
$a =& $array;
|
||||
foreach ($keys as $key) {
|
||||
if (!isset($a[$key])) {
|
||||
if (! isset($a[$key])) {
|
||||
$a[$key] = array();
|
||||
}
|
||||
$a =& $a[$key];
|
||||
@ -650,7 +650,7 @@ function PMA_array_remove($path, &$array)
|
||||
$found = true;
|
||||
// go as deep as required or possible
|
||||
foreach ($keys as $key) {
|
||||
if (!isset($path[$depth][$key])) {
|
||||
if (! isset($path[$depth][$key])) {
|
||||
$found = false;
|
||||
break;
|
||||
}
|
||||
@ -665,7 +665,7 @@ function PMA_array_remove($path, &$array)
|
||||
|
||||
// remove empty nested arrays
|
||||
for (; $depth >= 0; $depth--) {
|
||||
if (!isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
|
||||
if (! isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
|
||||
unset($path[$depth][$keys[$depth]]);
|
||||
} else {
|
||||
break;
|
||||
|
||||
@ -196,7 +196,7 @@ function PMA_usort_comparison_callback($a, $b)
|
||||
$sorter = 'strcasecmp';
|
||||
}
|
||||
/* No sorting when key is not present */
|
||||
if (!isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) {
|
||||
if (! isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) {
|
||||
return 0;
|
||||
}
|
||||
// produces f.e.:
|
||||
|
||||
@ -152,7 +152,7 @@ if (true === $cfg['SkipLockedTables']) {
|
||||
null, PMA_DBI_QUERY_STORE);
|
||||
if ($db_info_result && PMA_DBI_num_rows($db_info_result) > 0) {
|
||||
while ($tmp = PMA_DBI_fetch_row($db_info_result)) {
|
||||
if (!isset($sot_cache[$tmp[0]])) {
|
||||
if (! isset($sot_cache[$tmp[0]])) {
|
||||
$sts_result = PMA_DBI_query(
|
||||
'SHOW TABLE STATUS FROM ' . PMA_backquote($db)
|
||||
. ' LIKE \'' . addslashes($tmp[0]) . '\';');
|
||||
@ -160,7 +160,7 @@ if (true === $cfg['SkipLockedTables']) {
|
||||
PMA_DBI_free_result($sts_result);
|
||||
unset($sts_result);
|
||||
|
||||
if (!isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) {
|
||||
if (! isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) {
|
||||
$sts_tmp['Type'] =& $sts_tmp['Engine'];
|
||||
}
|
||||
|
||||
|
||||
@ -65,7 +65,7 @@ echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' .
|
||||
// If the export method was not set, the default is quick
|
||||
if(isset($_GET['export_method'])) {
|
||||
$cfg['Export']['method'] = $_GET['export_method'];
|
||||
} elseif(!isset($cfg['Export']['method'])) {
|
||||
} elseif(! isset($cfg['Export']['method'])) {
|
||||
$cfg['Export']['method'] = 'quick';
|
||||
}
|
||||
// The export method (quick, custom or custom-no-form)
|
||||
|
||||
@ -1091,7 +1091,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|
||||
}
|
||||
}
|
||||
|
||||
if (!is_array($map)) {
|
||||
if (! is_array($map)) {
|
||||
$map = array();
|
||||
}
|
||||
$row_no = 0;
|
||||
@ -1272,7 +1272,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|
||||
$condition_field = false;
|
||||
}
|
||||
|
||||
if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical' && (!isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1'))) {
|
||||
if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical' && (! isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1'))) {
|
||||
// the row number corresponds to a data row, not HTML table row
|
||||
$class .= ' row_' . $row_no;
|
||||
if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) {
|
||||
@ -1328,7 +1328,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|
||||
// will show both fields NULL even if only one is NULL,
|
||||
// so use the $pointer
|
||||
|
||||
if (!isset($row[$i]) || is_null($row[$i])) {
|
||||
if (! isset($row[$i]) || is_null($row[$i])) {
|
||||
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
|
||||
} elseif ($row[$i] != '') {
|
||||
|
||||
@ -1351,7 +1351,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|
||||
$class = str_replace('inline_edit', '', $class);
|
||||
|
||||
if (stristr($field_flags, 'BINARY')) {
|
||||
if (!isset($row[$i]) || is_null($row[$i])) {
|
||||
if (! isset($row[$i]) || is_null($row[$i])) {
|
||||
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
|
||||
} else {
|
||||
// for blobstreaming
|
||||
@ -1367,7 +1367,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|
||||
}
|
||||
// not binary:
|
||||
} else {
|
||||
if (!isset($row[$i]) || is_null($row[$i])) {
|
||||
if (! isset($row[$i]) || is_null($row[$i])) {
|
||||
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
|
||||
} elseif ($row[$i] != '') {
|
||||
// if a transform function for blob is set, none of these replacements will be made
|
||||
@ -1395,7 +1395,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|
||||
|
||||
// n o t n u m e r i c a n d n o t B L O B
|
||||
} else {
|
||||
if (!isset($row[$i]) || is_null($row[$i])) {
|
||||
if (! isset($row[$i]) || is_null($row[$i])) {
|
||||
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
|
||||
} elseif ($row[$i] != '') {
|
||||
// support blanks in the key
|
||||
@ -1477,7 +1477,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|
||||
|
||||
// 4. Gather links of del_urls and edit_urls in an array for later
|
||||
// output
|
||||
if (!isset($vertical_display['edit'][$row_no])) {
|
||||
if (! isset($vertical_display['edit'][$row_no])) {
|
||||
$vertical_display['edit'][$row_no] = '';
|
||||
$vertical_display['copy'][$row_no] = '';
|
||||
$vertical_display['delete'][$row_no] = '';
|
||||
@ -1563,7 +1563,7 @@ function PMA_displayVerticalTable()
|
||||
// Displays "edit" link at top if required
|
||||
if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) {
|
||||
echo '<tr>' . "\n";
|
||||
if (!is_array($vertical_display['row_delete'])) {
|
||||
if (! is_array($vertical_display['row_delete'])) {
|
||||
echo $vertical_display['textbtn'];
|
||||
}
|
||||
$foo_counter = 0;
|
||||
@ -1581,7 +1581,7 @@ function PMA_displayVerticalTable()
|
||||
// Displays "copy" link at top if required
|
||||
if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) {
|
||||
echo '<tr>' . "\n";
|
||||
if (!is_array($vertical_display['row_delete'])) {
|
||||
if (! is_array($vertical_display['row_delete'])) {
|
||||
echo $vertical_display['textbtn'];
|
||||
}
|
||||
$foo_counter = 0;
|
||||
@ -1599,7 +1599,7 @@ function PMA_displayVerticalTable()
|
||||
// Displays "delete" link at top if required
|
||||
if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) {
|
||||
echo '<tr>' . "\n";
|
||||
if (!is_array($vertical_display['edit']) && !is_array($vertical_display['row_delete'])) {
|
||||
if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) {
|
||||
echo $vertical_display['textbtn'];
|
||||
}
|
||||
$foo_counter = 0;
|
||||
@ -1652,7 +1652,7 @@ function PMA_displayVerticalTable()
|
||||
// Displays "edit" link at bottom if required
|
||||
if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) {
|
||||
echo '<tr>' . "\n";
|
||||
if (!is_array($vertical_display['row_delete'])) {
|
||||
if (! is_array($vertical_display['row_delete'])) {
|
||||
echo $vertical_display['textbtn'];
|
||||
}
|
||||
$foo_counter = 0;
|
||||
@ -1670,7 +1670,7 @@ function PMA_displayVerticalTable()
|
||||
// Displays "copy" link at bottom if required
|
||||
if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) {
|
||||
echo '<tr>' . "\n";
|
||||
if (!is_array($vertical_display['row_delete'])) {
|
||||
if (! is_array($vertical_display['row_delete'])) {
|
||||
echo $vertical_display['textbtn'];
|
||||
}
|
||||
$foo_counter = 0;
|
||||
@ -1688,7 +1688,7 @@ function PMA_displayVerticalTable()
|
||||
// Displays "delete" link at bottom if required
|
||||
if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) {
|
||||
echo '<tr>' . "\n";
|
||||
if (!is_array($vertical_display['edit']) && !is_array($vertical_display['row_delete'])) {
|
||||
if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) {
|
||||
echo $vertical_display['textbtn'];
|
||||
}
|
||||
$foo_counter = 0;
|
||||
@ -2070,7 +2070,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
|
||||
|
||||
PMA_showMessage($message, $sql_query, 'success');
|
||||
|
||||
} elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
|
||||
} elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
|
||||
PMA_showMessage(__('Your SQL query has been executed successfully'), $sql_query, 'success');
|
||||
}
|
||||
|
||||
@ -2090,7 +2090,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
|
||||
if ($is_display['nav_bar'] == '1') {
|
||||
PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'top_direction_dropdown');
|
||||
echo "\n";
|
||||
} elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
|
||||
} elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
|
||||
echo "\n" . '<br /><br />' . "\n";
|
||||
}
|
||||
|
||||
@ -2212,12 +2212,12 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
|
||||
if ($is_display['nav_bar'] == '1') {
|
||||
echo '<br />' . "\n";
|
||||
PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'bottom_direction_dropdown');
|
||||
} elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
|
||||
} elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
|
||||
echo "\n" . '<br /><br />' . "\n";
|
||||
}
|
||||
|
||||
// 6. ----- Displays "Query results operations"
|
||||
if (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
|
||||
if (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
|
||||
PMA_displayResultsOperations($the_disp_mode, $analyzed_sql);
|
||||
}
|
||||
} // end of the 'PMA_displayTable()' function
|
||||
@ -2298,8 +2298,8 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
|
||||
// If the parser found a PROCEDURE clause
|
||||
// (most probably PROCEDURE ANALYSE()) it makes no sense to
|
||||
// display the Export link).
|
||||
if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && !isset($printview) && ! isset($analyzed_sql[0]['queryflags']['procedure'])) {
|
||||
if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && !isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) {
|
||||
if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && ! isset($printview) && ! isset($analyzed_sql[0]['queryflags']['procedure'])) {
|
||||
if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && ! isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) {
|
||||
$_url_params['single_table'] = 'true';
|
||||
}
|
||||
if (!$header_shown) {
|
||||
|
||||
@ -166,7 +166,7 @@ if (window.parent.frame_content) {
|
||||
}
|
||||
|
||||
// Link to itself to replicate windows including frameset
|
||||
if (!isset($GLOBALS['checked_special'])) {
|
||||
if (! isset($GLOBALS['checked_special'])) {
|
||||
$GLOBALS['checked_special'] = false;
|
||||
}
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
|
||||
// if database storage for user preferences is transient, offer to load
|
||||
// exported settings from localStorage (detection will be done in JavaScript)
|
||||
$userprefs_offer_import = $GLOBALS['PMA_Config']->get('user_preferences') == 'session'
|
||||
&& !isset($_SESSION['userprefs_autoload']);
|
||||
&& ! isset($_SESSION['userprefs_autoload']);
|
||||
if ($userprefs_offer_import) {
|
||||
$GLOBALS['js_include'][] = 'config.js';
|
||||
}
|
||||
@ -123,7 +123,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
|
||||
PMA_generate_common_url($GLOBALS['db']),
|
||||
htmlspecialchars($GLOBALS['db']),
|
||||
__('Database'),
|
||||
's_tbl.png');
|
||||
's_db.png');
|
||||
// if the table is being dropped, $_REQUEST['purge'] is set
|
||||
// (it always contains "1")
|
||||
// so do not display the table name in upper div
|
||||
@ -143,7 +143,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
|
||||
* @uses $show_comment from libraries/tbl_info.inc.php
|
||||
* @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php
|
||||
*/
|
||||
if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) {
|
||||
if (!empty($show_comment) && ! isset($GLOBALS['avoid_show_comment'])) {
|
||||
if (strstr($show_comment, '; InnoDB free')) {
|
||||
$show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment);
|
||||
}
|
||||
|
||||
@ -127,7 +127,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
|
||||
}
|
||||
$msg = '# ';
|
||||
if ($result === FALSE) { // execution failed
|
||||
if (!isset($my_die)) {
|
||||
if (! isset($my_die)) {
|
||||
$my_die = array();
|
||||
}
|
||||
$my_die[] = array('sql' => $import_run_buffer['full'], 'error' => PMA_DBI_getError());
|
||||
@ -697,7 +697,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type
|
||||
/**
|
||||
* This is the first row to be analyzed
|
||||
*/
|
||||
elseif (!isset($last_cumulative_type) || $last_cumulative_type == NONE) {
|
||||
elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) {
|
||||
return $curr_size;
|
||||
}
|
||||
/**
|
||||
|
||||
@ -29,6 +29,9 @@ if (! empty($submit_mult)
|
||||
} else {
|
||||
$selected = $selected_tbl;
|
||||
switch ($submit_mult) {
|
||||
case 'add_prefix_tbl':
|
||||
case 'replace_prefix_tbl':
|
||||
case 'copy_tbl_change_prefix':
|
||||
case 'drop_db':
|
||||
case 'drop_tbl':
|
||||
case 'empty_tbl':
|
||||
@ -238,16 +241,50 @@ if (!empty($submit_mult) && !empty($what)) {
|
||||
<?php
|
||||
echo PMA_generate_common_hidden_inputs($_url_params);
|
||||
?>
|
||||
<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 if ($what == 'replace_prefix_tbl' || $what == 'copy_tbl_change_prefix'){ ?>
|
||||
<fieldset class = "input">
|
||||
<legend><?php echo ($what == 'replace_prefix_tbl' ? __('Replace table prefix') : __('Copy table with prefix')) ?>:</legend>
|
||||
<table>
|
||||
<tr>
|
||||
<td><?php echo __('From'); ?></td><td><input type="text" name="from_prefix" id="initialPrefix"</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php echo __('To'); ?> </td><td><input type="text" name="to_prefix" id="newPrefix"</td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
<fieldset class="tblFooters">
|
||||
<button type="submit" name="mult_btn" value="<?php echo __('Yes'); ?>" id="buttonYes"><? echo __('Submit'); ?></button>
|
||||
</fieldset>
|
||||
<?php
|
||||
require './libraries/footer.inc.php';
|
||||
}
|
||||
elseif($what == 'add_prefix_tbl'){ ?>
|
||||
<fieldset class = "input">
|
||||
<legend><?php echo __('Add table prefix') ?>:</legend>
|
||||
<table>
|
||||
<tr>
|
||||
<td><?php echo __('Add prefix'); ?></td> <td><input type="text" name="add_prefix" id="txtPrefix"</td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
<fieldset class="tblFooters">
|
||||
<button type="submit" name="mult_btn" value="<?php echo __('Yes'); ?>" id="buttonYes"><? echo __('Submit'); ?></button>
|
||||
</fieldset>
|
||||
<?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>
|
||||
<?php
|
||||
}
|
||||
require './libraries/footer.inc.php';
|
||||
|
||||
} // end if
|
||||
|
||||
|
||||
@ -373,6 +410,27 @@ elseif ($mult_btn == __('Yes')) {
|
||||
. PMA_backquote($selected[$i])
|
||||
. (($i == $selected_cnt-1) ? ');' : '');
|
||||
break;
|
||||
|
||||
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;
|
||||
break;
|
||||
|
||||
case 'replace_prefix_tbl':
|
||||
$current = $selected[$i];
|
||||
$newtablename = preg_replace("/^" . $from_prefix . "/" , $to_prefix , $current);
|
||||
$a_query = 'ALTER TABLE ' . PMA_backquote($selected[$i]) . ' RENAME ' . PMA_backquote($newtablename) ; // CHANGE PREFIX PATTERN
|
||||
$run_parts = true;
|
||||
break;
|
||||
|
||||
case 'copy_tbl_change_prefix':
|
||||
$current = $selected[$i];
|
||||
$newtablename = preg_replace("/^" . $from_prefix . "/" , $to_prefix , $current);
|
||||
$a_query = 'CREATE TABLE ' . PMA_backquote($newtablename) . ' SELECT * FROM ' . PMA_backquote($selected[$i]) ; // COPY TABLE AND CHANGE PREFIX PATTERN
|
||||
$run_parts = true;
|
||||
break;
|
||||
|
||||
} // end switch
|
||||
|
||||
// All "DROP TABLE", "DROP FIELD", "OPTIMIZE TABLE" and "REPAIR TABLE"
|
||||
|
||||
@ -37,7 +37,7 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) {
|
||||
: 'SELECT * FROM information_schema.COLLATIONS';
|
||||
$res = PMA_DBI_query($sql);
|
||||
while ($row = PMA_DBI_fetch_assoc($res)) {
|
||||
if (!is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) {
|
||||
if (! is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) {
|
||||
$mysql_collations[$row['CHARACTER_SET_NAME']] = array($row['COLLATION_NAME']);
|
||||
} else {
|
||||
$mysql_collations[$row['CHARACTER_SET_NAME']][] = $row['COLLATION_NAME'];
|
||||
@ -46,7 +46,7 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) {
|
||||
if ($row['IS_DEFAULT'] == 'Yes') {
|
||||
$mysql_default_collations[$row['CHARACTER_SET_NAME']] = $row['COLLATION_NAME'];
|
||||
}
|
||||
//$mysql_collations_available[$row['Collation']] = !isset($row['Compiled']) || $row['Compiled'] == 'Yes';
|
||||
//$mysql_collations_available[$row['Collation']] = ! isset($row['Compiled']) || $row['Compiled'] == 'Yes';
|
||||
$mysql_collations_available[$row['COLLATION_NAME']] = true;
|
||||
$mysql_charsets_available[$row['CHARACTER_SET_NAME']] =
|
||||
!empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']])
|
||||
|
||||
0
libraries/php-gettext/gettext.php
Executable file → Normal file
0
libraries/php-gettext/gettext.php
Executable file → Normal file
@ -71,7 +71,7 @@ function PMA_getString($name)
|
||||
function PMA_pluginCheckboxCheck($section, $opt)
|
||||
{
|
||||
// If the form is being repopulated using $_GET data, that is priority
|
||||
if (isset($_GET[$opt]) || !isset($_GET['repopulate']) && ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) ||
|
||||
if (isset($_GET[$opt]) || ! isset($_GET['repopulate']) && ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) ||
|
||||
(isset($GLOBALS['cfg'][$section][$opt]) && $GLOBALS['cfg'][$section][$opt]))) {
|
||||
return ' checked="checked"';
|
||||
}
|
||||
@ -160,7 +160,7 @@ function PMA_pluginIsActive($section, $opt, $val)
|
||||
*/
|
||||
function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL)
|
||||
{
|
||||
if (!isset($cfgname)) {
|
||||
if (! isset($cfgname)) {
|
||||
$cfgname = $name;
|
||||
}
|
||||
$ret = '<select id="plugins" name="' . $name . '">';
|
||||
@ -168,7 +168,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL)
|
||||
foreach ($list as $plugin_name => $val) {
|
||||
$ret .= '<option';
|
||||
// If the form is being repopulated using $_GET data, that is priority
|
||||
if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || !isset($_GET[$name]) && $plugin_name == $default) {
|
||||
if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) {
|
||||
$ret .= ' selected="selected"';
|
||||
}
|
||||
$ret .= ' value="' . $plugin_name . '">' . PMA_getString($val['text']) . '</option>' . "\n";
|
||||
|
||||
@ -680,7 +680,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
$dia->startDiaDoc($this->paper,$this->_topMargin,$this->_bottomMargin,$this->_leftMargin,$this->_rightMargin,$this->orientation);
|
||||
$alltables = $this->getAllTables($db,$this->pageNumber);
|
||||
foreach ($alltables as $table) {
|
||||
if (!isset($this->tables[$table])) {
|
||||
if (! isset($this->tables[$table])) {
|
||||
$this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys);
|
||||
}
|
||||
}
|
||||
@ -725,10 +725,10 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
*/
|
||||
private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys)
|
||||
{
|
||||
if (!isset($this->tables[$masterTable])) {
|
||||
if (! isset($this->tables[$masterTable])) {
|
||||
$this->tables[$masterTable] = new Table_Stats($masterTable, $this->pageNumber, $showKeys);
|
||||
}
|
||||
if (!isset($this->tables[$foreignTable])) {
|
||||
if (! isset($this->tables[$foreignTable])) {
|
||||
$this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->pageNumber, $showKeys);
|
||||
}
|
||||
$this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField);
|
||||
|
||||
@ -759,7 +759,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
$alltables = $this->getAllTables($db,$this->pageNumber);
|
||||
|
||||
foreach ($alltables AS $table) {
|
||||
if (!isset($this->tables[$table])) {
|
||||
if (! isset($this->tables[$table])) {
|
||||
$this->tables[$table] = new Table_Stats($table,$eps->getFont(),$eps->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension);
|
||||
}
|
||||
|
||||
@ -809,10 +809,10 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
*/
|
||||
private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo)
|
||||
{
|
||||
if (!isset($this->tables[$masterTable])) {
|
||||
if (! isset($this->tables[$masterTable])) {
|
||||
$this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tablewidth, false, $showInfo);
|
||||
}
|
||||
if (!isset($this->tables[$foreignTable])) {
|
||||
if (! isset($this->tables[$foreignTable])) {
|
||||
$this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo);
|
||||
}
|
||||
$this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField);
|
||||
|
||||
@ -882,7 +882,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
|
||||
/* snip */
|
||||
foreach ($alltables as $table) {
|
||||
if (!isset($this->tables[$table])) {
|
||||
if (! isset($this->tables[$table])) {
|
||||
$this->tables[$table] = new Table_Stats($table, $this->_ff, $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension);
|
||||
}
|
||||
if ($this->sameWide) {
|
||||
@ -962,11 +962,11 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
*/
|
||||
private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showInfo)
|
||||
{
|
||||
if (!isset($this->tables[$masterTable])) {
|
||||
if (! isset($this->tables[$masterTable])) {
|
||||
$this->tables[$masterTable] = new Table_Stats($masterTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo);
|
||||
$this->_setMinMax($this->tables[$masterTable]);
|
||||
}
|
||||
if (!isset($this->tables[$foreignTable])) {
|
||||
if (! isset($this->tables[$foreignTable])) {
|
||||
$this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo);
|
||||
$this->_setMinMax($this->tables[$foreignTable]);
|
||||
}
|
||||
@ -1305,7 +1305,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
if ($zerofill) {
|
||||
$attribute = 'UNSIGNED ZEROFILL';
|
||||
}
|
||||
if (!isset($row['Default'])) {
|
||||
if (! isset($row['Default'])) {
|
||||
if ($row['Null'] != '' && $row['Null'] != 'NO') {
|
||||
$row['Default'] = 'NULL';
|
||||
}
|
||||
|
||||
@ -742,7 +742,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
$alltables = $this->getAllTables($db,$this->pageNumber);
|
||||
|
||||
foreach ($alltables AS $table) {
|
||||
if (!isset($this->tables[$table])) {
|
||||
if (! isset($this->tables[$table])) {
|
||||
$this->tables[$table] = new Table_Stats($table,$svg->getFont(),$svg->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension);
|
||||
}
|
||||
|
||||
@ -805,11 +805,11 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
*/
|
||||
private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo)
|
||||
{
|
||||
if (!isset($this->tables[$masterTable])) {
|
||||
if (! isset($this->tables[$masterTable])) {
|
||||
$this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tablewidth, false, $showInfo);
|
||||
$this->_setMinMax($this->tables[$masterTable]);
|
||||
}
|
||||
if (!isset($this->tables[$foreignTable])) {
|
||||
if (! isset($this->tables[$foreignTable])) {
|
||||
$this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo);
|
||||
$this->_setMinMax($this->tables[$foreignTable]);
|
||||
}
|
||||
|
||||
@ -222,7 +222,7 @@ class PMA_User_Schema
|
||||
* Display WYSIWYG parts
|
||||
*/
|
||||
|
||||
if (!isset($_POST['with_field_names']) && !isset($_POST['showwysiwyg'])) {
|
||||
if (! isset($_POST['with_field_names']) && ! isset($_POST['showwysiwyg'])) {
|
||||
$with_field_names = TRUE;
|
||||
}
|
||||
$this->_displayScratchboardTables($array_sh_page);
|
||||
@ -783,10 +783,10 @@ class PMA_User_Schema
|
||||
$arrvalue = 'c_table_' . $i;
|
||||
global $$arrvalue;
|
||||
$arrvalue = $$arrvalue;
|
||||
if (!isset($arrvalue['x']) || $arrvalue['x'] == '') {
|
||||
if (! isset($arrvalue['x']) || $arrvalue['x'] == '') {
|
||||
$arrvalue['x'] = 0;
|
||||
}
|
||||
if (!isset($arrvalue['y']) || $arrvalue['y'] == '') {
|
||||
if (! isset($arrvalue['y']) || $arrvalue['y'] == '') {
|
||||
$arrvalue['y'] = 0;
|
||||
}
|
||||
if (isset($arrvalue['name']) && $arrvalue['name'] != '--') {
|
||||
|
||||
@ -505,7 +505,7 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
$alltables = $this->getAllTables($db,$this->pageNumber);
|
||||
|
||||
foreach ($alltables as $table) {
|
||||
if (!isset($this->tables[$table])) {
|
||||
if (! isset($this->tables[$table])) {
|
||||
$this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys);
|
||||
}
|
||||
}
|
||||
@ -550,10 +550,10 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
*/
|
||||
private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys)
|
||||
{
|
||||
if (!isset($this->tables[$masterTable])) {
|
||||
if (! isset($this->tables[$masterTable])) {
|
||||
$this->tables[$masterTable] = new Table_Stats($masterTable, $this->pageNumber, $showKeys);
|
||||
}
|
||||
if (!isset($this->tables[$foreignTable])) {
|
||||
if (! isset($this->tables[$foreignTable])) {
|
||||
$this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->pageNumber, $showKeys);
|
||||
}
|
||||
$this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField);
|
||||
|
||||
@ -27,7 +27,7 @@ if (!$GLOBALS['is_ajax_request']) {
|
||||
/**
|
||||
* Put something in $sub_part
|
||||
*/
|
||||
if (!isset($sub_part)) {
|
||||
if (! isset($sub_part)) {
|
||||
$sub_part = '';
|
||||
}
|
||||
|
||||
|
||||
@ -95,7 +95,7 @@ if (! isset($_COOKIE[$session_name])) {
|
||||
* Token which is used for authenticating access queries.
|
||||
* (we use "space PMA_token space" to prevent overwriting)
|
||||
*/
|
||||
if (!isset($_SESSION[' PMA_token '])) {
|
||||
if (! isset($_SESSION[' PMA_token '])) {
|
||||
$_SESSION[' PMA_token '] = md5(uniqid(rand(), true));
|
||||
}
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
|
||||
if (!defined('TESTSUITE')) {
|
||||
require_once './libraries/mysql_charsets.lib.php';
|
||||
}
|
||||
if (!isset($mysql_charsets)) {
|
||||
if (! isset($mysql_charsets)) {
|
||||
$mysql_charsets = array();
|
||||
$mysql_charsets_count = 0;
|
||||
$mysql_collations_flat = array();
|
||||
@ -244,9 +244,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
|
||||
6 => '<>',
|
||||
7 => '>=',
|
||||
8 => '>>',
|
||||
9 => '||'
|
||||
9 => '||',
|
||||
10 => '==',
|
||||
);
|
||||
$allpunct_list_pair_size = 10; //count($allpunct_list_pair);
|
||||
$allpunct_list_pair_size = 11; //count($allpunct_list_pair);
|
||||
$quote_list = '\'"`';
|
||||
$arraysize = 0;
|
||||
|
||||
@ -828,7 +829,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
|
||||
*/
|
||||
function PMA_SQP_analyze($arr)
|
||||
{
|
||||
if ($arr == array() || !isset($arr['len'])) {
|
||||
if ($arr == array() || ! isset($arr['len'])) {
|
||||
return array();
|
||||
}
|
||||
$result = array();
|
||||
@ -2090,7 +2091,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
|
||||
{
|
||||
//DEBUG echo 'in Format<pre>'; print_r($arr); echo '</pre>';
|
||||
// then check for an array
|
||||
if (!is_array($arr)) {
|
||||
if (! is_array($arr)) {
|
||||
return htmlspecialchars($arr);
|
||||
}
|
||||
// first check for the SQL parser having hit an error
|
||||
|
||||
@ -102,7 +102,7 @@ if ($showtable) {
|
||||
}
|
||||
}
|
||||
// we need explicit DEFAULT value here (different from '0')
|
||||
$pack_keys = (!isset($pack_keys) || strlen($pack_keys) == 0) ? 'DEFAULT' : $pack_keys;
|
||||
$pack_keys = (! isset($pack_keys) || strlen($pack_keys) == 0) ? 'DEFAULT' : $pack_keys;
|
||||
unset($create_options, $each_create_option);
|
||||
} // end if
|
||||
?>
|
||||
|
||||
@ -378,7 +378,7 @@ for ($i = 0; $i < $num_fields; $i++) {
|
||||
* having NULL enabled does not implicit having Default with NULL
|
||||
*
|
||||
if (isset($row)
|
||||
&& !isset($row['Default']) && isset($row['Null']) && $row['Null'] == 'YES') {
|
||||
&& ! isset($row['Default']) && isset($row['Null']) && $row['Null'] == 'YES') {
|
||||
$row['Default'] = 'NULL';
|
||||
}
|
||||
*/
|
||||
|
||||
0
libraries/transformations/generator.sh
Normal file → Executable file
0
libraries/transformations/generator.sh
Normal file → Executable file
0
libraries/transformations/template_generator.sh
Normal file → Executable file
0
libraries/transformations/template_generator.sh
Normal file → Executable file
0
libraries/transformations/template_generator_mimetype.sh
Normal file → Executable file
0
libraries/transformations/template_generator_mimetype.sh
Normal file → Executable file
@ -15,7 +15,7 @@ require './libraries/server_links.inc.php';
|
||||
// build user preferences menu
|
||||
|
||||
$form_param = filter_input(INPUT_GET, 'form');
|
||||
if (!isset($forms[$form_param])) {
|
||||
if (! isset($forms[$form_param])) {
|
||||
$forms_keys = array_keys($forms);
|
||||
$form_param = array_shift($forms_keys);
|
||||
}
|
||||
@ -64,7 +64,7 @@ $msg->display();
|
||||
|
||||
// warn about using session storage for settings
|
||||
$cfgRelation = PMA_getRelationsParam();
|
||||
if (!$cfgRelation['userconfigwork']) {
|
||||
if (! $cfgRelation['userconfigwork']) {
|
||||
$msg = __('Your preferences will be saved for current session only. Storing them permanently requires %sphpMyAdmin configuration storage%s.');
|
||||
$msg = PMA_sanitize(sprintf($msg, '[a@./Documentation.html#linked-tables@_blank]', '[/a]'));
|
||||
PMA_Message::notice($msg)->display();
|
||||
|
||||
@ -49,9 +49,9 @@ function PMA_userprefs_pageinit()
|
||||
function PMA_load_userprefs()
|
||||
{
|
||||
$cfgRelation = PMA_getRelationsParam();
|
||||
if (!$cfgRelation['userconfigwork']) {
|
||||
if (! $cfgRelation['userconfigwork']) {
|
||||
// no pmadb table, use session storage
|
||||
if (!isset($_SESSION['userconfig'])) {
|
||||
if (! isset($_SESSION['userconfig'])) {
|
||||
$_SESSION['userconfig'] = array(
|
||||
'db' => array(),
|
||||
'ts' => time());
|
||||
@ -104,7 +104,7 @@ function PMA_save_userprefs(array $config_array)
|
||||
? $GLOBALS['server']
|
||||
: $GLOBALS['cfg']['ServerDefault'];
|
||||
$cache_key = 'server_' . $server;
|
||||
if (!$cfgRelation['userconfigwork']) {
|
||||
if (! $cfgRelation['userconfigwork']) {
|
||||
// no pmadb table, use session storage
|
||||
$_SESSION['userconfig'] = array(
|
||||
'db' => $config_array,
|
||||
@ -175,7 +175,7 @@ function PMA_apply_userprefs(array $config_data)
|
||||
$whitelist['Server/hide_db'] = true;
|
||||
$whitelist['Server/only_db'] = true;
|
||||
foreach ($config_data as $path => $value) {
|
||||
if (!isset($whitelist[$path]) || isset($blacklist[$path])) {
|
||||
if (! isset($whitelist[$path]) || isset($blacklist[$path])) {
|
||||
continue;
|
||||
}
|
||||
PMA_array_write($path, $cfg, $value);
|
||||
|
||||
2
main.php
2
main.php
@ -292,7 +292,7 @@ if (file_exists('./config')) {
|
||||
*/
|
||||
if ($server > 0) {
|
||||
$cfgRelation = PMA_getRelationsParam();
|
||||
if(!$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
|
||||
if(! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
|
||||
$message = PMA_Message::notice(__('The phpMyAdmin configuration storage is not completely configured, some extended features have been deactivated. To find out why click %shere%s.'));
|
||||
$message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false);
|
||||
$message->addParam('</a>', false);
|
||||
|
||||
@ -6,6 +6,54 @@
|
||||
/**
|
||||
* init
|
||||
*/
|
||||
|
||||
|
||||
var _change = 0; // variable to track any change in designer layout.
|
||||
var _staying = 0; // variable to check if the user stayed after seeing the confirmation prompt.
|
||||
|
||||
// Below is the function to change the href attributes to '#' while the href script is called using
|
||||
// the onclick event. It fixes the Internet Explorer issue with href.
|
||||
|
||||
$(document).ready(function(){
|
||||
$('a').filter(function(){
|
||||
return ( /^javascript\:/i).test($(this).attr('href'));
|
||||
}).each(function(){
|
||||
var hrefscript = $(this).attr('href');
|
||||
hrefscript = hrefscript.substr(11);
|
||||
$(this).data('hrefscript', hrefscript);
|
||||
}).click(function(){
|
||||
var hrefscript = $(this).data('hrefscript');
|
||||
eval (hrefscript);
|
||||
return false;
|
||||
}).attr('href', '#');
|
||||
});
|
||||
|
||||
// Below is the function to bind onbeforeunload events with the content_frame as well as the top window.
|
||||
|
||||
$(document).ready(function(){
|
||||
$(window).bind('beforeunload', function(){ // onbeforeunload for the frame window.
|
||||
if (_change == 1 && _staying == 0)
|
||||
return PMA_messages['strLeavingDesigner'];
|
||||
else if (_change == 1 && _staying == 1)
|
||||
_staying = 0;
|
||||
});
|
||||
$(window).unload(function(){
|
||||
_change = 0;
|
||||
});
|
||||
window.top.onbeforeunload = function(){ // onbeforeunload for the browser main window.
|
||||
if (_change == 1 && _staying == 0){
|
||||
_staying = 1; // Helps if the user stays on the page as there
|
||||
setTimeout('make_zero();', 100); // is no other way of knowing whether the user stayed or not.
|
||||
return PMA_messages['strLeavingDesigner'];
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
function make_zero(){ // Function called if the user stays after seeing the confirmation prompt.
|
||||
_staying = 0;
|
||||
}
|
||||
|
||||
|
||||
var dx, dy, dy2;
|
||||
var cur_click;
|
||||
// update in Main()
|
||||
@ -95,6 +143,7 @@ function MouseMove(e)
|
||||
//window.status = "X = "+ Glob_X + " Y = "+ Glob_Y;
|
||||
|
||||
if (cur_click != null) {
|
||||
_change = 1;
|
||||
var mGx = Glob_X - dx;
|
||||
var mGy = Glob_Y - dy;
|
||||
mGx = mGx > 0 ? mGx : 0;
|
||||
@ -448,6 +497,7 @@ function Get_url_pos()
|
||||
|
||||
function Save2()
|
||||
{
|
||||
_change = 0;
|
||||
var poststr = 'IS_AJAX=1&server='+server+'&db=' + db + '&token=' + token + '&die_save_pos=1';
|
||||
poststr += Get_url_pos();
|
||||
makeRequest('pmd_save_pos.php', poststr);
|
||||
|
||||
1313
po/be@latin.po
1313
po/be@latin.po
File diff suppressed because it is too large
Load Diff
1323
po/en_GB.po
1323
po/en_GB.po
File diff suppressed because it is too large
Load Diff
1276
po/phpmyadmin.pot
1276
po/phpmyadmin.pot
File diff suppressed because it is too large
Load Diff
1297
po/pt_BR.po
1297
po/pt_BR.po
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user