ispman/lib/ISPMan UserMan.pm,1.35.2.2,1.35.2.3
Joerg Delker <[email protected]>
| Newsgroups | gmane.comp.isp.ispman.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ispman/ispman/lib/ISPMan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26195/lib/ISPMan
Modified Files:
Tag: rel_1_1-bugfixes
UserMan.pm
Log Message:
fixes bug [ 913364 ] ARRAY(0x805f978 instead of host in processes
Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -u -d -r1.35.2.2 -r1.35.2.3
--- UserMan.pm 8 Feb 2004 20:25:52 -0000 1.35.2.2
+++ UserMan.pm 17 Apr 2004 09:46:24 -0000 1.35.2.3
@@ -54,8 +54,8 @@
searchUsers
addUserFileServerProcess
-suggestHostForFileServer
-
+suggestHostForFileServer
+
);
$VERSION = '0.01';
@@ -158,11 +158,11 @@
#define 5 MB quota by default
if ($r->param("mailQuota") !~ /\d\d*/ || $r->param("mailQuota") < 0) {
$r->param("mailQuota", 5);
- }
-
- unless (defined $r->param("fileHost") && $r->param("fileHost") ne "none" ){
- $r->param('fileHost', $self->suggestHostForFileServer($domain));
- }
+ }
+
+ unless (defined $r->param("fileHost") && $r->param("fileHost") ne "none" ){
+ $r->param('fileHost', $self->suggestHostForFileServer($domain));
+ }
$r->param("homeDirectory", $homeDirectory);
@@ -556,21 +556,21 @@
-sub suggestHostForFileServer {
- my $self=shift;
-
+sub suggestHostForFileServer {
+ my $self=shift;
+
my ($domain)=@_;
-
- my $_filehost;
-
+
+ my $_filehost;
+
if ($_filehost=$self->getDomainAttribute($domain, "ispmanDomainDefaultFileServer")){
- return $_filehost;
+ return @$_filehost[0];
}elsif ($_filehost=$self->getHostGroupFirstMember('fileservergroup')) {
- return $_filehost;
+ return $_filehost;
} else {
- return 0;
+ return 0;
}
-}
+}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click