Skip to content

Commit 967a4ac

Browse files
committed
Enable vm module for admin user.
Fixed: Unknown column 'id_rsa' in 'field list' when password is changed in tools.
1 parent b74ef5e commit 967a4ac

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

install/sql/ispconfig3.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1916,7 +1916,7 @@ INSERT INTO `sys_ini` (`sysini_id`, `config`) VALUES (1, '');
19161916
-- Dumping data for table `sys_user`
19171917
--
19181918

1919-
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);
1919+
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);
19201920

19211921
-- --------------------------------------------------------
19221922

interface/lib/config.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
//** Database
5151
$conf['db_type'] = 'mysql';
5252
$conf['db_host'] = 'localhost';
53-
$conf['db_database'] = 'dbispconfig';
53+
$conf['db_database'] = 'ispconfig3';
5454
$conf['db_user'] = 'root';
5555
$conf['db_password'] = '';
5656
$conf['db_charset'] = 'utf8'; // same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1")

interface/web/tools/form/user_settings.tform.php

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -133,26 +133,6 @@
133133
'maxlength' => '2',
134134
'rows' => '',
135135
'cols' => ''
136-
),
137-
'id_rsa' => array (
138-
'datatype' => 'VARCHAR',
139-
'formtype' => 'TEXT',
140-
'default' => '',
141-
'datasource' => array ( 'type' => 'SQL',
142-
'querystring' => 'SELECT id_rsa FROM client WHERE {AUTHSQL}',
143-
'valuefield'=> 'id_rsa'
144-
),
145-
'value' => ''
146-
),
147-
'ssh_rsa' => array (
148-
'datatype' => 'VARCHAR',
149-
'formtype' => 'TEXT',
150-
'default' => '',
151-
'datasource' => array ( 'type' => 'SQL',
152-
'querystring' => 'SELECT ssh_rsa FROM client WHERE {AUTHSQL}',
153-
'valuefield'=> 'ssh_rsa'
154-
),
155-
'value' => ''
156136
)
157137
##################################
158138
# ENDE Datenbankfelder

0 commit comments

Comments
 (0)