gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-08-12 13:08:44 +02:00
commit 63c5f257aa
1 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
libraries/server_status.lib.php
View File

@ -30,6 +30,13 @@ function PMA_getHtmlForServerStatus($ServerStatusData)
//display the server state connection information
$retval .= PMA_getHtmlForServerStateConnections($ServerStatusData);
// display replication information
if ($GLOBALS['replication_info']['master']['status']
|| $GLOBALS['replication_info']['slave']['status']
) {
$retval .= PMA_getHtmlForReplicationInfo();
}
return $retval;
}
@ -69,48 +76,50 @@ function PMA_getHtmlForServerStateGeneralInfo($ServerStatusData)
) . "\n";
$retval .= '</p>';
return $retval;
}
/**
* Returns HTML to display replication information
*
* @return string HTML on replication
*/
function PMA_getHtmlForReplicationInfo()
{
$retval = '<p class="notice clearfloat">';
if ($GLOBALS['replication_info']['master']['status']
|| $GLOBALS['replication_info']['slave']['status']
&& $GLOBALS['replication_info']['slave']['status']
) {
$retval .= '<p class="notice">';
if ($GLOBALS['replication_info']['master']['status']
&& $GLOBALS['replication_info']['slave']['status']
) {
$retval .= __(
'This MySQL server works as <b>master</b> and '
. '<b>slave</b> in <b>replication</b> process.'
);
} elseif ($GLOBALS['replication_info']['master']['status']) {
$retval .= __(
'This MySQL server works as <b>master</b> '
. 'in <b>replication</b> process.'
);
} elseif ($GLOBALS['replication_info']['slave']['status']) {
$retval .= __(
'This MySQL server works as <b>slave</b> '
. 'in <b>replication</b> process.'
);
}
$retval .= '</p>';
$retval .= __(
'This MySQL server works as <b>master</b> and '
. '<b>slave</b> in <b>replication</b> process.'
);
} elseif ($GLOBALS['replication_info']['master']['status']) {
$retval .= __(
'This MySQL server works as <b>master</b> '
. 'in <b>replication</b> process.'
);
} elseif ($GLOBALS['replication_info']['slave']['status']) {
$retval .= __(
'This MySQL server works as <b>slave</b> '
. 'in <b>replication</b> process.'
);
}
$retval .= '</p>';
/*
* if the server works as master or slave in replication process,
* display useful information
*/
if ($GLOBALS['replication_info']['master']['status']
|| $GLOBALS['replication_info']['slave']['status']
) {
$retval .= '<hr class="clearfloat" />';
$retval .= '<h3><a name="replication">';
$retval .= __('Replication status');
$retval .= '</a></h3>';
foreach ($GLOBALS['replication_types'] as $type) {
if (isset($GLOBALS['replication_info'][$type]['status'])
&& $GLOBALS['replication_info'][$type]['status']
) {
$retval .= PMA_getHtmlForReplicationStatusTable($type);
}
$retval .= '<hr class="clearfloat" />';
$retval .= '<h3><a name="replication">';
$retval .= __('Replication status');
$retval .= '</a></h3>';
foreach ($GLOBALS['replication_types'] as $type) {
if (isset($GLOBALS['replication_info'][$type]['status'])
&& $GLOBALS['replication_info'][$type]['status']
) {
$retval .= PMA_getHtmlForReplicationStatusTable($type);
}
}