[Relay-bot-cvs] CVS: relay-bot relay-bot.config,1.9,1.10 relay-bot.pl,1.32,1.33

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/relay-bot/relay-bot
In directory usw-pr-cvs1:/tmp/cvs-serv28238

Modified Files:
	relay-bot.config relay-bot.pl 
Log Message:
Collapsed individual config options into monolithic hashes.

Index: relay-bot.config
===================================================================
RCS file: /cvsroot/relay-bot/relay-bot/relay-bot.config,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** relay-bot.config	14 Oct 2002 17:49:45 -0000	1.9
--- relay-bot.config	15 Oct 2002 04:41:01 -0000	1.10
***************
*** 4,8 ****

  # Nick/handle/name
! $nick = 'relaybot';

  # What channels to join; yes, can be used in multiple channels.  One is best.
--- 4,55 ----

  # Nick/handle/name
! $nick =>    'relaybot',
! 
! # Configuration options, 1 = enable, 0 = disable, edit as required...
! %config = (
!    
! 	   # Echo public messages
! 	   echo_public_msg => 1,
! 
! 	   # Echo private messages
! 	   echo_private_msg => 1,
! 
! 	   # Echo public actions
! 	   echo_public_action => 1,
! 
! 	   # Echo joins
! 	   echo_join => 1,
! 
! 	   # Echo parts
! 	   echo_part => 1,
! 
! 	   # Echo nick changes
! 	   echo_nick => 1,
! 
! 	   # Echo kicks
! 	   echo_kick => 1,
! 
! 	   # Echo channel mode changes
! 	   echo_cmode => 1,
! 
! 	   # Echo user mode changes
! 	   echo_umode => 1,
! 
! 	   # Echo quits
! 	   echo_quit => 1,
! 
! 	   # Echo topic changes
! 	   echo_topic => 1,
! 
!            # Run in the background
! 	   daemonize => 0,
! 
!            # IP Address of interface to connect through.
!            # Sometimes needed with multiple
!            # ethernet cards. Actually problem in
!            # Net::IRC :
!            # Ex:  interface_address = '66.92.186.143';
! 	   interface_address => "",
! );

  # What channels to join; yes, can be used in multiple channels.  One is best.
***************
*** 12,39 ****
  %relay_channels_extra = ('#relaybot' => ['#relay-bot'], 
                           '#relay-bot' => ['#relaybot']);
- 
- # Declare and initialize mode flags
- $echo_public_msg = 1;
- $echo_private_msg = 1;
- $echo_public_action = 1;
- $echo_join = 1;
- $echo_part = 1;
- $echo_nick = 1;
- $echo_kick = 1;
- $echo_cmode = 1;
- $echo_umode = 1;
- $echo_quit = 1;
- $echo_topic = 1;
- 
- # Run in background
- $daemonize = 0;
- 
- # IP Address of interface to connect through.
- # Sometimes needed with multiple
- # ethernet cards. Actually problem in
- # Net::IRC :
- 
- #$interface_address = '66.92.186.143';
- $interface_address = "";

  # simple hash -- key is "name", value is actual host to connect to.
--- 59,62 ----

Index: relay-bot.pl
===================================================================
RCS file: /cvsroot/relay-bot/relay-bot/relay-bot.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** relay-bot.pl	14 Oct 2002 17:49:45 -0000	1.32
--- relay-bot.pl	15 Oct 2002 04:41:01 -0000	1.33
***************
*** 6,14 ****
  use lib qw:/usr/local/lib/site_perl ./:;
  use Net::IRC;
! use vars qw/@relay_channels %relay_channels_extra %hosts @authorizations $nick/;
! use vars qw/$echo_private_msg $echo_public_action $echo_topic/;
! use vars qw/$echo_join $echo_part $echo_nick $echo_kick $echo_cmode/;
! use vars qw/$echo_umode $echo_quit $interface_address $echo_public_msg/;
! use vars qw/$daemonize/;

  my $config_file_name = "relay-bot.config";
