ispman/ispman-web/cgi-bin/tmpl/users add.tmpl, 1.15, 1.16 edit.tmpl, 1.18, 1.19

Update of /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/users
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21579/ispman-web/cgi-bin/tmpl/users

Modified Files:
	add.tmpl edit.tmpl 
Log Message:
merged branch dev_1_3-cyrus_virtdomain2

Index: add.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/users/add.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- add.tmpl	9 Sep 2006 20:24:57 -0000	1.15
+++ add.tmpl	21 Nov 2006 14:41:28 -0000	1.16
@@ -5,8 +5,9 @@
 
 Please enter the name of  user to create.
 Username can only contain characters a - z. <BR>
-No accent characters, numbers or punctuation marks are allowed.<BR>
-A good username is the first character of the firstname as a prefix, followed by the users lastname
+<perl>lc($ispman->getConf("CyrusUnixHierarchySep")) eq 'yes'? "Dot's are allowed, although no other":
+"No";</perl> accent characters, numbers or punctuation marks are allowed.<BR>
+A good username is the first character of the firstname as a prefix, followed by the users lastname.
  <P>
 <table border=0>
 <form action="<perl>$ispman->getConfig('ispmanUrlPrefix')</perl>/admin/index.cgi" method="POST">

Index: edit.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/users/edit.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- edit.tmpl	20 Nov 2006 18:23:40 -0000	1.18
+++ edit.tmpl	21 Nov 2006 14:41:28 -0000	1.19
@@ -9,7 +9,7 @@
   <form action="<perl>$ispman->getConfig('ispmanUrlPrefix')</perl>/admin/index.cgi" method="POST">
   <tr>
     <td colspan=2>
-      <b>User: </b> <perl>$r->param('uid') </perl> (<perl>$r->param('ispmanDomain')</perl>)
+      <b>User: </b> <perl>lc($ispman->getConf("CyrusUnixHierarchySep")) eq 'yes'? $ispman->{'user'}->{"ispmanUserId"} . '@' . $r->param('ispmanDomain') . ' / ':'';</perl><perl>$r->param('uid') </perl> (<perl>$r->param('ispmanDomain')</perl>)
       <br><br>
 	  <b>General Properties
       <br><hr noshade>


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV