From 8edabf647814a012307bbf68628e4656ecf89eff Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 30 Apr 2014 14:12:28 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'
---
interface/web/sites/database_list.php | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/interface/web/sites/database_list.php b/interface/web/sites/database_list.php
index 5be0ccf..dd0241f 100644
--- a/interface/web/sites/database_list.php
+++ b/interface/web/sites/database_list.php
@@ -28,8 +28,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
/******************************************
* Begin Form configuration
@@ -44,9 +44,31 @@
//* Check permissions for module
$app->auth->check_module_permissions('sites');
-$app->uses('listform_actions');
-
-$app->listform_actions->onLoad();
+$app->load('listform_actions');
-?>
\ No newline at end of file
+class list_action extends listform_actions {
+
+ function onShow() {
+ global $app, $conf;
+
+ $app->uses('getconf');
+ $global_config = $app->getconf->get_global_config('sites');
+
+ if($global_config['dblist_phpmyadmin_link'] == 'y') {
+ $app->tpl->setVar('dblist_phpmyadmin_link', 1);
+ } else {
+ $app->tpl->setVar('dblist_phpmyadmin_link', 0);
+ }
+
+ parent::onShow();
+ }
+
+}
+
+$list = new list_action;
+$list->SQLOrderBy = 'ORDER BY web_database.database_name';
+$list->onLoad();
+
+
+?>
--
Gitblit v1.9.1