X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=bd3ff3e03a512dcb1e3039fe5491241fad3ffce9;hp=bfef62807de2a05a150cf38be609f87bacf6ef40;hb=f4c5c0a244d4cb9ee80f72e909b090b3e71eea2d;hpb=918bbc9ce36a3dc5943f521e26751ea94a5a5539

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index bfef62807..bd3ff3e03 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -759,7 +759,7 @@ httemplate/docs/config.html
   {
     'key'         => 'showpasswords',
     'section'     => 'UI',
-    'description' => 'Display unencrypted user passwords in the web interface',
+    'description' => 'Display unencrypted user passwords in the backend (employee) web interface',
     'type'        => 'checkbox',
   },
 
@@ -1276,6 +1276,21 @@ httemplate/docs/config.html
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'agent-showpasswords',
+    'section'     => '',
+    'description' => 'Display unencrypted user passwords in the agent (reseller) interface',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'global_unique-username',
+    'section'     => 'username',
+    'description' => 'Global username uniqueness control: none (usual setting - check uniqueness per exports), username (all usernames are globally unique, regardless of domain or exports), or username@domain (all username@domain pairs are globally unique, regardless of exports)',
+    'type'        => 'select',
+    'select_enum' => [ 'none', 'username', 'username@domain' ],
+  },
+
 );
 
 1;