From 967a4acef25629464f21cc4ed2267b6c62a896e7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 29 Jun 2011 14:14:34 +0000
Subject: [PATCH] Enable vm module for admin user. Fixed: Unknown column
'id_rsa' in 'field list' when password is changed in tools.
---
install/sql/ispconfig3.sql | 2 +-
interface/lib/config.inc.php | 2 +-
.../web/tools/form/user_settings.tform.php | 20 -------------------
3 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 81d61efa30..21d3391813 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1916,7 +1916,7 @@ INSERT INTO `sys_ini` (`sysini_id`, `config`) VALUES (1, '');
-- Dumping data for table `sys_user`
--
-INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'dashboard,admin,client,mail,monitor,sites,dns,tools,help', 'dashboard', 'default', 'admin', 1, 'en', '1,2', 1, 0);
+INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'dashboard,admin,client,mail,monitor,sites,dns,vm,tools,help', 'dashboard', 'default', 'admin', 1, 'en', '1,2', 1, 0);
-- --------------------------------------------------------
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 2344132528..0aa84a47ea 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -50,7 +50,7 @@ define('ISPC_APP_VERSION', '3.0.2');
//** Database
$conf['db_type'] = 'mysql';
$conf['db_host'] = 'localhost';
-$conf['db_database'] = 'dbispconfig';
+$conf['db_database'] = 'ispconfig3';
$conf['db_user'] = 'root';
$conf['db_password'] = '';
$conf['db_charset'] = 'utf8'; // same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1")
diff --git a/interface/web/tools/form/user_settings.tform.php b/interface/web/tools/form/user_settings.tform.php
index 65316114d7..d3c35bfd2d 100644
--- a/interface/web/tools/form/user_settings.tform.php
+++ b/interface/web/tools/form/user_settings.tform.php
@@ -133,26 +133,6 @@ $form['tabs']['users'] = array (
'maxlength' => '2',
'rows' => '',
'cols' => ''
- ),
- 'id_rsa' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT id_rsa FROM client WHERE {AUTHSQL}',
- 'valuefield'=> 'id_rsa'
- ),
- 'value' => ''
- ),
- 'ssh_rsa' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT ssh_rsa FROM client WHERE {AUTHSQL}',
- 'valuefield'=> 'ssh_rsa'
- ),
- 'value' => ''
)
##################################
# ENDE Datenbankfelder
--
GitLab