From 269b746df44ff16cec4eb68a1ea7f1cd34b8475e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 18 Apr 2011 09:10:39 -0400
Subject: [PATCH] Merged revision 2308 from stable branch.
---
interface/web/tools/form/user_settings.tform.php | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/interface/web/tools/form/user_settings.tform.php b/interface/web/tools/form/user_settings.tform.php
index 4ca9442..6531611 100644
--- a/interface/web/tools/form/user_settings.tform.php
+++ b/interface/web/tools/form/user_settings.tform.php
@@ -69,7 +69,7 @@
$form["db_history"] = "no";
$form['tab_default'] = 'users';
$form['list_default'] = 'index.php';
-$form['auth'] = 'yes';
+$form['auth'] = 'no';
//* 0 = id of the user, > 0 id must match with id of current user
$form['auth_preset']['userid'] = 0;
@@ -104,6 +104,7 @@
'passwort' => array (
'datatype' => 'VARCHAR',
'formtype' => 'PASSWORD',
+ 'encryption'=> 'CRYPT',
'regex' => '',
'errmsg' => '',
'default' => '',
@@ -132,6 +133,26 @@
'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
@@ -140,4 +161,4 @@
);
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1