CVS: ispman/ispman-web/cgi-bin/tmpl/domains/edit defaultfilehost.tmpl,NONE,1.1 defaultmaildrop.tmpl,NONE,1.1 defaultwebhost.tmpl,NONE,1.1 comment.tmpl,1.4,1.5 customer.tmpl,1.4,1.5 domainname.tmpl,1.6,1.7 domainservices.tmpl,1.4,1.5 domaintype.tmpl,1.6,1.7 footer.tmpl,1.8,1.9 ftppassword.tmpl,1.4,1.5 gid.tmpl,1.4,1.5 header.tmpl,1.9,1.10 homedirectory.tmpl,1.4,1.5 locked.tmpl,1.5,1.6 maildelivery.tmpl,1.4,1.5 maxaccounts.tmpl,1.4,1.5 maxvhosts.tmpl,1.4,1.5 owner.tmpl,1.4,1.5 uid.tmpl,1.4,1.5 users.tmpl,1.5,1.6 vhosts.tmpl,1.5,1.6 controlpanelpassword.tmpl,1.6,NONE
Joerg Delker <[email protected]>
| Newsgroups | gmane.comp.isp.ispman.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit
In directory sc8-pr-cvs1:/tmp/cvs-serv27313/cgi-bin/tmpl/domains/edit
Modified Files:
comment.tmpl customer.tmpl domainname.tmpl domainservices.tmpl
domaintype.tmpl footer.tmpl ftppassword.tmpl gid.tmpl
header.tmpl homedirectory.tmpl locked.tmpl maildelivery.tmpl
maxaccounts.tmpl maxvhosts.tmpl owner.tmpl uid.tmpl users.tmpl
vhosts.tmpl
Added Files:
defaultfilehost.tmpl defaultmaildrop.tmpl defaultwebhost.tmpl
Removed Files:
controlpanelpassword.tmpl
Log Message:
some major bugfixes/form completion
in particular:
* beauty cleanup (old stylesheet tags, reordering of fields)
* form completion for default file/mail/webhosts
* enhancment for multiple webhosts
--- NEW FILE ---
<tr>
<td width="20%"><perl>_("Default File Server Host for this domain")</perl> </td>
<td>
<select name="ispmanDomainDefaultFileServer">
<perl>
my $text="";
my @ispmanDomainDefaultFileServers=$ispman->getGroupMembers("fileservergroup");
my $filehost=$ispman->{'domain'}->{'ispmanDomainDefaultFileServer'};
for (@ispmanDomainDefaultFileServers){
if ($filehost eq $_) {
$text.="<option VALUE=$_ selected>$_</option>";
} else {
$text.="<option VALUE=$_>$_</option>";
}
}
if ($#ispmanDomainDefaultFileServers<0){
$text.="<option VALUE=''>";
$text.=_("WARNING: No members in group [_1] defined", "fileservergroup");
$text.="</option>";
}
$text
</perl>
</select>
</td>
</tr>
--- NEW FILE ---
<tr>
<td><perl>_("Default Maildrop Host for this domain")</perl> </td>
<td>
<select name="ispmanDomainDefaultMailDropHost">
<perl>
my $text="";
my @ispmanDomainDefaultMailDropHosts=$ispman->getGroupMembers("mailstoregroup");
my $mailhost=$ispman->{'domain'}->{'ispmanDomainDefaultMailDropHost'};
for (@ispmanDomainDefaultMailDropHosts){
if ($mailhost eq $_) {
$text.="<option VALUE='$_' selected>$_</option>";
} else {
$text.="<option VALUE='$_'>$_</option>";
}
}
if ($#ispmanDomainDefaultMailDropHosts<0){
$text.="<option VALUE=''>";
$text.=_("WARNING: No members in group [_1] defined", "mailstoregroup");
$text.="</option>";
}
$text
</perl>
<OPTION VALUE=""><perl>_("No Maildrop Host (no mailbox. just forwardings)")</perl></option>
</select>
</td>
</tr>
--- NEW FILE ---
<tr>
<td><perl>_("Default Web Server Host for this domain")</perl> </td>
<td>
<select name="ispmanDomainDefaultWebHost" MULTIPLE>
<perl>
my $text="";
my @ispmanDomainDefaultWebHosts=$ispman->getGroupMembers("httpgroup");
my @defaulthosts=$ispman->as_array($ispman->{'domain'}->{'ispmanDomainDefaultWebHost'});
for (@ispmanDomainDefaultWebHosts){
my $webhost=$_;
my $tag="";
for (@defaulthosts){
if ($webhost eq $_) { $tag="selected" };
}
$text.="<option VALUE=\"$_\" $tag>$_</option>";
}
if ($#ispmanDomainDefaultWebHosts<0){
$text.="<option VALUE=''>";
$text.=_("WARNING: No members in group [_1] defined", "httpgroup");
$text.="</option>";
}
$text
</perl>
</select>
</td>
</tr>
Index: comment.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/comment.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** comment.tmpl 28 Apr 2003 14:47:19 -0000 1.4
--- comment.tmpl 8 Jan 2004 00:08:26 -0000 1.5
***************
*** 1,5 ****
<tr>
! <td class=line1><perl>_("Domain Comment")</perl></td>
! <td class=line1>
<textarea cols=40 rows=4 name=ispmanDomainComment><perl>$ispman->{'domain'}{'ispmanDomainComment'}</perl></textarea>
</td>
--- 1,5 ----
<tr>
! <td><perl>_("Domain Comment")</perl></td>
! <td>
<textarea cols=40 rows=4 name=ispmanDomainComment><perl>$ispman->{'domain'}{'ispmanDomainComment'}</perl></textarea>
</td>
Index: customer.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/customer.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** customer.tmpl 28 Apr 2003 14:47:20 -0000 1.4
--- customer.tmpl 8 Jan 2004 00:08:26 -0000 1.5
***************
*** 1,5 ****
<tr >
! <td class=line0><perl>_("Domain Customer")</perl></td>
! <td class=line0>
<INPUT size=25 TYPE="TEXT" NAME="ispmanDomainCustomer" value="<perl>$ispman->{'domain'}{'ispmanDomainCustomer'}</perl>">
</td>
--- 1,5 ----
<tr >
! <td><perl>_("Domain Customer")</perl></td>
! <td>
<INPUT size=25 TYPE="TEXT" NAME="ispmanDomainCustomer" value="<perl>$ispman->{'domain'}{'ispmanDomainCustomer'}</perl>">
</td>
Index: domainname.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/domainname.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** domainname.tmpl 28 Apr 2003 18:34:04 -0000 1.6
--- domainname.tmpl 8 Jan 2004 00:08:26 -0000 1.7
***************
*** 1,5 ****
<tr>
! <td class=line0><perl>_("Domainname")</perl></td>
! <td class=line0>
<perl>$r->param('ispmanDomain')</perl>
</td>
--- 1,5 ----
<tr>
! <td><perl>_("Domainname")</perl></td>
! <td>
<perl>$r->param('ispmanDomain')</perl>
</td>
Index: domainservices.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/domainservices.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** domainservices.tmpl 28 Apr 2003 14:47:20 -0000 1.4
--- domainservices.tmpl 8 Jan 2004 00:08:26 -0000 1.5
***************
*** 1,5 ****
<tr>
! <td class=line1><perl>_("Domain Services")</perl></td>
! <td class=line1>
<SELECT MULTIPLE name=ispmanDomainService>
<perl>
--- 1,5 ----
<tr>
! <td><perl>_("Domain Services")</perl></td>
! <td>
<SELECT MULTIPLE name=ispmanDomainService>
<perl>
Index: domaintype.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/domaintype.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** domaintype.tmpl 25 Jun 2003 21:46:46 -0000 1.6
--- domaintype.tmpl 8 Jan 2004 00:08:26 -0000 1.7
***************
*** 1,6 ****
<tr>
! <td class=line1><perl>_("Domain type")</perl></td>
! <td class=line1><perl>$ispman->getDomainType($r->param('ispmanDomain'))</perl>
</td>
</tr>
--- 1,6 ----
<tr>
! <td><perl>_("Domain type")</perl></td>
! <td><perl>$ispman->getDomainType($r->param('ispmanDomain'))</perl>
</td>
</tr>
Index: footer.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/footer.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** footer.tmpl 28 Apr 2003 18:36:33 -0000 1.8
--- footer.tmpl 8 Jan 2004 00:08:26 -0000 1.9
***************
*** 8,14 ****
</td>
</tr></table>
! </td></tr>
! </form></table>
!
--- 8,16 ----
</td>
</tr></table>
! </td></tr></table>
! </div>
! </td></tr></table>
!
! </form>
Index: ftppassword.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/ftppassword.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ftppassword.tmpl 28 Apr 2003 14:47:20 -0000 1.4
--- ftppassword.tmpl 8 Jan 2004 00:08:26 -0000 1.5
***************
*** 1,5 ****
<tr>
! <td class=line1><perl>_("FTP Password")</perl> </td>
! <td class=line1>
<input size=35 type=text name=userPassword value="<perl>$ispman->{'domain'}{'userPassword'}</perl>">
</td>
--- 1,5 ----
<tr>
! <td><perl>_("FTP Password")</perl> </td>
! <td>
<input size=35 type=text name=userPassword value="<perl>$ispman->{'domain'}{'userPassword'}</perl>">
</td>
Index: gid.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/gid.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** gid.tmpl 28 Apr 2003 14:47:22 -0000 1.4
--- gid.tmpl 8 Jan 2004 00:08:26 -0000 1.5
***************
*** 1,6 ****
<tr>
! <td class=line0><perl>_("Domain GID")</perl></td>
! <td class=line0>
<input size=35 type=hidden name=gidNumber value="<perl>$ispman->{'domain'}{'gidNumber'}</perl>">
<perl>$ispman->{'domain'}{'gidNumber'}</perl>
--- 1,6 ----
<tr>
! <td><perl>_("Domain GID")</perl></td>
! <td>
<input size=35 type=hidden name=gidNumber value="<perl>$ispman->{'domain'}{'gidNumber'}</perl>">
<perl>$ispman->{'domain'}{'gidNumber'}</perl>
Index: header.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/header.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** header.tmpl 9 Jul 2003 16:03:16 -0000 1.9
--- header.tmpl 8 Jan 2004 00:08:26 -0000 1.10
***************
*** 9,14 ****
</script>
- <P>
- <table border=0>
<form>
--- 9,14 ----
</script>
<form>
+
+ <table border="0" cellpadding="2" cellspacing="1" >
Index: homedirectory.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/homedirectory.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** homedirectory.tmpl 28 Apr 2003 14:47:22 -0000 1.4
--- homedirectory.tmpl 8 Jan 2004 00:08:26 -0000 1.5
***************
*** 1,5 ****
<tr>
! <td class=line0><perl>_("Home Directory")</perl></td>
! <td class=line0>
<input size=35 type=hidden name=homeDirectory value="<perl>$ispman->{'domain'}{'homeDirectory'}</perl>">
<perl>$ispman->{'domain'}{$ispman->getSchemaAttr('homeDirectory')}</perl>
--- 1,5 ----
<tr>
! <td><perl>_("Home Directory")</perl></td>
! <td>
<input size=35 type=hidden name=homeDirectory value="<perl>$ispman->{'domain'}{'homeDirectory'}</perl>">
<perl>$ispman->{'domain'}{$ispman->getSchemaAttr('homeDirectory')}</perl>
Index: locked.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/locked.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** locked.tmpl 17 Jun 2003 22:20:49 -0000 1.5
--- locked.tmpl 8 Jan 2004 00:08:26 -0000 1.6
***************
*** 1,6 ****
<tr>
! <td class=line0><perl>_("Locked")</perl></td>
! <td class=line1>
<input class=checkbox type=checkbox name="ispmanDomainLocked"
<perl>($ispman->{'domain'}{'ispmanDomainLocked'} eq "true")? " checked ": ""</perl>
--- 1,6 ----
<tr>
! <td><perl>_("Locked")</perl></td>
! <td>
<input class=checkbox type=checkbox name="ispmanDomainLocked"
<perl>($ispman->{'domain'}{'ispmanDomainLocked'} eq "true")? " checked ": ""</perl>
Index: maildelivery.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/maildelivery.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** maildelivery.tmpl 28 Apr 2003 14:47:22 -0000 1.4
--- maildelivery.tmpl 8 Jan 2004 00:08:26 -0000 1.5
***************
*** 1,5 ****
<tr>
! <td class=line0><perl>_("Mail Delivery")</perl></td>
! <td class=line0>
<input type=radio name="ispmanDomainMailDeliveryMethod" value="local" <perl>($ispman->{'domain'}{'ispmanDomainMailDeliveryMethod'} eq "local")?"checked":""</perl> > <perl>_("Deliver Localy")</perl><br>
<input type=radio name="ispmanDomainMailDeliveryMethod" value="smtp" <perl>($ispman->{'domain'}{'ispmanDomainMailDeliveryMethod'} eq "smtp")?"checked":""</perl> > <perl>_("Deliver to MX host")</perl>
--- 1,5 ----
<tr>
! <td><perl>_("Mail Delivery")</perl></td>
! <td>
<input type=radio name="ispmanDomainMailDeliveryMethod" value="local" <perl>($ispman->{'domain'}{'ispmanDomainMailDeliveryMethod'} eq "local")?"checked":""</perl> > <perl>_("Deliver Localy")</perl><br>
<input type=radio name="ispmanDomainMailDeliveryMethod" value="smtp" <perl>($ispman->{'domain'}{'ispmanDomainMailDeliveryMethod'} eq "smtp")?"checked":""</perl> > <perl>_("Deliver to MX host")</perl>
Index: maxaccounts.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/maxaccounts.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** maxaccounts.tmpl 28 Apr 2003 14:47:22 -0000 1.4
--- maxaccounts.tmpl 8 Jan 2004 00:08:26 -0000 1.5
***************
*** 1,7 ****
<tr>
! <td class=line0><perl>_("Max Email accounts")</perl> </td>
! <td class=line0>
<input size=4 type=text name=ispmanMaxAccounts value="<perl>$ispman->{'domain'}{'ispmanMaxAccounts'}</perl>">
</td>
</tr>
--- 1,8 ----
<tr>
! <td><perl>_("Max Email accounts")</perl> </td>
! <td>
<input size=4 type=text name=ispmanMaxAccounts value="<perl>$ispman->{'domain'}{'ispmanMaxAccounts'}</perl>">
+ (<perl>$ispman->getUserCount($r->param("domain"))</perl> accounts in use)
</td>
</tr>
Index: maxvhosts.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/maxvhosts.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** maxvhosts.tmpl 28 Apr 2003 14:47:22 -0000 1.4
--- maxvhosts.tmpl 8 Jan 2004 00:08:26 -0000 1.5
***************
*** 1,6 ****
<tr>
! <td class=line1><perl>_("Max Virtual Hosts")</perl> </td>
! <td class=line1>
<input size=4 type=text name=ispmanMaxVhosts value="<perl>$ispman->{'domain'}{'ispmanMaxVhosts'}</perl>">
</td>
</tr>
--- 1,7 ----
<tr>
! <td><perl>_("Max Virtual Hosts")</perl> </td>
! <td>
<input size=4 type=text name=ispmanMaxVhosts value="<perl>$ispman->{'domain'}{'ispmanMaxVhosts'}</perl>">
+ (<perl>$ispman->getVhostCount($r->param("domain"))</perl> vhosts in use)
</td>
</tr>
Index: owner.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/owner.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** owner.tmpl 28 Apr 2003 14:47:22 -0000 1.4
--- owner.tmpl 8 Jan 2004 00:08:26 -0000 1.5
***************
*** 1,6 ****
<tr>
! <td class=line1><perl>_("Domain Owner")</perl></td>
! <td class=line1>
<INPUT size=25 TYPE="TEXT" NAME="ispmanDomainOwner" value="<perl>$ispman->{'domain'}{'ispmanDomainOwner'}</perl>">
</td>
--- 1,6 ----
<tr>
! <td><perl>_("Domain Owner")</perl></td>
! <td>
<INPUT size=25 TYPE="TEXT" NAME="ispmanDomainOwner" value="<perl>$ispman->{'domain'}{'ispmanDomainOwner'}</perl>">
</td>
Index: uid.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/uid.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** uid.tmpl 28 Apr 2003 14:47:22 -0000 1.4
--- uid.tmpl 8 Jan 2004 00:08:26 -0000 1.5
***************
*** 1,6 ****
<tr>
! <td class=line1><perl>_("Domain UID")</perl></td>
! <td class=line1>
<input size=35 type=hidden name=uidNumber value="<perl>$ispman->{'domain'}{'uidNumber'}</perl>">
<perl>$ispman->{'domain'}{'uidNumber'}</perl>
--- 1,6 ----
<tr>
! <td><perl>_("Domain UID")</perl></td>
! <td>
<input size=35 type=hidden name=uidNumber value="<perl>$ispman->{'domain'}{'uidNumber'}</perl>">
<perl>$ispman->{'domain'}{'uidNumber'}</perl>
Index: users.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/users.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** users.tmpl 28 Apr 2003 14:47:22 -0000 1.5
--- users.tmpl 8 Jan 2004 00:08:26 -0000 1.6
***************
*** 1,5 ****
<tr>
! <td class=line1><perl>_("Users")</perl></td>
! <td class=line1>
<perl>$ispman->getUserCount($r->param("domain"))</perl> of <perl>$ispman->{'domain'}{'ispmanMaxAccounts'} || "undefined" </perl> user(s) <br>
--- 1,5 ----
<tr>
! <td><perl>_("Users")</perl></td>
! <td>
<perl>$ispman->getUserCount($r->param("domain"))</perl> of <perl>$ispman->{'domain'}{'ispmanMaxAccounts'} || "undefined" </perl> user(s) <br>
Index: vhosts.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/domains/edit/vhosts.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** vhosts.tmpl 28 Apr 2003 14:47:22 -0000 1.5
--- vhosts.tmpl 8 Jan 2004 00:08:26 -0000 1.6
***************
*** 1,5 ****
<tr>
! <td class=line0><perl>_("Vhosts")</perl></td>
! <td class=line0>
<perl>$ispman->getVhostCount($r->param("domain"))</perl> of <perl>$ispman->{'domain'}{'ispmanMaxVhosts'} || "undefined" </perl> virtual host(s) <br>
--- 1,5 ----
<tr>
! <td><perl>_("Vhosts")</perl></td>
! <td>
<perl>$ispman->getVhostCount($r->param("domain"))</perl> of <perl>$ispman->{'domain'}{'ispmanMaxVhosts'} || "undefined" </perl> virtual host(s) <br>
--- controlpanelpassword.tmpl DELETED ---
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html