From de0b031857cc6745cac972147fb3bf46d293f5ef Mon Sep 17 00:00:00 2001
From: Darko <dkrisan@gmail.com>
Date: Mon, 31 Mar 2014 12:33:12 +0200
Subject: [PATCH] Updated IRCScraper and prehash.php

---
 bin/monitor.php                     |  2 +-
 lib/IRCScraper.php                  |  9 ++--
 lib/IRCScraper/settings_example.php | 80 ++++++++++++++++++++++-------
 lib/prehash.php                     |  2 +-
 4 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/bin/monitor.php b/bin/monitor.php
index 9ac10b55e..d9cf93b64 100644
--- a/bin/monitor.php
+++ b/bin/monitor.php
@@ -9,7 +9,7 @@ require_once(dirname(__FILE__)."/../lib/showsleep.php");
 require_once(dirname(__FILE__)."/../lib/functions.php");
 
 
-$version="0.3r1039";
+$version="0.3r1040";
 
 $db = new DB();
 $functions = new Functions();
diff --git a/lib/IRCScraper.php b/lib/IRCScraper.php
index c78d674ec..f44725f40 100644
--- a/lib/IRCScraper.php
+++ b/lib/IRCScraper.php
@@ -205,9 +205,12 @@ class IRCScraper
 			echo
 				'[' .
 				date('r') .
-				'] [Scraping of IRC channels for ' .
-				$this->serverType .
-				' started.]' .
+				'] [Scraping of IRC channels for (' .
+				$server .
+				$port .
+				') (' .
+				$nickname .
+				') started.]' .
 				PHP_EOL;
 		}
 
diff --git a/lib/IRCScraper/settings_example.php b/lib/IRCScraper/settings_example.php
index a7a9ee9f8..dd95bbdc8 100644
--- a/lib/IRCScraper/settings_example.php
+++ b/lib/IRCScraper/settings_example.php
@@ -1,24 +1,68 @@
 <?php
-// If you are lazy, just change this, or else go and change everything else you need to.
-$username = '';
+// Random username will be generated for you, you can change the "$username" bellow with "YourActualUserName" if you want to.
+$username = getRandomUsername();
 
-// IRC EFNET server address. Change this only if you have issues.
-define('SCRAPE_IRC_EFNET_SERVER', 'irc.Prison.NET');
-// Port for the efnet server.
-define('SCRAPE_IRC_EFNET_PORT', '6667');
-// IRC Corrupt.net address.
-define('SCRAPE_IRC_CORRUPT_SERVER', 'irc.corrupt-net.org');
-// Port for the corrupt server.
+// EFNET server details.
+define('SCRAPE_IRC_EFNET_SERVER', 'irc.Prison.NET'); // Efnet server address, change if you have issues connecting.
+define('SCRAPE_IRC_EFNET_PORT', '6667');             // Port for efnet server.
+define('SCRAPE_IRC_EFNET_NICKNAME', "$username");    // Nick name (this is the nickname everyone sees in the channel)
+define('SCRAPE_IRC_EFNET_REALNAME', "$username");    // This is a name that people see in /whois, you can set this to your nickname.
+define('SCRAPE_IRC_EFNET_USERNAME', "$username");    // This is part of your hostname, you can set this the same as nickname. This is also used to log in to ZNC.
+define('SCRAPE_IRC_EFNET_PASSWORD', false);          // This is used for bouncers like ZNC, set this false or '' if you don't have a bouncer.
+
+define('SCRAPE_IRC_C_Z_BOOL', true); // True uses Corrupt, False uses Zenet. (they both PRE the same stuff). If you have trouble with one, use the other.
+
+// Corrupt-Net server details.
+define('SCRAPE_IRC_CORRUPT_SERVER', 'irc.corrupt-net.org'); // This should not be changed, since this is the only address to corrupt.
 define('SCRAPE_IRC_CORRUPT_PORT', '6667');
-// Nick name in the IRC channel.
-define('SCRAPE_IRC_EFNET_NICKNAME', "$username");
 define('SCRAPE_IRC_CORRUPT_NICKNAME', "$username");
-// User name, used to log in to the server (like a ZNC server). Use the same as Nick name if you don't know what this is for.
-define('SCRAPE_IRC_EFNET_USERNAME', "$username");
+define('SCRAPE_IRC_CORRUPT_REALNAME', "$username");
 define('SCRAPE_IRC_CORRUPT_USERNAME', "$username");
