Empty commit

classes/class_debug.php

@@ -1,6 +1,6 @@
 <?
 // Debug info for developers
-
+ini_set('max_execution_time',600);
 define('MAX_TIME', 20000); //Maximum execution time in ms
 define('MAX_ERRORS', 0); //Maxmimum errors, warnings, notices we will allow in a page
 define('MAX_MEMORY', 80*1024*1024); //Maximum memory used per pageload

sections/blog/index.php

@@ -76,6 +76,10 @@
 					$DB->query("INSERT IGNORE INTO users_subscriptions VALUES ('$LoggedUser[ID]', $ThreadID)");
 					$Cache->delete_value('subscriptions_user_'.$LoggedUser['ID']);
 				}
+				$Tweet = trim($_POST['tweet']);
+				if(!empty($Tweet)) {
+					send_irc("PRIVMSG #what.cd-twitter !tweet ".$Tweet); 
+				}
 		
 				header('Location: blog.php');
 				break;
@@ -105,6 +109,19 @@
 					<br /><br />
 					<input id="subscribebox" type="checkbox" name="subscribe"<?=!empty($HeavyInfo['AutoSubscribe'])?' checked="checked"':''?> tabindex="2" />
 					<label for="subscribebox">Subscribe</label>
+
+					<h3>Tweet</h3>
+					<input type="text" id="tweettext" name="tweet" size="95" onkeyup="charCount()"/><br />
+					<label for="tweettext" id="tweetlabel">0/140</label>
+					<script type="text/javascript">
+						function charCount() {	
+							var count = document.getElementById("tweettext").value.length;
+							document.getElementById("tweetlabel").innerHTML = "Characters " + count +"/140";
+							if(count > 140) {
+								document.getElementById("tweetlabel").innerHTML = "<strong style='color:red'>Exceeded Max Length!</strong>";
+							}
+						}
+					</script>	
 					<div class="center">
 						<input type="submit" value="<?=((!isset($_GET['action'])) ? 'Create blog post' : 'Edit blog post') ?>" />
 					</div>

sections/reportsv2/takeresolve.php

@@ -178,9 +178,12 @@
 		if(isset($Escaped['log_message']) && $Escaped['log_message'] != "") {
 			$Log .= " ( ".$Escaped['log_message']." )";
 		}
-		$DB->query("SELECT GroupID FROM torrents WHERE ID = ".$TorrentID);
+		$DB->query("SELECT GroupID, hex(info_hash) FROM torrents WHERE ID = ".$TorrentID);
-		list($GroupID) = $DB->next_record();
+		list($GroupID, $InfoHash) = $DB->next_record();
 		delete_torrent($TorrentID, 0, $ResolveType['reason']);
+		
+		//$InfoHash = unpack("H*", $InfoHash);
+		$Log .= " (".strtoupper($InfoHash).")";
 		write_log($Log);
 		$Log = "deleted torrent for the reason: ".$ResolveType['title'].". ( ".$Escaped['log_message']." )";
 		write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], $Log, 0);

sections/tools/data/registration_log.php

@@ -9,6 +9,7 @@
 	SQL_CALC_FOUND_ROWS
 	m.ID,
 	m.IP,
+	m.ipcc,
 	m.Email,
 	m.Username,
 	m.PermissionID,
@@ -21,6 +22,7 @@
 	(SELECT COUNT(h1.UserID) FROM users_history_ips AS h1 WHERE h1.IP=m.IP) AS Uses,
 	im.ID,
 	im.IP,
+	im.ipcc,
 	im.Email,
 	im.Username,
 	im.PermissionID,
@@ -55,11 +57,12 @@
 			<td>Ratio</td>
 			<td>Email</td>
 			<td>IP</td>
+			<td>Country</td>
 			<td>Host</td>
 			<td>Registered</td>
 		</tr>
 <?
-	while(list($UserID, $IP, $Email, $Username, $PermissionID, $Uploaded, $Downloaded, $Enabled, $Donor, $Warned, $Joined, $Uses, $InviterID, $InviterIP, $InviterEmail, $InviterUsername, $InviterPermissionID, $InviterUploaded, $InviterDownloaded, $InviterEnabled, $InviterDonor, $InviterWarned, $InviterJoined, $InviterUses)=$DB->next_record()) {
+	while(list($UserID, $IP, $IPCC, $Email, $Username, $PermissionID, $Uploaded, $Downloaded, $Enabled, $Donor, $Warned, $Joined, $Uses, $InviterID, $InviterIP, $InviterIPCC, $InviterEmail, $InviterUsername, $InviterPermissionID, $InviterUploaded, $InviterDownloaded, $InviterEnabled, $InviterDonor, $InviterWarned, $InviterJoined, $InviterUses)=$DB->next_record()) {
 	$Row = ($IP == $InviterIP) ? 'a' : 'b';
 ?>
 		<tr class="row<?=$Row?>">
@@ -77,6 +80,10 @@
 				<span style="float:left;"><?=display_str($InviterIP)?></span>
 				<span style="float:right;"><?=display_str($InviterUses)?> [<a href="userhistory.php?action=ips&amp;userid=<?=$InviterID?>" title="History">H</a>|<a href="/user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($InviterIP)?>" title="Search">S</a>]</span><br />
 			</td>
+			<td>
+				<?=$IPCC?> <br />
+				<?=$InviterIPCC?>
+			</td>
 			<td>
 				<?=get_host($IP)?><br />
 				<?=get_host($InviterIP)?>

sections/tools/managers/news.php

@@ -15,6 +15,10 @@
 			$DB->query("UPDATE news SET Title='".db_string($_POST['title'])."', Body='".db_string($_POST['body'])."' WHERE ID='".db_string($_POST['newsid'])."'");
 			$Cache->delete_value('news');
 			$Cache->delete_value('feed_news');
+			$Tweet = trim($_POST['tweet']);
+			if(!empty($Tweet)) {
+			send_irc("PRIVMSG #what.cd-twitter !tweet ".$Tweet); 
+			}
 		}
 		header('Location: index.php');
 		break;
@@ -41,6 +45,20 @@
 			<br />
 			<h3>Body</h3>
 			<textarea name="body" cols="95" rows="15"><? if(!empty($Body)) { echo display_str($Body); } ?></textarea> <br /><br />
+			
+			<h3>Tweet</h3>
+					<input type="text" id="tweettext" name="tweet" size="95" onkeyup="charCount()"/><br />
+					<label for="tweettext" id="tweetlabel">0/140</label>
+					<script type="text/javascript">
+						function charCount() {	
+							var count = document.getElementById("tweettext").value.length;
+							document.getElementById("tweetlabel").innerHTML = "Characters " + count +"/140";
+							if(count > 140) {
+								document.getElementById("tweetlabel").innerHTML = "<strong style='color:red'>Exceeded Max Length!</strong>";
+							}
+						}
+					</script>	
+
 			<div class="center">
 				<input type="submit" value="<?= ($_GET['action'] == 'news')? 'Create news post' : 'Edit news post';?>" />
 			</div>