ispman/lib/CustomerMan ApacheMan.pm,1.7,1.8 DNSMan.pm,1.2,1.3 DomainSignature.pm,1.2,1.3 MailGroups.pm,1.7,1.8 UserMan.pm,1.8,1.9 Utils.pm,1.5,1.6
Joerg Delker <[email protected]>
| Newsgroups | gmane.comp.isp.ispman.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ispman/ispman/lib/CustomerMan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30799/lib/CustomerMan
Modified Files:
ApacheMan.pm DNSMan.pm DomainSignature.pm MailGroups.pm
UserMan.pm Utils.pm
Log Message:
code reformatting by perltidy conforming perl style guide
Index: MailGroups.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/CustomerMan/MailGroups.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MailGroups.pm 21 Feb 2004 21:31:31 -0000 1.7
+++ MailGroups.pm 30 May 2004 23:35:36 -0000 1.8
@@ -2,52 +2,52 @@
use strict;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $Config);
-
sub getMailingLists {
- my $self=shift;
- my $r=shift;
- return $self->{'ispman'}->getMailGroups($self->{'domaindn'});
+ my $self = shift;
+ my $r = shift;
+ return $self->{'ispman'}->getMailGroups( $self->{'domaindn'} );
}
sub deleteMailingList {
- my $self=shift;
- my $r=shift;
- $self->removeMailGroup($r->param("ispmanDomain"), $r->param("cn"));
- $r->param("mode", "advanceItems");
- $r->param("section", "MailingLists");
- $self->advanceItems($r);
+ my $self = shift;
+ my $r = shift;
+ $self->removeMailGroup( $r->param("ispmanDomain"), $r->param("cn") );
+ $r->param( "mode", "advanceItems" );
+ $r->param( "section", "MailingLists" );
+ $self->advanceItems($r);
}
sub updateMailingList {
- my $self=shift;
- my $r=shift;
- my $dn=$r->param("dn");
- $self->updateEntryWithData($dn, {
- 'mailForwardingAddress' => $self->as_arrayref($r->param("mailForwardingAddress"))
- });
- $r->param("mode", "advanceItems");
- $r->param("section", "MailingLists");
- $r->delete('dn');
- $self->advanceItems($r);
+ my $self = shift;
+ my $r = shift;
+ my $dn = $r->param("dn");
+ $self->updateEntryWithData(
+ $dn,
+ {
+ 'mailForwardingAddress' =>
+ $self->as_arrayref( $r->param("mailForwardingAddress") )
+ }
+ );
+ $r->param( "mode", "advanceItems" );
+ $r->param( "section", "MailingLists" );
+ $r->delete('dn');
+ $self->advanceItems($r);
}
-
-
sub addMailingList {
- my $self=shift;
- my $r=shift;
- $r->param("ispmanDomain", $self->{'domain'});
-
- # Break the list into a scalar where each email is separated by space char
- my $addresses=$self->as_arrayref($r->param('mailForwardingAddress'));
- $r->param('mailForwardingAddress', (join ' ' , @$addresses));
-
- $self->addMailGroup($r);
+ my $self = shift;
+ my $r = shift;
+ $r->param( "ispmanDomain", $self->{'domain'} );
+ # Break the list into a scalar where each email is separated by space char
+ my $addresses = $self->as_arrayref( $r->param('mailForwardingAddress') );
+ $r->param( 'mailForwardingAddress', ( join ' ', @$addresses ) );
- $r->param("mode", "advanceItems");
- $r->param("section", "MailingLists");
- $self->advanceItems($r);
+ $self->addMailGroup($r);
+
+ $r->param( "mode", "advanceItems" );
+ $r->param( "section", "MailingLists" );
+ $self->advanceItems($r);
}
1;
Index: DNSMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/CustomerMan/DNSMan.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DNSMan.pm 4 May 2002 10:40:55 -0000 1.2
+++ DNSMan.pm 30 May 2004 23:35:36 -0000 1.3
@@ -3,242 +3,288 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $Config);
sub getNSRecords {
- my $self=shift;
- my $nsrecordslist=$self->{'ispman'}->getRecords("cn=nsrecords, ou=dnsdata, $self->{'domaindn'}", "nsrecords");
- my $nsrecordsHash={};
- for (@$nsrecordslist) {
- my ($origion, $host)=split(/\s*,\s*/, $_);
- $nsrecordsHash->{$origion}=$host;
- }
+ my $self = shift;
+ my $nsrecordslist =
+ $self->{'ispman'}
+ ->getRecords( "cn=nsrecords, ou=dnsdata, $self->{'domaindn'}",
+ "nsrecords" );
+ my $nsrecordsHash = {};
+ for (@$nsrecordslist) {
+ my ( $origion, $host ) = split( /\s*,\s*/, $_ );
+ $nsrecordsHash->{$origion} = $host;
+ }
}
sub xupdateNSRecords {
- my $self=shift;
- my $r=shift;
- $r->param("dn", "cn=nsrecords, ou=dnsdata, $self->{'domaindn'}");
- $self->{'ispman'}->modifynsrecords($r, $r->param("dn"));
- $r->param("mode", "advanceItems");
- $r->param("section", "DNSSettings");
- $self->advanceItems($r);
+ my $self = shift;
+ my $r = shift;
+ $r->param( "dn", "cn=nsrecords, ou=dnsdata, $self->{'domaindn'}" );
+ $self->{'ispman'}->modifynsrecords( $r, $r->param("dn") );
+ $r->param( "mode", "advanceItems" );
+ $r->param( "section", "DNSSettings" );
+ $self->advanceItems($r);
}
sub updateNSRecords {
- my $self=shift;
- my $r=shift;
- print "Sorry, just fixing some bug<br>";
- print "Use wrong version of control panel. the API is changed so I have to fix some stuff<br>";
- print $r->as_string;
-
-
+ my $self = shift;
+ my $r = shift;
+ print "Sorry, just fixing some bug<br>";
+ print
+"Use wrong version of control panel. the API is changed so I have to fix some stuff<br>";
+ print $r->as_string;
- #$r->param("dn", "cn=nsrecords, ou=dnsdata, $self->{'domaindn'}");
- #$self->{'ispman'}->modifynsrecords($r, $r->param("dn"));
- $r->param("mode", "advanceItems");
- $r->param("section", "DNSSettings");
- $self->advanceItems($r);
+ #$r->param("dn", "cn=nsrecords, ou=dnsdata, $self->{'domaindn'}");
+ #$self->{'ispman'}->modifynsrecords($r, $r->param("dn"));
+ $r->param( "mode", "advanceItems" );
+ $r->param( "section", "DNSSettings" );
+ $self->advanceItems($r);
}
-
sub updateMXRecords {
- my $self=shift;
- my $r=shift;
- $r->param("dn", "cn=mxrecords, ou=dnsdata, $self->{'domaindn'}");
- $self->{'ispman'}->modifymxrecords($r, $r->param("dn"));
- $r->param("mode", "advanceItems");
- $r->param("section", "DNSSettings");
- $self->advanceItems($r);
+ my $self = shift;
+ my $r = shift;
+ $r->param( "dn", "cn=mxrecords, ou=dnsdata, $self->{'domaindn'}" );
+ $self->{'ispman'}->modifymxrecords( $r, $r->param("dn") );
+ $r->param( "mode", "advanceItems" );
+ $r->param( "section", "DNSSettings" );
+ $self->advanceItems($r);
}
sub updateARecords {
- my $self=shift;
- my $r=shift;
- $r->param("dn", "cn=arecords, ou=dnsdata, $self->{'domaindn'}");
+ my $self = shift;
+ my $r = shift;
+ $r->param( "dn", "cn=arecords, ou=dnsdata, $self->{'domaindn'}" );
- $self->{'ispman'}->modifyarecords($r, $r->param("dn"));
- $r->param("mode", "advanceItems");
- $r->param("section", "DNSSettings");
- $self->advanceItems($r);
+ $self->{'ispman'}->modifyarecords( $r, $r->param("dn") );
+ $r->param( "mode", "advanceItems" );
+ $r->param( "section", "DNSSettings" );
+ $self->advanceItems($r);
}
-
sub updateCnames {
- my $self=shift;
- my $r=shift;
- $r->param("dn", "cn=cnames, ou=dnsdata, $self->{'domaindn'}");
+ my $self = shift;
+ my $r = shift;
+ $r->param( "dn", "cn=cnames, ou=dnsdata, $self->{'domaindn'}" );
- $self->{'ispman'}->modifycnames($r, $r->param("dn"));
- $r->param("mode", "advanceItems");
- $r->param("section", "DNSSettings");
- $self->advanceItems($r);
+ $self->{'ispman'}->modifycnames( $r, $r->param("dn") );
+ $r->param( "mode", "advanceItems" );
+ $r->param( "section", "DNSSettings" );
+ $self->advanceItems($r);
}
-
-
-
-
-
-
-
-
-
sub editDNSRecord {
- my $self=shift;
- my $r=shift;
- my $type=$r->param("type");
- my $template=$self->getTemplate("customerMan/dns/$type.tmpl");
- print $template->fill_in();
+ my $self = shift;
+ my $r = shift;
+ my $type = $r->param("type");
+ my $template = $self->getTemplate("customerMan/dns/$type.tmpl");
+ print $template->fill_in();
}
sub addDNSRecord {
- my $self=shift;
- my $r=shift;
- my $type=$r->param("type");
-
- if ($type eq "ns") {
- $self->newDNSRecord($self->{'domain'}, "nSRecord", $r->param("origion"), $r->param("host"));
- }
- if ($type eq "mx") {
- $self->newDNSRecord($self->{'domain'}, "mXRecord", $r->param("origion"), join " ", ($r->param("pref"), $r->param("host")));
- }
- if ($type eq "a") {
- $self->newDNSRecord($self->{'domain'}, "aRecord", $r->param("host"), $r->param("ip"));
- }
- if ($type eq "cname") {
- $self->newDNSRecord($self->{'domain'}, "cNAMERecord", $r->param("alias"), $r->param("host"));
- }
+ my $self = shift;
+ my $r = shift;
+ my $type = $r->param("type");
- #$self->touchSOA($self->{'domain'});
- $r->param("section", "DNSSettings");
- $r->delete("dn");
- $r->delete("dns_partial_dn");
- $r->delete("ip");
- $r->delete("pref");
- $r->delete("origion");
- $r->delete("alias");
- $r->delete("hosts");
- $self->advanceItems($r);
-}
+ if ( $type eq "ns" ) {
+ $self->newDNSRecord(
+ $self->{'domain'}, "nSRecord",
+ $r->param("origion"), $r->param("host")
+ );
+ }
+ if ( $type eq "mx" ) {
+ $self->newDNSRecord( $self->{'domain'}, "mXRecord",
+ $r->param("origion"), join " ",
+ ( $r->param("pref"), $r->param("host") ) );
+ }
+ if ( $type eq "a" ) {
+ $self->newDNSRecord(
+ $self->{'domain'}, "aRecord",
+ $r->param("host"), $r->param("ip")
+ );
+ }
+ if ( $type eq "cname" ) {
+ $self->newDNSRecord(
+ $self->{'domain'}, "cNAMERecord",
+ $r->param("alias"), $r->param("host")
+ );
+ }
+ #$self->touchSOA($self->{'domain'});
+ $r->param( "section", "DNSSettings" );
+ $r->delete("dn");
+ $r->delete("dns_partial_dn");
+ $r->delete("ip");
+ $r->delete("pref");
+ $r->delete("origion");
+ $r->delete("alias");
+ $r->delete("hosts");
+ $self->advanceItems($r);
+}
sub updateDNSRecord {
- my $self=shift;
- my $r=shift;
- my $type=$r->param("type");
- if ($type eq "ns") {
- my $dn= join ("", ($r->param("dns_partial_dn"), $self->getDNSDN($self->{'domain'})));
- $self->deleteEntry($dn);
- $self->newDNSRecord($self->{'domain'}, "nSRecord", $r->param("origion"), $r->param("host"));
- }
-
- if ($type eq "mx") {
- my $dn= join ("", ($r->param("dns_partial_dn"), $self->getDNSDN($self->{'domain'})));
- $self->deleteEntry($dn);
- $self->newDNSRecord($self->{'domain'}, "mXRecord", $r->param("origion"), join " ", ($r->param("pref"), $r->param("host")));
- }
+ my $self = shift;
+ my $r = shift;
+ my $type = $r->param("type");
+ if ( $type eq "ns" ) {
+ my $dn = join(
+ "",
+ (
+ $r->param("dns_partial_dn"),
+ $self->getDNSDN( $self->{'domain'} )
+ )
+ );
+ $self->deleteEntry($dn);
+ $self->newDNSRecord(
+ $self->{'domain'}, "nSRecord",
+ $r->param("origion"), $r->param("host")
+ );
+ }
+ if ( $type eq "mx" ) {
+ my $dn = join(
+ "",
+ (
+ $r->param("dns_partial_dn"),
+ $self->getDNSDN( $self->{'domain'} )
+ )
+ );
+ $self->deleteEntry($dn);
+ $self->newDNSRecord( $self->{'domain'}, "mXRecord",
+ $r->param("origion"), join " ",
+ ( $r->param("pref"), $r->param("host") ) );
+ }
- if ($type eq "a") {
- my $dn= join ("", ($r->param("dns_partial_dn"), $self->getDNSDN($self->{'domain'})));
- $self->deleteEntry($dn);
- $self->newDNSRecord($self->{'domain'}, "aRecord", $r->param("host"), $r->param("ip"));
- }
+ if ( $type eq "a" ) {
+ my $dn = join(
+ "",
+ (
+ $r->param("dns_partial_dn"),
+ $self->getDNSDN( $self->{'domain'} )
+ )
+ );
+ $self->deleteEntry($dn);
+ $self->newDNSRecord(
+ $self->{'domain'}, "aRecord",
+ $r->param("host"), $r->param("ip")
+ );
+ }
- if ($type eq "cname") {
- my $dn= join ("", ($r->param("dns_partial_dn"), $self->getDNSDN($self->{'domain'})));
- $self->deleteEntry($dn);
- $self->newDNSRecord($self->{'domain'}, "cNAMERecord", $r->param("alias"), $r->param("host"));
- }
+ if ( $type eq "cname" ) {
+ my $dn = join(
+ "",
+ (
+ $r->param("dns_partial_dn"),
+ $self->getDNSDN( $self->{'domain'} )
+ )
+ );
+ $self->deleteEntry($dn);
+ $self->newDNSRecord(
+ $self->{'domain'}, "cNAMERecord",
+ $r->param("alias"), $r->param("host")
+ );
+ }
-
- $self->touchSOA($self->{'domain'});
- $r->param("section", "DNSSettings");
- $r->delete("dn");
- $r->delete("dns_partial_dn");
- $r->delete("ip");
- $r->delete("pref");
- $r->delete("origion");
- $r->delete("alias");
- $r->delete("hosts");
- $self->advanceItems($r);
+ $self->touchSOA( $self->{'domain'} );
+ $r->param( "section", "DNSSettings" );
+ $r->delete("dn");
+ $r->delete("dns_partial_dn");
+ $r->delete("ip");
+ $r->delete("pref");
+ $r->delete("origion");
+ $r->delete("alias");
+ $r->delete("hosts");
+ $self->advanceItems($r);
}
sub deleteDNSRecord {
- my $self=shift;
- my $r=shift;
- my $type=$r->param("type");
- if ($type eq "ns") {
- my $recordDN= $self->{'ispman'}->getnSRecordDn($self->{'domain'}, $r->param("origion"), $r->param("host"));
- $self->deleteEntry($recordDN);
- }
- if ($type eq "mx") {
- my $recordDN= $self->{'ispman'}->getmXRecordDn($self->{'domain'}, $r->param("origion"), $r->param("pref"), $r->param("host"));
- $self->deleteEntry($recordDN);
- }
- if ($type eq "a") {
- my $recordDN= $self->{'ispman'}->getARecordDn($self->{'domain'}, $r->param("host"), $r->param("ip"));
- $self->deleteEntry($recordDN);
- }
- if ($type eq "cname") {
- my $recordDN= $self->{'ispman'}->getcNAMERecordDn($self->{'domain'}, $r->param("host"), $r->param("alias"));
- $self->deleteEntry($recordDN);
- }
- if ($type eq "mx") {
- my $recordDN= $self->{'ispman'}->getmXRecordDn($self->{'domain'}, $r->param("origion"), $r->param("pref"), $r->param("host"));
- $self->deleteEntry($recordDN);
- }
-
- $self->touchSOA($self->{'domain'});
- $r->param("section", "DNSSettings");
- $r->delete("dn");
- $r->delete("dns_partial_dn");
- $r->delete("ip");
- $r->delete("pref");
- $r->delete("origion");
- $r->delete("hosts");
- $self->advanceItems($r);
-}
-
+ my $self = shift;
+ my $r = shift;
+ my $type = $r->param("type");
+ if ( $type eq "ns" ) {
+ my $recordDN =
+ $self->{'ispman'}
+ ->getnSRecordDn( $self->{'domain'}, $r->param("origion"),
+ $r->param("host") );
+ $self->deleteEntry($recordDN);
+ }
+ if ( $type eq "mx" ) {
+ my $recordDN = $self->{'ispman'}->getmXRecordDn(
+ $self->{'domain'}, $r->param("origion"),
+ $r->param("pref"), $r->param("host")
+ );
+ $self->deleteEntry($recordDN);
+ }
+ if ( $type eq "a" ) {
+ my $recordDN =
+ $self->{'ispman'}->getARecordDn( $self->{'domain'}, $r->param("host"),
+ $r->param("ip") );
+ $self->deleteEntry($recordDN);
+ }
+ if ( $type eq "cname" ) {
+ my $recordDN =
+ $self->{'ispman'}
+ ->getcNAMERecordDn( $self->{'domain'}, $r->param("host"),
+ $r->param("alias") );
+ $self->deleteEntry($recordDN);
+ }
+ if ( $type eq "mx" ) {
+ my $recordDN = $self->{'ispman'}->getmXRecordDn(
+ $self->{'domain'}, $r->param("origion"),
+ $r->param("pref"), $r->param("host")
+ );
+ $self->deleteEntry($recordDN);
+ }
+ $self->touchSOA( $self->{'domain'} );
+ $r->param( "section", "DNSSettings" );
+ $r->delete("dn");
+ $r->delete("dns_partial_dn");
+ $r->delete("ip");
+ $r->delete("pref");
+ $r->delete("origion");
+ $r->delete("hosts");
+ $self->advanceItems($r);
+}
sub remove_parent_dn {
- # remove the domain part etc.
- # we dont want someone to hack another domain than their own.
- my $self=shift;
- my ($domain, $recordDN)=@_;
- my $dnsDN=$self->getDNSDN($self->{'domain'});
- $recordDN=~s/\s*,\s*/,/g;
- $dnsDN=~s/\s*,\s*/,/g;
- $recordDN=~s/$dnsDN//;
- return $recordDN;
-}
+ # remove the domain part etc.
+ # we dont want someone to hack another domain than their own.
+ my $self = shift;
+ my ( $domain, $recordDN ) = @_;
+ my $dnsDN = $self->getDNSDN( $self->{'domain'} );
+ $recordDN =~ s/\s*,\s*/,/g;
+ $dnsDN =~ s/\s*,\s*/,/g;
+ $recordDN =~ s/$dnsDN//;
+ return $recordDN;
+}
sub getCustomer_nSRecordDn {
- my $self=shift;
- return $self->remove_parent_dn($self->{'domain'}, $self->{'ispman'}->getnSRecordDn($self->{'domain'}, @_));
+ my $self = shift;
+ return $self->remove_parent_dn( $self->{'domain'},
+ $self->{'ispman'}->getnSRecordDn( $self->{'domain'}, @_ ) );
}
-
sub getCustomer_mXRecordDn {
- my $self=shift;
- return $self->remove_parent_dn($self->{'domain'}, $self->{'ispman'}->getmXRecordDn($self->{'domain'}, @_));
+ my $self = shift;
+ return $self->remove_parent_dn( $self->{'domain'},
+ $self->{'ispman'}->getmXRecordDn( $self->{'domain'}, @_ ) );
}
sub getCustomer_ARecordDn {
- my $self=shift;
- return $self->remove_parent_dn($self->{'domain'}, $self->{'ispman'}->getARecordDn($self->{'domain'}, @_));
+ my $self = shift;
+ return $self->remove_parent_dn( $self->{'domain'},
+ $self->{'ispman'}->getARecordDn( $self->{'domain'}, @_ ) );
}
sub getCustomer_cNAMERecordDn {
- my $self=shift;
- return $self->remove_parent_dn($self->{'domain'}, $self->{'ispman'}->getcNAMERecordDn($self->{'domain'}, @_));
+ my $self = shift;
+ return $self->remove_parent_dn( $self->{'domain'},
+ $self->{'ispman'}->getcNAMERecordDn( $self->{'domain'}, @_ ) );
}
-
-
-
1;
__END__
Index: DomainSignature.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/CustomerMan/DomainSignature.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DomainSignature.pm 4 May 2002 10:43:44 -0000 1.2
+++ DomainSignature.pm 30 May 2004 23:35:36 -0000 1.3
@@ -2,23 +2,26 @@
use strict;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $Config);
-sub getDomainSignature(){
- my $self=shift;
- my $domain=$self->{'domain'};
- my $entry=$self->{'ispman'}->{'ldap'}->getEntryAsHashRef($self->{'domaindn'}, "uid=$domain" , ["ispmanDomainSignature"]);
- return $entry->{'ispmanDomainSignature'};
+sub getDomainSignature() {
+ my $self = shift;
+ my $domain = $self->{'domain'};
+ my $entry =
+ $self->{'ispman'}->{'ldap'}
+ ->getEntryAsHashRef( $self->{'domaindn'}, "uid=$domain",
+ ["ispmanDomainSignature"] );
+ return $entry->{'ispmanDomainSignature'};
}
-
-sub changeDomainSignature{
- my $self=shift;
- my $r=shift;
- my $dn=$self->{'domaindn'};
- $self->updateEntryWithData($dn, {"ispmanDomainSignature" => $r->param("ispmanDomainSignature")});
- $r->param("mode", "advanceItems");
- $r->param("message", "Signature changed");
- $r->param("section", "DomainSignature");
- $self->advanceItems($r);
+sub changeDomainSignature {
+ my $self = shift;
+ my $r = shift;
+ my $dn = $self->{'domaindn'};
+ $self->updateEntryWithData( $dn,
+ { "ispmanDomainSignature" => $r->param("ispmanDomainSignature") } );
+ $r->param( "mode", "advanceItems" );
+ $r->param( "message", "Signature changed" );
+ $r->param( "section", "DomainSignature" );
+ $self->advanceItems($r);
}
1;
Index: ApacheMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/CustomerMan/ApacheMan.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ApacheMan.pm 2 May 2004 17:31:06 -0000 1.7
+++ ApacheMan.pm 30 May 2004 23:35:36 -0000 1.8
@@ -3,290 +3,292 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $Config);
sub editVhost {
- my $self=shift;
- my $r=shift;
- my $text=shift;
-
+ my $self = shift;
+ my $r = shift;
+ my $text = shift;
- $r->param("ispmanDomain", $self->{'domain'});
-
+ $r->param( "ispmanDomain", $self->{'domain'} );
- unless ($r->param("vhost")){
- my $template=$self->getTemplate("customerMan/websites/editVhostHeader.tmpl");
- print $template->fill_in(PACKAGE => "CustomerMan");
- return;
- }
-
+ unless ( $r->param("vhost") ) {
+ my $template =
+ $self->getTemplate("customerMan/websites/editVhostHeader.tmpl");
+ print $template->fill_in( PACKAGE => "CustomerMan" );
+ return;
+ }
- $r->param("cn", $r->param("vhost"));
-
+ $r->param( "cn", $r->param("vhost") );
- my $template=$self->getTemplate("customerMan/websites/editVhostHeader.tmpl");
- $text.= $template->fill_in(PACKAGE => "CustomerMan");
-
- unless ($r->param("section")){
- $r->param("section", "WebsiteInfos");
- }
-
- $template=$self->getTemplate(join "", ("customerMan/websites/editVhost", $r->param("section"), ".tmpl"));
- $text.= $template->fill_in(PACKAGE => "CustomerMan");
- #$text.= $template->fill_in() || "<font color=red>This module is currently not available</font>";
+ my $template =
+ $self->getTemplate("customerMan/websites/editVhostHeader.tmpl");
+ $text .= $template->fill_in( PACKAGE => "CustomerMan" );
- $template=$self->getTemplate("customerMan/websites/editVhostFooter.tmpl");
- $text.= $template->fill_in(PACKAGE => "CustomerMan");
- #$text.= $template->fill_in();
-
- print $text;
+ unless ( $r->param("section") ) {
+ $r->param( "section", "WebsiteInfos" );
+ }
-}
+ $template =
+ $self->getTemplate( join "",
+ ( "customerMan/websites/editVhost", $r->param("section"), ".tmpl" ) );
+ $text .= $template->fill_in( PACKAGE => "CustomerMan" );
+#$text.= $template->fill_in() || "<font color=red>This module is currently not available</font>";
+ $template = $self->getTemplate("customerMan/websites/editVhostFooter.tmpl");
+ $text .= $template->fill_in( PACKAGE => "CustomerMan" );
-sub displayVhosts {
- my $self=shift;
- my $r=shift;
-
- my $template=$self->getTemplate("customerMan/websites/displayVhosts.tmpl");
- print $template->fill_in();
-}
+ #$text.= $template->fill_in();
+ print $text;
-sub displayAddVhostForm {
- my $self=shift;
- my $r=shift;
- my $template=$self->getTemplate("customerMan/websites/displayAddVhostForm.tmpl");
- print $template->fill_in();
}
+sub displayVhosts {
+ my $self = shift;
+ my $r = shift;
+ my $template =
+ $self->getTemplate("customerMan/websites/displayVhosts.tmpl");
+ print $template->fill_in();
+}
-
-
-
+sub displayAddVhostForm {
+ my $self = shift;
+ my $r = shift;
+ my $template =
+ $self->getTemplate("customerMan/websites/displayAddVhostForm.tmpl");
+ print $template->fill_in();
+}
sub getVhosts {
- my $self=shift;
- my $domain=$self->{'domain'};
- my $base=$self->{'ispman'}->getConf("ldapBaseDN");
- my $dn="ou=httpdata, ispmanDomain=$domain, $base";
- my $vhosts=$self->{'ispman'}->getApacheVhosts($dn);
- return $vhosts;
+ my $self = shift;
+ my $domain = $self->{'domain'};
+ my $base = $self->{'ispman'}->getConf("ldapBaseDN");
+ my $dn = "ou=httpdata, ispmanDomain=$domain, $base";
+ my $vhosts = $self->{'ispman'}->getApacheVhosts($dn);
+ return $vhosts;
}
sub deleteVhost {
- my $self=shift;
- my $r=shift;
+ my $self = shift;
+ my $r = shift;
- my $vhost=$r->param("cn");
- my $domain=$self->{'domain'};
- my $base=$self->{'ispman'}->getConf("ldapBaseDN");
- my $dn="ispmanVhostName=$vhost, ou=httpdata, ispmanDomain=$domain, $base";
-
- $r->param("ispmanDomain", $domain);
- $r->param("dn", $dn);
-
-
- if ($self->{'ispman'}->deleteVhost($r, 1)){
- $self->editVhost($r);
- }
+ my $vhost = $r->param("cn");
+ my $domain = $self->{'domain'};
+ my $base = $self->{'ispman'}->getConf("ldapBaseDN");
+ my $dn = "ispmanVhostName=$vhost, ou=httpdata, ispmanDomain=$domain, $base";
+
+ $r->param( "ispmanDomain", $domain );
+ $r->param( "dn", $dn );
+ if ( $self->{'ispman'}->deleteVhost( $r, 1 ) ) {
+ $self->editVhost($r);
+ }
}
-
sub getDomainVhostQuota {
- my $self=shift;
- my $domain=$self->{'domain'};
- my $domainInfo=$self->{'ispman'}->getDomainInfo($domain,1);
- return $domainInfo->{'ispmanMaxVhosts'};
+ my $self = shift;
+ my $domain = $self->{'domain'};
+ my $domainInfo = $self->{'ispman'}->getDomainInfo( $domain, 1 );
+ return $domainInfo->{'ispmanMaxVhosts'};
}
sub getDomainVhostInfo {
- my $self=shift;
- my $r=shift;
- my $vhost=$r->param("vhost");
- my $domain=$self->{'domain'};
- my $vhostInfo=$self->{'ispman'}->getVhostInfo($vhost, $domain);
- return $vhostInfo;
+ my $self = shift;
+ my $r = shift;
+ my $vhost = $r->param("vhost");
+ my $domain = $self->{'domain'};
+ my $vhostInfo = $self->{'ispman'}->getVhostInfo( $vhost, $domain );
+ return $vhostInfo;
}
sub getWebsiteAliases {
- my $self=shift;
- my $vhostInfo=$self->getDomainVhostInfo(@_);
- use Data::Dumper;
- print Dumper($vhostInfo);
+ my $self = shift;
+ my $vhostInfo = $self->getDomainVhostInfo(@_);
+ use Data::Dumper;
+ print Dumper($vhostInfo);
}
+sub changeWebsiteInfos {
+ my $self = shift;
+ my $r = shift;
+ my $vhost = $r->param("cn");
+ my $domain = $self->{'domain'};
+ my @documentrootoptions = ();
+ my @scriptdiroptions = ();
+ for ( $r->param ) {
+ if (/^documentrootoption/) {
+ if ( $r->param($_) ) {
+ push @documentrootoptions, $r->param($_);
+ }
+ }
+ if (/^scriptdiroption/) {
+ if ( $r->param($_) ) {
+ push @scriptdiroptions, $r->param($_);
+ }
+ }
+ }
+ my $dn = "ispmanVhostName=$vhost, ou=httpdata, $self->{'domaindn'}";
+ my $data = {};
+ $data->{"ispmanVhostDocumentRootOption"} = \@documentrootoptions;
+ $data->{"ispmanVhostScriptDirOption"} = \@scriptdiroptions;
-sub changeWebsiteInfos{
- my $self=shift;
- my $r=shift;
- my $vhost=$r->param("cn");
- my $domain=$self->{'domain'};
- my @documentrootoptions=();
- my @scriptdiroptions=();
-
- for ($r->param) {
- if (/^documentrootoption/) {
- if ($r->param($_)) {
- push @documentrootoptions, $r->param($_);
- }
- }
- if (/^scriptdiroption/) {
- if ($r->param($_)) {
- push @scriptdiroptions, $r->param($_);
- }
- }
- }
-
- my $dn="ispmanVhostName=$vhost, ou=httpdata, $self->{'domaindn'}";
- my $data={};
- $data->{"ispmanVhostDocumentRootOption"} = \@documentrootoptions;
- $data->{"ispmanVhostScriptDirOption"} = \@scriptdiroptions;
-
-
- if ($self->updateEntryWithData($dn, $data)){
- $self->addProcessToGroup($domain, "httpgroup", "ModifyVirtualHost", $r->param("cn"));
- }
+ if ( $self->updateEntryWithData( $dn, $data ) ) {
+ $self->addProcessToGroup( $domain, "httpgroup", "ModifyVirtualHost",
+ $r->param("cn") );
+ }
- $r->param("vhost", $vhost);
- $self->editVhost($r);
+ $r->param( "vhost", $vhost );
+ $self->editVhost($r);
}
-
sub addWebsiteAlias {
- my $self=shift;
- my $r=shift;
- print $r->as_string;
+ my $self = shift;
+ my $r = shift;
+ print $r->as_string;
- my $alias=$r->param("alias");
- $alias=~s/\.$self->{'domain'}//;
- $alias=join '.', ($alias, $self->{'domain'});
- my $vhost=$r->param("vhost");
+ my $alias = $r->param("alias");
+ $alias =~ s/\.$self->{'domain'}//;
+ $alias = join '.', ( $alias, $self->{'domain'} );
+ my $vhost = $r->param("vhost");
- my $dn="ispmanVhostName=$vhost, ou=httpdata, $self->{'domaindn'}";
+ my $dn = "ispmanVhostName=$vhost, ou=httpdata, $self->{'domaindn'}";
- print "Alias: $alias";
+ print "Alias: $alias";
+ if (
+ $self->{'ispman'}->getCount(
+ "ou=httpdata, $self->{'domaindn'}",
+ "ispmanVhostServerAlias=$alias"
+ )
+ )
+ {
+ $r->param( "errors",
+"This alias already exists for another website in your domain<br>Please choose another alias"
+ );
+ }
+ else {
+ $r->param( "message",
+ "Adding Website alias $alias for $vhost.$self->{'domain'}" );
+ $self->{'ispman'}
+ ->addData2Entry( $dn, { "ispmanVhostServerAlias" => $alias } );
+ }
- if ($self->{'ispman'}->getCount("ou=httpdata, $self->{'domaindn'}", "ispmanVhostServerAlias=$alias")){
- $r->param("errors", "This alias already exists for another website in your domain<br>Please choose another alias");
- } else {
- $r->param("message", "Adding Website alias $alias for $vhost.$self->{'domain'}");
- $self->{'ispman'}->addData2Entry($dn, {"ispmanVhostServerAlias" => $alias});
- }
-
- $self->addProcessToGroup($r->param("ispmanDomain"), "httpgroup", "ModifyVirtualHost", $vhost);
- $r->param("mode", "editVhost");
- $r->param("section", "WebsiteAliases");
- $self->editVhost($r);
+ $self->addProcessToGroup( $r->param("ispmanDomain"),
+ "httpgroup", "ModifyVirtualHost", $vhost );
+ $r->param( "mode", "editVhost" );
+ $r->param( "section", "WebsiteAliases" );
+ $self->editVhost($r);
}
-
sub updateWebsiteAliases {
- my $self=shift;
- my $r=shift;
- my $vhost=$r->param("cn");
- my $dn="cn=$vhost, ou=httpdata, $self->{'domaindn'}";
- my @aliases=();
-
- for ($r->param("serveralias")){
- if (/\S/){
- s/\.$self->{'domain'}$//;
- push @aliases, "$_\.$self->{'domain'}";
- }
- }
- my $vhostInfo=$self->{'ispman'}->getVhostInfo($dn);
- if (@aliases) {
- if ($self->modifyAttribute($dn, 'serveralias', \@aliases)){
- $self->addProcessToGroup($self->{'domain'}, "httpgroup", "ModifyVirtualHost", $r->param("cn"));
- }
- $vhostInfo->{'serveralias'}=\@aliases;
- } else {
- delete $vhostInfo->{'serveralias'};
- $self->deleteAttributes($dn, ["serveralias"]);
- }
-
-
+ my $self = shift;
+ my $r = shift;
+ my $vhost = $r->param("cn");
+ my $dn = "cn=$vhost, ou=httpdata, $self->{'domaindn'}";
+ my @aliases = ();
- $r->param("mode", "editVhost");
- $r->param("section", "WebsiteAliases");
- $r->param("vhost", $vhost);
- $self->editVhost($r);
+ for ( $r->param("serveralias") ) {
+ if (/\S/) {
+ s/\.$self->{'domain'}$//;
+ push @aliases, "$_\.$self->{'domain'}";
+ }
+ }
+ my $vhostInfo = $self->{'ispman'}->getVhostInfo($dn);
+ if (@aliases) {
+ if ( $self->modifyAttribute( $dn, 'serveralias', \@aliases ) ) {
+ $self->addProcessToGroup(
+ $self->{'domain'}, "httpgroup",
+ "ModifyVirtualHost", $r->param("cn")
+ );
+ }
+ $vhostInfo->{'serveralias'} = \@aliases;
+ }
+ else {
+ delete $vhostInfo->{'serveralias'};
+ $self->deleteAttributes( $dn, ["serveralias"] );
+ }
+ $r->param( "mode", "editVhost" );
+ $r->param( "section", "WebsiteAliases" );
+ $r->param( "vhost", $vhost );
+ $self->editVhost($r);
}
-
sub addHttpUser {
- my $self=shift;
- my $r=shift;
-
- #FIXME:: add code to check if the user does not exist
- # add code to create this branch if it does not exist
+ my $self = shift;
+ my $r = shift;
+ #FIXME:: add code to check if the user does not exist
+ # add code to create this branch if it does not exist
- #check if ou=httpusers, ispmanDomain=domain, o=ldapBaseDN exists.
- #if not, then create it.
- my $branch="ou=httpusers, " . $self->{'domaindn'};
- $self->prepareBranchForDN($branch);
+ #check if ou=httpusers, ispmanDomain=domain, o=ldapBaseDN exists.
+ #if not, then create it.
+ my $branch = "ou=httpusers, " . $self->{'domaindn'};
+ $self->prepareBranchForDN($branch);
- my $dn=join "", ("ispmanUserId=", $r->param("newusername"), ",ou=httpUsers, " , $self->{'domaindn'});
+ my $dn = join "",
+ (
+ "ispmanUserId=", $r->param("newusername"),
+ ",ou=httpUsers, ", $self->{'domaindn'}
+ );
- my $data={
- "ispmanUserId" => $r->param("newusername"),
- "ispmanDomain" => $self->{'domain'},
- "objectclass" => "ispmanVirtualHostUser"
- };
+ my $data = {
+ "ispmanUserId" => $r->param("newusername"),
+ "ispmanDomain" => $self->{'domain'},
+ "objectclass" => "ispmanVirtualHostUser"
+ };
- $data->{'userPassword'}=$self->encryptPassWithMethod($r->param("newuserpassword"),$self->getConf('userPassHashMethod'));
+ $data->{'userPassword'} =
+ $self->encryptPassWithMethod( $r->param("newuserpassword"),
+ $self->getConf('userPassHashMethod') );
- $self->addNewEntryWithData($dn, $data);
- $r->param("mode", "advanceItems");
- $r->param("section", "HttpUsers");
- $self->advanceItems($r);
+ $self->addNewEntryWithData( $dn, $data );
+ $r->param( "mode", "advanceItems" );
+ $r->param( "section", "HttpUsers" );
+ $self->advanceItems($r);
}
sub deleteHttpUser {
- my $self=shift;
- my $r=shift;
- my $dn=$r->param("dn");
- $self->deleteEntry($dn);
+ my $self = shift;
+ my $r = shift;
+ my $dn = $r->param("dn");
+ $self->deleteEntry($dn);
- $r->param("mode", "advanceItems");
- $r->param("section", "HttpUsers");
- $self->advanceItems($r);
+ $r->param( "mode", "advanceItems" );
+ $r->param( "section", "HttpUsers" );
+ $self->advanceItems($r);
}
sub updateHttpUser {
- #updating a user is to delete and recreate a user since userid is part of the dn.
- my $self=shift;
- my $r=shift;
- my $dn=$r->param("dn");
- $self->deleteEntry($dn);
- $r->param("newusername", $r->param("userid"));
- $r->param("newuserpassword", $r->param("userpassword"));
- $r->delete("userid");
- $r->delete("userpassword");
- $self->addHttpUser($r);
-}
-
+#updating a user is to delete and recreate a user since userid is part of the dn.
+ my $self = shift;
+ my $r = shift;
+ my $dn = $r->param("dn");
+ $self->deleteEntry($dn);
+ $r->param( "newusername", $r->param("userid") );
+ $r->param( "newuserpassword", $r->param("userpassword") );
+ $r->delete("userid");
+ $r->delete("userpassword");
+ $self->addHttpUser($r);
+}
sub getWebUsers {
- my $self=shift;
- return $self->getEntriesAsHashRef("ou=httpUsers, @{[$self->{'domaindn'}]}", "objectclass=ispmanVirtualHostUser", ["ispmanUserId", "userpassword"]);
+ my $self = shift;
+ return $self->getEntriesAsHashRef(
+ "ou=httpUsers, @{[$self->{'domaindn'}]}",
+ "objectclass=ispmanVirtualHostUser",
+ [ "ispmanUserId", "userpassword" ]
+ );
}
-
-
-
1;
-
__END__
Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/CustomerMan/UserMan.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- UserMan.pm 27 Apr 2004 22:17:23 -0000 1.8
+++ UserMan.pm 30 May 2004 23:35:36 -0000 1.9
@@ -2,386 +2,386 @@
use strict;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $Config);
-
-
sub addDomainUser {
- my $self=shift;
- my $domain=$self->{'domain'};
- print "Adding user in domain $domain<br>";
- my $template=$self->getTemplate("customerMan/users/addDomainUser.tmpl");
- print $template->fill_in(PACKAGE => "CustomerMan");
+ my $self = shift;
+ my $domain = $self->{'domain'};
+ print "Adding user in domain $domain<br>";
+ my $template = $self->getTemplate("customerMan/users/addDomainUser.tmpl");
+ print $template->fill_in( PACKAGE => "CustomerMan" );
}
-
sub newDomainUser {
- my $self=shift;
- my $domain=$self->{'domain'};
- #print "Domain: $domain <br>";
+ my $self = shift;
+ my $domain = $self->{'domain'};
- my $r=shift;
- #print $r->as_string;
+ #print "Domain: $domain <br>";
- my $domainInfo=$self->{'ispman'}->getDomainInfo($domain);
- #print $self->html_dumper($domainInfo);
+ my $r = shift;
- my $domainUsers=$self->getUserCount($domain);
- #print $self->html_dumper($domainUsers);
+ #print $r->as_string;
- my @errors=();
-
-
- if ($domainInfo->{'ispmanMaxAccounts'}>0 && $domainUsers >= $domainInfo->{'ispmanMaxAccounts'}) {
- push @errors, "Accounts limit exceeded. <br>Your Accounts limit is $domainInfo->{'ispmanMaxAccounts'}<br> You cannot create any more accounts";
- }
+ my $domainInfo = $self->{'ispman'}->getDomainInfo($domain);
+ #print $self->html_dumper($domainInfo);
- unless ($r->param("ispmanUserId")){
- push @errors, "Username not defined";
- }
- unless ($r->param("givenName")){
- push @errors, "Firstname not defined";
- }
- unless ($r->param("sn")){
- push @errors, "Lastname not defined";
- }
- unless ($r->param("userPassword")){
- push @errors, "Password not defined";
- }
-
- if (@errors) {
- my $errors= "User was not created<br><br><br><b>The following errors were encountered</b><br><br>";
- $errors.= join "<br>\n", @errors;
- $r->param("errors", $errors);
- $self->addDomainUser();
- return 0;
- }
-
- $domainInfo=$self->{'ispman'}->getDomainInfo($domain);
+ my $domainUsers = $self->getUserCount($domain);
- my $givenname=$r->param("givenName");
- my $sn=$r->param("sn");
- my $userpassword=$r->param("userPassword");
- my $username=$r->param("ispmanUserId");
+ #print $self->html_dumper($domainUsers);
- $givenname=~s/^\s\s*//g;
- $givenname=~s/\s\s*$//g;
-
- $sn=~s/^\s\s*//g;
- $sn=~s/\s\s*$//g;
-
- $userpassword=~s/^\s\s*//g;
- $userpassword=~s/\s\s*$//g;
+ my @errors = ();
- $username=~s/^\s\s*//g;
- $username=~s/\s\s*$//g;
+ if ( $domainInfo->{'ispmanMaxAccounts'} > 0
+ && $domainUsers >= $domainInfo->{'ispmanMaxAccounts'} )
+ {
+ push @errors,
+"Accounts limit exceeded. <br>Your Accounts limit is $domainInfo->{'ispmanMaxAccounts'}<br> You cannot create any more accounts";
+ }
-
- if($self->userExists($username)) {
- print "User account already exists.";
- return;
- }
-
+ unless ( $r->param("ispmanUserId") ) {
+ push @errors, "Username not defined";
+ }
+ unless ( $r->param("givenName") ) {
+ push @errors, "Firstname not defined";
+ }
+ unless ( $r->param("sn") ) {
+ push @errors, "Lastname not defined";
+ }
+ unless ( $r->param("userPassword") ) {
+ push @errors, "Password not defined";
+ }
- $r->param("uid", $username);
- $r->param("mailHost", $domainInfo->{'ispmanDomainDefaultMailDropHost'});
- $r->param("ispmanDomain", $self->{'domain'});
-
-
- my $infoHash;
+ if (@errors) {
+ my $errors =
+"User was not created<br><br><br><b>The following errors were encountered</b><br><br>";
+ $errors .= join "<br>\n", @errors;
+ $r->param( "errors", $errors );
+ $self->addDomainUser();
+ return 0;
+ }
+ $domainInfo = $self->{'ispman'}->getDomainInfo($domain);
-
- #if ($self->{'ispman'}->addUser($r)){
- if ($self->{'ispman'}->addUser($r)){
- my $infoHash;
- $infoHash->{'username'}=$username;
- $infoHash->{'uid'}=$self->userid2uid($username);
- $infoHash->{'userpassword'}=$userpassword;
- $infoHash->{'domain'}=$domain;
- $infoHash->{'givenname'}=$givenname;
- $infoHash->{'sn'}=$sn;
- my $message=qq|
- User created<br><br>
- Please print out the following information about the user<br><hr>
- |;
- $infoHash->{'message'}=$message;
- $r->param("message", $message);
+ my $givenname = $r->param("givenName");
+ my $sn = $r->param("sn");
+ my $userpassword = $r->param("userPassword");
+ my $username = $r->param("ispmanUserId");
+ $givenname =~ s/^\s\s*//g;
+ $givenname =~ s/\s\s*$//g;
+ $sn =~ s/^\s\s*//g;
+ $sn =~ s/\s\s*$//g;
+ $userpassword =~ s/^\s\s*//g;
+ $userpassword =~ s/\s\s*$//g;
- my $template=$self->getTemplate("customerMan/users/showDomainUserInfo.tmpl");
- print $template->fill_in(HASH => $infoHash);
- }
-}
+ $username =~ s/^\s\s*//g;
+ $username =~ s/\s\s*$//g;
+ if ( $self->userExists($username) ) {
+ print "User account already exists.";
+ return;
+ }
-sub deleteDomainUser {
- my $self=shift;
- my $r=shift;
+ $r->param( "uid", $username );
+ $r->param( "mailHost", $domainInfo->{'ispmanDomainDefaultMailDropHost'} );
+ $r->param( "ispmanDomain", $self->{'domain'} );
- my $domain=$self->{'domain'};
- my $uid=$self->userid2uid($r->param("user"));
- my $dn="uid=$uid, ou=users, $self->{'domaindn'}";
- $self->{'ispman'}->killUser($dn);
- $r->param("mode", "editDomainUser");
- $r->param("message", $self->getText("User deleted"));
- $r->delete("user");
- $self->editDomainUser($r);
+ my $infoHash;
+ #if ($self->{'ispman'}->addUser($r)){
+ if ( $self->{'ispman'}->addUser($r) ) {
+ my $infoHash;
+ $infoHash->{'username'} = $username;
+ $infoHash->{'uid'} = $self->userid2uid($username);
+ $infoHash->{'userpassword'} = $userpassword;
+ $infoHash->{'domain'} = $domain;
+ $infoHash->{'givenname'} = $givenname;
+ $infoHash->{'sn'} = $sn;
+ my $message = qq|
+ User created<br><br>
+ Please print out the following information about the user<br><hr>
+ |;
+ $infoHash->{'message'} = $message;
+ $r->param( "message", $message );
+
+ my $template =
+ $self->getTemplate("customerMan/users/showDomainUserInfo.tmpl");
+ print $template->fill_in( HASH => $infoHash );
+ }
}
-sub editDomainUser {
- my $self=shift;
- my $r=shift;
- unless ($r->param("user")){
- $r->param("section", "");
- my $template=$self->getTemplate("customerMan/users/editDomainUserHeader.tmpl");
- print $template->fill_in();
- return;
- }
-
+sub deleteDomainUser {
+ my $self = shift;
+ my $r = shift;
- $self->{'user'}=$self->{'ispman'}->getUserInfo($self->{'ispman'}->create_uid($r->param("user"), $self->{'domain'}));
+ my $domain = $self->{'domain'};
+ my $uid = $self->userid2uid( $r->param("user") );
+ my $dn = "uid=$uid, ou=users, $self->{'domaindn'}";
+ $self->{'ispman'}->killUser($dn);
+ $r->param( "mode", "editDomainUser" );
+ $r->param( "message", $self->getText("User deleted") );
+ $r->delete("user");
+ $self->editDomainUser($r);
- my $text="";
+}
- unless ($r->param("section")){
- $r->param("section", "PersonalInfo");
- }
- my $template=$self->getTemplate("customerMan/users/editDomainUserHeader.tmpl");
- $text.= $template->fill_in();
-
- $template=$self->getTemplate(join "", ("customerMan/users/editDomainUser", $r->param("section"), ".tmpl"));
- $text.= $template->fill_in();
+sub editDomainUser {
+ my $self = shift;
+ my $r = shift;
+ unless ( $r->param("user") ) {
+ $r->param( "section", "" );
+ my $template =
+ $self->getTemplate("customerMan/users/editDomainUserHeader.tmpl");
+ print $template->fill_in();
+ return;
+ }
- $template=$self->getTemplate("customerMan/users/editDomainUserFooter.tmpl");
- $text.= $template->fill_in();
+ $self->{'user'} =
+ $self->{'ispman'}->getUserInfo(
+ $self->{'ispman'}->create_uid( $r->param("user"), $self->{'domain'} ) );
- print $text;
-}
+ my $text = "";
+ unless ( $r->param("section") ) {
+ $r->param( "section", "PersonalInfo" );
+ }
+ my $template =
+ $self->getTemplate("customerMan/users/editDomainUserHeader.tmpl");
+ $text .= $template->fill_in();
+ $template =
+ $self->getTemplate( join "",
+ ( "customerMan/users/editDomainUser", $r->param("section"), ".tmpl" ) );
+ $text .= $template->fill_in();
+ $template =
+ $self->getTemplate("customerMan/users/editDomainUserFooter.tmpl");
+ $text .= $template->fill_in();
+ print $text;
+}
sub manageDomainUsers {
- my $self=shift;
- my $r=shift;
- my $template=$self->getTemplate("customerMan/users/manageDomainUsers.tmpl");
- print $template->fill_in();
+ my $self = shift;
+ my $r = shift;
+ my $template =
+ $self->getTemplate("customerMan/users/manageDomainUsers.tmpl");
+ print $template->fill_in();
}
-
-
sub getDomainUsers {
- my $self=shift;
-
- my $_dn;
- my $_users;
-
+ my $self = shift;
- my $users=$self->{'ispman'}->getDomainUsersForDomain($self->{'domain'});
- #print $self->{'ispman'}->html_dumper($users);
+ my $_dn;
+ my $_users;
-
-
- for (keys %$users) {
- $_dn=ISPMan::explodeDN($users->{$_});
- $_dn->{'ispmanDomain'}=~s/\./_/g;
- $_dn->{'uid'}=~s/_$_dn->{'ispmanDomain'}//g;
- $_users->{$_dn->{'uid'}}=$_;
- }
- return $_users;
-}
+ my $users = $self->{'ispman'}->getDomainUsersForDomain( $self->{'domain'} );
+ #print $self->{'ispman'}->html_dumper($users);
+ for ( keys %$users ) {
+ $_dn = ISPMan::explodeDN( $users->{$_} );
+ $_dn->{'ispmanDomain'} =~ s/\./_/g;
+ $_dn->{'uid'} =~ s/_$_dn->{'ispmanDomain'}//g;
+ $_users->{ $_dn->{'uid'} } = $_;
+ }
+ return $_users;
+}
sub editUsers {
- my $self=shift;
- my $r=shift;
- my $template=$self->getTemplate("customerMan/users/editUsers.tmpl");
- print $template->fill_in();
+ my $self = shift;
+ my $r = shift;
+ my $template = $self->getTemplate("customerMan/users/editUsers.tmpl");
+ print $template->fill_in();
}
-
sub changeDomainUserPersonalInfo {
- my $self=shift;
- my $r=shift;
- $self->{'ispman'}->set_user_attributes(
- $self->{'domain'},
- $self->{'ispman'}->create_uid($r->param("user"), $self->{'domain'}),
- {
+ my $self = shift;
+ my $r = shift;
+ $self->{'ispman'}->set_user_attributes(
+ $self->{'domain'},
+ $self->{'ispman'}->create_uid( $r->param("user"), $self->{'domain'} ),
+ {
'givenName' => $r->param("givenName"),
- 'sn' => $r->param("sn"),
- 'cn' => $r->param("cn")
- }
- );
+ 'sn' => $r->param("sn"),
+ 'cn' => $r->param("cn")
+ }
+ );
- $r->param("mode", "editDomainUser");
- $r->param("section", "PersonalInfo");
- $self->editDomainUser($r);
+ $r->param( "mode", "editDomainUser" );
+ $r->param( "section", "PersonalInfo" );
+ $self->editDomainUser($r);
}
-
sub changeDomainUserPass {
- my $self=shift;
- my $r=shift;
-
- my $uid=$self->userid2uid($r->param("user"));
- $self->{'ispman'}->changePassword($uid, $self->{'domain'}, $r->param("pass"), $self->{'ispman'}->getConf('userPassHashMethod'));
- $r->param("message", "Password changed to <font size=+1 color=maroon>@{[$r->param('pass')]}</font> for <font size=+1 color=maroon>$uid</font>");
- $r->param("mode", "editDomainUser");
- $self->editDomainUser($r);
+ my $self = shift;
+ my $r = shift;
-}
+ my $uid = $self->userid2uid( $r->param("user") );
+ $self->{'ispman'}
+ ->changePassword( $uid, $self->{'domain'}, $r->param("pass"),
+ $self->{'ispman'}->getConf('userPassHashMethod') );
+ $r->param( "message",
+"Password changed to <font size=+1 color=maroon>@{[$r->param('pass')]}</font> for <font size=+1 color=maroon>$uid</font>"
+ );
+ $r->param( "mode", "editDomainUser" );
+ $self->editDomainUser($r);
+}
sub addMailAlias {
- my $self=shift;
- my $r=shift;
- my ($mail,$dom)=split('@', $r->param("alias"));
- my $alias=join '@', ($mail, $self->{'domain'});
- my $uid=$self->userid2uid($r->param("user"));
-
+ my $self = shift;
+ my $r = shift;
+ my ( $mail, $dom ) = split( '@', $r->param("alias") );
+ my $alias = join '@', ( $mail, $self->{'domain'} );
+ my $uid = $self->userid2uid( $r->param("user") );
- $self->{'ispman'}->addMailAliasForUser($uid, $self->{'domain'}, $alias);
+ $self->{'ispman'}->addMailAliasForUser( $uid, $self->{'domain'}, $alias );
- $r->param("mode", "editDomainUser");
- $r->param("section", "EmailAliases");
- $self->editDomainUser($r);
+ $r->param( "mode", "editDomainUser" );
+ $r->param( "section", "EmailAliases" );
+ $self->editDomainUser($r);
}
-
sub deleteMailAlias {
- my $self=shift;
- my $r=shift;
-
- if ($r->param("mailAlias")){
- my $uid=$self->userid2uid($r->param("user"));
- my $aliasHash={};
- my $mailAliases=$self->as_arrayref($self->{'ispman'}->getMailAliasesForUser($uid, $self->{'domain'}));
-
- #print $self->html_dumper($mailAliases);
-
-
- if ($mailAliases) {
- #fill up the hash with all mailAliases.
- for (@$mailAliases) {
- $aliasHash->{$_}++;
- }
-
- #now delete the ones that we are being passed.
- for ($r->param("mailAlias")) {
- delete $aliasHash->{$_};
- }
-
- #call replaceMailAliasForUser method with reference to list of aliases
- $self->replaceMailAliasForUser($uid, $self->{'domain'}, [keys %$aliasHash]);
- }
- }
-
- $r->param("mode", "editDomainUser");
- $r->param("section", "EmailAliases");
- $self->editDomainUser($r);
-
+ my $self = shift;
+ my $r = shift;
+
+ if ( $r->param("mailAlias") ) {
+ my $uid = $self->userid2uid( $r->param("user") );
+ my $aliasHash = {};
+ my $mailAliases =
+ $self->as_arrayref(
+ $self->{'ispman'}->getMailAliasesForUser( $uid, $self->{'domain'} )
+ );
+
+ #print $self->html_dumper($mailAliases);
+
+ if ($mailAliases) {
+
+ #fill up the hash with all mailAliases.
+ for (@$mailAliases) {
+ $aliasHash->{$_}++;
+ }
+ #now delete the ones that we are being passed.
+ for ( $r->param("mailAlias") ) {
+ delete $aliasHash->{$_};
+ }
+
+ #call replaceMailAliasForUser method with reference to list of aliases
+ $self->replaceMailAliasForUser( $uid, $self->{'domain'},
+ [ keys %$aliasHash ] );
+ }
+ }
+
+ $r->param( "mode", "editDomainUser" );
+ $r->param( "section", "EmailAliases" );
+ $self->editDomainUser($r);
}
sub addMailDrop {
- my $self=shift;
- my $r=shift;
- my $maildrop=$r->param("maildrop");
- my @errors=();
- if (RFC::RFC822::Address::valid($maildrop)) {
- my $uid=$self->userid2uid($r->param("user"));
- my $dn="uid=$uid, ou=users, $self->{'domaindn'}";
- if ($self->{'ispman'}->getCount($dn, "mailForwardingAddress=$maildrop")){
- $r->param("message", "Mail drop $maildrop exists for $uid");
- } else {
- $r->param("message", "Adding $maildrop for $uid");
- $self->{'ispman'}->addData2Entry($dn, {"mailForwardingAddress" => $maildrop});
- }
- } else {
- $r->param("error", "Address $maildrop is not a valid internet email addres");
- }
- $r->param("mode", "editDomainUser");
- $r->param("section", "EmailForwards");
- $self->editDomainUser($r);
+ my $self = shift;
+ my $r = shift;
+ my $maildrop = $r->param("maildrop");
+ my @errors = ();
+ if ( RFC::RFC822::Address::valid($maildrop) ) {
+ my $uid = $self->userid2uid( $r->param("user") );
+ my $dn = "uid=$uid, ou=users, $self->{'domaindn'}";
+ if ( $self->{'ispman'}
+ ->getCount( $dn, "mailForwardingAddress=$maildrop" ) )
+ {
+ $r->param( "message", "Mail drop $maildrop exists for $uid" );
+ }
+ else {
+ $r->param( "message", "Adding $maildrop for $uid" );
+ $self->{'ispman'}
+ ->addData2Entry( $dn, { "mailForwardingAddress" => $maildrop } );
+ }
+ }
+ else {
+ $r->param( "error",
+ "Address $maildrop is not a valid internet email addres" );
+ }
+ $r->param( "mode", "editDomainUser" );
+ $r->param( "section", "EmailForwards" );
+ $self->editDomainUser($r);
}
-
sub deleteMailDrop {
- my $self=shift;
- my $r=shift;
-
- if ($r->param("mailForwardingAddress")){
- my $uid=$self->userid2uid($r->param("user"));
- my $forwardsHash={};
- my $mailForwardingAddress=$self->as_arrayref($self->{'ispman'}->getMailForwardsForUser($uid, $self->{'domain'}));
-
- #print $self->html_dumper($mailForwardingAddress);
-
-
- if ($mailForwardingAddress) {
- #fill up the hash with all mailAliases.
- for (@$mailForwardingAddress) {
- $forwardsHash->{$_}++;
- }
-
- #print $self->html_dumper($forwardsHash);
- #now delete the ones that we are being passed.
- for ($r->param("mailForwardingAddress")) {
- delete $forwardsHash->{$_};
- }
-
- #print $self->html_dumper($forwardsHash);
- #call replaceMailAliasForUser method with reference to list of aliases
- $self->replaceMailForwardForUser($uid, $self->{'domain'}, [keys %$forwardsHash]);
- }
- }
-
- $r->param("mode", "editDomainUser");
- $r->param("section", "EmailForwards");
- $self->editDomainUser($r);
-
+ my $self = shift;
+ my $r = shift;
+
+ if ( $r->param("mailForwardingAddress") ) {
+ my $uid = $self->userid2uid( $r->param("user") );
+ my $forwardsHash = {};
+ my $mailForwardingAddress =
+ $self->as_arrayref(
+ $self->{'ispman'}->getMailForwardsForUser( $uid, $self->{'domain'} )
+ );
+ #print $self->html_dumper($mailForwardingAddress);
-}
+ if ($mailForwardingAddress) {
+
+ #fill up the hash with all mailAliases.
+ for (@$mailForwardingAddress) {
+ $forwardsHash->{$_}++;
+ }
+
+ #print $self->html_dumper($forwardsHash);
+ #now delete the ones that we are being passed.
+ for ( $r->param("mailForwardingAddress") ) {
+ delete $forwardsHash->{$_};
+ }
+
+ #print $self->html_dumper($forwardsHash);
+ #call replaceMailAliasForUser method with reference to list of aliases
+ $self->replaceMailForwardForUser( $uid, $self->{'domain'},
+ [ keys %$forwardsHash ] );
+ }
+ }
+
+ $r->param( "mode", "editDomainUser" );
+ $r->param( "section", "EmailForwards" );
+ $self->editDomainUser($r);
+}
sub userid2uid {
- my $self=shift;
- my $username=shift;
- return $self->{'ispman'}->create_uid($username , $self->{'domain'});
+ my $self = shift;
+ my $username = shift;
+ return $self->{'ispman'}->create_uid( $username, $self->{'domain'} );
}
sub uid2userid {
- my $self=shift;
- my $uid=shift;
- $uid=~s/\_.*//g; #delete everything from first _, the name is already fully qualified.
- return lc($uid);
+ my $self = shift;
+ my $uid = shift;
+ $uid =~ s/\_.*//g
+ ; #delete everything from first _, the name is already fully qualified.
+ return lc($uid);
}
sub userExists {
- my $self=shift;
- #overrides the ISPMan::userExists;
- my $user=shift;
- my $uid=$self->userid2uid($user);
- #print "UID is $uid<br>";
+ my $self = shift;
- my $dn="uid=$uid, ou=users, $self->{'domaindn'}";
- #print "DN is $dn<br>";
+ #overrides the ISPMan::userExists;
+ my $user = shift;
+ my $uid = $self->userid2uid($user);
- return $self->{'ispman'}->getCount($dn);
-}
+ #print "UID is $uid<br>";
+ my $dn = "uid=$uid, ou=users, $self->{'domaindn'}";
+ #print "DN is $dn<br>";
-1;
+ return $self->{'ispman'}->getCount($dn);
+}
+1;
__END__
Index: Utils.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/CustomerMan/Utils.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Utils.pm 4 Jan 2004 18:56:15 -0000 1.5
+++ Utils.pm 30 May 2004 23:35:36 -0000 1.6
@@ -2,34 +2,21 @@
use strict;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $Config);
-
-
-
-
-
-
-
-
-
-
sub controlpanelmenu {
- my $self=shift;
- my $r=shift;
- my $template=$self->getTemplate("customerMan/menu.tmpl");
- print $template->fill_in(PACKAGE => "CustomerMan");
+ my $self = shift;
+ my $r = shift;
+ my $template = $self->getTemplate("customerMan/menu.tmpl");
+ print $template->fill_in( PACKAGE => "CustomerMan" );
}
sub index {
- my $self=shift;
- my $r=shift;
- my $template=$self->getTemplate("customerMan/index.tmpl");
- print $template->fill_in(PACKAGE => "CustomerMan");
+ my $self = shift;
+ my $r = shift;
+ my $template = $self->getTemplate("customerMan/index.tmpl");
+ print $template->fill_in( PACKAGE => "CustomerMan" );
}
-
-
1;
-
__END__
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click