From daefe6609683b92238fdc75fd3eba3637102f207 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Mon, 13 Oct 2008 06:17:42 +0000
Subject: [PATCH] Refactor sendToUDP() some more

---
 includes/RecentChange.php | 17 +++++++++++------
 includes/User.php         | 10 ++++++++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index a576009762..ba52b9f823 100644
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -140,7 +140,7 @@ class RecentChange
 	# Writes the data in this object to the database
 	function save()
 	{
-		global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, $wgRC2UDPPrefix, $wgRC2UDPOmitBots;
+		global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, $wgRC2UDPOmitBots;
 		$fname = 'RecentChange::save';
 
 		$dbw = wfGetDB( DB_MASTER );
@@ -176,7 +176,7 @@ class RecentChange
 
 		# Notify external application via UDP
 		if ( $wgRC2UDPAddress && ( !$this->mAttribs['rc_bot'] || !$wgRC2UDPOmitBots ) ) {
-			self::sendToUDP( $wgRC2UDPPrefix, $this->getIRCLine() );
+			self::sendToUDP( $this->getIRCLine() );
 		}
 
 		# E-mail notifications
@@ -208,16 +208,21 @@ class RecentChange
 	/**
 	 * Send some text to UDP
 	 * @param string $line
+	 * @param string $prefix
+	 * @param string $address
 	 * @return bool success
 	 */
-	public static function sendToUDP( $prefix, $line ) {
-		global $wgRC2UDPAddress, $wgRC2UDPPort;
+	public static function sendToUDP( $line, $address = '', $prefix = '' ) {
+		global $wgRC2UDPAddress, $wgRC2UDPPrefix, $wgRC2UDPPort;
+		# Assume default for standard RC case
+		$address = $address ? $address : $wgRC2UDPAddress;
+		$prefix = $prefix ? $prefix : $wgRC2UDPPrefix;
 		# Notify external application via UDP
-		if( $wgRC2UDPAddress ) {
+		if( $address && $prefix ) {
 			$conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP );
 			if( $conn ) {
 				$line = $prefix . $line;
-				socket_sendto( $conn, $line, strlen($line), 0, $wgRC2UDPAddress, $wgRC2UDPPort );
+				socket_sendto( $conn, $line, strlen($line), 0, $address, $wgRC2UDPPort );
 				socket_close( $conn );
 				return true;
 			}
diff --git a/includes/User.php b/includes/User.php
index c0c6ebca1d..e14e503b48 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -814,8 +814,14 @@ class User {
 			$this->loadDefaults();
 			return false;
 		}
-		if ( isset( $_SESSION['wsUserName'] ) ) {
-			$sName = $_SESSION['wsUserName'];
+		if ( isset( $_SESSION['wsUserName'] ) && isset( $_COOKIE["{$wgCookiePrefix}UserName"] ) ) {
+			// Cookie and session username should match
+			if( $_SESSION['wsUserName'] == $_COOKIE["{$wgCookiePrefix}UserName"] ) {
+				$sName = $_SESSION['wsUserName'];
+			} else {
+				$this->loadDefaults();
+				return false;
+			}
 		} else if ( isset( $_COOKIE["{$wgCookiePrefix}UserName"] ) ) {
 			$sName = $_COOKIE["{$wgCookiePrefix}UserName"];
 			$_SESSION['wsUserName'] = $sName;
-- 
2.20.1