ispman/lib/ISPMan ConfMan.pm,1.11,1.12 L10N.pm,1.3,1.4 ProcessMan.pm,1.20,1.21

Update of /cvsroot/ispman/ispman/lib/ISPMan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14652/lib/ISPMan

Modified Files:
	ConfMan.pm L10N.pm ProcessMan.pm 
Log Message:
removed all those nasty ^Ms

Folks! Try to avoid windows editors when editing ispman files



Index: ConfMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/ConfMan.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ConfMan.pm	14 Jan 2004 00:01:24 -0000	1.11
+++ ConfMan.pm	21 Feb 2004 21:31:31 -0000	1.12
@@ -40,8 +40,8 @@
 modifyModule
 getConfVars
 setConfVar
-getConfVarDN
-getConfModuleDN
+getConfVarDN
+getConfModuleDN
 );
 
 $VERSION = '0.01';
@@ -57,17 +57,17 @@
 
 }
 
-sub getConfModuleDN{
-	my $self=shift;
-	my ($module)=shift;
-	return "ispmanModule=$module,ou=conf, @{[$self->getConf('ldapBaseDN')]}";
-}
-
-sub getConfVarDN {
-	my $self=shift;
-	my ($module,$var)=@_;
-	return join ',', "ispmanVar=$var" , $self->getConfModuleDN($module);
-}
+sub getConfModuleDN{
+	my $self=shift;
+	my ($module)=shift;
+	return "ispmanModule=$module,ou=conf, @{[$self->getConf('ldapBaseDN')]}";
+}
+
+sub getConfVarDN {
+	my $self=shift;
+	my ($module,$var)=@_;
+	return join ',', "ispmanVar=$var" , $self->getConfModuleDN($module);
+}
 
 sub getConfModules {
    my $self=shift;

Index: L10N.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/L10N.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- L10N.pm	10 Jan 2004 18:27:11 -0000	1.3
+++ L10N.pm	21 Feb 2004 21:31:31 -0000	1.4
@@ -29,9 +29,9 @@
    if (-e $po) {
       $languages->{$_}=["Gettext" => $po];
    } else {
-      unless ($_ eq $Config->{'nls'}{'defaults'}{'language'}){
+      unless ($_ eq $Config->{'nls'}{'defaults'}{'language'}){
 		  delete $ISPMan::Config->{'nls'}{'languages'}{$_};
-	   }
+	   }
    }
 }
 

Index: ProcessMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/ProcessMan.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ProcessMan.pm	14 Jan 2004 01:16:14 -0000	1.20
+++ ProcessMan.pm	21 Feb 2004 21:31:31 -0000	1.21
@@ -138,11 +138,11 @@
    if ($ENV{'HTTP_USER_AGENT'}){
       if ($self->{'sessID'}) {
 		$data->{'ispmanStatus'}="insession";
-		$data->{'ispmanSession'}=$self->{'sessID'};
+		$data->{'ispmanSession'}=$self->{'sessID'};
 		$data->{'ispmanUser'}=$self->{'REMOTE_USER'};		 
       } else {
-		$data->{'ispmanStatus'}="new";
-		$data->{'ispmanSession'}="CONTROLPANEL-$domain";
+		$data->{'ispmanStatus'}="new";
+		$data->{'ispmanSession'}="CONTROLPANEL-$domain";
 		$data->{'ispmanUser'}=$domain;		 
       }
    } else {



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click