Reorganizing part 1

svn path=/experimental/; revision=15

5 files changed, 69 insertions, 0 deletions

diff --git a/games-rpg/lotgd/files/digest-lotgd-1.0.2 b/games-rpg/lotgd/files/digest-lotgd-1.0.2
new file mode 100644
index 0000000..c4e73a5
--- /dev/null
+++ b/games-rpg/lotgd/files/digest-lotgd-1.0.2
@@ -0,0 +1 @@
+MD5 19f71b4fdf9eb193c3f91f540d31c4c8 lotgd-1.0.2.tar.gz 1267776
diff --git a/games-rpg/lotgd/files/lotgd-1.0.2-fix-changing-master-bug.diff b/games-rpg/lotgd/files/lotgd-1.0.2-fix-changing-master-bug.diff
new file mode 100644
index 0000000..0ab8196
--- /dev/null
+++ b/games-rpg/lotgd/files/lotgd-1.0.2-fix-changing-master-bug.diff
@@ -0,0 +1,13 @@
+--- lotgd-1.0.2.orig/train.php	2005-04-12 23:39:23.000000000 -0400
++++ lotgd-1.0.2/train.php	2005-06-07 15:22:47.000000000 -0400
+@@ -30,6 +30,10 @@
+ $result = db_query($sql);
+ if (db_num_rows($result) > 0 && $session['user']['level'] <= 14){
+ 	$master = db_fetch_assoc($result);
++	$master['creaturename'] = stripslashes($master['creaturename']);
++	$master['creaturewin'] = stripslashes($master['creaturewin']);
++	$master['creaturelose'] = stripslashes($master['creaturelose']);
++	$master['creatureweapon'] = stripslashes($master['creatureweapon']);
+ 	if ($master['creaturename'] == "Gadriel the Elven Ranger" && $session['user']['race'] == "Elf") {
+ 		$master['creaturewin'] = "You call yourself an Elf?? Maybe Half-Elf! Come back when you've been better trained.";
+ 		$master['creaturelose'] = "It is only fitting that another Elf should best me.  You make good progress.";
diff --git a/games-rpg/lotgd/files/lotgd-1.0.2-fix-commentary-bug.diff b/games-rpg/lotgd/files/lotgd-1.0.2-fix-commentary-bug.diff
new file mode 100644
index 0000000..400c153
--- /dev/null
+++ b/games-rpg/lotgd/files/lotgd-1.0.2-fix-commentary-bug.diff
@@ -0,0 +1,11 @@
+--- lotgd-1.0.2.orig/lib/commentary.php	2005-04-02 15:32:00.000000000 -0500
++++ lotgd-1.0.2/lib/commentary.php	2005-06-07 15:55:36.000000000 -0400
+@@ -490,7 +490,7 @@
+ 			x=3;
+ 			out += '</span><span class=\'colLtWhite\'>';
+ 		}else{
+-			out += '</span><span class=\'colDkCyan\'>".addslashes(appoencode($talkline)).", \"</span><span class=\'colLtCyan\'>';
++			out += '</span><span class=\'colDkCyan\'>".addslashes(appoencode(translate_inline($talkline))).", \"</span><span class=\'colLtCyan\'>';
+ 			end += '</span><span class=\'colDkCyan\'>\"';
+ 		}
+ 		for (; x < t.length; x++){
diff --git a/games-rpg/lotgd/files/lotgd-1.0.2-fix-game-settings-bug.diff b/games-rpg/lotgd/files/lotgd-1.0.2-fix-game-settings-bug.diff
new file mode 100644
index 0000000..934ef50
--- /dev/null
+++ b/games-rpg/lotgd/files/lotgd-1.0.2-fix-game-settings-bug.diff
@@ -0,0 +1,12 @@
+--- lotgd-1.0.2.orig/configuration.php	2005-04-13 02:11:43.000000000 -0400
++++ lotgd-1.0.2/configuration.php	2005-06-06 23:06:13.000000000 -0400
+@@ -58,8 +58,8 @@
+ 	$post = httpallpost();
+ 	reset($post);
+ 	$old=$settings;
+ 	while (list($key,$val)=each($post)){
+-		if (isset($settings[$key]) && stripslashes($val) != $settings[$key]) {
++		if ((!isset($settings[$key]) && stripslashes($val)) || (isset($settings[$key]) && (stripslashes($val) != $settings[$key]))) {
+ 			savesetting($key,stripslashes($val));
+ 			output("Setting %s to %s`n", $key, stripslashes($val));
+ 			gamelog("`@Changed core setting `^$key`@ from `#{$old[$key]}`@ to `&$val`0","settings");
diff --git a/games-rpg/lotgd/files/lotgd-1.0.2-fix-translating-bug.diff b/games-rpg/lotgd/files/lotgd-1.0.2-fix-translating-bug.diff
new file mode 100644
index 0000000..8fbe973
--- /dev/null
+++ b/games-rpg/lotgd/files/lotgd-1.0.2-fix-translating-bug.diff
@@ -0,0 +1,32 @@
+--- lotgd-1.0.2.orig/translatortool.php	2005-02-11 10:43:19.000000000 -0500
++++ lotgd-1.0.2/translatortool.php	2005-06-07 15:41:16.000000000 -0400
+@@ -65,7 +65,7 @@
+ 		}elseif(db_num_rows($result)==1){
+ 			$row = db_fetch_assoc($result);
+ 			// MySQL is case insensitive so we need to do it here.
+-			if ($row['intext'] == $text){
++			if ($row['intext'] == stripslashes($text)){
+ 				$sql = "UPDATE ".db_prefix("translations")." SET author='{$session['user']['login']}', version='$logd_version', uri='$uri', outtext='$trans' WHERE tid={$row['tid']}";
+ 			}else{
+ 				$sql = "INSERT INTO " . db_prefix("translations") . " (language,uri,intext,outtext,author,version) VALUES ('" . LANGUAGE . "','$uri','$text','$trans','{$session['user']['login']}','$logd_version ')";
+@@ -76,11 +76,17 @@
+ 			$rows = array();
+ 			while ($row = db_fetch_assoc($result)){
+ 				// MySQL is case insensitive so we need to do it here.
+-				if ($row['intext'] == $text){
+-					$rows['tid']=$row['tid'];
++				if ($row['intext'] == stripslashes($text)){
++					array_push($rows,$row['tid']);
+ 				}
+ 			}
+-			$sql = "UPDATE ".db_prefix("translations")." SET author='{$session['user']['login']}', version='$logd_version', uri='$page', outtext='$trans' WHERE tid IN (".join(",",$rows).")";
++			if (count($rows)>0){
++				$sql = "UPDATE ".db_prefix("translations")." SET author='{$session['user']['login']}', version='$logd_version', uri='$page', outtext='$trans' WHERE tid IN (".join(",",$rows).")";
++			}else{
++				$sql = "INSERT INTO " . db_prefix("translations") . " (language,uri,intext,outtext,author,version) VALUES ('" . LANGUAGE . "','$uri','$text','$trans','{$session['user']['login']}','$logd_version ')";
++				$sql1 = "DELETE FROM " . db_prefix("untranslated") . " WHERE intext='$text' AND language='" . LANGUAGE . "' AND namespace='$url'";
++				db_query($sql1);
++			}
+ 		}
+ 	}
+ 	db_query($sql);