[Ispman-cvs] CVS: ispman-utils/lib/ISPMan ApacheMan.pm,1.21,1.22 DomainMan.pm,1.35,1.36 UserMan.pm,1.23,1.24

[Atif G. <ma...@us...>]

Update of /cvsroot/ispman/ispman-utils/lib/ISPMan
In directory usw-pr-cvs1:/tmp/cvs-serv24277/lib/ISPMan

Modified Files:
	ApacheMan.pm DomainMan.pm UserMan.pm 
Log Message:


Index: ApacheMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman-utils/lib/ISPMan/ApacheMan.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** ApacheMan.pm	30 May 2002 18:55:20 -0000	1.21
--- ApacheMan.pm	31 May 2002 04:07:20 -0000	1.22
***************
*** 78,108 ****
  
  sub editVhost {
!    my $self=shift;
!    my $r=shift;
!    my $dn=$r->param("dn");
!    $self->{'vhost'}=$self->getVhostInfo($dn);
! 
! 
! 
  
- 	my $vhostDN=$self->getVhostDN($r->param("ispmanDomain"), $r->param("ispmanVhostName"));
- 	
-    my $template;
- 	my $tmpl;
- 	my $text="";
- 	
- 	my $text=$self->getTemplate("vhosts/edit_header.tmpl")->fill_in(PACKAGE => "ISPMan");
  
!    if ($self->isDomainEditable($r->param("ispmanDomain"))) {
!       $tmpl=($r->param("section"))? join "_", ("edit", $r->param("section")) : "edit";
!       
!       
!       $template=$self->getTemplate("vhosts/$tmpl\.tmpl");
!    } else {
!       $template=$self->getTemplate("vhosts/view.tmpl");
!    }
!    $text.=$template->fill_in(PACKAGE => "ISPMan");
!    print $text;
!    
  }
  
--- 78,109 ----
  
  sub editVhost {
!     my $self=shift;
!     my $r=shift;
  
  
!     my $dn;
!     if ($r->param("dn")) {
!         $dn=$r->param("dn");
!     } else {
!         $dn=$self->getVhostDN($r->param("ispmanDomain") , $r->param("ispmanVhostName"));
!     }
! 
!     $self->{'vhost'}=$self->getVhostInfo($dn);
!     my $vhostDN=$self->getVhostDN($r->param("ispmanDomain"), $r->param("ispmanVhostName"));
! 
!     my $template;
!     my $tmpl;
!     my $text="";
! 
!     my $text=$self->getTemplate("vhosts/edit_header.tmpl")->fill_in(PACKAGE => "ISPMan");
! 
!     if ($self->isDomainEditable($r->param("ispmanDomain"))) {
!         $tmpl=($r->param("section"))? join "_", ("edit", $r->param("section")) : "edit";
!         $template=$self->getTemplate("vhosts/$tmpl\.tmpl");
!     } else {
!         $template=$self->getTemplate("vhosts/view.tmpl");
!     }
!     $text.=$template->fill_in(PACKAGE => "ISPMan");
!     print $text;
  }
  
***************
*** 112,127 ****
  
  sub getApacheVhosts {
!    my $self=shift;
!    my $dn=shift;
!    unless ($dn=~/^(ispmanVhostName|ou=)/){
!       #its a domain name instead
!       $dn="ou=httpdata, " . $self->getDomainDN($dn);
!    }
!    my $vhostsHash=$self->getEntriesAsHashRef($dn, "objectclass=ispmanVirtualHost", ["ispmanVhostName"]);
!    my $vhosts;
!    for (keys %$vhostsHash) {
!       $vhosts->{$vhostsHash->{$_}{'ispmanVhostName'}}=$_;
!    }
!    return $vhosts;
  }
  
--- 113,128 ----
  
  sub getApacheVhosts {
!     my $self=shift;
!     my $dn=shift;
!     unless ($dn=~/^(ispmanVhostName|ou=)/){
! #its a domain name instead
!         $dn="ou=httpdata, " . $self->getDomainDN($dn);
!     }
!     my $vhostsHash=$self->getEntriesAsHashRef($dn, "objectclass=ispmanVirtualHost", ["ispmanVhostName"]);
!     my $vhosts;
!     for (keys %$vhostsHash) {
!         $vhosts->{$vhostsHash->{$_}{'ispmanVhostName'}}=$_;
!     }
!     return $vhosts;
  }
  
