diff --git a/ag/char.php b/ag/char.php index e384940..4d09bfd 100644 --- a/ag/char.php +++ b/ag/char.php @@ -332,7 +332,7 @@ if ($anzahl_charactere < $chars_max) { if($charm === NULL){ handleFirstPhase($user_daten,$anzahl_charactere); } else if($charm == 1){ - if(isUserInGroup($usergroups, tester)) { + if(isUserInGroup($usergroups, TESTER)) { handleSecondPhaseForTester($char_type, $char_name); } else { handleSecondPhase($char_type, $char_name); diff --git a/ag/char_profil.php b/ag/char_profil.php index 81ec8bf..13add81 100644 --- a/ag/char_profil.php +++ b/ag/char_profil.php @@ -467,7 +467,7 @@ function eintragen($char_id,$name,$user_ida) { $attacke2[$y] = $row[l_id]; } - if($user_ida[admin] != "ja") { + if($user_ida['admin'] != "ja") { if($row[type] == "tausch") { $kampf_tausch_n++; }elseif($row[type] == "SSJ") { $kampf_ssj_n++; }elseif($row[type] == "hpmp") { $kampf_hpmp_n++; diff --git a/ag/gm/gm_seite.php b/ag/gm/gm_seite.php index 6072c4c..a859bac 100644 --- a/ag/gm/gm_seite.php +++ b/ag/gm/gm_seite.php @@ -69,7 +69,7 @@ function loginUser($user,$pass){ $result = mysql_fetch_assoc($qry); $usergroups = getUserGroups($user); - if(isUserInGroup($usergroups, admin)) { + if(isUserInGroup($usergroups, ADMIN)) { $_SESSION['user'] = $result['id']; $_SESSION['username'] = $result['nickname']; $_SESSION['password'] = $result['passwort']; @@ -244,8 +244,8 @@ if(checkLoginData($_SESSION['user'],$_SESSION['password'])){ showActionLog(); } else if($_REQUEST['choose'] == 'cheat'){ displayCheater($_REQUEST['action'], $_REQUEST['from'], $_REQUEST['until'], $_REQUEST['user1'], $_REQUEST['user2'], $_REQUEST['tradeid'], $_REQUEST['verify']); - } else if($_REQUEST['choose'] == 'npc'){ - displayNPC($_REQUEST['action'], $_REQUEST['task'], $_REQUEST['charid'], $_REQUEST['table'], $_REQUEST['page'], $REQUEST['data']); + } else if($_REQUEST['choose'] == 'npc'){ + displayNPC($_REQUEST['action'], $_REQUEST['task'], $_REQUEST['charid'], $_REQUEST['table'], $_REQUEST['page'], $_REQUEST['data']); } else if($_REQUEST['choose'] == 'shop'){ displayShop($_REQUEST['action'], $_REQUEST['s_id'],$_REQUEST['info'], $_REQUEST['s_name'] , $_REQUEST['s2_name'], $_REQUEST['s3_name'], $_REQUEST['s_typ'], $_REQUEST['preis'], $_REQUEST['frei'], $_REQUEST['anzahl']); } else if($_REQUEST['choose'] == 'usergroups'){ diff --git a/ag/include/designfunctions.inc.php b/ag/include/designfunctions.inc.php index 0f59d29..7168fdf 100644 --- a/ag/include/designfunctions.inc.php +++ b/ag/include/designfunctions.inc.php @@ -36,12 +36,12 @@ function generateUserNameByID($userid, $showClanTags = TRUE){ $sql = 'select nickname, user.id as userid, clan.clanz_pre, clan.clanz_suff from user left join clan on user.clan = clan.id where user.id = '.$userid; $user_info = mysql_fetch_assoc(mysql_query($sql)); - if(isUserInGroup($groups, Werbung_an)){ - if(isUserInGroup($groups, admin)){ + if(isUserInGroup($groups, WERBUNG_AN)){ + if(isUserInGroup($groups, ADMIN)){ $color = 'style="color:'.$GLOBALS['COLOR_GM'].'"'; - } else if(isUserInGroup($groups, entwickler)){ + } else if(isUserInGroup($groups, ENTWICKLER)){ $color = 'style="color:'.$GLOBALS['COLOR_DEVELOPER'].'"'; - } else if(isUserInGroup($groups, designer)){ + } else if(isUserInGroup($groups, DESIGNER)){ $color = 'style="color:'.$GLOBALS['COLOR_CREATIVE'].'"'; } else { $color = 'style="color:'.$GLOBALS['COLOR_SUPPORTER'].'"'; diff --git a/ag/include/usergroup.inc.php b/ag/include/usergroup.inc.php index 07b8ab9..fa4725a 100644 --- a/ag/include/usergroup.inc.php +++ b/ag/include/usergroup.inc.php @@ -7,14 +7,14 @@ */ //Konstanten -define("admin", 1); -define("tester", 2); -define("entwickler", 3); -define("designer", 4); -define("Werbung_an", 5); -define("inaktiv_loeschschutz", 6); -define("aktiv_loeschschutz", 7); -define("aktiv_chat", 8); +define("ADMIN", 1); +define("TESTER", 2); +define("ENTWICKLER", 3); +define("DESIGNER", 4); +define("WERBUNG_AN", 5); +define("INAKTIV_LOESCHSCHUTZ", 6); +define("AKTIV_LOESCHSCHUTZ", 7); +define("AKTIV_CHAT", 8); include_once($_SERVER['DOCUMENT_ROOT'].'ag/include/parse.inc.php'); diff --git a/ag/index.php b/ag/index.php index ef475b7..ccd3653 100644 --- a/ag/index.php +++ b/ag/index.php @@ -428,7 +428,7 @@ if($user_ida){

Chat: