From b78b951d65eeaca65f01393a5d4abf1cf5509474 Mon Sep 17 00:00:00 2001
From: hecht <hecht@9a2b23b2-43f4-4935-bed2-871a584d7cab>
Date: Tue, 6 Sep 2011 18:34:25 +0000
Subject: [PATCH] if one quits the clan there will be no "fired" message sent.
 It is not possible to join a clan by creating a clan with the same name
 anymore!!

---
 ag/clan/clan_info.php |  7 ++++++-
 ag/clan/new.php       | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ag/clan/clan_info.php b/ag/clan/clan_info.php
index 64ff3a7..8792e65 100644
--- a/ag/clan/clan_info.php
+++ b/ag/clan/clan_info.php
@@ -466,7 +466,9 @@ function fireMember($user, $member){
 		if(mysql_affected_rows() > 0){ // Soll nur ausgeführt werden, wenn member wirklich gekickt wurde!!
 			$sql = 'Update chars set clan_train = NULL where besitzer = '.$member;
 			mysql_query($sql);
-			sendMessage($user['nickname'], $member, 'Clan rauswurf!', 'Du wurdest von '.$user['nickname'].' aus deinem Clan geworfen. Du wirst dir wohl einen neuen suchen m&uuml;ssen!');
+			if($user['id'] != $member) {
+				sendMessage($user['nickname'], $member, 'Clan rauswurf!', 'Du wurdest von '.$user['nickname'].' aus deinem Clan geworfen. Du wirst dir wohl einen neuen suchen m&uuml;ssen!');
+			}
 		}
 	} else{
 		echo displayErrorMessage(NULL, 'Du kannst den Member nicht feuern!', displayHistoryBackLink());
@@ -535,6 +537,9 @@ if($action !== NULL) { // this is done to not require to reprogramm the whole st
 			break;
 		case 'fire':
 			fireMember($user_ida, $member);
+			if($user_ida['id'] == $member) {
+				$displayMore = false;
+			}
 			break;
 		case 'putsch':
 			setMeAsLeader($user_ida);
diff --git a/ag/clan/new.php b/ag/clan/new.php
index e6e5c3b..0dfc4f2 100644
--- a/ag/clan/new.php
+++ b/ag/clan/new.php
@@ -37,6 +37,16 @@ if ($charm == 1) {
 		exit;
 	}
 
+	$sql = 'SELECT id, clanname FROM clan WHERE clanname = \'' .$clan_name. '\'';
+//	echo $sql.'<br>';
+	$dup = mysql_fetch_assoc(mysql_query($sql));
+
+	if($dup) {
+		// we have a clan that has the same name!!
+		displayErrorMessage(NULL, 'Es gibt schon einen Clan mit dem Namen '.$clan_name.'.', displayHistoryBackLink());
+		exit;
+	}
+
 	$sql = 'INSERT into clan(clanname,clanz_pre,clanz_suff,info, leader) values(\''.$clan_name.'\', \''.$clan_for.'\', \''.$clan_back.'\', \''.$clan_info.'\', '.$user_ida['id'].')';
 //	echo $sql.'<br>';
 	mysql_query($sql);