diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 81d61efa303f200bede5e0942f9651e61fa756d9..21d3391813c08a4200bfdf3ef290bdc14657157a 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 23441325288fce79206bc3bff58257fc245a6fd9..0aa84a47eafcdce3a3a33e74b4891db8b89e1021 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 65316114d7bb6dca63833bdf3555228392eb57cf..d3c35bfd2dfdb36481aef3d5bac16c788050392a 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