-// Password used to log in to the server (like a ZNC server). Leave false if you don't require a password.
-define('SCRAPE_IRC_EFNET_PASSWORD', false);
 define('SCRAPE_IRC_CORRUPT_PASSWORD', false);
-// "Real name" for IRC server. Use the same as Nick name if you don't know what this is for.
-define('SCRAPE_IRC_EFNET_REALNAME', "$username");
-define('SCRAPE_IRC_CORRUPT_REALNAME', "$username");
\ No newline at end of file
+
+// Zenet server details.
+define('SCRAPE_IRC_ZENET_SERVER', 'irc.zenet.org');
+define('SCRAPE_IRC_ZENET_PORT', '6667');
+define('SCRAPE_IRC_ZENET_NICKNAME', "$username");
+define('SCRAPE_IRC_ZENET_REALNAME', "$username");
+define('SCRAPE_IRC_ZENET_USERNAME', "$username");
+define('SCRAPE_IRC_ZENET_PASSWORD', false);
+
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+
+// Try to generate a random username for you (up to 9 chars long).
+function getRandomUsername() {
+	$username = array(
+		'John', 'Jeff', 'Mike', 'Micheal', 'Simon', 'Eric', 'Jennifer',
+		'Robert', 'Natasha', 'James', 'Ozzy', 'Dana', 'Patricia', 'Patrick',
+		'Bill', 'Anita', 'Bart', 'Billy', 'Aaron', 'Chris', 'Chipper', 'Edge',
+		'Zhed', 'Scott', 'David', 'Willie', 'Stewart',
+		'Sophia', 'Emma', 'Olivia', 'Isabella', 'Lily', 'Chloe',
+		'Madison', 'Emily', 'Ella', 'Madelyn', 'Abigail', 'Aubrey',
+		'Addison', 'Avery', 'Layla', 'Hailey', 'Amelia', 'Hannah', 'Charlotte',
+		'Kaitlyn', 'Harper', 'Kaylee', 'Sophie', 'Mackenzie', 'Peyton', 'Riley',
+		'Grace', 'Brooklyn', 'Sarah', 'Aaliyah', 'Anna', 'Arianna', 'Ellie',
+		'Natalie', 'Isabelle', 'Lillian', 'Evelyn', 'Elizabeth', 'Lyla', 'Lucy',
+		'Claire', 'Makayla', 'Kylie', 'Audrey', 'Maya', 'Aiden', 'Jackson',
+		'Ethan', 'Liam', 'Mason', 'Noah', 'Lucas', 'Jacob', 'Jayden', 'Jack',
+		'Logan', 'Ryan', 'Caleb', 'Benjamin', 'William', 'Michael', 'Alexander',
+		'Elijah', 'Matthew', 'Dylan', 'James', 'Owen', 'Connor', 'Brayden',
+		'Carter', 'Landon', 'Joshua', 'Luke', 'Daniel', 'Gabriel', 'Nicholas',
+		'Nathan', 'Oliver', 'Henry', 'Andrew', 'Gavin', 'Cameron',
+		'Isaac', 'Evan', 'Samuel', 'Grayson', 'Tyler', 'Zachary', 'Wyatt',
+		'Joseph', 'Charlie', 'Hunter', 'David', 'Gabriella', 'Annabelle'
+	);
+	$username = $username[mt_rand(0, count($username) - 1)];
+	$current = strlen($username);
+	if ($current >= 7) {
+		$username = substr($username, 0, 6);
+		$current = 6;
+	}
+	for ($i = 0; $i < (9 - $current); $i++) {
+		$username .= rand(0,9);
+	}
+	return $username;
+}
+
diff --git a/lib/prehash.php b/lib/prehash.php
index e964d3b0b..3006346d1 100644
--- a/lib/prehash.php
+++ b/lib/prehash.php
@@ -33,7 +33,7 @@ Class PreHash
 		$db = new DB();
         $f = new Functions();
 		$newnames = 0;
-		$newestrel = $db->queryOneRow("SELECT adddate, ID FROM prehash ORDER BY adddate DESC LIMIT 1");
+		$newestrel = $db->queryOneRow('SELECT adddate, ID FROM prehash WHERE source NOT like "#%" ORDER BY adddate DESC LIMIT 1');
 		if (strtotime($newestrel["adddate"]) < time()-1200 || is_null($newestrel['adddate']))
 		{
 			if ($this->echooutput)