don't allow services altnicks to be same as defaultnicks

git-svn-id: http://svn.tabris.net/repos/srsv@3591 70d4eda1-72e9-0310-a436-91e5bd24443c

diff --git a/branches/0.4.3/modules/services.pm b/branches/0.4.3/modules/services.pm
index c7102fd7da92aca76ecf957e80dac45ffd47057b..aa6f603f38b18cc2eb14ad96267689271360ebb2 100644 (file)
--- a/branches/0.4.3/modules/services.pm
+++ b/branches/0.4.3/modules/services.pm
@@ -46,31 +46,31 @@ our @agents = (
        [$adminserv::asnick_default, '+pqzBS', 'Services\' Administration Agent'],
        [$hostserv::hsnick_default, '+pqzBS', 'vHost Agent']
 );
-if(services_conf_nickserv) {
+if(services_conf_nickserv && (lc(services_conf_nickserv) ne lc($nickserv::nsnick_default)) ) {
        push @agents, [services_conf_nickserv, '+opqzBHS', 'Nick Registration Agent'];
        $nickserv::nsnick = services_conf_nickserv;
 }
-if(services_conf_chanserv) {
+if(services_conf_chanserv && (lc(services_conf_chanserv) ne lc($chanserv::csnick_default)) ) {
        push @agents, [services_conf_chanserv, '+pqzBS', 'Channel Registration Agent'];
        $chanserv::csnick = services_conf_chanserv;
 }
-if(services_conf_operserv) {
+if(services_conf_operserv && (lc(services_conf_operserv) ne lc($operserv::osnick_default)) ) {
        push @agents, [services_conf_operserv, '+opqzBHS', 'Operator Services Agent'];
        $operserv::osnick = services_conf_operserv;
 }
-if(services_conf_memoserv) {
+if(services_conf_memoserv && (lc(services_conf_memoserv) ne lc($memoserv::msnick_default)) ) {
        push @agents, [services_conf_memoserv, '+pqzBS', 'Memo Exchange Agent'];
        $memoserv::msnick = services_conf_memoserv;
 }
-if(services_conf_botserv) {
+if(services_conf_botserv && (lc(services_conf_botserv) ne lc($botserv::bsnick_default)) ) {
        push @agents, [services_conf_botserv, '+pqzBS', 'Channel Bot Control Agent'];
        $botserv::bsnick = services_conf_botserv;
 }
-if(services_conf_adminserv) {
+if(services_conf_adminserv && (lc(services_conf_adminserv) ne lc($adminserv::asnick_default)) ) {
        push @agents, [services_conf_adminserv, '+pqzBS', 'Services\' Administration Agent'];
        $adminserv::asnick = services_conf_adminserv;
 }
-if(services_conf_hostserv) {
+if(services_conf_hostserv && (lc(services_conf_hostserv) ne lc($adminserv::asnick_default)) ) {
        push @agents, [services_conf_hostserv, '+pqzBS', 'vHost Agent'];
        $hostserv::hsnick = services_conf_hostserv;
 }