[Squalk-cvs] ircbot ircbot.cfg,1.4,1.5 ircbot.php,1.6,1.7 numerics.inc,1.2,1.3

[Matthew K. <mka...@us...>]

Update of /cvsroot/squalk/ircbot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19297

Modified Files:
	ircbot.cfg ircbot.php numerics.inc 
Log Message:
more crap stuff gone

Index: numerics.inc
===================================================================
RCS file: /cvsroot/squalk/ircbot/numerics.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** numerics.inc	15 Apr 2004 16:52:03 -0000	1.2
--- numerics.inc	28 Sep 2005 20:38:07 -0000	1.3
***************
*** 156,159 ****
  	501 => 'ERR_UMODEUNKNOWNFLAG',
  	502 => 'ERR_USERSDONTMATCH'
! );
! ?>
\ No newline at end of file
--- 156,158 ----
  	501 => 'ERR_UMODEUNKNOWNFLAG',
  	502 => 'ERR_USERSDONTMATCH'
! );
\ No newline at end of file

Index: ircbot.php
===================================================================
RCS file: /cvsroot/squalk/ircbot/ircbot.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ircbot.php	27 Sep 2005 21:03:23 -0000	1.6
--- ircbot.php	28 Sep 2005 20:38:07 -0000	1.7
***************
*** 21,24 ****
--- 21,29 ----
  define('ROOT_PATH', realpath(dirname(__FILE__)));
  
+ if(isset($_SERVER['REMOTE_HOST'])) {
+ 	die('Will not run in web environment!');
+ }
+ assert(debug("Not running in a web environment"));
+ 	
  require_once(ROOT_PATH.'lib/functions.php');
  require_once(ROOT_PATH.'lib/class_irc_commands.php');
***************
*** 27,46 ****
  if(!extension_loaded('sockets')) {
  	if(!@dl('sockets.so')) {
! 		panic('You know, we do need INTERNETS for this. Hurr.');
! 	}
! 	else {
! 		echo "Loaded sockets extension\n";
  	}
! }
! 
! if(isset($_SERVER['REMOTE_HOST'])) {
! 	panic('Will not run in web environment!');
! }
! else {
! 	echo "Not running in a web environment, good\n";
  }
  
  $config = get_config('ircbot.cfg');
! echo "Got configuration\n";
  
  $irc = new irc();
--- 32,42 ----
  if(!extension_loaded('sockets')) {
  	if(!@dl('sockets.so')) {
! 		error("Could not load sockets extension", TRUE);
  	}
! 	assert(debug("Loaded sockets extension"));
  }
  
  $config = get_config('ircbot.cfg');
! assert(debug("Got configuration"));
  
  $irc = new irc();

Index: ircbot.cfg
===================================================================
RCS file: /cvsroot/squalk/ircbot/ircbot.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ircbot.cfg	27 Sep 2005 19:29:36 -0000	1.4
--- ircbot.cfg	28 Sep 2005 20:38:07 -0000	1.5
***************
*** 12,14 ****
  channels = "|#ptibot"
  [module_section]
! modules = "|modules/log.php|modules/misc.php|modules/lesbian.php|modules/attack.php|modules/sleep.php"
--- 12,14 ----
  channels = "|#ptibot"
  [module_section]
! modules = "|modules/log.php"