';
$retval .= $this->getMessage();
}
- if ($this->_isEnabled && isset($_REQUEST['recent_table']) && strlen($_REQUEST['recent_table'])) {
+ if ($this->_isEnabled && empty($_REQUEST['recent_table'])) {
$retval .= $this->_addRecentTable(
$GLOBALS['db'],
$GLOBALS['table']
diff --git a/libraries/classes/MultSubmits.php b/libraries/classes/MultSubmits.php
index 915ef9766d..fb694a28b7 100644
--- a/libraries/classes/MultSubmits.php
+++ b/libraries/classes/MultSubmits.php
@@ -401,7 +401,7 @@ class MultSubmits
$html .= '
';
$html .= '
';
$html .= '
';
- $html .= '
';
+ $html .= '
';
$html .= '
';
$html .= '
';
$html .= '
';
diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php
index c4a297bee6..146860f6b1 100644
--- a/libraries/classes/Navigation/Navigation.php
+++ b/libraries/classes/Navigation/Navigation.php
@@ -233,8 +233,8 @@ class Navigation
$html .= '
'
- . Util::getIcon('show.png', __('Show'))
- . ' | ';
+ . Util::getIcon('show', __('Show'))
+ . '';
}
$html .= '';
$first = false;
diff --git a/libraries/classes/Plugins/TwoFactor/Application.php b/libraries/classes/Plugins/TwoFactor/Application.php
index 3056af3e46..c739b98080 100644
--- a/libraries/classes/Plugins/TwoFactor/Application.php
+++ b/libraries/classes/Plugins/TwoFactor/Application.php
@@ -91,15 +91,30 @@ class Application extends TwoFactorPlugin
public function setup()
{
$secret = $this->_twofactor->config['settings']['secret'];
- $inlineUrl = $this->_google2fa->getQRCodeInline(
- 'phpMyAdmin (' . $this->getAppId(false) . ')',
- $this->_twofactor->user,
- $secret
- );
- return Template::get('login/twofactor/application_configure')->render([
- 'image' => $inlineUrl,
- 'secret' => $secret
- ]);
+ $renderArray = ['secret' => $secret];
+ if (extension_loaded('gd')) {
+ $inlineUrl = $this->_google2fa->getQRCodeInline(
+ 'phpMyAdmin (' . $this->getAppId(false) . ')',
+ $this->_twofactor->user,
+ $secret
+ );
+ $renderArray['image'] = $inlineUrl;
+ } else {
+ $inlineUrl = $this->_google2fa->getQRCodeUrl(
+ 'phpMyAdmin (' . $this->getAppId(false) . ')',
+ $this->_twofactor->user,
+ $secret
+ );
+ trigger_error(
+ __(
+ 'The gd PHP extension was not found.'
+ . ' The QRcode can not be displayed without the gd PHP extension.'
+ ),
+ E_USER_WARNING
+ );
+ $renderArray['url'] = $inlineUrl;
+ }
+ return Template::get('login/twofactor/application_configure')->render($renderArray);
}
/**
diff --git a/libraries/classes/Rte/Events.php b/libraries/classes/Rte/Events.php
index c47ca5f104..3f10c638c2 100644
--- a/libraries/classes/Rte/Events.php
+++ b/libraries/classes/Rte/Events.php
@@ -123,7 +123,7 @@ class Events
htmlspecialchars($drop_item)
)
. '
'
- . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+ . __('MySQL said: ') . $GLOBALS['dbi']->getError();
} else {
$result = $GLOBALS['dbi']->tryQuery($item_query);
if (! $result) {
@@ -132,7 +132,7 @@ class Events
htmlspecialchars($item_query)
)
. '
'
- . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+ . __('MySQL said: ') . $GLOBALS['dbi']->getError();
// We dropped the old item, but were unable to create
// the new one. Try to restore the backup query
$result = $GLOBALS['dbi']->tryQuery($create_item);
@@ -163,7 +163,7 @@ class Events
htmlspecialchars($item_query)
)
. '
'
- . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+ . __('MySQL said: ') . $GLOBALS['dbi']->getError();
} else {
$message = Message::success(
__('Event %1$s has been created.')
diff --git a/libraries/classes/Rte/Footer.php b/libraries/classes/Rte/Footer.php
index 43dbb8b63c..2fdb2583df 100644
--- a/libraries/classes/Rte/Footer.php
+++ b/libraries/classes/Rte/Footer.php
@@ -30,7 +30,7 @@ class Footer
{
global $db, $table, $url_query;
- $icon = mb_strtolower($name) . '_add.png';
+ $icon = mb_strtolower($name) . '_add';
$retval = "";
$retval .= "\n";
$retval .= "