***************
*** 138,197 ****
  
  sub update_vhost {
!    my $self=shift;
!    my $r=shift;
!    my $dn=$r->param("dn");
  
!    my $domain=$r->param("ispmanDomain");
!    my $domain_info=$self->getDomainInfo($domain);
  
-    
-    if ($r->param("ispmanVhostServerAlias")){
  
-       my $serveralias=[split(/\s\s*/, $r->param("ispmanVhostServerAlias"))];
-       $r->param("ispmanVhostServerAlias", $serveralias) if $serveralias;
-    } else {
-       $r->param("ispmanVhostServerAlias", " ");
-    }
-    
-    my $data;
-    $data ={
-             "ispmanVhostName" =>  $r->param("ispmanVhostName"),
-             "cn" =>  $r->param("ispmanVhostName"),
-             'uidNumber' => $domain_info->{'uidNumber'},
-             'gidNumber' => $domain_info->{'gidNumber'},
-             "ispmanDomain" => $domain,
-    };
-    $data->{'uid'}=join '.' , ($r->param("ispmanVhostName"), $r->param("ispmanDomain"));
-    $data->{'homeDirectory'}=join '/' , ($domain_info->{'homeDirectory'}, "vhosts", $r->param("ispmanVhostName"));
  
!    for (qw(ispmanVhostServerAlias ispmanVhostExtraConf ispmanVhostIpAddress ispmanVhostDocumentRoot ispmanVhostScriptDir
!       FTPQuotaMBytes FTPStatus)) {
!       if ($r->param($_)) {
!             $data->{$_}=$r->param($_);
!       }
!    }
!    
!    $data->{'userPassword'}=$self->encryptPassWithMethod($r->param("userPassword"),$self->getConf('userPassHashMethod'));
!    #update the objectclasses if they are different
!    $data->{'objectClass'}=$self->{'Config'}{'ispmanVhostObjectclasses'};
  
  
  
-    for (qw(ispmanVhostDocumentRootOption ispmanVhostScriptDirOption)) {
-       if ($r->param($_)) {
-             $data->{$_}=[$r->param($_)];
-       } else {
-          $data->{$_}="";
-       }
-    }
-     
  
!    
!    
!    if ($self->{'ldap'}->updateEntryWithData($dn, $data)){
!       $self->addProcessToGroup($r->param("ispmanDomain"), "httpgroup", "ModifyVirtualHost", $r->param("ispmanVhostName"));
!    }
  
! 	return 1;
  }
  
--- 139,198 ----
  
  sub update_vhost {
!     my $self=shift;
!     my $r=shift;
!     my $dn=$r->param("dn");
! 
!     my $domain=$r->param("ispmanDomain");
!     my $domain_info=$self->getDomainInfo($domain);
! 
! 
!     if ($r->param("ispmanVhostServerAlias")) {
! 
!         my $serveralias=[split(/\s\s*/, $r->param("ispmanVhostServerAlias"))];
!         $r->param("ispmanVhostServerAlias", $serveralias) if$serveralias;
!     } else {
!         $r->param("ispmanVhostServerAlias", " ");
!     }
! 
!     my $data;
!     $data ={
!       "ispmanVhostName" =>  $r->param("ispmanVhostName"),
!       "cn" =>  $r->param("ispmanVhostName"),
!       'uidNumber' => $domain_info->{'uidNumber'},
!       'gidNumber' => $domain_info->{'gidNumber'},
!       "ispmanDomain" => $domain,
!     };
!     $data->{'uid'}=join '.' , ($r->param("ispmanVhostName"), $r->param("ispmanDomain"));
!     $data->{'homeDirectory'}=join '/' , ($domain_info->{'homeDirectory'}, "vhosts", $r->param("ispmanVhostName"));
! 
!     for (qw(ispmanVhostServerAlias ispmanVhostExtraConf ispmanVhostIpAddress ispmanVhostDocumentRoot ispmanVhostScriptDir
!             FTPQuotaMBytes FTPStatus)) {
!         if ($r->param($_)) {
!             $data->{$_}=$r->param($_);
!         }
!     }
  
!     $data->{'userPassword'}=$self->encryptPassWithMethod($r->param("userPassword"),$self->getConf('userPassHashMethod'));
! #update the objectclasses if they are different
!     $data->{'objectClass'}=$self->{'Config'}{'ispmanVhostObjectclasses'};
  
  
  
!     for (qw(ispmanVhostDocumentRootOption ispmanVhostScriptDirOption)) {
!         if ($r->param($_)) {
!             $data->{$_}=[$r->param($_)];
!         } else {
!             $data->{$_}="";
!         }
!     }
  
  
  
  
!     if ($self->{'ldap'}->updateEntryWithData($dn, $data)) {
!         $self->addProcessToGroup($r->param("ispmanDomain"), "httpgroup", "ModifyVirtualHost", $r->param("ispmanVhostName"));
!     }
  
!     return 1;
  }
  
