ispman/bin ispman-agent,1.65,1.65.2.1 ispman.addDomain,1.10,1.10.2.1 ispman.addSlaveDomain,1.4,1.4.2.1 ispman.domainmail,1.4,1.4.4.1 ispman.getConf,1.7,1.7.4.1 ispman.ldap2apache,1.9,1.9.2.1 ispman.ldap2named,1.9,1.9.2.1 ispman.listModules,1.4,1.4.4.1 ispman.listSessionProcesses,1.4,1.4.4.1 ispman.listSessions,1.5,1.5.4.1 ispman.listVars,1.8,1.8.4.1 ispman.makelogs,1.25,1.25.2.1 ispman.passwd.user,1.3,1.3.4.1 ispman.postfix.makemaps,1.11,1.11.4.1 ispman.processdump,1.4,1.4.4.1 ispman.processes,1.5,1.5.4.1 ispman.removeEmptySessions,1.5,1.5.4.1 ispman.showdomains,1.8,1.8.4.1 ispman.showmailtransport,1.5,1.5.4.1 ispman.substConf,1.1,1.1.2.1
Joerg Delker <[email protected]>
| Newsgroups | gmane.comp.isp.ispman.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ispman/ispman/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29520/bin
Modified Files:
Tag: dev_1_3-bigcleanup
ispman-agent ispman.addDomain ispman.addSlaveDomain
ispman.domainmail ispman.getConf ispman.ldap2apache
ispman.ldap2named ispman.listModules
ispman.listSessionProcesses ispman.listSessions
ispman.listVars ispman.makelogs ispman.passwd.user
ispman.postfix.makemaps ispman.processdump ispman.processes
ispman.removeEmptySessions ispman.showdomains
ispman.showmailtransport ispman.substConf
Log Message:
first cleanup changes
aims:
- have nice, clean, independant Config.pm to manage *all* ISPMan configs
- remove "name space pollution" (with using objects more strictly there is no need to export everything, code is better readable/understandable)
- separating libs for backend and UI
Index: ispman.passwd.user
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.passwd.user,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- ispman.passwd.user 30 May 2004 23:35:32 -0000 1.3
+++ ispman.passwd.user 10 Aug 2004 20:54:29 -0000 1.3.4.1
@@ -24,6 +24,6 @@
my $uid = join( '_', ( $ispmanUserId, $domain ) );
$uid =~ s/\./_/g;
$ispman->changePassword( $uid, $domain, $ARGV[1],
- $ispman->getConf('userPassHashMethod') );
+ ISPMan::Config->get('userPassHashMethod') );
__END__
Index: ispman.listSessionProcesses
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.listSessionProcesses,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- ispman.listSessionProcesses 31 May 2004 20:13:40 -0000 1.4
+++ ispman.listSessionProcesses 10 Aug 2004 20:54:29 -0000 1.4.4.1
@@ -16,7 +16,7 @@
my $processes =
$ispman->getEntriesAsHashRef(
- "ou=processes, @{[$ispman->getConf('ldapBaseDN')]}", "$filter" );
+ "ou=processes, @{[ISPMan::Config->get('ldapBaseDN')]}", "$filter" );
$opts{'s'} ||= "ispmanPid";
Index: ispman.showmailtransport
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.showmailtransport,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- ispman.showmailtransport 30 May 2004 23:35:32 -0000 1.5
+++ ispman.showmailtransport 10 Aug 2004 20:54:29 -0000 1.5.4.1
@@ -12,7 +12,7 @@
if ( $ARGV[0] ) {
$domains->{ $ARGV[0] } =
- "ispmanDomain=$ARGV[0], " . $ispman->getConf("ldapBaseDN");
+ "ispmanDomain=$ARGV[0], " . ISPMan::Config->get("ldapBaseDN");
}
else {
$domains = $ispman->makeDomainHash( $ispman->getDomains() );
Index: ispman.listSessions
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.listSessions,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- ispman.listSessions 30 May 2004 23:35:32 -0000 1.5
+++ ispman.listSessions 10 Aug 2004 20:54:29 -0000 1.5.4.1
@@ -17,7 +17,7 @@
else {
$h =
$ispman->getEntriesAsHashRef(
- "ou=processes, @{[$ispman->getConf('ldapBaseDN')]}",
+ "ou=processes, @{[ISPMan::Config->get('ldapBaseDN')]}",
"objectClass=*", ["objectclass"], 'one' );
}
Index: ispman.ldap2apache
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.ldap2apache,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- ispman.ldap2apache 4 Aug 2004 17:25:39 -0000 1.9
+++ ispman.ldap2apache 10 Aug 2004 20:54:29 -0000 1.9.2.1
@@ -38,8 +38,8 @@
$ispman = ISPMan->new();
$ispman->setConfig( 'debug', $opts{'d'} );
-$ldapBaseDN = $ispman->getConf('ldapBaseDN');
-$install_dir = $ispman->getConf("installDir");
+$ldapBaseDN = ISPMan::Config->get('ldapBaseDN');
+$install_dir = ISPMan::Config->get("installDir");
require "$install_dir/lib/http.lib";
$template = $ispman->getTemplate("$install_dir/templates/vhosts.conf.template");
@@ -63,7 +63,7 @@
&make_vhosts_conf($template);
-if ( $ispman->getConf("apacheVhostsStyle") =~ /dir/m ) {
+if ( ISPMan::Config->get("apacheVhostsStyle") =~ /dir/m ) {
for ( keys %$vhosts ) {
&make_vhosts_conf( $template, $vhosts->{$_}{'ispmanDomain'} );
}
Index: ispman.ldap2named
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.ldap2named,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- ispman.ldap2named 4 Aug 2004 17:25:40 -0000 1.9
+++ ispman.ldap2named 10 Aug 2004 20:54:29 -0000 1.9.2.1
@@ -35,18 +35,18 @@
$ispman = ISPMan->new();
$ispman->setConfig( 'debug', $opts{'d'} );
-my $install_dir = $ispman->getConf("installDir");
+my $install_dir = ISPMan::Config->get("installDir");
require "$install_dir/lib/dns.lib";
-$namedConfFile = $ispman->getConf('namedConfFile');
-$namedConfHeaderFile = $ispman->getConf('namedConfHeaderFile');
-$namedConfFooterFile = $ispman->getConf('namedConfFooterFile');
+$namedConfFile = ISPMan::Config->get('namedConfFile');
+$namedConfHeaderFile = ISPMan::Config->get('namedConfHeaderFile');
+$namedConfFooterFile = ISPMan::Config->get('namedConfFooterFile');
$namedDir = join "/",
- ( $ispman->getConf('namedDir'), $ispman->getConf('namedIspmanSubDir') );
-$namedRevDir = join "/", ( $namedDir, $ispman->getConf('namedRevDir') );
-$namedPriDir = join "/", ( $namedDir, $ispman->getConf('namedPriDir') );
-$namedSecDir = join "/", ( $namedDir, $ispman->getConf('namedSecDir') );
+ ( ISPMan::Config->get('namedDir'), $ispmanISPMan::Config->get('namedIspmanSubDir') );
+$namedRevDir = join "/", ( $namedDir, ISPMan::Config->get('namedRevDir') );
+$namedPriDir = join "/", ( $namedDir, ISPMan::Config->get('namedPriDir') );
+$namedSecDir = join "/", ( $namedDir, ISPMan::Config->get('namedSecDir') );
$namedDir =~ s!//!/!g;
$namedRevDir =~ s!//!/!g;
Index: ispman.addSlaveDomain
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.addSlaveDomain,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- ispman.addSlaveDomain 26 Jun 2004 08:40:22 -0000 1.4
+++ ispman.addSlaveDomain 10 Aug 2004 20:54:29 -0000 1.4.2.1
@@ -37,7 +37,7 @@
$r->param( "ispmanDomain", $domain );
$d->{'homeDirectory'} =
- join( '/', $ispman->getConf("defaultHomeDirectoryPath"), $domain );
+ join( '/', ISPMan::Config->get("defaultHomeDirectoryPath"), $domain );
for ( keys %$d ) {
$r->param( $_, $d->{$_} );
Index: ispman.domainmail
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.domainmail,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- ispman.domainmail 5 Jun 2004 12:45:18 -0000 1.4
+++ ispman.domainmail 10 Aug 2004 20:54:29 -0000 1.4.4.1
@@ -1,72 +1,61 @@
#!/usr/bin/perl
-package ISPMan;
-BEGIN {
- use FindBin;
- unshift @INC,
- ( $FindBin::Bin, "$FindBin::Bin/../lib", "$FindBin::Bin/../conf" );
- use Getopt::Std;
- getopts( 'vns:f:d:m:', \%opts );
- unless ( $opts{'d'} && $opts{'m'} ) {
- print
-"Usage: $FindBin::Script. [-v] -d domainName|all -s 'subject' -m file_with_the_email_text [-f 'Name <email>']\n";
- exit;
- }
- unless ( $opts{'s'} ) {
- print
-"Are you sure you want to send a mass email without a subject?\nI don't think so.\n";
+use FindBin;
+use Getopt::Std;
+
+use lib ( $FindBin::Bin, "$FindBin::Bin/../lib", "$FindBin::Bin/../conf" );
+getopts( 'vns:f:d:m:', \%opts );
+unless ( $opts{'d'} && $opts{'m'} ) {
+ print
+ "Usage: $FindBin::Script. [-v] -d domainName|all -s 'subject' -m file_with_the_email_text [-f 'Name <email>']\n";
+ exit;
+}
+unless ( $opts{'s'} ) {
+ print "Are you sure you want to send a mass email without a subject?\n".
+ "I don't think so.\n";
+ exit;
+}
+unless ( $opts{'f'} ) {
+ print "You have not defined a sender address.\n".
+ "I will use whatever email is defined in LDAP as rootEmail.\n";
+ print "You can check this email with the command ispman.getConf rootEmail.\n";
+ print "Are you sure you want to send this mail with the rootEmail address [y/N]: ";
+ chomp( my $ans = <> );
+ unless ( $ans =~ /^y/i ) {
exit;
}
- unless ( $opts{'f'} ) {
- print
-"You have not defined a sender address.\nI will use whatever email is defined in LDAP as rootEmail.\n";
- print
-"You can check this email with the command ispman.getConf rootEmail.\n";
- print
-"Are you sure you want to send this mail with the rootEmail address [y/N]: ";
- chomp( my $ans = <> );
- unless ( $ans =~ /^y/i ) {
- exit;
- }
- }
}
+
$|++;
undef $/;
-use lib qw(%%installDir%%/lib);
-use vars
- qw($VERSION @ISA @EXPORT @EXPORT_OK %opts $Config $from $subject $domain);
use Net::SMTP;
use ISPMan::LDAP;
-require "ispman.conf";
+use ISPMan::Config;
+
+my $Config = ISPMan::Config->new();
+
open M, $opts{'m'};
my $mailText = join "", <M>;
close(M);
-my $ldap = ISPMan::LDAP->new(
- $Config->{'ldapBaseDN'}, $Config->{'ldapHost'},
- $Config->{'ldapRootDN'}, $Config->{'ldapRootPass'}
-);
-$ldap->setConfig($Config); #pass config to ISPMan::LDAP
-if ( !$ldap->connected() ) {
- $ldap->connect();
-}
+my $ldap = ISPMan::LDAP->new();
my $domain = ( lc( $opts{'d'} ) eq "all" ) ? '*' : $opts{'d'};
my $users = $ldap->getEntriesAsHashRef(
- $Config->{"ldapBaseDN"},
- "&(ispmanDomain=$domain)(objectclass=ispmanDomainUser)",
- [ "uid", "cn", "mailLocalAddress", "mailAlias", "mailRoutingAddress" ]
-);
+ $Config->get("ldapBaseDN"),
+ "&(ispmanDomain=$domain)(objectclass=ispmanDomainUser)",
+ [ "uid", "cn", "mailLocalAddress", "mailAlias", "mailRoutingAddress" ]
+ );
-my $mailhost = $self->{'Config'}{"mailhost"} || "localhost";
+my $mailhost = $Config->get("mailhost") || "localhost";
my $smtp = Net::SMTP->new($mailhost);
$subject = $opts{'s'} || "No Subject";
-$from = $opts{'f'} || $ldap->getConf('rootEmail');
+$from = $opts{'f'} || $Config->get('rootEmail');
print "Sending email to users for $opts{'d'} domain\n";
print "Sending from $from\n";
Index: ispman.substConf
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.substConf,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- ispman.substConf 1 Aug 2004 21:39:29 -0000 1.1
+++ ispman.substConf 10 Aug 2004 20:54:29 -0000 1.1.2.1
@@ -18,7 +18,7 @@
# read STDIN and substitute any %%token%% or @@eval@@
for (<>) {
- s/%%(\w+)?%%/$ISPMan::Config->{$1}/g;
+ s/%%(\w+)?%%/ISPMan::Config->{$1}/g;
s/\@\@(randcrypt.*?)\@\@/eval($1)/ge;
print;
}
Index: ispman.makelogs
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.makelogs,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -d -r1.25 -r1.25.2.1
--- ispman.makelogs 8 Jul 2004 09:35:49 -0000 1.25
+++ ispman.makelogs 10 Aug 2004 20:54:29 -0000 1.25.2.1
@@ -29,12 +29,12 @@
use ISPMan;
my $ispman = ISPMan->new();
-$webalizer = $ispman->getConf("apacheWebalizerPath");
-my $apacheGracefulCommand = $ispman->getConf("apacheGracefulCommand");
-my $apacheGracefulTime = $ispman->getConf("apacheGracefulTime");
+$webalizer = ISPMan::Config->get("apacheWebalizerPath");
+my $apacheGracefulCommand = ISPMan::Config->get("apacheGracefulCommand");
+my $apacheGracefulTime = ISPMan::Config->get("apacheGracefulTime");
# Basic Password security
-#our $protectLogs=$ispman->getConf("protectLogs");
+#our $protectLogs=ISPMan::Config->get("protectLogs");
#our $authBindHost=$ispman->{'Config'}{'ldapHost'};
#our $authBindDN=$ispman->{'Config'}{'ldapBaseDN'};
#our $authBindRootDN=$ispman->{'Config'}{'ldapRootDN'};
@@ -45,7 +45,7 @@
#}
unless ($apacheGracefulCommand) {
- ( $apacheGracefulCommand = $ispman->getConf("apacheStartCommand") ) =~
+ ( $apacheGracefulCommand = ISPMan::Config->get("apacheStartCommand") ) =~
s!\w+$!graceful!g;
print "!!!WARNING!!!!!\n";
print "---------------\n";
@@ -69,7 +69,7 @@
"Webalizer command does not exists\nI will split the files but no reports will be generated.";
}
-if ( $ispman->getConf("ispmanVhostsStyle") =~ /dir/m ) {
+if ( ISPMan::Config->get("ispmanVhostsStyle") =~ /dir/m ) {
print "Using one hash file per domain\n";
my ( $domain, $domains );
@@ -80,7 +80,7 @@
my $domainInfo = $ispman->getDomainInfo($domain);
unless ( $domainInfo->{'ispmanDomainType'} eq "replica" ) {
$vhostsHashFile =
- join( "/", $ispman->getConf("apacheVhostsFile"), "hash", $domain )
+ join( "/", ISPMan::Config->get("apacheVhostsFile"), "hash", $domain )
. ".hash";
if ( -e $vhostsHashFile ) {
print "Loading $vhostsHashFile...\n";
@@ -96,7 +96,7 @@
else {
print "Using one hash file for all domains\n";
$vhostsHashFile = join '.',
- ( $ispman->getConf("apacheVhostsFile"), "hash" );
+ ( ISPMan::Config->get("apacheVhostsFile"), "hash" );
if ( -e $vhostsHashFile ) {
require $vhostsHashFile;
$vhosts = $VAR1;
@@ -154,7 +154,7 @@
### Here for upgraders
if ( $logdir eq "" ) {
- $logdir = $ispman->getConf("apacheLogsDirectory");
+ $logdir = ISPMan::Config->get("apacheLogsDirectory");
$logdir = join "/", ( $logdir, "vhosts" );
}
@@ -181,11 +181,11 @@
### Here for upgraders
if ( $logdir eq "" ) {
- $logdir = $ispman->getConf("apacheLogsDirectory");
+ $logdir = ISPMan::Config->get("apacheLogsDirectory");
$logdir = join "/", ( $logdir, "vhosts" );
}
if ( $statdir eq "" ) {
- $statdir = $ispman->getConf("apacheLogsDirectory");
+ $statdir = ISPMan::Config->get("apacheLogsDirectory");
$statdir = join "/", ( $statdir, "domains", $domain, $vhost );
}
@@ -221,7 +221,7 @@
### Here for upgraders
if ( $statdir eq "" ) {
- $statdir = $ispman->getConf("apacheLogsDirectory");
+ $statdir = ISPMan::Config->get("apacheLogsDirectory");
$statdir = join "/", ( $statdir, "domains", $domain, $vhost );
}
Index: ispman.listVars
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.listVars,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -d -r1.8 -r1.8.4.1
--- ispman.listVars 30 May 2004 23:35:32 -0000 1.8
+++ ispman.listVars 10 Aug 2004 20:54:29 -0000 1.8.4.1
@@ -16,7 +16,7 @@
push @$modules, $ARGV[0];
}
else {
- my $all_modules = $ispman->getConfModules();
+ my $all_modules = ISPMan::Config->getModules();
for ( keys %$all_modules ) {
push @$modules, $all_modules->{$_}{'ispmanModule'};
}
@@ -26,7 +26,7 @@
for $module (@$modules) {
print "Module: $module\n\n";
- my $vars = $ispman->getConfVars($module);
+ my $vars = ISPMan::Config->getVars($module);
for ( keys %$vars ) {
$ispmanVars->{ $vars->{$_}{'ispmanVar'} }{'ispmanQuestion'} =
$vars->{$_}{'ispmanQuestion'};
@@ -37,8 +37,8 @@
my @ispmanVars;
my $varDN;
- if ( $ispman->{'Config'}{'ispmanVarSort'}{$module} ) {
- my $varSort = $ispman->{'Config'}{'ispmanVarSort'}{$module};
+ if ( $ispman->{'Config'}->get('ispmanVarSort')->{$module} ) {
+ my $varSort = $ispman->{'Config'}->get('ispmanVarSort')->{$module};
for (@$varSort) {
$var = $_;
$val = $ispmanVars->{$var}{'ispmanVal'};
Index: ispman.postfix.makemaps
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.postfix.makemaps,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -u -d -r1.11 -r1.11.4.1
--- ispman.postfix.makemaps 14 Jun 2004 08:48:46 -0000 1.11
+++ ispman.postfix.makemaps 10 Aug 2004 20:54:29 -0000 1.11.4.1
@@ -9,8 +9,8 @@
use vars qw($ispman $smtpServerConfDir);
$ispman = ISPMan->new();
-$smtpServerConfDir = $ispman->getConf("smtpServerConfDir");
-$smtp_lib = join "/", ( $ispman->getConf("installDir"), "lib/smtp.lib" );
+$smtpServerConfDir = ISPMan::Config->get("smtpServerConfDir");
+$smtp_lib = join "/", ( ISPMan::Config->get("installDir"), "lib/smtp.lib" );
require $smtp_lib;
Index: ispman.getConf
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.getConf,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -d -r1.7 -r1.7.4.1
--- ispman.getConf 30 May 2004 23:35:32 -0000 1.7
+++ ispman.getConf 10 Aug 2004 20:54:29 -0000 1.7.4.1
@@ -9,7 +9,7 @@
use ISPMan;
my $ispman = ISPMan->new();
-print $ispman->getConf( $ARGV[0] ), "\n";
+print ISPMan::Config->get( $ARGV[0] ), "\n";
__END__
Index: ispman.removeEmptySessions
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.removeEmptySessions,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- ispman.removeEmptySessions 30 May 2004 23:35:32 -0000 1.5
+++ ispman.removeEmptySessions 10 Aug 2004 20:54:29 -0000 1.5.4.1
@@ -8,7 +8,7 @@
my $ispman = ISPMan->new();
my $h =
$ispman->getEntriesAsHashRef(
- "ou=processes, @{[$ispman->getConf('ldapBaseDN')]}",
+ "ou=processes, @{[ISPMan::Config->get('ldapBaseDN')]}",
"objectClass=ispmanBranch" );
for ( keys %$h ) {
next unless /^ispmanSession/;
Index: ispman.processes
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.processes,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- ispman.processes 31 May 2004 20:13:40 -0000 1.5
+++ ispman.processes 10 Aug 2004 20:54:29 -0000 1.5.4.1
@@ -23,7 +23,7 @@
}
my $processes =
$ispman->getEntriesAsHashRef(
- "ou=processes, @{[$ispman->getConf('ldapBaseDN')]}", "$filter" );
+ "ou=processes, @{[ISPMan::Config->get('ldapBaseDN')]}", "$filter" );
$opts{'s'} ||= "ispmanPid";
Index: ispman.addDomain
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.addDomain,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- ispman.addDomain 26 Jun 2004 08:40:22 -0000 1.10
+++ ispman.addDomain 10 Aug 2004 20:54:29 -0000 1.10.2.1
@@ -108,7 +108,7 @@
}
$d->{'homeDirectory'} =
- join( '/', $ispman->getConf("defaultHomeDirectoryPath"), $domain );
+ join( '/', ISPMan::Config->get("defaultHomeDirectoryPath"), $domain );
for ( keys %$d ) {
$r->param( $_, $d->{$_} );
Index: ispman-agent
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman-agent,v
retrieving revision 1.65
retrieving revision 1.65.2.1
diff -u -d -r1.65 -r1.65.2.1
--- ispman-agent 1 Aug 2004 21:15:51 -0000 1.65
+++ ispman-agent 10 Aug 2004 20:54:29 -0000 1.65.2.1
@@ -158,17 +158,17 @@
$ispman = ISPMan->new();
-$agentFrequency = $ispman->getConf("agentFrequency") || 1;
-$ldapBaseDN = $ispman->getConf('ldapBaseDN');
-$namedConfFile = $ispman->getConf('namedConfFile');
-$namedConfHeaderFile = $ispman->getConf('namedConfHeaderFile');
-$namedConfFooterFile = $ispman->getConf('namedConfFooterFile');
+$agentFrequency = ISPMan::Config->get("agentFrequency") || 1;
+$ldapBaseDN = ISPMan::Config->get('ldapBaseDN');
+$namedConfFile = ISPMan::Config->get('namedConfFile');
+$namedConfHeaderFile = ISPMan::Config->get('namedConfHeaderFile');
+$namedConfFooterFile = ISPMan::Config->get('namedConfFooterFile');
$namedDir = join "/",
- ( $ispman->getConf('namedDir'), $ispman->getConf('namedIspmanSubDir') );
-$namedRevDir = join "/", ( $namedDir, $ispman->getConf('namedRevDir') );
-$namedPriDir = join "/", ( $namedDir, $ispman->getConf('namedPriDir') );
-$namedSecDir = join "/", ( $namedDir, $ispman->getConf('namedSecDir') );
+ ( ISPMan::Config->get('namedDir'), $ispmanISPMan::Config->get('namedIspmanSubDir') );
+$namedRevDir = join "/", ( $namedDir, ISPMan::Config->get('namedRevDir') );
+$namedPriDir = join "/", ( $namedDir, ISPMan::Config->get('namedPriDir') );
+$namedSecDir = join "/", ( $namedDir, ISPMan::Config->get('namedSecDir') );
$namedDir =~ s!//!/!g;
$namedRevDir =~ s!//!/!g;
Index: ispman.processdump
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.processdump,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- ispman.processdump 5 Jun 2004 12:45:18 -0000 1.4
+++ ispman.processdump 10 Aug 2004 20:54:29 -0000 1.4.4.1
@@ -48,7 +48,7 @@
$ispman = ISPMan->new();
-$ldapBaseDN = $ispman->getConf('ldapBaseDN');
+$ldapBaseDN = ISPMan::Config->get('ldapBaseDN');
$ispman = ISPMan->new();
Index: ispman.showdomains
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.showdomains,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -d -r1.8 -r1.8.4.1
--- ispman.showdomains 30 May 2004 23:35:32 -0000 1.8
+++ ispman.showdomains 10 Aug 2004 20:54:29 -0000 1.8.4.1
@@ -5,7 +5,8 @@
( $FindBin::Bin, "$FindBin::Bin/../lib", "$FindBin::Bin/../conf" );
}
use Getopt::Std;
-use lib qw(%%installDir%%/lib);
+
+
use ISPMan;
getopt( 't', \%opts );
Index: ispman.listModules
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.listModules,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- ispman.listModules 30 May 2004 23:35:32 -0000 1.4
+++ ispman.listModules 10 Aug 2004 20:54:29 -0000 1.4.4.1
@@ -6,7 +6,7 @@
}
use ISPMan;
my $ispman = ISPMan->new();
-my $modules = $ispman->getConfModules();
+my $modules = ISPMan::Config->getModules();
for ( keys %$modules ) {
print "$modules->{$_}{'ispmanModule'}\n";
}
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285