From cd605a3fa61abaab41472d4fab58ec5c50f16532 Mon Sep 17 00:00:00 2001
From: xrogaan <devnull@localhost>
Date: Sat, 19 Jan 2008 14:04:53 +0000
Subject: [PATCH] 27 Some minor update

---
 main.php                   | 41 +++++++++++++++++++++++++++++++++++------
 release-cleanup.sh         |  1 +
 sources/main-class.inc.php | 19 +++++++++++--------
 3 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/main.php b/main.php
index f63375b..b80b8f6 100755
--- a/main.php
+++ b/main.php
@@ -2,7 +2,7 @@
 <?php
 /**
  *  This file is part of IrBot, irc robot.
- *  Copyright (C) 2007  Bellière Ludovic
+ *  Copyright (C) 2007  Bellière Ludovic
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: main.php 25 2008-01-03 03:19:35Z xrogaan $
+ * $Id: main.php 27 2008-01-19 14:04:53Z xrogaan $
  */
 
 require_once('./config.php');
@@ -52,15 +52,41 @@ if (isset($argv[1])) {
 			list($option,$val) = explode('=',$option);
 		}
 
-		if (!$val) {
+		if (!$val && ($option != '-h' && $option != '--help')) {
 			$i++;
 			$val = $argv[$i];
 		}
 
 		switch ($option) {
 			case '-h':case '--help':
-				echo "help content need to be write\n";
-				break 2;
+				echo "
+./main.php [options]
+
+Options :
+  -s	Equivalent to --server=name
+  -p	Equivalent to --port=number
+  -c	Equivalent to --channel=#name
+  -n	Equivalent to --nick=name
+  -i	Equivalent to --ip=number
+  -d	Equivalent to --domain=HOST
+  -a	Equivalent to --password=pwd
+  --server=name
+	IRC server to connect (default: ".IRC_SERVER.")
+  --port=number
+  	Port to use (default: ".IRC_PORT.")
+  --channel=#value
+  	Channel to join (default: ".IRC_CHANNEL.")
+  --nick=nickname
+  	Nick of the bot (default: ".IRC_PSEUDO.")
+  --ip=xxx.xxx.xxx.xxx
+  	Local ip (default: ".IRC_IP.")
+  --domain=HOST
+  	Local domain (default: ".IRC_DOMAIN.")
+  --password=pwd
+  	Server password (default: ".IRC_PASSWORD.")
+";
+				$stop = true;
+				break;
 			case '-s':case '--server':
 				bot::$server = $val;
 				break;
@@ -70,7 +96,7 @@ if (isset($argv[1])) {
 			case '-c':case '--channel':
 				bot::$channel = $val;
 				break;
-			case '-n':case '--pseudo':
+			case '-n':case '--nick':
 				bot::$myBotName = $val;
 				break;
 			case '-i':case '--ip':
@@ -91,6 +117,9 @@ if (isset($argv[1])) {
 		}
 		$i++;
 	}
+	if (isset($stop)) {
+		die();
+	}
 }
 
 if (!isset(bot::$server))    bot::$server    = IRC_SERVER;
diff --git a/release-cleanup.sh b/release-cleanup.sh
index 1268bc9..00c65df 100755
--- a/release-cleanup.sh
+++ b/release-cleanup.sh
@@ -6,6 +6,7 @@ echo ------------------------------------
 
 find . -depth -type d -name .svn -exec rm -fr {} \;
 find . -type d -exec chmod 775 {} \;
+find . -type f -name "*.*~" -exec rm -fr {} \;
 find . -type f -name "*.php" -exec chmod -x {} \;
 find . -type f -name "main.php" -exec chmod +x {} \;
 
diff --git a/sources/main-class.inc.php b/sources/main-class.inc.php
index 6982f23..7d17150 100644
--- a/sources/main-class.inc.php
+++ b/sources/main-class.inc.php
@@ -22,7 +22,7 @@ final class bot {
 	// Timeout avant une reconnexion
 	public $socketTimeout = 180;
 
-	// Variables privées
+	// Variables privèes
 	static public $instance = FALSE;
 
 	protected $C;
@@ -81,7 +81,7 @@ final class bot {
 			$this->lastData = mktime();
 			$this->C = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 			if ($this->C === false) {
-				throw new Exception('Impossible de créer le socket IRC !',0);
+				throw new Exception('Impossible de créer le socket IRC !',0);
 			}
 
 			if (self::$ip != "") { socket_bind($this->C, self::$ip); }
@@ -188,7 +188,7 @@ final class bot {
 						if (preg_match('`^connect ([^ ]+) ([^ ]+)`',$msg_info['message'],$m)) {
 							if ($m[1] == 'admin' && $m[2] == 'mypass') {
 								$this->auth = true;
-								self::notice($msg_info['from'],'Vous êtes bien authentifié comme administrateur.');
+								self::notice($msg_info['from'],'Vous êtes bien authentifié comme administrateur.');
 							} else {
 								self::notice($msg_info['from'],'Erreur dans votre login et / ou mot de passe.');
 								echo debug() ? 'l: '.$m[1].' p: '.$m[2]."\n":'';
@@ -274,6 +274,9 @@ final class bot {
 	 * @param string $message
 	 */
 	public function privmsg ($to,$message) {
+		$search = array('#name');
+		$replace = array(self::$myBotName);
+		$message = str_replace($search,$replace,$message);
 		self::put('PRIVMSG '.$to.' :'.$message."\n");
 	}
 
@@ -325,16 +328,16 @@ final class bot {
 
 			if (!strpos($buf, "\n")) { //Si ne contient aucun retour, on bufferise
 				$buffer = $buffer.$buf;
-				$data = ""; //rien à envoyer
+				$data = ""; //rien è envoyer
 			} else {
 				//Si contient au moins un retour,
-				//on vérifie que le dernier caractère en est un
+				//on vèrifie que le dernier caractère en est un
 				if (substr($buf, -1, 1)  == "\n") {
-					//alors on additionne ces données au buffer
+					//alors on additionne ces donnèes au buffer
 					$data = $buffer.$buf;
 					$buffer = ""; //on vide le buffer
 				} else  {
-					//si le dernier caractère n'est pas un retour à la
+					//si le dernier caractère n'est pas un retour è la
 					//ligne, alors on envoit tout jusqu'au dernier retour
 					//puis on bufferise le reste
 					$buffer = $buffer.substr($buf, strrchr($buf, "\n"));
@@ -443,4 +446,4 @@ final class bot {
 	}
 }
 
-?>
\ No newline at end of file
+?>
-- 
2.11.4.GIT