Merge branch 'master' into alexichi

6 files changed, 126 insertions, 5 deletions

diff --git a/inc/Inventory.inc b/inc/Inventory.inc
index 20c63bf..024a4fe 100644
--- a/inc/Inventory.inc
+++ b/inc/Inventory.inc
@@ -45,7 +45,11 @@ class Inventory {
 		$inv = self::get();
 		$inv->_removeItem($item);
 	}
-	
+
+	public function addToXML($root) {
+		foreach($this->items as $item)
+			$item->addToXML($root);
+	}
 }
 
 ?>
diff --git a/inc/Item.inc b/inc/Item.inc
index bf77818..8e90998 100644
--- a/inc/Item.inc
+++ b/inc/Item.inc
@@ -12,6 +12,18 @@ class Item {
 		$this->icon = $icon;
 		$this->desc = $desc;
 	}
+
+	function addToXML($root) {
+		$item = $root->addChild("item");
+		$item->addChild("name", $this->name);
+		$item->addChild("cost", $this->cost);
+		$item->addChild("icon", $this->icon);
+		$item->addChild("desc", $this->desc);
+	}
+
+	public static function fromXML($xml) {
+		return new static((string)$xml->name, +(string)$xml->cost /* convert to number */, (string)$xml->icon, (string)$xml->desc);
+	}
 }
 
 ?>
diff --git a/inc/messages.inc b/inc/messages.inc
index c24bd18..c51adba 100644
--- a/inc/messages.inc
+++ b/inc/messages.inc
@@ -7,12 +7,26 @@ $messages = array(
 	"guild_not_yet_created" => "You need to create a guild first.",
 	"guild_already_built" => "You have aready built a guild.",
 	"dungeon_already_available" => "You can already access the dungeon"
+
+	"gamesave_ok" => "Game saved.",
+	"gamesave_error" => "An error occured when trying to save the game.",
+	"gamesave_not_found" => "Couldn't find the specified save file.",
+	"gamesave_delete_fail" => "Couldn't delete the specified save file.",
+	"gamesave_delete_success" => "Game save successfully removed from server",
 );
 
-function sendError($msg) {
+function sendMessage($type, $msg) {
 	global $messages;
 	$text = $messages[$msg];
-	echo json_encode(array("error" => $text));
+	echo json_encode(array($type => $text));
+}
+
+function sendError($msg) {
+	sendMessage("error", $msg);
+}
+
+function sendInfo($msg) {
+	sendMessage("info", $msg);
 }
 
 ?>
diff --git a/inc/mine.inc b/inc/mine.inc
index 94a2c66..752fc69 100644
--- a/inc/mine.inc
+++ b/inc/mine.inc
@@ -1,7 +1,7 @@
 <?php
 
 function initCraftMine() {
-	$_SESSION["mine"] = array("mine" => 0, "gold" => 0, "miners" => 0);
+	$_SESSION["mine"] = array("gold" => 0, "miners" => 0);
 }
 
 function withdrawMine() {
diff --git a/inc/savegame.inc b/inc/savegame.inc
new file mode 100644
index 0000000..1fa95b0
--- /dev/null
+++ b/inc/savegame.inc
@@ -0,0 +1,92 @@
+<?php
+
+require_once("inc/messages.inc");
+
+define("SAVEDIR", "data/save");
+
+function genXML($table, $xml) {
+	foreach($table as $k => $v) {
+		if(is_object($v)) { // Object: either Item or Inventory
+			if(is_callable(array($v, "addToXML"))) // Check if the object has a addToXML method
+				$v->addToXML($xml->addChild($k));
+		} elseif(is_array($v)) // Nested array
+			genXML($v, $xml->addChild($k));
+		else // Single value (numeric or string)
+			$xml->addChild($k, $v);
+	}
+}
+
+function genSave() {
+	$save = new SimpleXMLElement("<save/>");
+	genXML($_SESSION, $save);
+	return $save;
+}
+
+function genFilename() {
+	return "craftmine-".date("d-m-Y_H-i-s").".save.xml";
+}
+
+function saveGame() {
+	$save = genSave();
+	if($save->asXML(SAVEDIR."/".genFilename())) sendInfo("gamesave_ok");
+	else sendError("gamesave_error");
+}
+
+function downSave() {
+	$save = "";
+	$filename = "";
+
+	if(empty($_GET["filename"])) {
+		$filename = genFilename();
+		$save = genSave()->asXML(); // Send current game save file if no file specified
+	} else {
+		$filename = $_GET["filename"];
+		$save = file_get_contents(SAVEDIR . "/" . $filename);
+		if(empty($save)) return; // Probably file not found
+	}
+
+	header("Content-Type: application/xml"); // Force browser to intepret the file as XML
+	header("Content-Disposition: attachment; filename=".$filename); // Force download with specific filename
+	header("Cache-Control: no-cache"); // Avoid storing save file in proxy/browser cache
+	echo $save;
+}
+
+function listSaves() {
+	chdir(SAVEDIR); // Go to SAVEDIR folder, avoiding leading folder name in file list
+	echo json_encode(glob("*.save.xml"));
+}
+
+function parseSave($xml, &$table) { // Passing $table by reference
+	foreach($xml as $k => $v) {
+		if($v->count() == 0) { // No child, treat as string
+			$v = (string)$v;
+			if(is_numeric($v)) $v = +$v; // If it is in fact a number, treat it that way using PHP unary '+' coercion
+			$table[$k] = $v;
+		} elseif($k == "inventory") { // Special case for inventory: objects need to be created
+			foreach($v as $item) Inventory::addItem(Item::fromXML($item));
+		} else { // If nested array
+			$table[$k] = array();
+			parseSave($v, $table[$k]);
+		} // Other types unsupported (unused)
+	}
+}
+
+function deleteSave() {
+	if(empty($_POST["filename"])) return;
+	$path = SAVEDIR . "/" . basename($_POST["filename"]); // remove any leading directory
+	if(file_exists($path) && unlink($path))
+		sendInfo("gamesave_delete_success");
+	else sendError("gamesave_delete_fail");
+}
+
+function loadSave() {
+	if(empty($_POST["filename"])) return;
+	$xml = simplexml_load_file(SAVEDIR . "/" . $_POST["filename"]);
+	if(empty($xml)) {
+		sendError("gamesave_not_found");
+		return;
+	}
+	$_SESSION = array(); // drop current game
+	parseSave($xml, $_SESSION);
+}
+?>
diff --git a/inc/shop.inc b/inc/shop.inc
index 83b08b0..49ee20b 100644
--- a/inc/shop.inc
+++ b/inc/shop.inc
@@ -48,7 +48,6 @@ function buildShop() {
 	}
 	elseif(debitAccount($shop["cost"])) {
 		initShop();
-		$_SESSION["mine"]["gold"] -= $shop["cost"];
 		echo json_encode($shop);
 	}
 }