diff --git a/ag/clan/add.php b/ag/clan/add.php
index de80f02..2c14fc7 100644
--- a/ag/clan/add.php
+++ b/ag/clan/add.php
@@ -5,7 +5,6 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public Licence
*
*/
-
include_once ($_SERVER['DOCUMENT_ROOT'] . 'ag/include/config.inc.php');
include_once ($_SERVER['DOCUMENT_ROOT'] . 'ag/include/fehlerausgabe.inc.php');
include_once ($_SERVER['DOCUMENT_ROOT'] . 'ag/include/designfunctions.inc.php');
@@ -13,149 +12,173 @@ include_once ($_SERVER['DOCUMENT_ROOT'] . 'ag/include/parse.inc.php');
// GET-Section
// Kritisch (SQL-Injections)
-$clan_name = validateName($_GET['clan_name']);
-$clan_pw = validateString($_GET['clan_pw']);
+$clanid = validateUnsignedInteger($_GET['clanid'], null);
$poll1 = validateString($_GET['poll1']);
$poll2 = validateString('ASC');
$pagenum = validateUnsignedInteger($_GET['pagenum'], null);
// Unkritisch
-$charm = $_GET['charm'];
+$action = $_GET['action'];
$user = $user_ida;
-if ($charm == 1) {
- $clan = mysql_fetch_assoc(mysql_query('SELECT *, (Select 10 - count(*) from user u where clan = c.id and ((c.leader is null || c.leader != u.id) and (c.co_leader is null || c.co_leader != u.id))) as freeslots FROM clan c WHERE clanname=\''.$clan_name.'\' AND pw=\''.$clan_pw.'\''));
-
- if (!$clan['id']) {
- displayErrorMessage(NULL, 'Clanname oder Clanpasswort ist falsch!', displayHistoryBackLink());
- exit;
- }
- if ($user['clan'] != 0) {
- displayErrorMessage(NULL, 'Du bist schon in einem Clan!', displayHistoryBackLink());
- exit;
+function joinClan($user, $clanid){
+ $sql = 'SELECT * FROM user_clan_invitations WHERE userid = '.$user['id'].' and clanid = '.$clanid.' and valid > now();';
+ $clan_user = mysql_fetch_assoc(mysql_query($sql));
+
+ if($clan_user){
+ $sql = 'Select *, (Select member - count(*) from user u where clan = c.id and ((c.leader is null || c.leader != u.id) and (c.co_leader is null || c.co_leader != u.id))) as freeslots from clan c where id = '.$clanid;
+// echo $sql . 'weiter ');
+ }
+ } else{
+ displayErrorMessage(NULL,'Konnte die Einladung des Clans nicht annehmen!',displayHistoryBackLink());
+ return;
}
+ mysql_query('DELETE FROM user_clan_invitations WHERE userid = '.$user['id'].' and clanid = '.$clanid);
+}
- if ($clan['freeslots'] <= 0) { // Keine Plätze mehr frei
- displayErrorMessage(NULL, 'Der Clan ist voll!', displayHistoryBackLink());
- exit;
+function denyClan($user, $clanid){
+ mysql_query('DELETE FROM user_clan_invitations WHERE userid = '.$user['id'].' and clanid = '.$clanid);
+ if(mysql_affected_rows() > 0){
+ displayErrorMessage('Abgelehnt','Du hast die Einladung erfolgreich abgelehnt!','weiter ');
+ } else{
+ displayErrorMessage(NULL,'Einladung des Clans konnte nicht abgelehnt werden!',displayHistoryBackLink());
}
-
- mysql_query('UPDATE user SET clan='.$clan['id'].' WHERE id='.$user_ida['id']);
-
- displayErrorMessage(NULL, 'Du bist jetzt im '.$clan_name.' Clan', 'weiter... ');
- exit;
}
-?>
-
diff --git a/ag/clan/clan_info.php b/ag/clan/clan_info.php
index f961d1e..c3d038e 100644
--- a/ag/clan/clan_info.php
+++ b/ag/clan/clan_info.php
@@ -6,97 +6,556 @@
*
*/
-include_once($_SERVER['DOCUMENT_ROOT'].'ag/include/designfunctions.inc.php');
-include_once ($_SERVER['DOCUMENT_ROOT'] . 'ag/include/parse.inc.php');
+include_once($_SERVER['DOCUMENT_ROOT'].'ag/include/clan.inc.php');
+include_once($_SERVER['DOCUMENT_ROOT'].'ag/include/fehlerausgabe.inc.php');
+
+
// GET-Section
+
+if(isset($_GET['action'])) {
+ $action = $_GET['action'];
+} else {
+ $action = NULL;
+}
+
+//Unkritisch
+if(isset($_GET['what'])) {
+ $what = $_GET['what'];
+} else {
+ $what = NULL;
+}
+
// Kritisch (SQL-Injections)
$clan_id = validateUnsignedInteger($_GET['clan_id'], null);
-//Unkritisch
+$member = validateUnsignedInteger($_GET['member'], NULL);
+$text = validateString($_GET['text']);
-function displayClanProfile($clanid){
- $sql = 'SELECT * FROM clan where clan.id = '.$clanid;
- $clan = mysql_fetch_assoc(mysql_query($sql));
- $clan_zeichen = explode(",", $clan['clanzeichen']);
- $member_qry = mysql_query('Select nickname, id from user where clan = '.$clan['id']);
+$displayMore = true;
+
+if($clan_id == NULL){
+ if($user_ida['clan'] != null){
+ $clan_id = $user_ida['clan'];
+ } else {
+ $displayMore = false;
+ }
+}
+
+if(isset($_GET['value1'])) {
+ if($what == 'Banner'){
+ $value1 = validateURL($_GET['value1']);
+ } else if($what == 'Homepage' || $what == 'Info' || $what == 'Clan Passwort'){
+ $value1 = validateString($_GET['value1']);
+ } else if($what == 'Clanzeichen'){
+ $value1 = validateString($_GET['value1']);
+ $value2 = validateString($_GET['value2']);
+ } else if($what == 'Leadership') {
+ $value1 = validateUnsignedInteger($_GET['value1'], NULL);
+ $value2 = validateUnsignedInteger($_GET['value2'], NULL);
+ }
+}
+
+
+
+function displayClanProfileReadOnly($clan, $ownclan, $userid){
+ $member_qry = mysql_query('Select id from user where clan = '.$clan['id']);
$count = mysql_num_rows($member_qry);
+ $member = array();
while($row = mysql_fetch_assoc($member_qry)){
- $member[] = displayUserLink($row['id'], $row['nickname'], $clan_zeichen[0], $clan_zeichen[1]);
+ $tmp = displayUserLinkByID($row['id']);
+ if($row['id'] == $userid){
+ $member[] = $tmp.' (verlassen )';
+ } else{
+ $member[] = $tmp;
+ }
if($row['id'] == $clan['leader']){
- $leader = $row;
- } else if($row['id'] == $clan['co_leader']){
- $coleader = $row;
+ $leader = $tmp;
+ }
+ if($row['id'] == $clan['co_leader']){
+ $coleader = $tmp;
}
- }
+ }
+
+ $inv_qry = mysql_query('SELECT userid, TIMESTAMPDIFF(HOUR, now(), valid) as till FROM user_clan_invitations WHERE clanid = '.$clan['id'].' and valid > now()');
+ $invited = array();
+
+ while($row = mysql_fetch_assoc($inv_qry)) {
+ $invited[] = displayUserLinkByID($row['userid']) . ' (noch ' . $row['till'] . 'h gültig)';
+ }
+
?>
-
-
-
- Info
-
+
+
+
+
+ Info
+
+
+
+
+
+
+ Leader:
+ Macht übernehmen ';
+ } else {
+ echo 'Keine Leader ';
+ }
+ } else{
+ echo ''.$leader.' ';
+ }
+ ?>
+
+
+ Co-Leader:
'.$coleader.'';
+ }
+ ?>
+
+
+ Clanzeichen:
+
+
+ Member ():
+ ',$member); ?>
+
+
-
-
+
+ Eingeladen
+
+
+
+ Level:
+
+
+ Homepage:
'.$clan['homepage'].' ';
+ } else{
+ echo 'Keine ';
}
?>
-
- Leader:
-
-
- Co-Leader:
-
-
- Clanzeichen:
-
-
- Member ():
- ',$member); ?>
-
-
- Level:
-
-
- Homepage:
- '.$clan['homepage'].' ';
- } else{
- echo 'Keine ';
- }
- ?>
-
-
- Info:
-
-
-
-
-
+ Info:
+
+
+
+
+
+
+
+
+
+
Einen Clan mit dieser ID exisitert nicht!
';
- /* Wenn es einen Datensatz mit der ID in der Tabelle gibt, werden die Claninformationen angezeigt */
+
+function displayClanProfileEditable($clan, $userid){
+ $member_qry = mysql_query('Select id from user where clan = '.$clan['id']);
+ $member = array();
+ $count = mysql_num_rows($member_qry);
+ while($row = mysql_fetch_assoc($member_qry)){
+ $tmp = displayUserLinkByID($row['id']);
+ $kickable = true;
+
+ if($row['id'] == $clan['leader']){
+ $leader = $tmp;
+ $kickable = false;
+ }
+ if($row['id'] == $clan['co_leader']){
+ $coleader = $tmp;
+ $kickable = false;
+ }
+ if($userid == $row['id'] && $kickable){
+ $member[] = $tmp.' (verlassen )';
+ } else if($kickable){
+ $member[] = $tmp.' (kicken )';
+ } else{
+ $member[] = $tmp;
+ }
+ }
+
+ $inv_qry = mysql_query('SELECT userid, TIMESTAMPDIFF(HOUR, now(), valid) as till FROM user_clan_invitations WHERE clanid = '.$clan['id'].' and valid > now()');
+ $invited = array();
+
+ while($row = mysql_fetch_assoc($inv_qry)) {
+ $invited[] = displayUserLinkByID($row['userid']) . ' (noch ' . $row['till'] . 'h gültig, zurückziehen )';
+ }
+
+
+ ?>
+
+ ';
+ $clan = mysql_fetch_assoc(mysql_query($sql));
+ $editable = $clan['leader'] == $user['id'] || $clan['co_leader'] == $user['id'];
+ if(!$editable){
+ displayClanProfileReadOnly($clan, $user['clan'] == $clan['id'], $user['id']);
+ } else{
+ displayClanProfileEditable($clan, $user['id']);
+ }
+}
+
+
+function setMeAsLeader($user){
+ mysql_query('UPDATE clan set leader = '.$user['id'].' WHERE id = '.$user['clan'].' and leader is null and co_leader is null');
+}
+
+function sendClanNewsletter($user, $text){
+ $qry = mysql_query('SELECT * FROM clan WHERE id = ' . $user['clan']);
+ $clan = mysql_fetch_assoc($qry);
+
+ $errors = FALSE;
+ $sql = 'SELECT id FROM user WHERE clan='.$user['clan'];
+ $clans = mysql_query($sql);
+ while($row = mysql_fetch_assoc($clans)) {
+ $errors |= !sendMessage($user['nickname'], $row['id'], $clan['clanname'].' Nachricht', $text);
+ }
+ if($errors) {
+ displayErrorMessage(NULL,'Beim Versenden sind Fehler aufgetreten', 'weiter... ');
} else {
- displayClanProfile($clan_id);
+ displayErrorMessage(NULL,'Nachricht erfolgreich verschickt', 'weiter... ');
+ }
+}
+
+function setProfile($what, $value1, $value2, $clanid, $root){
+
+ switch($what){
+ case 'Homepage':
+ mysql_query('UPDATE clan SET homepage = \''.$value1.'\' where id = '.$clanid);
+ return;
+ case 'Clanzeichen':
+ mysql_query('UPDATE clan SET clanz_pre = \''.$value1.'\', clanz_suff = \''.$value2.'\' where id = '.$clanid);
+ return;
+ case 'Banner':
+ mysql_query('UPDATE clan SET banner = \''.$value1.'\' where id = '.$clanid);
+ return;
+ case 'Info':
+ mysql_query('UPDATE clan SET Info = \''.$value1.'\' where id = '.$clanid);
+ return;
+ case 'Leadership':
+ if($value1 == 0){$value1 = 'null';}
+ if($value2 == 0){$value2 = 'null';}
+ if(!$root){
+ $sql = 'UPDATE clan SET co_leader = '.$value2.' where id = '.$clanid;
+ mysql_query($sql);
+ } else{
+ $sql = 'UPDATE clan SET leader = '.$value1.', co_leader = '.$value2.' where id = '.$clanid;
+ // echo $sql.'Prefix: Suffix: Niemand ';
+ $member2[] = 'Niemand ';
+ while($row = mysql_fetch_assoc($member_qry)){
+ if($row['id'] == $clan['leader']) {
+ $member[] = ''.$row['nickname'].' ';
+ } else {
+ $member[] = ''.$row['nickname'].' ';
+ }
+
+ if($row['id'] == $clan['co_leader']) {
+ $member2[] = ''.$row['nickname'].' ';
+ } else {
+ $member2[] = ''.$row['nickname'].' ';
+ }
+
+ }
+ if($root){
+ $content = 'Leader: Co-Leader: Error '.$what.' unknown! weiter ');
+// $displayMore = false;
+// }
+//}
+
+
+
+
+if($action !== NULL) { // this is done to not require to reprogramm the whole stuff!
+ switch ($action) {
+ case 'edit':
+ $row = mysql_fetch_assoc(mysql_query('SELECT leader, co_leader from clan where id = '.$user_ida['clan']));
+ if($row['leader'] != $user_ida['id'] && $row['co_leader'] != $user_ida['id']){
+ displayErrorMessage(NULL, 'Du bist weder Leader noch Co-Leader des Clans!', displayHistoryBackLink());
+ } else if(isset($value1)){
+ setProfile($what, $value1, $value2, $user_ida['clan'], $row['leader'] == $user_ida['id'] || $row['leader'] === null);
+ } else{
+ displayEdit($what, $user_ida['clan'],$row['leader'] == $user_ida['id'] || $row['leader'] === null);
+ $displayMore = false;
+ }
+ break;
+ case 'fire':
+ fireMember($user_ida, $member);
+ break;
+ case 'putsch':
+ setMeAsLeader($user_ida);
+ break;
+ case 'kill':
+ deleteClan($user_ida);
+ break;
+ case 'reject':
+ $errorMsg = revokeInvitation($user_ida, $member);
+ if($errorMsg !== NULL) {
+ echo displayErrorMessage(NULL, $errorMsg, displayHistoryBackLink());
+ $displayMore = false;
+ } else {
+ displayErrorMessage('','Du hast die Einladung erfolgreich zurückgezogen!', 'weiter ');
+ $displayMore = false;
+ }
+ break;
+ case 'newsletter':
+ sendClanNewsletter($user_ida, $text);
+ $displayMore = false;
+ break;
+ default:
+ break;
+ }
+}
+
+if($displayMore){
+ displayClanProfile($clan_id, $user_ida);
+}
?>
\ No newline at end of file
diff --git a/ag/clan/del.php b/ag/clan/del.php
deleted file mode 100644
index 054123e..0000000
--- a/ag/clan/del.php
+++ /dev/null
@@ -1,28 +0,0 @@
-Ja | '.displayHistoryBackLink());
-}
-if($charm == 1) {
- $dl = mysql_fetch_array(mysql_query("SELECT id FROM clan WHERE id='$user_ida[clan]' AND leader='$user_ida[id]' LIMIT 1"));
- if($dl['id']) {
- mysql_query("DELETE FROM clan WHERE id='$user_ida[clan]' AND leader='$user_ida[id]' LIMIT 1");
- mysql_query("DELETE FROM clan_ware WHERE clan='$dl[id]'");
-
- mysql_query("UPDATE user SET clan=NULL WHERE clan='$user_ida[clan]' LIMIT 1");
- displayErrorMessage(NULL,'Clan erfolgreich gelöscht', 'weiter... ');
- }
-}
\ No newline at end of file
diff --git a/ag/clan/index.php b/ag/clan/index.php
deleted file mode 100644
index a2c43b2..0000000
--- a/ag/clan/index.php
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
- Clan Mitglieder
-
-
-
-
- Nickname
- kicken "; } ?>
-
-
-
-
- Charakter
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ag/clan/new.php b/ag/clan/new.php
index 040a696..e6e5c3b 100644
--- a/ag/clan/new.php
+++ b/ag/clan/new.php
@@ -5,7 +5,6 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public Licence
*
*/
-
include_once ($_SERVER['DOCUMENT_ROOT'] . 'ag/include/config.inc.php');
include_once ($_SERVER['DOCUMENT_ROOT'] . 'ag/include/designfunctions.inc.php');
include_once ($_SERVER['DOCUMENT_ROOT'] . 'ag/include/fehlerausgabe.inc.php');
@@ -13,7 +12,6 @@ include_once ($_SERVER['DOCUMENT_ROOT'] . 'ag/include/parse.inc.php');
// GET-Section
// Kritisch (SQL-Injections)
$clan_name = validateName($_GET['clan_name']);
-$clan_pw = validateString($_GET['clan_pw']);
$clan_for = validateString($_GET['clan_for']);
$clan_back = validateString($_GET['clan_back']);
$clan_info = validateString($_GET['clan_info']);
@@ -24,20 +22,6 @@ $charm = $_GET['charm'];
if ($charm == 1) {
- $clanz = mysql_fetch_assoc(mysql_Query("SELECT id FROM clan ORDER BY id DESC LIMIT 1"));
- $clan_upps = mysql_fetch_assoc(mysql_query("SELECT id FROM clan WHERE clanname='$clan_name' OR clanzeichen='$clan_for,$clan_back'"));
- $clan_num = $clanz['id'] + 1;
-
- if ($clan_upps[id]) {
- displayErrorMessage(NULL, 'Clanname oder Clan Zeichen gibt es schon.', displayHistoryBackLink());
- exit;
- }
-
- if (!$clan_pw) {
- displayErrorMessage(NULL, 'Clan Passwort Eingeben!', displayHistoryBackLink());
- exit;
- }
-
if (!$clan_for AND !$clan_back) {
displayErrorMessage(NULL, 'Sie müssen ein Clanzeichen haben.', displayHistoryBackLink());
exit;
@@ -53,61 +37,52 @@ if ($charm == 1) {
exit;
}
- $clan_name = preg_replace("#<#", "<", $clan_name);
- $clan_pw = preg_replace("#<#", "<", $clan_pw);
- $clan_info = preg_replace("#<#", "<", $clan_info);
-
- mysql_query("INSERT INTO clan SET clanname='$clan_name', clanzeichen='$clan_for,$clan_back', pw='$clan_pw', info='$clan_info', leader='$user_ida[id]'") OR DIE (mysql_error());
- $c_id = mysql_fetch_assoc(mysql_query('Select * from clan where clanname = \''.$clan_name.'\''));
- mysql_query('UPDATE user SET clan='.$c_id['id'].' WHERE id='.$user_ida['id']);
-
- displayErrorMessage(NULL, 'Clan erfolgreich Erstellt.', 'weiter... ');
+ $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.'weiter... ');
+ } else{
+ $sql = 'Select * from clan where clanname = \''.$clan_name.'\'';
+ $c_id = mysql_fetch_assoc(mysql_query($sql));
+ if($c_id){
+ $error = 'Clanname besteht schon!';
+ } else{
+ $error = 'Insert failed!';
+ }
+ displayErrorMessage(NULL, 'Clan erstellen fehlgeschlagen! ('.$error.')', displayHistoryBackLink());
+ }
exit;
}
?>
-
-
-
-
-
diff --git a/ag/clan/post.php b/ag/clan/post.php
index 6f4a981..52ee122 100644
--- a/ag/clan/post.php
+++ b/ag/clan/post.php
@@ -11,41 +11,133 @@ include_once($_SERVER['DOCUMENT_ROOT'].'ag/include/designfunctions.inc.php');
include_once($_SERVER['DOCUMENT_ROOT'].'ag/include/fehlerausgabe.inc.php');
include_once ($_SERVER['DOCUMENT_ROOT'] . 'ag/include/parse.inc.php');
include_once ($_SERVER['DOCUMENT_ROOT'] . 'ag/include/messagefunctions.inc.php');
-
// GET-Section
// Kritisch (SQL-Injections)
-$text = validateString($_REQUEST['text']);
+$text = validateString($_GET['text']);
+$username = validateName($_GET['username'], NULL);
+
// Unkritisch
-$charm = $_REQUEST['charm'];
+$action = $_GET['action'];
-if($charm) {
- if($user_ida['clan'] <= 0){
- return;
+function handleInvitation($user, $username, $clan){
+ if($clan['leader'] != $user['id'] && $clan['co_leader'] != $user['id']){
+ displayErrorMessage(NULL, 'Nur der Leader, bzw. der Co-Leader kann neue Member einladen!');
+ return false;
+ }
+
+ if($user['clan'] == NULL){
+ displayErrorMessage(NULL, 'Fehler! Nutzer existiert nicht!');
+ return false;
}
- $clans = mysql_query('SELECT id FROM user WHERE clan='.$user_ida['clan']);
- while($row = mysql_fetch_array($clans)) {
- sendMessage($user_ida['nickname'], $row['id'], 'Clan Nachricht', $text);
-// mysql_query("INSERT nachricht SET von='$user_ida[nickname]', besitzer='$row[id]', betreff='Clan Nachricht', text='$text'");
+ $row = mysql_fetch_assoc(mysql_query('SELECT * FROM user where nickname = \''. $username.'\''));
+ $userid = $row['id'];
+ if($row['clan'] == $user['clan']){
+ displayErrorMessage(NULL, 'Fehler! Nutzer ist schon in deinem Clan!', displayHistoryBackLink());
+ return false;
+ }
+
+ if($row){
+ $sql = 'INSERT INTO user_clan_invitations(userid, clanid, valid) values('.$userid.','.$user['clan'].',TIMESTAMPADD(DAY, 5, now()))';
+// echo $sql.'weiter ');
+ sendMessage($user['id'], $userid, 'Einladung in Clan', 'Die Einladung des Clans '.$clan['clanname'].' wurde aufgefrischt! Klicke auf "Clan beitreten" um die Einladung anzunehmen!');
+ }
+ } else{
+ displayErrorMessage('','Nutzer erfolgreich eingeladen!', 'weiter ');
+ sendMessage($user['id'], $userid, 'Einladung in Clan', 'Du wurdest eingeladen dich dem Clan '.$clan['clanname'].' anzuschliessen! Klicke auf "Clan beitreten" um die Einladung anzunehmen!');
}
-
+ }
+ return true;
+}
+
+function sendClanNewsletter($user, $clan, $text){
+ if($clan == NULL){
+ return;
+ }
+ $sql = 'SELECT id FROM user WHERE clan='.$clan['id'];
+ $clans = mysql_query($sql);
+ while($row = mysql_fetch_assoc($clans)) {
+ sendMessage($user['id'], $row['id'], $clan['clanname'].' Nachricht', $text);
+ }
displayErrorMessage(NULL,'Nachricht erfolgreich verschickt', 'weiter... ');
- exit;
}
-?>
-