***************
*** 217,226 ****
     my $self=shift;
     my $r=shift;
- 
- 
     if ($self->addVhost($r)){
-       #if ($r->param("database") eq "on") {
-       #   $self->create_vhost_database($r->param("domain"), $r->param("ispmanVhostName"), $self->genPass());
-       #}
        print $self->refreshSignal($r->param("ispmanDomain"));
        $self->editVhost($r);
--- 218,222 ----
***************
*** 242,249 ****
     my $domain=$r->param("ispmanDomain");
     my $domain_info=$self->getDomainInfo($domain);
!    my $dn="ispmanVhostName=$ispmanVhostName, ou=httpdata, ispmanDomain=$domain, " . $self->getConf("ldapBaseDN");
!    $self->prepareBranchForDN("ou=httpdata, ispmanDomain=$domain, " . $self->getConf("ldapBaseDN"));
     $r->param("dn", $dn);
     
     my $documentrootoptions=$self->as_arrayref($r->param("ispmanVhostDocumentRootOption"));
     my $scriptdiroptions=$self->as_arrayref($r->param("ispmanVhostScriptDirOption"));;
--- 238,246 ----
     my $domain=$r->param("ispmanDomain");
     my $domain_info=$self->getDomainInfo($domain);
!    my $dn=$self->getVhostDN($domain, $ispmanVhostName);
     $r->param("dn", $dn);
     
+    $self->prepareBranchForDN($self->getVhostsBranchDN($domain));
+    
     my $documentrootoptions=$self->as_arrayref($r->param("ispmanVhostDocumentRootOption"));
     my $scriptdiroptions=$self->as_arrayref($r->param("ispmanVhostScriptDirOption"));;
***************
*** 311,315 ****
     my $self=shift;
     my ($domain, $vhost)=@_;
!    return "ispmanVhostName=$vhost, ou=httpdata, ". $self->getDomainDN($domain);
  
  }
--- 308,312 ----
     my $self=shift;
     my ($domain, $vhost)=@_;
!    return join ",", ("ispmanVhostName=$vhost", $self->getVhostsBranchDN($domain));
  
  }
***************
*** 318,322 ****
     my $self=shift;
     my $domain=shift;
!    return join  (",",  "ou=httpdata, ispmanDomain=$domain", $self->getConf('ldapBaseDN'));
  }
  
--- 315,319 ----
     my $self=shift;
     my $domain=shift;
!    return join  (",",  "ou=httpdata", "ispmanDomain=$domain", $self->getConf('ldapBaseDN'));
  }
  

Index: DomainMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman-utils/lib/ISPMan/DomainMan.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** DomainMan.pm	30 May 2002 18:55:20 -0000	1.35
--- DomainMan.pm	31 May 2002 04:07:20 -0000	1.36
***************
*** 625,629 ****
  }
  
! sub getDomainsCount {
     my ($self)=@_;
     my $base = "ou=domains, ";
--- 625,629 ----
  }
  
