ispman/bin ispman-agent,1.59,1.60 ispman.getVhostAttribute,1.2,1.3 ispman.listVars,1.6,1.7

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

Modified Files:
	ispman-agent ispman.getVhostAttribute ispman.listVars 
Log Message:
removed all those nasty ^Ms

Folks! Try to avoid windows editors when editing ispman files



Index: ispman-agent
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman-agent,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- ispman-agent	1 Feb 2004 15:21:38 -0000	1.59
+++ ispman-agent	21 Feb 2004 21:31:24 -0000	1.60
@@ -93,7 +93,7 @@
         unlink $pid_file if $ARGV[0] =~ /forcerestart/i;
 	sleep (1) if $ARGV[0] =~/restart/i;
 }
-
+
   if ($ARGV[0] && ($ARGV[0] =~ /stop|restart|forcerestart/i)) {
     unless (-e $pid_file) {
       print "pid file $pid_file not found\n";

Index: ispman.getVhostAttribute
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.getVhostAttribute,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ispman.getVhostAttribute	18 Jan 2004 02:24:47 -0000	1.2
+++ ispman.getVhostAttribute	21 Feb 2004 21:31:25 -0000	1.3
@@ -13,11 +13,11 @@
 use ISPMan;
 
 my $ispman=ISPMan->new();
-
-my $vals=$ispman->as_arrayref($ispman->getVhostAttribute(@ARGV));
-
-for (@$vals){
-	print "$_";
-}
+
+my $vals=$ispman->as_arrayref($ispman->getVhostAttribute(@ARGV));
+
+for (@$vals){
+	print "$_";
+}
 	
-print "\n";
+print "\n";

Index: ispman.listVars
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.listVars,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ispman.listVars	16 Jan 2004 17:27:46 -0000	1.6
+++ ispman.listVars	21 Feb 2004 21:31:25 -0000	1.7
@@ -6,54 +6,54 @@
 
 use ISPMan;
 my $ispman=ISPMan->new();
-
-my $modules;
-my $module;
+
+my $modules;
+my $module;
 my ($var,$val);
-
-if ($ARGV[0]){
-	push @$modules, $ARGV[0];
-} else {
-	my $all_modules=$ispman->getConfModules();
-	for (keys %$all_modules){
-		push @$modules, $all_modules->{$_}{'ispmanModule'};
-	}
-}
-
-my $ispmanVars;
-
-
-for $module(@$modules){
-	print "Module: $module\n\n";
+
+if ($ARGV[0]){
+	push @$modules, $ARGV[0];
+} else {
+	my $all_modules=$ispman->getConfModules();
+	for (keys %$all_modules){
+		push @$modules, $all_modules->{$_}{'ispmanModule'};
+	}
+}
+
+my $ispmanVars;
+
+
+for $module(@$modules){
+	print "Module: $module\n\n";
 	my $vars=$ispman->getConfVars($module);
-	for (keys %$vars){
-		$ispmanVars->{$vars->{$_}{'ispmanVar'}}{'ispmanQuestion'}=$vars->{$_}{'ispmanQuestion'};
-		$ispmanVars->{$vars->{$_}{'ispmanVar'}}{'ispmanVal'}=$vars->{$_}{'ispmanVal'};
-	}
-	
-	
-	
-	my @ispmanVars;
-	my $varDN;
-	
-	
-	if ($ispman->{'Config'}{'ispmanVarSort'}{$module}){
-		my $varSort=$ispman->{'Config'}{'ispmanVarSort'}{$module};
-		for (@$varSort){
-			$var=$_;
-			$val=$ispmanVars->{$var}{'ispmanVal'};
-			write();
-		}
-	}
-}
-
-	
-
-
-
-
-
-
+	for (keys %$vars){
+		$ispmanVars->{$vars->{$_}{'ispmanVar'}}{'ispmanQuestion'}=$vars->{$_}{'ispmanQuestion'};
+		$ispmanVars->{$vars->{$_}{'ispmanVar'}}{'ispmanVal'}=$vars->{$_}{'ispmanVal'};
+	}
+	
+	
+	
+	my @ispmanVars;
+	my $varDN;
+	
+	
+	if ($ispman->{'Config'}{'ispmanVarSort'}{$module}){
+		my $varSort=$ispman->{'Config'}{'ispmanVarSort'}{$module};
+		for (@$varSort){
+			$var=$_;
+			$val=$ispmanVars->{$var}{'ispmanVal'};
+			write();
+		}
+	}
+}
+
+	
+
+
+
+
+
+
 
 
 format STDOUT =



-------------------------------------------------------
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