Fixes #769 - Replace Variant Autoloader

README.md

@@ -4,7 +4,7 @@ webDiplomacy lets you play Diplomacy online.
 
 --- 
 
-README.txt - Installation information.
+install/README.txt - Installation information.
 
 AGPL.txt - The license webDiplomacy is distributed under.
 
@@ -23,8 +23,6 @@ When writing the text of your pull request, please include:
 * The details of the testing that you've performed
 * The github issue number that this pull request is a fix for
 
-Any questions, please email [email protected], and a member of the dev team will answer.
-
 ---
 
 If you get errors for files within /javascript/ it is because some default Apache configurations use this as a shared folder by default. Disable this alias to resolve.
@@ -35,8 +33,6 @@ http://webdiplomacy.net/ - The official webDiplomacy server.
 
 https://github.com/kestasjk/webDiplomacy - The webDiplomacy github source repository.
 
-http://sourceforge.net/projects/phpdiplomacy - The webDiplomacy Sourceforge project page.
-
 ---
 
 Kestas J. Kuliukas - [email protected]

api.php

@@ -673,17 +673,18 @@ public function run($userID, $permissionIsExplicit) {
 			throw new ClientForbiddenException('User does not have explicit permission to make this API call.');
 		}
 
-		if ($toCountryID < 1 || $toCountryID > count($game->Members) || $toCountryID == $countryID) {
+		if ($toCountryID < 1 || $toCountryID > count($game->Members->ByUserID) || $toCountryID == $countryID) {
 			throw new RequestException('Invalid toCountryID');
 		}
 
 		$toUser = new User($game->Members->ByCountryID[$toCountryID]->userID);
 		if(!$toUser->isCountryMuted($game->id, $countryID)) {
-			libGameMessage::send($toCountryID, $countryID, $message);
+			$time = libGameMessage::send($toCountryID, $countryID, $message);
 		}
 
-		// FIXME: what to return?
-		return json_encode($args);
+		$DB->sql_put("COMMIT");
+
+		return $time;
 	}
 }
 

api/responses/game_state.php

@@ -389,14 +389,15 @@ function load()
 		// messages
 		if ($this->pressType != 'NoPress') {
 			$msgTabl = $DB->sql_tabl(
-				"SELECT turn, fromCountryID, toCountryID, message, phaseMarker from wD_GameMessages_Redacted WHERE gameID = ".$this->gameID." AND (fromCountryID = ".$this->countryID." OR toCountryID = ".$this->countryID.") ORDER BY timeSent"
+				"SELECT turn, fromCountryID, toCountryID, message, timeSent, phaseMarker from wD_GameMessages_Redacted WHERE gameID = ".$this->gameID." AND (fromCountryID = ".$this->countryID." OR toCountryID = ".$this->countryID.") ORDER BY timeSent"
 			);
 
 			while ($row = $DB->tabl_hash($msgTabl)) {
 				$message = new \webdiplomacy_api\Message(
 					$row['message'],
 					$row['fromCountryID'],
 					$row['toCountryID'],
+					$row['timeSent'],
 					$row['phaseMarker']
 				);
 				$phase = $gameSteps->get($row['turn'], 'Diplomacy', array());

api/responses/message.php

@@ -29,6 +29,7 @@ class Message {
 	public $message;
 	public $fromCountryID;
 	public $toCountryID;
+	public $timeSent;
 	public $phaseMarker;
 
 	function toJson() { return json_encode($this); }
@@ -38,14 +39,16 @@ function toJson() { return json_encode($this); }
 	 * @param string $message - message
 	 * @param int $fromCountryID - sender country ID
 	 * @param int $toCountryID - receiver country ID
+	 * @param int $timeSent - time sent
 	 * @param string $phaseMarker - Diplomacy/Retreat/Builds/etc
 
 	 */
-	function __construct($message, $fromCountryID, $toCountryID, $phaseMarker = null)
+	function __construct($message, $fromCountryID, $toCountryID, $timeSent, $phaseMarker = null)
 	{
 		$this->message = $message;
 		$this->fromCountryID = intval($fromCountryID);
 		$this->toCountryID = intval($toCountryID);
+		$this->timeSent = intval($timeSent);
 		$this->phaseMarker = $phaseMarker;
 	}
 }

board.php

@@ -277,8 +277,11 @@
 	// Post messages we sent, and get the user we're speaking to
 	$msgCountryID = $CB->findTab();
 
-	$CB->postMessage($msgCountryID);
-	$DB->sql_put("COMMIT");
+	if( isset($Member) )
+	{
+		$CB->postMessage($msgCountryID);
+		$DB->sql_put("COMMIT");
+	}
 
 	$forum = $CB->output($msgCountryID);