! sub xgetDomainsCount {
     my ($self)=@_;
     my $base = "ou=domains, ";
***************
*** 632,635 ****
--- 632,650 ----
  
  
+ sub getDomainsCount {
+    my $self=shift;
+    
+    undef $self->{'filter'};
+    $self->{'filter'}=shift;
+   
+    $self->{'searchFilter'}="&(objectclass=ispmanDomain)";
+    $self->{'searchFilter'}.="($self->{'filter'})"  if ($self->{'filter'});
+    
+    return $self->getCount(
+    	$self->{'Config'}->{'ldapBaseDN'}, 
+    	"$self->{'searchFilter'}", 
+    	);
+ }
+ 
  sub getReplicaCountForDomain {
     my ($self, $domain)=@_;
***************
*** 887,891 ****
        
        for (qw(homeDirectory ispmanDomainOwner ispmanDomainCustomer 
!          ispmanMaxAccounts ispmanMaxVhosts ispmanDomainComment
           FTPStatus FTPQuotaMBytes
                 ispmanDomainService )) {
--- 902,906 ----
        
        for (qw(homeDirectory ispmanDomainOwner ispmanDomainCustomer 
!          ispmanMaxAccounts ispmanMaxVhosts ispmanDomainSignature ispmanDomainComment
           FTPStatus FTPQuotaMBytes
                 ispmanDomainService )) {

Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman-utils/lib/ISPMan/UserMan.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** UserMan.pm	30 May 2002 16:11:54 -0000	1.23
--- UserMan.pm	31 May 2002 04:07:20 -0000	1.24
***************
*** 7,11 ****
  
  @ISA = qw(ISPMan Exporter AutoLoader);
! @EXPORT = qw(
     newUser
     addUser
--- 7,17 ----
  
  @ISA = qw(ISPMan Exporter AutoLoader);
! use ISPMan::UserMan::WebUsers;
! 
! push @EXPORT, @ISPMan::UserMan::WebUsers::EXPORT;
! 
! 
! push @EXPORT , qw(
!    create_uid
     newUser
     addUser
***************
*** 23,39 ****
     getUsersCount
     userExists
! getUsersBranchDN
! getUserDN
! fixDuplicateUsers
! getDomainUsersForDomain
! getMailAliasesForUser
! addMailAliasForUser
! replaceMailAliasForUser
! getMailForwardsForUser
! addMailForwardForUser
! replaceMailForwardForUser
! 
! 
! changePassword
     searchUsers
  );
--- 29,45 ----
     getUsersCount
     userExists
!    getUsersBranchDN
!    getUserDN
!    fixDuplicateUsers
!    getDomainUsersForDomain
!    getMailAliasesForUser
!    addMailAliasForUser
!    replaceMailAliasForUser
!    getMailForwardsForUser
!    addMailForwardForUser
!    replaceMailForwardForUser
!    
!    
!    changePassword
     searchUsers
  );
***************
*** 112,120 ****
     my $domain=$r->param("ispmanDomain");
  
-    #my $_uid=$r->param("uid");
-    my $_uid=join '_', ($r->param("uid"), $domain);
-    $_uid=~s/\./_/g;
-    
  
     $r->param("uid", $_uid);
     
--- 118,123 ----
     my $domain=$r->param("ispmanDomain");
  
  
+    my $_uid=$self->create_uid($r->param("uid"), $r->param("ispmanDomain"));
     $r->param("uid", $_uid);
     
***************
*** 404,407 ****
--- 407,427 ----
     return $self->getCount($uid);
  }
+ 
+ sub create_uid {
+    my $self=shift;
+    my ($userId, $domain)=@_;
+    
+    # here is the logic to convert userName to user_domain_tld
+    # If you dont want this behaviour and just wasnt uid uncomment the next line;
+    # return $userId;
+    
+ 
+    $domain=~  s/\./_/g;
+    unless ($userId=~ /$domain$/){
+       $userId=join "_", ($userId, $domain);
+    }
+    return $userId;
+ }
+ 
  1;