From 6f5ea3637d40c6bc9d8561b7fdd7e76011abaec3 Mon Sep 17 00:00:00 2001
From: yi12345 <yarin_din@walla.com>
Date: Sun, 12 May 2013 20:50:49 +0300
Subject: [PATCH] fix ally invite

---
 GameEngine/Alliance.php       | 34 +++++-----------------------------
 Templates/Alliance/invite.tpl | 17 +----------------
 2 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/GameEngine/Alliance.php b/GameEngine/Alliance.php
index 2a935971..3bf96e35 100644
--- a/GameEngine/Alliance.php
+++ b/GameEngine/Alliance.php
@@ -108,42 +108,19 @@
 		public function sendInvite($post) {
 			global $form, $database, $session;
 			if($session->access != BANNED){
-			if($post['a_name'] != "" or $post['a_uid'] == ""){
-			$UserData = $database->getUserArray($post['a_name'], 0);
+			$UserData = $database->getUserArray(stripslashes($post['a_name']), 0);
 			if($this->userPermArray['opt4'] == 0) {
 				$form->addError("perm", NO_PERMISSION);
 			}elseif(!isset($post['a_name']) || $post['a_name'] == "") {
 				$form->addError("name1", NAME_EMPTY);
-			}elseif(!$database->checkExist($post['a_name'], 0)) {
-				$form->addError("name2", NAME_NO_EXIST.$post['a_name']);
-			}elseif($post['a_name'] == (addslashes($session->username))) {
+			}elseif(!$database->checkExist(stripslashes($post['a_name']), 0)) {
+				$form->addError("name2", NAME_NO_EXIST."".stripslashes(stripslashes($post['a_name'])));
+			}elseif($UserData['id'] == $session->uid) {
 				$form->addError("name3", SAME_NAME);
 			}elseif($database->getInvitation2($UserData['id'],$session->alliance)) {
 				$form->addError("name4", $post['a_name'].ALREADY_INVITED);
 			}elseif($UserData['alliance'] == $session->alliance) {
 				$form->addError("name5", $post['a_name'].ALREADY_IN_ALLY);
-			}else{
-				// Obtenemos la informacion necesaria
-				$aid = $session->alliance;
-				// Insertamos invitacion
-				$database->sendInvitation($UserData['id'], $aid, $session->uid);
-				// Log the notice
-				$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . addslashes($session->username) . '</a> has invited  <a href="spieler.php?uid=' . $UserData['id'] . '">' . $UserData['username'] . '</a> into the alliance.');
-			}
-			}elseif(isset($post['a_uid'])){
-			$UserData = $database->getUserArray($post['a_uid'], 1);
-			if($this->userPermArray['opt4'] == 0) {
-				$form->addError("perm", NO_PERMISSION);
-			}elseif(!isset($post['a_uid']) || $post['a_uid'] == "") {
-				$form->addError("name1", NAME_EMPTY);
-			}elseif(!$database->checkExist($UserData['email'], 1)) {
-				$form->addError("name2", ID_NO_EXIST.$post['a_uid']);
-			}elseif($post['a_uid'] == ($session->uid)) {
-				$form->addError("name3", SAME_NAME);
-			}elseif($database->getInvitation2($UserData['id'],$session->alliance)) {
-				$form->addError("name4", $UserData['username'].ALREADY_INVITED);
-			}elseif($UserData['alliance'] == $session->alliance) {
-				$form->addError("name5", $UserData['username'].ALREADY_IN_ALLY);
 			}else{
 				// Obtenemos la informacion necesaria
 				$aid = $session->alliance;
@@ -152,7 +129,6 @@
 				// Log the notice
 				$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . addslashes($session->username) . '</a> has invited  <a href="spieler.php?uid=' . $UserData['id'] . '">' . addslashes($UserData['username']) . '</a> into the alliance.');
 			}
-			}
 			}else{
 			header("Location: banned.php");
 			}
@@ -187,7 +163,7 @@
 				if($invite['id'] == $get['d']) {
 				$invitename = $database->getUserArray($invite['uid'], 1);
 					$database->removeInvitation($get['d']);
-					$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . addslashes($session->username) . '</a> has deleted the invitation for <a href="spieler.php?uid=' . $invitename['id'] . '">' . $invitename['username'] . '</a>.');
+					$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . addslashes($session->username) . '</a> has deleted the invitation for <a href="spieler.php?uid=' . $invitename['id'] . '">' . addslashes($invitename['username']) . '</a>.');
 				}
 			}
 			header("Location: allianz.php?delinvite");
diff --git a/Templates/Alliance/invite.tpl b/Templates/Alliance/invite.tpl
index 7dd31869..5acafa09 100644
--- a/Templates/Alliance/invite.tpl
+++ b/Templates/Alliance/invite.tpl
@@ -23,24 +23,9 @@ include("alli_menu.tpl");
 </tr>
 </thead><tbody>
 <tr><th>Name</th>
-<td><input class="name text" type="text" name="a_name" maxlength="20"><span class="error"></span></td>
+<td><input class="name text" type="text" name="a_name" maxlength="30"><span class="error"></span></td>
 </tr>
 </tbody></table>
-<table cellpadding="1" cellspacing="1" id="invite" class="small_option"><thead>
-
-<form method="post" action="allianz.php">
-<input type="hidden" name="s" value="5">
-<input type="hidden" name="o" value="4">
-<input type="hidden" name="a" value="4">
-
-<tr>
-<th colspan="2">Invite a player into the alliance (with user id)</th>
-</tr>
-</thead><tbody>
-<tr><th>UID</th>
-<td><input class="name text" type="text" name="a_uid" maxlength="10"><span class="error"></span></td>
-</tr>
-</tbody></table>(for who have ' in the name)
 <p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" onclick="this.disabled=true;this.form.submit();"/></form> </p>
 
 <p class="error"><?php echo $form->getError("name1"); ?><br /><?php echo $form->getError("name2"); ?><br /><?php echo $form->getError("name3"); ?><br /><?php echo $form->getError("name4"); ?><br /><?php echo $form->getError("name5"); ?><br /><?php echo $form->getError("perm"); ?></p><br />