Merge branch 'master' into plugins-and-OOP
This commit is contained in:
Alex Marin
commit
cccd5695aa
@ -73,7 +73,8 @@ if (strlen($db) && (! empty($_REQUEST['db_rename']) || ! empty($_REQUEST['db_cop
|
||||
"sql",
|
||||
'libraries/plugins/export/',
|
||||
array(
|
||||
'single_table' => isset($single_table)
|
||||
'single_table' => isset($single_table),
|
||||
'export_type' => 'database'
|
||||
)
|
||||
);
|
||||
$GLOBALS['sql_constraints_query_full_db'] =
|
||||
|
||||
@ -140,7 +140,7 @@ $overhead_check = '';
|
||||
$create_time_all = '';
|
||||
$update_time_all = '';
|
||||
$check_time_all = '';
|
||||
$checked = !empty($checkall) ? ' checked="checked"' : '';
|
||||
$checked = (!empty($checkall) ? ' checked="checked"' : '');
|
||||
$num_columns = $cfg['PropertiesNumColumns'] > 1
|
||||
? ceil($num_tables / $cfg['PropertiesNumColumns']) + 1
|
||||
: 0;
|
||||
@ -167,7 +167,7 @@ foreach ($tables as $keyname => $current_table) {
|
||||
|
||||
list($current_table, $formatted_size, $unit, $formatted_overhead,
|
||||
$overhead_unit, $overhead_size, $table_is_view, $sum_size)
|
||||
= PMA_getStuffForEnginetable($current_table, $db_is_information_schema,
|
||||
= PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schema,
|
||||
$is_show_stats, $table_is_view, $sum_size, $overhead_size
|
||||
);
|
||||
|
||||
@ -218,7 +218,7 @@ foreach ($tables as $keyname => $current_table) {
|
||||
);
|
||||
}
|
||||
|
||||
list($alias, $truename) = PMA_getAliasAndTruename(
|
||||
list($alias, $truename) = PMA_getAliasAndTrueName(
|
||||
$tooltip_aliasname, $current_table, $tooltip_truename
|
||||
);
|
||||
|
||||
@ -318,7 +318,10 @@ $response->addHTML('</div><hr />');
|
||||
*/
|
||||
/* DATABASE WORK */
|
||||
/* Printable view of a table */
|
||||
$response->addHTML(PMA_getHtmlForPrintViewAndDataDictionaryLinks($url_query));
|
||||
$response->addHTML(
|
||||
PMA_getHtmlForTablePrintViewLink($url_query)
|
||||
. PMA_getHtmlForDataDictionaryLink($url_query)
|
||||
);
|
||||
|
||||
if (empty($db_is_information_schema)) {
|
||||
ob_start();
|
||||
|
||||
@ -546,6 +546,7 @@ $(function() {
|
||||
$.get($(this).attr('href'), {'ajax_request' : true}, function(data) {
|
||||
// This form is not on screen when first entering Privileges
|
||||
// if there are more than 50 users
|
||||
$("div.notice").remove();
|
||||
$("#usersForm").hide("medium").remove();
|
||||
$("#fieldset_add_user").hide("medium").remove();
|
||||
$("#initials_table")
|
||||
|
||||
@ -57,7 +57,7 @@ function PMA_getHtmlForRenameDatabase($db)
|
||||
. '<form id="rename_db_form" '
|
||||
. ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : '')
|
||||
. 'method="post" action="db_operations.php"'
|
||||
. 'onsubmit="return emptyFormElements(this, ' . "'newname'" . ')">';
|
||||
. 'onsubmit="return emptyFormElements(this, \'newname\')">';
|
||||
if (isset($_REQUEST['db_collation'])) {
|
||||
$html_output .= '<input type="hidden" name="db_collation" '
|
||||
. 'value="' . $_REQUEST['db_collation']
|
||||
@ -160,7 +160,7 @@ function PMA_getHtmlForCopyDatabase($db)
|
||||
$html_output .= '<form id="copy_db_form" '
|
||||
. ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : '')
|
||||
. 'method="post" action="db_operations.php"'
|
||||
. 'onsubmit="return emptyFormElements(this' . "'newname'" . ')">';
|
||||
. 'onsubmit="return emptyFormElements(this, \'newname\')">';
|
||||
|
||||
if (isset($_REQUEST['db_collation'])) {
|
||||
$html_output .= '<input type="hidden" name="db_collation" '
|
||||
@ -467,7 +467,7 @@ function PMA_getSqlQueryForCopyTable($tables_full, $sql_query, $move, $db)
|
||||
|
||||
if (! PMA_Table::moveCopy(
|
||||
$db, $each_table, $_REQUEST['newname'], $each_table,
|
||||
isset($this_what) ? $this_what : 'data',
|
||||
(isset($this_what) ? $this_what : 'data'),
|
||||
$move, 'db_copy'
|
||||
)) {
|
||||
$error = true;
|
||||
@ -1033,9 +1033,9 @@ function PMA_getHtmlForCopytable()
|
||||
|
||||
$html_output .= '<input type="checkbox" name="switch_to_new" value="true"'
|
||||
. 'id="checkbox_switch"'
|
||||
. (isset($pma_switch_to_new) && $pma_switch_to_new == 'true')
|
||||
. ((isset($pma_switch_to_new) && $pma_switch_to_new == 'true')
|
||||
? ' checked="checked"'
|
||||
: '' . '/>';
|
||||
: '' . '/>');
|
||||
$html_output .= '<label for="checkbox_switch">'
|
||||
. __('Switch to copied table') . '</label>'
|
||||
. '</fieldset>';
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -128,9 +128,9 @@ function PMA_getTableDropQueryAndMessage($table_is_view, $current_table)
|
||||
$current_table['TABLE_NAME']
|
||||
);
|
||||
$drop_message = sprintf(
|
||||
($table_is_view || $current_table['ENGINE'] == null)
|
||||
(($table_is_view || $current_table['ENGINE'] == null)
|
||||
? __('View %s has been dropped')
|
||||
: __('Table %s has been dropped'),
|
||||
: __('Table %s has been dropped')),
|
||||
str_replace(
|
||||
' ',
|
||||
' ',
|
||||
@ -349,32 +349,39 @@ function PMA_getHtmlForCheckTablesHavingOverheadlink($overhead_check) {
|
||||
|
||||
|
||||
/**
|
||||
* Get HTML links for "Print view" and "Data Dictionary" options
|
||||
* Get HTML links for "Print view" options
|
||||
*
|
||||
* @param string $url_query url query
|
||||
*
|
||||
* @return string $html_output
|
||||
*/
|
||||
function PMA_getHtmlForPrintViewAndDataDictionaryLinks($url_query)
|
||||
function PMA_getHtmlForTablePrintViewLink($url_query)
|
||||
{
|
||||
$common_functions = PMA_CommonFunctions::getInstance();
|
||||
$html_output = '<p>'
|
||||
return '<p>'
|
||||
. '<a href="db_printview.php?' . $url_query . '">'
|
||||
. $common_functions->getIcon(
|
||||
. PMA_CommonFunctions::getInstance()->getIcon(
|
||||
'b_print.png',
|
||||
__('Print view'),
|
||||
true
|
||||
) . '</a>';
|
||||
}
|
||||
|
||||
$html_output .= '<a href="db_datadict.php?' . $url_query . '">'
|
||||
. $common_functions->getIcon(
|
||||
/**
|
||||
* Get HTML links "Data Dictionary" options
|
||||
*
|
||||
* @param string $url_query url query
|
||||
*
|
||||
* @return string $html_output
|
||||
*/
|
||||
function PMA_getHtmlForDataDictionaryLink($url_query)
|
||||
{
|
||||
return '<a href="db_datadict.php?' . $url_query . '">'
|
||||
. PMA_CommonFunctions::getInstance()->getIcon(
|
||||
'b_tblanalyse.png',
|
||||
__('Data Dictionary'),
|
||||
true
|
||||
) . '</a>'
|
||||
. '</p>';
|
||||
|
||||
return $html_output;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -756,7 +763,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false
|
||||
.'<thead>' . "\n"
|
||||
.'<tr><th></th>' . "\n"
|
||||
.'<th>'
|
||||
. PMA_SortableTableHeader(__('Table'), 'table')
|
||||
. PMA_sortableTableHeader(__('Table'), 'table')
|
||||
. '</th>' . "\n";
|
||||
if ($replication) {
|
||||
$html_output .= '<th>' . "\n"
|
||||
@ -767,7 +774,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false
|
||||
.' ' . __('Action') . "\n"
|
||||
.'</th>'
|
||||
// larger values are more interesting so default sort order is DESC
|
||||
.'<th>' . PMA_SortableTableHeader(__('Rows'), 'records', 'DESC')
|
||||
.'<th>' . PMA_sortableTableHeader(__('Rows'), 'records', 'DESC')
|
||||
. PMA_CommonFunctions::getInstance()->showHint(
|
||||
PMA_sanitize(
|
||||
__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')
|
||||
@ -775,43 +782,43 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false
|
||||
) . "\n"
|
||||
.'</th>' . "\n";
|
||||
if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) {
|
||||
$html_output .= '<th>' . PMA_SortableTableHeader(__('Type'), 'type')
|
||||
$html_output .= '<th>' . PMA_sortableTableHeader(__('Type'), 'type')
|
||||
. '</th>' . "\n";
|
||||
$cnt++;
|
||||
$html_output .= '<th>'
|
||||
. PMA_SortableTableHeader(__('Collation'), 'collation')
|
||||
. PMA_sortableTableHeader(__('Collation'), 'collation')
|
||||
. '</th>' . "\n";
|
||||
$cnt++;
|
||||
}
|
||||
if ($GLOBALS['is_show_stats']) {
|
||||
// larger values are more interesting so default sort order is DESC
|
||||
$html_output .= '<th>'
|
||||
. PMA_SortableTableHeader(__('Size'), 'size', 'DESC')
|
||||
. PMA_sortableTableHeader(__('Size'), 'size', 'DESC')
|
||||
. '</th>' . "\n"
|
||||
// larger values are more interesting so default sort order is DESC
|
||||
. '<th>'
|
||||
. PMA_SortableTableHeader(__('Overhead'), 'overhead', 'DESC')
|
||||
. PMA_sortableTableHeader(__('Overhead'), 'overhead', 'DESC')
|
||||
. '</th>' . "\n";
|
||||
$cnt += 2;
|
||||
}
|
||||
if ($GLOBALS['cfg']['ShowDbStructureCreation']) {
|
||||
// larger values are more interesting so default sort order is DESC
|
||||
$html_output .= '<th>'
|
||||
. PMA_SortableTableHeader(__('Creation'), 'creation', 'DESC')
|
||||
. PMA_sortableTableHeader(__('Creation'), 'creation', 'DESC')
|
||||
. '</th>' . "\n";
|
||||
$cnt += 2;
|
||||
}
|
||||
if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']) {
|
||||
// larger values are more interesting so default sort order is DESC
|
||||
$html_output .= '<th>'
|
||||
. PMA_SortableTableHeader(__('Last update'), 'last_update', 'DESC')
|
||||
. PMA_sortableTableHeader(__('Last update'), 'last_update', 'DESC')
|
||||
. '</th>' . "\n";
|
||||
$cnt += 2;
|
||||
}
|
||||
if ($GLOBALS['cfg']['ShowDbStructureLastCheck']) {
|
||||
// larger values are more interesting so default sort order is DESC
|
||||
$html_output .= '<th>'
|
||||
. PMA_SortableTableHeader(__('Last check'), 'last_check', 'DESC')
|
||||
. PMA_sortableTableHeader(__('Last check'), 'last_check', 'DESC')
|
||||
. '</th>' . "\n";
|
||||
$cnt += 2;
|
||||
}
|
||||
@ -833,7 +840,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false
|
||||
*
|
||||
* @return string link to be displayed in the table header
|
||||
*/
|
||||
function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
|
||||
function PMA_sortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
|
||||
{
|
||||
$common_functions = PMA_CommonFunctions::getInstance();
|
||||
// Set some defaults
|
||||
@ -914,7 +921,7 @@ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
|
||||
*
|
||||
* @return array ($alias, $truename)
|
||||
*/
|
||||
function PMA_getAliasAndTruename($tooltip_aliasname, $current_table,
|
||||
function PMA_getAliasAndTrueName($tooltip_aliasname, $current_table,
|
||||
$tooltip_truename
|
||||
) {
|
||||
$alias = (! empty($tooltip_aliasname)
|
||||
@ -1004,7 +1011,7 @@ function PMA_getServerSlaveStatus($server_slave_status, $truename) {
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
function PMA_getStuffForEnginetable($current_table, $db_is_information_schema,
|
||||
function PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schema,
|
||||
$is_show_stats, $table_is_view, $sum_size, $overhead_size
|
||||
) {
|
||||
$common_functions = PMA_CommonFunctions::getInstance();
|
||||
@ -1115,7 +1122,7 @@ function PMA_getValuesForAriaTable($db_is_information_schema, $current_table,
|
||||
list($formatted_overhead, $overhead_unit)
|
||||
= $common_functions->formatByteDown(
|
||||
$current_table['Data_free'], 3,
|
||||
($current_table['Data_free'] > 0) ? 1 : 0
|
||||
(($current_table['Data_free'] > 0) ? 1 : 0)
|
||||
);
|
||||
$overhead_size += $current_table['Data_free'];
|
||||
}
|
||||
@ -1156,7 +1163,7 @@ function PMA_getValuesForPbmsTable($current_table, $is_show_stats, $sum_size)
|
||||
$tblsize = $current_table['Data_length'] + $current_table['Index_length'];
|
||||
$sum_size += $tblsize;
|
||||
list($formatted_size, $unit) = $common_functions->formatByteDown(
|
||||
$tblsize, 3, ($tblsize > 0) ? 1 : 0
|
||||
$tblsize, 3, (($tblsize > 0) ? 1 : 0)
|
||||
);
|
||||
}
|
||||
|
||||
@ -1351,7 +1358,7 @@ function PMA_getHtmlForDropColumn($tbl_is_view, $db_is_information_schema,
|
||||
*
|
||||
* @return string $html_output
|
||||
*/
|
||||
function PMA_getHtmlForCheckAlltableColumn($pmaThemeImage, $text_dir,
|
||||
function PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir,
|
||||
$tbl_is_view, $db_is_information_schema, $tbl_storage_engine
|
||||
) {
|
||||
$common_functions = PMA_CommonFunctions::getInstance();
|
||||
@ -1478,7 +1485,7 @@ function PMA_getHtmlForEditView($url_params)
|
||||
*
|
||||
* @return string $html_output
|
||||
*/
|
||||
function PMA_getHtmlForSomeLinks($url_query, $tbl_is_view,
|
||||
function PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view,
|
||||
$db_is_information_schema, $tbl_storage_engine, $cfgRelation
|
||||
) {
|
||||
$common_functions = PMA_CommonFunctions::getInstance();
|
||||
@ -1680,7 +1687,7 @@ function PMA_getHtmlForOptimizeLink($url_query)
|
||||
*
|
||||
* @return string $html_output
|
||||
*/
|
||||
function PMA_getHtmlForRowStatstableRow($odd_row, $name, $value)
|
||||
function PMA_getHtmlForRowStatsTableRow($odd_row, $name, $value)
|
||||
{
|
||||
$common_functions = PMA_CommonFunctions::getInstance();
|
||||
|
||||
@ -1723,7 +1730,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
|
||||
} else {
|
||||
$value = $showtable['Row_format'];
|
||||
}
|
||||
$html_output .= PMA_getHtmlForRowStatstableRow(
|
||||
$html_output .= PMA_getHtmlForRowStatsTableRow(
|
||||
$odd_row, __('Format'), $value
|
||||
);
|
||||
$odd_row = !$odd_row;
|
||||
@ -1734,7 +1741,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
|
||||
} else {
|
||||
$value = $showtable['Create_options'];
|
||||
}
|
||||
$html_output .= PMA_getHtmlForRowStatstableRow(
|
||||
$html_output .= PMA_getHtmlForRowStatsTableRow(
|
||||
$odd_row, __('Options'), $value
|
||||
);
|
||||
$odd_row = !$odd_row;
|
||||
@ -1742,13 +1749,13 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
|
||||
if (!empty($tbl_collation)) {
|
||||
$value = '<dfn title="' . PMA_getCollationDescr($tbl_collation) . '">'
|
||||
. $tbl_collation . '</dfn>';
|
||||
$html_output .= PMA_getHtmlForRowStatstableRow(
|
||||
$html_output .= PMA_getHtmlForRowStatsTableRow(
|
||||
$odd_row, __('Collation'), $value
|
||||
);
|
||||
$odd_row = !$odd_row;
|
||||
}
|
||||
if (!$is_innodb && isset($showtable['Rows'])) {
|
||||
$html_output .= PMA_getHtmlForRowStatstableRow($odd_row,
|
||||
$html_output .= PMA_getHtmlForRowStatsTableRow($odd_row,
|
||||
__('Rows'), $common_functions->formatNumber($showtable['Rows'], 0)
|
||||
);
|
||||
$odd_row = !$odd_row;
|
||||
@ -1757,7 +1764,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
|
||||
&& isset($showtable['Avg_row_length'])
|
||||
&& $showtable['Avg_row_length'] > 0
|
||||
) {
|
||||
$html_output .= PMA_getHtmlForRowStatstableRow($odd_row,
|
||||
$html_output .= PMA_getHtmlForRowStatsTableRow($odd_row,
|
||||
__('Row length'),
|
||||
$common_functions->formatNumber($showtable['Avg_row_length'], 0)
|
||||
);
|
||||
@ -1768,33 +1775,33 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
|
||||
&& $showtable['Rows'] > 0
|
||||
&& $mergetable == false
|
||||
) {
|
||||
$html_output .= PMA_getHtmlForRowStatstableRow($odd_row,
|
||||
$html_output .= PMA_getHtmlForRowStatsTableRow($odd_row,
|
||||
__('Row size'), ($avg_size . ' ' . $avg_unit)
|
||||
);
|
||||
$odd_row = !$odd_row;
|
||||
}
|
||||
if (isset($showtable['Auto_increment'])) {
|
||||
$html_output .= PMA_getHtmlForRowStatstableRow($odd_row,
|
||||
$html_output .= PMA_getHtmlForRowStatsTableRow($odd_row,
|
||||
__('Next autoindex'),
|
||||
$common_functions->formatNumber($showtable['Auto_increment'], 0)
|
||||
);
|
||||
$odd_row = !$odd_row;
|
||||
}
|
||||
if (isset($showtable['Create_time'])) {
|
||||
$html_output .= PMA_getHtmlForRowStatstableRow($odd_row,
|
||||
$html_output .= PMA_getHtmlForRowStatsTableRow($odd_row,
|
||||
__('Creation'),
|
||||
$common_functions->localisedDate(strtotime($showtable['Create_time']))
|
||||
);
|
||||
}
|
||||
if (isset($showtable['Update_time'])) {
|
||||
$html_output .= PMA_getHtmlForRowStatstableRow($odd_row,
|
||||
$html_output .= PMA_getHtmlForRowStatsTableRow($odd_row,
|
||||
__('Last update'),
|
||||
$common_functions->localisedDate(strtotime($showtable['Update_time']))
|
||||
);
|
||||
$odd_row = !$odd_row;
|
||||
}
|
||||
if (isset($showtable['Check_time'])) {
|
||||
$html_output .= PMA_getHtmlForRowStatstableRow($odd_row,
|
||||
$html_output .= PMA_getHtmlForRowStatsTableRow($odd_row,
|
||||
__('Last check'),
|
||||
$common_functions->localisedDate(strtotime($showtable['Check_time']))
|
||||
);
|
||||
@ -1828,29 +1835,27 @@ function PMA_getHtmlDivsForStructureActionsDropdown($class, $isActionEnabled,
|
||||
) {
|
||||
$common_functions = PMA_CommonFunctions::getInstance();
|
||||
|
||||
$html_output = '<div class="' . $class . '"';
|
||||
if (!empty ($isActionEnabled)) {
|
||||
if ($isActionEnabled) {
|
||||
$html_output .= '<a href="sql.php?' . $url_query
|
||||
. '&sql_query='
|
||||
. urlencode(
|
||||
'ALTER TABLE ' . $common_functions->backquote($GLOBALS['table'])
|
||||
. ($isPrimary ? ($primary ? ' DROP PRIMARY KEY,' : '') : '')
|
||||
. ' ' . $syntax . '('
|
||||
. $common_functions->backquote($row['Field']) . ');'
|
||||
)
|
||||
. '&message_to_show=' . urlencode(
|
||||
sprintf(
|
||||
$message,
|
||||
htmlspecialchars($row['Field'])
|
||||
)
|
||||
$html_output = '<div class="' . $class . '">';
|
||||
if ($isActionEnabled) {
|
||||
$html_output .= '<a href="sql.php?' . $url_query
|
||||
. '&sql_query='
|
||||
. urlencode(
|
||||
'ALTER TABLE ' . $common_functions->backquote($GLOBALS['table'])
|
||||
. ($isPrimary ? ($primary ? ' DROP PRIMARY KEY,' : '') : '')
|
||||
. ' ' . $syntax . '('
|
||||
. $common_functions->backquote($row['Field']) . ');'
|
||||
)
|
||||
. '&message_to_show=' . urlencode(
|
||||
sprintf(
|
||||
$message,
|
||||
htmlspecialchars($row['Field'])
|
||||
)
|
||||
. '">'
|
||||
. $hidden_titles
|
||||
. '</a>';
|
||||
} else {
|
||||
$html_output .= $hidden_titles_no;
|
||||
}
|
||||
)
|
||||
. '">'
|
||||
. $hidden_titles
|
||||
. '</a>';
|
||||
} else {
|
||||
$html_output .= $hidden_titles_no;
|
||||
}
|
||||
$html_output .= '</div>';
|
||||
|
||||
@ -1910,17 +1915,17 @@ function PMA_getHtmlForMoreOptionInTableStructure($rownum, $primary_enabled,
|
||||
if (!PMA_DRIZZLE) {
|
||||
$html_output .= PMA_getHtmlDivsForStructureActionsDropdown(
|
||||
'action_spatial replace_in_more',
|
||||
$fulltext_enabled, $url_query, $row,
|
||||
$spatial_enabled, $url_query, $row,
|
||||
$hidden_titles['Spatial'],
|
||||
$hidden_titles['NoSpatial'], false, 'ADD FULLTEXT',
|
||||
$hidden_titles['NoSpatial'], false, 'ADD SPATIAL',
|
||||
__('An index has been added on %s'), false
|
||||
);
|
||||
|
||||
$html_output .= PMA_getHtmlDivsForStructureActionsDropdown(
|
||||
'action_fulltext replace_in_more',
|
||||
$spatial_enabled, $url_query, $row,
|
||||
$fulltext_enabled, $url_query, $row,
|
||||
$hidden_titles['IdxFulltext'],
|
||||
$hidden_titles['NoIdxFulltext'], false, 'ADD SPATIAL',
|
||||
$hidden_titles['NoIdxFulltext'], false, 'ADD FULLTEXT',
|
||||
__('An index has been added on %s'), false
|
||||
);
|
||||
|
||||
@ -2027,7 +2032,7 @@ function PMA_getHtmlForFullTextAction($tbl_storage_engine, $type, $url_query,
|
||||
)
|
||||
&& (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))
|
||||
) {
|
||||
$html_output = "\n";
|
||||
$html_output .= "\n";
|
||||
$html_output .= '<a href="sql.php?' . $url_query . '&sql_query='
|
||||
. urlencode(
|
||||
'ALTER TABLE ' . $common_functions->backquote($GLOBALS['table'])
|
||||
@ -2059,7 +2064,7 @@ function PMA_getHtmlForFullTextAction($tbl_storage_engine, $type, $url_query,
|
||||
*
|
||||
* @return string $html_output
|
||||
*/
|
||||
function PMA_getHtmlForDistincValueAction($url_query, $row, $titles)
|
||||
function PMA_getHtmlForDistinctValueAction($url_query, $row, $titles)
|
||||
{
|
||||
$common_functions = PMA_CommonFunctions::getInstance();
|
||||
$html_output = '<td class="browse replaced_by_more center">';
|
||||
@ -2094,7 +2099,7 @@ function PMA_getHtmlForDistincValueAction($url_query, $row, $titles)
|
||||
*
|
||||
* @return string $html_output;
|
||||
*/
|
||||
function PMA_getHtmlForActionsIntableStructure($type, $tbl_storage_engine,
|
||||
function PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine,
|
||||
$primary, $field_name, $url_query, $titles, $row, $rownum, $hidden_titles,
|
||||
$columns_with_unique_index
|
||||
) {
|
||||
@ -2150,7 +2155,7 @@ function PMA_getHtmlForActionsIntableStructure($type, $tbl_storage_engine,
|
||||
$url_query, $row, $titles);
|
||||
$html_output .= $fulltext;
|
||||
}
|
||||
$html_output .= PMA_getHtmlForDistincValueAction($url_query, $row, $titles);
|
||||
$html_output .= PMA_getHtmlForDistinctValueAction($url_query, $row, $titles);
|
||||
|
||||
if ($GLOBALS['cfg']['PropertiesIconic'] !== true
|
||||
&& $GLOBALS['cfg']['HideStructureActions'] === true
|
||||
|
||||
91
po/ckb.po
91
po/ckb.po
@ -8,10 +8,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2012-08-10 12:59+0200\n"
|
||||
"PO-Revision-Date: 2012-08-04 12:39+0200\n"
|
||||
"Last-Translator: renwar kurd <renwarkurd@yahoo.com>\n"
|
||||
"Language-Team: Kurdish Sorani <http://l10n.cihar.com/projects/phpmyadmin/"
|
||||
"master/ckb/>\n"
|
||||
"PO-Revision-Date: 2012-08-18 12:25+0200\n"
|
||||
"Last-Translator: Ahmed Ameen <ah.shwani@gmail.com>\n"
|
||||
"Language-Team: Kurdish Sorani "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/ckb/>\n"
|
||||
"Language: ckb\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -428,6 +428,8 @@ msgid ""
|
||||
"This view has at least this number of rows. Please refer to %sdocumentation"
|
||||
"%s."
|
||||
msgstr ""
|
||||
"لەم تێڕوانیینە بەلایەنی کەم ئەم ژمارە دێڕە بوونی هەیە.تکایە سەردانی %"
|
||||
"sبەڵگەسازی%s بکە ."
|
||||
|
||||
#: db_structure.php:548 db_structure.php:582 libraries/Menu.class.php:191
|
||||
#: libraries/tbl_info.inc.php:59 tbl_structure.php:212
|
||||
@ -470,7 +472,7 @@ msgstr "پشکنینی هەموو"
|
||||
|
||||
#: db_structure.php:693
|
||||
msgid "Check tables having overhead"
|
||||
msgstr ""
|
||||
msgstr "پشکنین بۆ ئەو خشتانە بکەن کە ژوورسەریان هەیە."
|
||||
|
||||
#: db_structure.php:701 libraries/CommonFunctions.class.php:3608
|
||||
#: libraries/CommonFunctions.class.php:3609
|
||||
@ -510,7 +512,7 @@ msgstr "پشکنینی خشتە"
|
||||
#: db_structure.php:714 libraries/operations.lib.php:1164
|
||||
#: tbl_structure.php:880
|
||||
msgid "Optimize table"
|
||||
msgstr ""
|
||||
msgstr "چاکسازی خشتە"
|
||||
|
||||
#: db_structure.php:716 libraries/operations.lib.php:1149
|
||||
msgid "Repair table"
|
||||
@ -612,8 +614,9 @@ msgid "Tracking report"
|
||||
msgstr "ڕاپۆرتە شوێنکەتووەکان"
|
||||
|
||||
#: db_tracking.php:139 tbl_tracking.php:282 tbl_tracking.php:755
|
||||
#, fuzzy
|
||||
msgid "Structure snapshot"
|
||||
msgstr ""
|
||||
msgstr "وێنەی هەنووکەیی پێکهاتە"
|
||||
|
||||
#: db_tracking.php:185
|
||||
msgid "Untracked tables"
|
||||
@ -621,44 +624,47 @@ msgstr "خشتە شوێن نەکەوتوەکان"
|
||||
|
||||
#: db_tracking.php:204 tbl_structure.php:681
|
||||
msgid "Track table"
|
||||
msgstr ""
|
||||
msgstr "شوێنکەوتنی خشتە"
|
||||
|
||||
#: db_tracking.php:230
|
||||
msgid "Database Log"
|
||||
msgstr ""
|
||||
msgstr "پێشینەی کارکردی بنکەی زانیاری"
|
||||
|
||||
#: export.php:44
|
||||
msgid "Bad type!"
|
||||
msgstr ""
|
||||
msgstr "جۆری هەڵە !"
|
||||
|
||||
#: export.php:95
|
||||
msgid "Selected export type has to be saved in file!"
|
||||
msgstr "دەستنیشانکردنی جۆری هەناردن بۆ پاشەکەوتکردنی لە پەڕگە!"
|
||||
|
||||
#: export.php:124
|
||||
#, fuzzy
|
||||
msgid "Bad parameters!"
|
||||
msgstr ""
|
||||
msgstr "ڕاگهیێنە هەڵەکان!"
|
||||
|
||||
#: export.php:195 export.php:226 export.php:782
|
||||
#, fuzzy, php-format
|
||||
#, php-format
|
||||
msgid "Insufficient space to save the file %s."
|
||||
msgstr "پاشکەوتکردنی فایل وەک"
|
||||
msgstr "شوێنی پێویست بۆ پاشەکەوت کردنی فایل %s ."
|
||||
|
||||
#: export.php:363
|
||||
#, php-format
|
||||
msgid ""
|
||||
"File %s already exists on server, change filename or check overwrite option."
|
||||
msgstr ""
|
||||
"فایلی %s لە ئێستادا بوونی هەیە , ناوی فایلەکە بگۆڕن وە یان ڕێکخستنەکانی "
|
||||
"لەسەرنوسین بپشکنە ."
|
||||
|
||||
#: export.php:370 export.php:376
|
||||
#, php-format
|
||||
msgid "The web server does not have permission to save the file %s."
|
||||
msgstr ""
|
||||
msgstr "وێبڕاژهكار مۆڵەتی پاشهكهوت کردنی فایلی %s نییە ."
|
||||
|
||||
#: export.php:788
|
||||
#, php-format
|
||||
msgid "Dump has been saved to file %s."
|
||||
msgstr ""
|
||||
msgstr "زانیاری وەدەست هاتوو لە فایلی %s پاشەکەوت کرا."
|
||||
|
||||
#: file_echo.php:21
|
||||
msgid "Invalid export type"
|
||||
@ -667,11 +673,12 @@ msgstr "هەناردنی ئەم جۆرە ڕێگەپێدراو نییە"
|
||||
#: gis_data_editor.php:75
|
||||
#, php-format
|
||||
msgid "Value for the column \"%s\""
|
||||
msgstr ""
|
||||
msgstr "نرخی ستوون \"%s\""
|
||||
|
||||
#: gis_data_editor.php:104 tbl_gis_visualization.php:171
|
||||
#, fuzzy
|
||||
msgid "Use OpenStreetMaps as Base Layer"
|
||||
msgstr ""
|
||||
msgstr "بەکارهێنانی OpenStreetMaps وەک چینی بنچینەیی."
|
||||
|
||||
#: gis_data_editor.php:124
|
||||
msgid "SRID"
|
||||
@ -680,7 +687,7 @@ msgstr "SRID"
|
||||
#: gis_data_editor.php:141 js/messages.php:326
|
||||
#: libraries/DisplayResults.class.php:1649
|
||||
msgid "Geometry"
|
||||
msgstr ""
|
||||
msgstr "ئەندازەزانی"
|
||||
|
||||
#: gis_data_editor.php:161 js/messages.php:322
|
||||
msgid "Point"
|
||||
@ -689,18 +696,18 @@ msgstr "خاڵ"
|
||||
#: gis_data_editor.php:162 gis_data_editor.php:186 gis_data_editor.php:234
|
||||
#: gis_data_editor.php:286 js/messages.php:320
|
||||
msgid "X"
|
||||
msgstr ""
|
||||
msgstr "X"
|
||||
|
||||
#: gis_data_editor.php:164 gis_data_editor.php:188 gis_data_editor.php:236
|
||||
#: gis_data_editor.php:288 js/messages.php:321
|
||||
msgid "Y"
|
||||
msgstr ""
|
||||
msgstr "Y"
|
||||
|
||||
#: gis_data_editor.php:184 gis_data_editor.php:232 gis_data_editor.php:284
|
||||
#: js/messages.php:323
|
||||
#, php-format
|
||||
msgid "Point %d"
|
||||
msgstr ""
|
||||
msgstr "خاڵ %d"
|
||||
|
||||
#: gis_data_editor.php:193 gis_data_editor.php:239 gis_data_editor.php:291
|
||||
#: js/messages.php:329
|
||||
@ -709,31 +716,31 @@ msgstr "زیادکردنی خاڵ"
|
||||
|
||||
#: gis_data_editor.php:209 js/messages.php:324
|
||||
msgid "Linestring"
|
||||
msgstr ""
|
||||
msgstr "ڕیزبهندی هێڵی"
|
||||
|
||||
#: gis_data_editor.php:212 gis_data_editor.php:268 js/messages.php:328
|
||||
msgid "Outer Ring"
|
||||
msgstr ""
|
||||
msgstr "ئەڵفەی دەرەکی"
|
||||
|
||||
#: gis_data_editor.php:214 gis_data_editor.php:270 js/messages.php:327
|
||||
msgid "Inner Ring"
|
||||
msgstr ""
|
||||
msgstr "ئەڵقەی ناوەکی"
|
||||
|
||||
#: gis_data_editor.php:241
|
||||
msgid "Add a linestring"
|
||||
msgstr ""
|
||||
msgstr "زیاد کردنی ڕیزبەندە هێڵ"
|
||||
|
||||
#: gis_data_editor.php:241 gis_data_editor.php:293 js/messages.php:330
|
||||
msgid "Add an inner ring"
|
||||
msgstr ""
|
||||
msgstr "زیاد کردنی ئەڵقەیەکی ناوەکی"
|
||||
|
||||
#: gis_data_editor.php:255 js/messages.php:325
|
||||
msgid "Polygon"
|
||||
msgstr ""
|
||||
msgstr "فرە گۆشە"
|
||||
|
||||
#: gis_data_editor.php:295 js/messages.php:331
|
||||
msgid "Add a polygon"
|
||||
msgstr ""
|
||||
msgstr "زیاد کردنی فرە گۆشەیەک"
|
||||
|
||||
#: gis_data_editor.php:299
|
||||
msgid "Add geometry"
|
||||
@ -741,13 +748,15 @@ msgstr "زیادکردنی ئەندازەگەری"
|
||||
|
||||
#: gis_data_editor.php:306
|
||||
msgid "Output"
|
||||
msgstr "بەرهەم"
|
||||
msgstr "دەرچە"
|
||||
|
||||
#: gis_data_editor.php:307
|
||||
msgid ""
|
||||
"Chose \"GeomFromText\" from the \"Function\" column and paste the below "
|
||||
"string into the \"Value\" field"
|
||||
msgstr ""
|
||||
"هەڵبژاردەی \"GeomFromText\" لە ستوونی \"Function\" هەڵبژێرن وە ڕیزبەنی خوارەوە "
|
||||
"لە خانەی \"نرخ(value)\" داخڵ بکەن."
|
||||
|
||||
#: import.php:94
|
||||
#, php-format
|
||||
@ -755,14 +764,16 @@ msgid ""
|
||||
"You probably tried to upload too large file. Please refer to %sdocumentation"
|
||||
"%s for ways to workaround this limit."
|
||||
msgstr ""
|
||||
"لەوانەیە ئێوە هەوڵتان دابێت فایلێک بە قەبارەیەکی زۆر بار بکەن.تکایە بۆ ڕیگە "
|
||||
"چارەیەک بۆ ئەم سنوردار کردنە سەردانی %sبەڵگەسازی%s بکەن."
|
||||
|
||||
#: import.php:232 import.php:485
|
||||
msgid "Showing bookmark"
|
||||
msgstr ""
|
||||
msgstr "پیشاندانی شوێندۆز"
|
||||
|
||||
#: import.php:247 import.php:481
|
||||
msgid "The bookmark has been deleted."
|
||||
msgstr ""
|
||||
msgstr "شوێندۆز سڕایەوە"
|
||||
|
||||
#: import.php:342 import.php:395 libraries/File.class.php:426
|
||||
#: libraries/File.class.php:517
|
||||
@ -776,38 +787,46 @@ msgid ""
|
||||
"You attempted to load file with unsupported compression (%s). Either support "
|
||||
"for it is not implemented or disabled by your configuration."
|
||||
msgstr ""
|
||||
"ئێوە فایلێک بە پەستێنەر سازێکی پاڵپشتی نەکراو بار ئەکەن (%s).لەوانەیە لە "
|
||||
"ڕێکخستنەکان ناچالاک بێت وە یان پاڵپشتی بەردەست نییە بۆ ئەم فایلە."
|
||||
|
||||
#: import.php:400
|
||||
msgid ""
|
||||
"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]."
|
||||
msgstr "هێنان"
|
||||
msgstr ""
|
||||
"هیچ داتایەک وەرنەگیرا بۆ هاوردە کردن. یان فایلێک دیاری نەکراوە ، یان فایلەکە "
|
||||
"لە ڕێژە دیاری کراوەکە زیاترە. سەردانی "
|
||||
"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a] بکەن."
|
||||
|
||||
#: import.php:418
|
||||
msgid ""
|
||||
"Cannot convert file's character set without character set conversion library"
|
||||
msgstr ""
|
||||
msgstr "ناکرێت فایلەکانی نوسە بگۆڕدرێن بە بێ نوسەى کتێبخانەی تایبەت بەم کارە"
|
||||
|
||||
#: import.php:454 libraries/display_import.lib.php:29
|
||||
msgid "Could not load import plugins, please check your installation!"
|
||||
msgstr ""
|
||||
msgstr "هەڵە لە بارکردنی پێوەکراەکان, تکایە فۆناغەکانی دامەزراندن بپشکنن!"
|
||||
|
||||
#: import.php:488 sql.php:1109
|
||||
#, php-format
|
||||
msgid "Bookmark %s created"
|
||||
msgstr ""
|
||||
msgstr "شوێندۆز %s دروستکرا"
|
||||
|
||||
#: import.php:496 import.php:502
|
||||
#, php-format
|
||||
msgid "Import has been successfully finished, %d queries executed."
|
||||
msgstr ""
|
||||
msgstr "داخڵ کردنی زانیاریەکان بە سەرکەوتوویی بە کۆتا هات، %d پرسگە دامەزرا ."
|
||||
|
||||
#: import.php:511
|
||||
msgid ""
|
||||
"Script timeout passed, if you want to finish import, please resubmit same "
|
||||
"file and import will resume."
|
||||
msgstr ""
|
||||
"کاتی جێ بە جێ کردنی کردار بە کۆتا هاتووە، ئەگەر دەتانەوێت کردارەکە بە کۆتا "
|
||||
"بینن، فایلی مەبەست دووبارە تۆمار بکەن تاکوو درێژە بە داخڵ کردنی زانیاریەکان "
|
||||
"بدەن."
|
||||
|
||||
#: import.php:513
|
||||
msgid ""
|
||||
|
||||
6
po/de.po
6
po/de.po
@ -4,8 +4,8 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2012-08-10 12:59+0200\n"
|
||||
"PO-Revision-Date: 2012-08-16 15:36+0200\n"
|
||||
"Last-Translator: Jan Erik Zassenhaus <Jan.Zassenhaus@jgerman.de>\n"
|
||||
"PO-Revision-Date: 2012-08-16 22:05+0200\n"
|
||||
"Last-Translator: Jan Mienert <jan.mienert@heinze.de>\n"
|
||||
"Language-Team: German <http://l10n.cihar.com/projects/phpmyadmin/master/de/>\n"
|
||||
"Language: de\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -1923,7 +1923,7 @@ msgstr ", aktuelle stabile Version:"
|
||||
|
||||
#: js/messages.php:374
|
||||
msgid "up to date"
|
||||
msgstr "auf dem neusten Stand"
|
||||
msgstr "auf dem neuesten Stand"
|
||||
|
||||
#. l10n: Display text for calendar close link
|
||||
#: js/messages.php:393
|
||||
|
||||
18
po/th.po
18
po/th.po
@ -4,7 +4,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2012-08-10 12:59+0200\n"
|
||||
"PO-Revision-Date: 2012-08-08 08:31+0200\n"
|
||||
"PO-Revision-Date: 2012-08-19 09:13+0200\n"
|
||||
"Last-Translator: Anusuk Sangubon <jaideejung007@gmail.com>\n"
|
||||
"Language-Team: Thai <http://l10n.cihar.com/projects/phpmyadmin/master/th/>\n"
|
||||
"Language: th\n"
|
||||
@ -287,16 +287,16 @@ msgid "The database name is empty!"
|
||||
msgstr "ไม่มีชื่อฐานข้อมูล"
|
||||
|
||||
#: db_operations.php:128
|
||||
#, fuzzy, php-format
|
||||
#, php-format
|
||||
#| msgid "Database %s has been renamed to %s"
|
||||
msgid "Database %1$s has been renamed to %2$s"
|
||||
msgstr "ฐานข้อมูล %s ได้ถูกเปลี่ยนชื่อเป็น %s"
|
||||
msgstr "ฐานข้อมูล %1$s ได้ถูกเปลี่ยนชื่อเป็น %2$s"
|
||||
|
||||
#: db_operations.php:132
|
||||
#, fuzzy, php-format
|
||||
#, php-format
|
||||
#| msgid "Database %s has been copied to %s"
|
||||
msgid "Database %1$s has been copied to %2$s"
|
||||
msgstr "คัดลอกฐานข้อมูล %s ไปเก็บในชื่อ %s เรียบร้อยแล้ว"
|
||||
msgstr "คัดลอกฐานข้อมูล %1$s ไปเก็บในชื่อ %2$s เรียบร้อยแล้ว"
|
||||
|
||||
#: db_operations.php:255
|
||||
#, php-format
|
||||
@ -420,7 +420,9 @@ msgstr "หยุดการติดตามแล้ว"
|
||||
msgid ""
|
||||
"This view has at least this number of rows. Please refer to %sdocumentation"
|
||||
"%s."
|
||||
msgstr "การแสดงผลนี้แสดงเพียงจำนวนข้อมูลเท่านี้, ดูข้อมูลเพิ่มเติมได้ที่ %sdocumentation%s"
|
||||
msgstr ""
|
||||
"การแสดงผลนี้ จะแสดงเพียงจำนวนข้อมูลนี้เท่านั้น ดูข้อมูลเพิ่มเติมได้ที่ %"
|
||||
"sdocumentation%s"
|
||||
|
||||
#: db_structure.php:548 db_structure.php:582 libraries/Menu.class.php:191
|
||||
#: libraries/tbl_info.inc.php:59 tbl_structure.php:212
|
||||
@ -626,7 +628,7 @@ msgstr "ประเภทไม่ถูกต้อง!"
|
||||
|
||||
#: export.php:95
|
||||
msgid "Selected export type has to be saved in file!"
|
||||
msgstr "ชนิดการส่งออกที่ถูกเลือกต้องถูกบันทึกลงไฟล์"
|
||||
msgstr "ประเภทการส่งออกที่เลือกจะต้องมีการบันทึกไว้ในไฟล์"
|
||||
|
||||
#: export.php:124
|
||||
msgid "Bad parameters!"
|
||||
@ -646,7 +648,7 @@ msgstr "ให้เปลี่ยนชื่อไฟล์ หรือเ
|
||||
#: export.php:370 export.php:376
|
||||
#, php-format
|
||||
msgid "The web server does not have permission to save the file %s."
|
||||
msgstr "บันทึกไฟล์ %s ไม่ได้ เพราะเว็บเซิร์ฟเวอร์ไม่อนุญาติ"
|
||||
msgstr "บันทึกไฟล์ %s ไม่ได้ เพราะเว็บเซิร์ฟเวอร์ไม่อนุญาต"
|
||||
|
||||
#: export.php:788
|
||||
#, php-format
|
||||
|
||||
@ -130,12 +130,13 @@ if (isset($dbname)) {
|
||||
$db_and_table = '*.*';
|
||||
}
|
||||
|
||||
$dbname_is_wildcard = false;
|
||||
// check if given $dbname is a wildcard or not
|
||||
if (isset($dbname)) {
|
||||
//if (preg_match('/\\\\(?:_|%)/i', $dbname)) {
|
||||
if (preg_match('/(?<!\\\\)(?:_|%)/i', $dbname)) {
|
||||
$dbname_is_wildcard = true;
|
||||
} else {
|
||||
$dbname_is_wildcard = false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -143,11 +144,13 @@ if (isset($dbname)) {
|
||||
* Checks if the user is allowed to do what he tries to...
|
||||
*/
|
||||
if (! $is_superuser) {
|
||||
echo '<h2>' . "\n"
|
||||
$response->addHTML(
|
||||
'<h2>' . "\n"
|
||||
. $common_functions->getIcon('b_usrlist.png')
|
||||
. __('Privileges') . "\n"
|
||||
. '</h2>' . "\n";
|
||||
PMA_Message::error(__('No Privileges'))->display();
|
||||
. '</h2>' . "\n"
|
||||
);
|
||||
$response->addHTML(PMA_Message::error(__('No Privileges'))->getDisplay());
|
||||
exit;
|
||||
}
|
||||
|
||||
@ -215,7 +218,9 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
|
||||
$_add_user_error = true;
|
||||
} else {
|
||||
list($create_user_real, $create_user_show, $real_sql_query, $sql_query)
|
||||
= PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password);
|
||||
= PMA_getSqlQueriesForDisplayAndAddUser(
|
||||
$username, $hostname, (isset ($password) ? $password : '')
|
||||
);
|
||||
|
||||
if (empty($_REQUEST['change_copy'])) {
|
||||
$_error = false;
|
||||
@ -323,7 +328,9 @@ if (isset($_REQUEST['delete'])
|
||||
$GLOBALS['reload'] = true;
|
||||
|
||||
if ($GLOBALS['is_ajax_request'] != true) {
|
||||
echo $common_functions->getReloadNavigationScript();
|
||||
$response->addHTML(
|
||||
$common_functions->getReloadNavigationScript()
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -380,16 +387,10 @@ if ($GLOBALS['is_ajax_request']
|
||||
&& ! isset($_REQUEST['edit_user_dialog'])
|
||||
&& ! isset($_REQUEST['db_specific'])
|
||||
) {
|
||||
$isPass = false;
|
||||
if (isset($password)) {
|
||||
$isPass = true;
|
||||
}
|
||||
|
||||
$extra_data = PMA_getExtraDataForAjaxBehavior(
|
||||
$isPass, $link_export,
|
||||
(isset ($password) ? $password : ''), $link_export,
|
||||
(isset($sql_query) ? $sql_query : ''),
|
||||
$link_edit, $dbname_is_wildcard,
|
||||
$hostname, $username
|
||||
$link_edit, $hostname, $username
|
||||
);
|
||||
|
||||
if ($message instanceof PMA_Message) {
|
||||
@ -411,11 +412,14 @@ if (isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'db') {
|
||||
|
||||
// Gets the database structure
|
||||
$sub_part = '_structure';
|
||||
ob_start();
|
||||
include 'libraries/db_info.inc.php';
|
||||
echo "\n";
|
||||
$content = ob_get_contents();
|
||||
ob_end_clean();
|
||||
$response->addHTML($content . "\n");
|
||||
} else {
|
||||
if (! empty($GLOBALS['message'])) {
|
||||
echo $common_functions->getMessage($GLOBALS['message']);
|
||||
$response->addHTML($common_functions->getMessage($GLOBALS['message']));
|
||||
unset($GLOBALS['message']);
|
||||
}
|
||||
}
|
||||
@ -469,7 +473,8 @@ if (empty($_REQUEST['adduser'])
|
||||
);
|
||||
$response->addHTML(
|
||||
PMA_getHtmlForDisplayUserProperties(
|
||||
$dbname_is_wildcard, $url_dbname, $random_n,
|
||||
((isset ($dbname_is_wildcard)) ? $dbname_is_wildcard : ''),
|
||||
$url_dbname, $random_n,
|
||||
$username, $hostname, $link_edit, $link_revoke,
|
||||
(isset($dbename) ? $dbname : ''),
|
||||
(isset($tablename) ? $tablename : '')
|
||||
@ -479,7 +484,7 @@ if (empty($_REQUEST['adduser'])
|
||||
} elseif (isset($_REQUEST['adduser'])) {
|
||||
// Add user
|
||||
$response->addHTML(
|
||||
PMA_getHtmlForAddUser($random_n, $dbname)
|
||||
PMA_getHtmlForAddUser($random_n, (isset($dbname) ? $dbname : ''))
|
||||
);
|
||||
} else {
|
||||
// check the privileges for a particular database.
|
||||
|
||||
@ -321,7 +321,7 @@ foreach ($fields as $row) {
|
||||
|
||||
if (! $tbl_is_view && ! $db_is_information_schema) {
|
||||
$response->addHTML(
|
||||
PMA_getHtmlForActionsIntableStructure($type, $tbl_storage_engine,
|
||||
PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine,
|
||||
$primary, $field_name, $url_query, $titles, $row, $rownum,
|
||||
$hidden_titles, $columns_with_unique_index
|
||||
)
|
||||
@ -339,7 +339,7 @@ $response->addHTML(
|
||||
);
|
||||
|
||||
$response->addHTML(
|
||||
PMA_getHtmlForCheckAlltableColumn($pmaThemeImage, $text_dir,
|
||||
PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir,
|
||||
$tbl_is_view, $db_is_information_schema, $tbl_storage_engine
|
||||
)
|
||||
);
|
||||
@ -360,7 +360,7 @@ if ($tbl_is_view) {
|
||||
$response->addHTML(PMA_getHtmlForEditView($url_params));
|
||||
}
|
||||
$response->addHTML(
|
||||
PMA_getHtmlForSomeLinks($url_query, $tbl_is_view,
|
||||
PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view,
|
||||
$db_is_information_schema, $tbl_storage_engine, $cfgRelation
|
||||
)
|
||||
);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
