[Squalk-cvs] ircbot ircbot.php,1.7,1.8 ircbot.cfg,1.5,NONE numerics.inc,1.3,NONE

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

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

Modified Files:
	ircbot.php 
Removed Files:
	ircbot.cfg numerics.inc 
Log Message:
lalalala

--- numerics.inc DELETED ---

Index: ircbot.php
===================================================================
RCS file: /cvsroot/squalk/ircbot/ircbot.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ircbot.php	28 Sep 2005 20:38:07 -0000	1.7
--- ircbot.php	28 Sep 2005 21:00:11 -0000	1.8
***************
*** 1,5 ****
  <?php
  # squalk - lightweight modular irc bot written in PHP.
! # Copyright (C) 2004  Matt Kavanagh <ma...@te...>
  #
  # This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  <?php
  # squalk - lightweight modular irc bot written in PHP.
! # Copyright (C) 2004-2005 Matt Kavanagh <ma...@te...>
  #
  # This program is free software; you can redistribute it and/or modify
***************
*** 22,44 ****
  
  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');
! require_once(ROOT_PATH.'lib/class_irc.php');
  
  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();
  if($irc->connect($config['server'], $config['port'], $config['username'], $config['realname'])) {
  	$irc->nick($config['nickname']);
--- 22,39 ----
  
  if(isset($_SERVER['REMOTE_HOST'])) {
! 	die('Will not run in web environment\n');
  }
! 
! require_once(ROOT_PATH.'/lib/irc.class.php');
! require_once(ROOT_PATH.'/config.inc.php');
  
  if(!extension_loaded('sockets')) {
  	if(!@dl('sockets.so')) {
! 		die("Could not load sockets extension\n";
  	}
  }
  
  $irc = new irc();
+ 
  if($irc->connect($config['server'], $config['port'], $config['username'], $config['realname'])) {
  	$irc->nick($config['nickname']);

--- ircbot.cfg DELETED ---