--- 6,10 ----
  use lib qw:/usr/local/lib/site_perl ./:;
  use Net::IRC;
! use vars qw/@relay_channels %relay_channels_extra %hosts @authorizations $nick %config/;

  my $config_file_name = "relay-bot.config";
***************
*** 18,35 ****
  my $unused_option = -1;

! my $set_echo_public_msg    = $unused_option;
! my $set_echo_private_msg   = $unused_option;
! my $set_echo_public_action = $unused_option;
! my $set_echo_join          = $unused_option;
! my $set_echo_part          = $unused_option;
! my $set_echo_nick          = $unused_option;
! my $set_echo_kick          = $unused_option;
! my $set_echo_cmode         = $unused_option;
! my $set_echo_umode         = $unused_option;
! my $set_echo_quit          = $unused_option;
! my $set_echo_topic         = $unused_option;
! my $set_daemonize          = $unused_option;
! 
! my $set_interface_address = "";

  my $valid_args = "acedhijkmnpqtuv";
--- 14,32 ----
  my $unused_option = -1;

! my %override = (
! 	       echo_public_msg =>    $unused_option,
! 	       echo_private_msg =>   $unused_option,
! 	       echo_public_action => $unused_option,
! 	       echo_join =>          $unused_option,
! 	       echo_part =>          $unused_option,
! 	       echo_nick =>          $unused_option,
! 	       echo_kick =>          $unused_option,
! 	       echo_cmode =>         $unused_option,
! 	       echo_umode =>         $unused_option,
! 	       echo_quit =>          $unused_option,
! 	       echo_topic =>         $unused_option,
! 	       daemonize =>          $unused_option,
! 	       interface_address =>  "",
! );

  my $valid_args = "acedhijkmnpqtuv";
***************
*** 54,85 ****
  		# -a
  		if( $arg =~ /^\-[$valid_args]*a/ ) {
! 			$set_echo_public_action = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*a/ ) {
! 			$set_echo_public_action = 1;
  		}

  		# -c
  		if( $arg =~ /^\-[$valid_args]*c/ ) {
! 			$set_echo_cmode = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*c/ ) {
! 			$set_echo_cmode = 1;
  		}

  		# -d
  		if( $arg =~ /^\-[$valid_args]*d/ ) {
! 			$set_daemonize = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*d/ ) {
! 			$set_daemonize = 1;
  		}

  		# -e
  		if( $arg =~ /^\-[$valid_args]*e/ ) {
! 			$set_echo_public_msg = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*e/ ) {
! 			$set_echo_public_msg = 1;
  		}

--- 51,82 ----
  		# -a
  		if( $arg =~ /^\-[$valid_args]*a/ ) {
! 			$override{echo_public_action} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*a/ ) {
! 			$override{echo_public_action} = 1;
  		}

  		# -c
  		if( $arg =~ /^\-[$valid_args]*c/ ) {
! 			$override{echo_cmode} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*c/ ) {
! 			$override{echo_cmode} = 1;
  		}

  		# -d
  		if( $arg =~ /^\-[$valid_args]*d/ ) {
! 			$override{daemonize} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*d/ ) {
! 			$override{daemonize} = 1;
  		}

  		# -e
  		if( $arg =~ /^\-[$valid_args]*e/ ) {
! 			$override{echo_public_msg} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*e/ ) {
! 			$override{echo_public_msg} = 1;
  		}

