From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master
---
interface/web/tools/form/user_settings.tform.php | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/interface/web/tools/form/user_settings.tform.php b/interface/web/tools/form/user_settings.tform.php
index 6531611..d3c35bf 100644
--- a/interface/web/tools/form/user_settings.tform.php
+++ b/interface/web/tools/form/user_settings.tform.php
@@ -133,26 +133,6 @@
'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
--
Gitblit v1.9.1