***************
*** 126,130 ****
  			my $addr = $ARGV[$i+1];
  			if( $addr =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/ ) {	
! 				$set_interface_address = $addr;
  				$interval = 2;
  				next SWITCH;	
--- 123,127 ----
  			my $addr = $ARGV[$i+1];
  			if( $addr =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/ ) {	
! 				$override{interface_address} = $addr;
  				$interval = 2;
  				next SWITCH;	
***************
*** 137,200 ****
  		# -j
  		if( $arg =~ /^\-[$valid_args]*j/ ) {
! 			$set_echo_join = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*j/ ) {
! 			$set_echo_join = 1;
  		}

  		# -k
  		if( $arg =~ /^\-[$valid_args]*k/ ) {
! 			$set_echo_kick = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*k/ ) {
! 			$set_echo_kick = 1;
  		}

  		# -m
  		if( $arg =~ /^\-[$valid_args]*m/ ) {
! 			$set_echo_private_msg = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*m/ ) {
! 			$set_echo_private_msg = 1;
  		}

  		# -n
  		if( $arg =~ /^\-[$valid_args]*n/ ) {
! 			$set_echo_nick = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*n/ ) {
! 			$set_echo_nick = 1;
  		}

  		# -p
  		if( $arg =~ /^\-[$valid_args]*p/ ) {
! 			$set_echo_part = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*p/ ) {
! 			$set_echo_part = 1;
  		}

  		# -q
  		if( $arg =~ /^\-[$valid_args]*q/ ) {
! 			$set_echo_quit = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*q/ ) {
! 			$set_echo_quit = 1;
  		}

  		# -t
  		if( $arg =~ /^\-[$valid_args]*t/ ) {
! 			$set_echo_topic = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*t/ ) {
! 			$set_echo_topic = 1;
  		}

  		# -u  
  		if( $arg =~ /^\-[$valid_args]*u/ ) {
! 			$set_echo_umode = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*u/ ) {
! 			$set_echo_umode = 1;
  		}

--- 134,197 ----
  		# -j
  		if( $arg =~ /^\-[$valid_args]*j/ ) {
! 			$override{echo_join} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*j/ ) {
! 			$override{echo_join} = 1;
  		}

  		# -k
  		if( $arg =~ /^\-[$valid_args]*k/ ) {
! 			$override{echo_kick} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*k/ ) {
! 			$override{echo_kick} = 1;
  		}

  		# -m
  		if( $arg =~ /^\-[$valid_args]*m/ ) {
! 			$override{echo_private_msg} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*m/ ) {
! 			$override{echo_private_msg} = 1;
  		}

  		# -n
  		if( $arg =~ /^\-[$valid_args]*n/ ) {
! 			$override{echo_nick} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*n/ ) {
! 			$override{echo_nick} = 1;
  		}

  		# -p
  		if( $arg =~ /^\-[$valid_args]*p/ ) {
! 			$override{echo_part} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*p/ ) {
! 			$override{echo_part} = 1;
  		}

  		# -q
  		if( $arg =~ /^\-[$valid_args]*q/ ) {
! 			$override{echo_quit} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*q/ ) {
! 			$override{echo_quit} = 1;
  		}

  		# -t
  		if( $arg =~ /^\-[$valid_args]*t/ ) {
! 			$override{echo_topic} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*t/ ) {
! 			$override{echo_topic} = 1;
  		}

  		# -u  
  		if( $arg =~ /^\-[$valid_args]*u/ ) {
! 			$override{echo_umode} = 0;
  		}
  		if( $arg =~ /^\+[$valid_args]*u/ ) {
! 			$override{echo_umode} = 1;
  		}

***************
*** 211,290 ****

  # In case the options are not present in the config file...
! if ( !defined( $echo_public_msg ) ) {
!     $echo_public_msg = 1;
! }
! if( !defined( $echo_private_msg ) ) {
!     $echo_private_msg = 1;
! }
! if ( !defined( $echo_public_action ) ) {
!     $echo_public_action = 1;
! }
! if ( !defined( $echo_join ) ) {
!     $echo_join = 1;
! }
! if ( !defined( $echo_part ) ) {
!     $echo_part = 1;
! }
! if( !defined( $echo_nick ) ) {
!     $echo_nick = 1;
! }
! if( !defined( $echo_kick ) ) {
!     $echo_kick = 1;
! }
! if( !defined( $echo_cmode ) ) {
!     $echo_cmode = 1;
! }
! if( !defined( $echo_umode ) ) {
!     $echo_umode = 1;
! }
! if( !defined( $echo_quit ) ) {
!     $echo_quit = 1;
! }
! if( !defined( $echo_topic ) ) {
!     $echo_topic = 1;
! }
! if( !defined( $daemonize ) ) {
!     $daemonize = 0;
  }

  # Override config file settings with command line args where req'd.
! if ( $set_echo_public_msg != $unused_option ) {
!     $echo_public_msg = $set_echo_public_msg;
  }
! if ( $set_echo_private_msg != $unused_option ) {
!     $echo_private_msg = $set_echo_private_msg;
  }
! if ( $set_echo_public_action != $unused_option ) {
!     $echo_public_action = $set_echo_public_action;
  }
! if ( $set_echo_join != $unused_option ) {
!     $echo_join = $set_echo_join;
  }
! if ( $set_echo_part != $unused_option ) {
!     $echo_part = $set_echo_part;
  }
! if ( $set_echo_nick != $unused_option ) {
!     $echo_nick = $set_echo_nick;
  }
! if ( $set_echo_kick != $unused_option ) {
!     $echo_kick = $set_echo_kick;
  }
! if ( $set_echo_cmode != $unused_option ) {
!     $echo_cmode = $set_echo_cmode;
  }
! if ( $set_echo_umode != $unused_option ) {
!     $echo_umode = $set_echo_umode;
  }
! if ( $set_echo_quit != $unused_option ) {
!     $echo_quit = $set_echo_quit;
  }
! if ( $set_echo_topic != $unused_option ) {
!     $echo_topic = $set_echo_topic;
  }
! if ( $set_interface_address ne "" ) {
!     $interface_address = $set_interface_address;
  }
! if ( $set_daemonize != $unused_option ) {
!     $daemonize = $set_daemonize;
  }

--- 208,268 ----

  # In case the options are not present in the config file...
! if ( !defined( %config ) ) {
!     %config = (
! 	       echo_public_msg => 1,
! 	       echo_private_msg => 1,
! 	       echo_public_action => 1,
! 	       echo_join => 1,
! 	       echo_part => 1,
! 	       echo_nick => 1,
! 	       echo_kick => 1,
! 	       echo_cmode => 1,
! 	       echo_umode => 1,
! 	       echo_quit => 1,
! 	       echo_topic => 1,
! 	       daemonize => 0,
! 	       interface_address => "",
!     );
  }

  # Override config file settings with command line args where req'd.
! if ( $override{echo_public_msg} != $unused_option ) {
!     $config{echo_public_msg} = $override{echo_public_msg};
  }
! if ( $override{echo_private_msg} != $unused_option ) {
!     $config{echo_private_msg} = $override{echo_private_msg};
  }
! if ( $override{echo_public_action} != $unused_option ) {
!     $config{echo_public_action} = $override{echo_public_action};
  }
! if ( $override{echo_join} != $unused_option ) {
!     $config{echo_join} = $override{echo_join};
  }
! if ( $override{echo_part} != $unused_option ) {
!     $config{echo_part} = $override{echo_part};
  }
! if ( $override{echo_nick} != $unused_option ) {
!     $config{echo_nick} = $override{echo_nick};
  }
! if ( $override{echo_kick} != $unused_option ) {
!     $config{echo_kick} = $override{echo_kick};
  }
! if ( $override{echo_cmode} != $unused_option ) {
!     $config{echo_cmode} = $override{echo_cmode};
  }
! if ( $override{echo_umode} != $unused_option ) {
!     $config{echo_umode} = $override{echo_umode};
  }
! if ( $override{echo_quit} != $unused_option ) {
!     $config{echo_quit} = $override{echo_quit};
  }
! if ( $override{echo_topic} != $unused_option ) {
!     $config{echo_topic} = $override{echo_topic};
  }
! if ( $override{interface_address} ne "" ) {
!     $config{interface_address} = $override{interface_address};
  }
! if ( $override{daemonize} != $unused_option ) {
!     $config{daemonize} = $override{daemonize};
  }

***************
*** 294,298 ****
  print "Created Net::IRC object\n";

! if ( $daemonize ) {
      require Proc::Daemon;
      Proc::Daemon::Init();
--- 272,276 ----
  print "Created Net::IRC object\n";

! if ( $config{daemonize} ) {
      require Proc::Daemon;
      Proc::Daemon::Init();
***************
*** 322,326 ****
      foreach my $server (@server) {

! 	if( !defined($interface_address) || ($interface_address eq "" ) ) {
  	    $connect =  $irc->newconn(
  					 Nick   => $nick,
--- 300,304 ----
      foreach my $server (@server) {

! 	if( $config{interface_address} eq "" ) {
  	    $connect =  $irc->newconn(
  					 Nick   => $nick,
***************
*** 333,337 ****
  					 Ircname => "Relay-bot for @relay_channels on $host ($server)",
  					 Server => $server,
! 					 LocalAddr => $interface_address,
  	    );
  	}
--- 311,315 ----
  					 Ircname => "Relay-bot for @relay_channels on $host ($server)",
  					 Server => $server,
! 					 LocalAddr => $config{interface_address},
  	    );
  	}
***************
*** 586,590 ****
  # Look at the topic for a channel you join.
  sub on_topic {
!     return if !$echo_topic;
      my ($self, $event) = @_;
      my @args = $event->args();
--- 564,568 ----
  # Look at the topic for a channel you join.
  sub on_topic {
!     return if !$config{echo_topic};
      my ($self, $event) = @_;
      my @args = $event->args();
***************
*** 641,645 ****

  sub public_msg {
!     return if !$echo_public_msg;
      my $self = shift;
      my $event = shift;
--- 619,623 ----

  sub public_msg {
!     return if !$config{echo_public_msg};
      my $self = shift;
      my $event = shift;
***************
*** 684,688 ****

  sub public_action {
!     return if !$echo_public_action;
      my ($self, $event) = @_;
      my ($nick, @args) = ($event->nick, $event->args);
--- 662,666 ----

  sub public_action {
!     return if !$config{echo_public_action};
      my ($self, $event) = @_;
      my ($nick, @args) = ($event->nick, $event->args);
***************
*** 712,716 ****

  sub private_msg {
!     return if !$echo_private_msg;
      my $self = shift;
      my $event = shift;
--- 690,694 ----

  sub private_msg {
!     return if !$config{echo_private_msg};
      my $self = shift;
      my $event = shift;
***************
*** 765,769 ****
      }

!     return if !$echo_join;

      my $nick = $event->nick;
--- 743,747 ----
      }

!     return if !$config{echo_join};

      my $nick = $event->nick;
***************
*** 801,805 ****

  sub on_nick_change {
!     return if !$echo_nick;
      my $self = shift;
      my $event = shift;
--- 779,783 ----

  sub on_nick_change {
!     return if !$config{echo_nick};
      my $self = shift;
      my $event = shift;
***************
*** 822,826 ****

  sub on_part {
!     return if !$echo_part;
      my $self = shift;
      my $event = shift;
--- 800,804 ----

  sub on_part {
!     return if !$config{echo_part};
      my $self = shift;
      my $event = shift;
***************
*** 847,851 ****

  sub on_kick {
!     return if !$echo_kick;
      my $self = shift;
      my $event = shift;
--- 825,829 ----

  sub on_kick {
!     return if !$config{echo_kick};
      my $self = shift;
      my $event = shift;
***************
*** 867,871 ****

  sub on_mode {
!     return if !$echo_cmode;
      my $self = shift;
      my $event = shift;
--- 845,849 ----

  sub on_mode {
!     return if !$config{echo_cmode};
      my $self = shift;
      my $event = shift;
***************
*** 885,889 ****

  sub on_umode {
!     return if !$echo_umode;
      my $self = shift;
      my $event = shift;
--- 863,867 ----

  sub on_umode {
!     return if !$config{echo_umode};
      my $self = shift;
      my $event = shift;
***************
*** 904,908 ****
  sub on_quit {

!     return if !$echo_quit;
      my $self = shift;
      my $event = shift;
--- 882,886 ----
  sub on_quit {

!     return if !$config{echo_quit};
      my $self = shift;
      my $event = shift;