xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-14 15:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from yi12345/master

Browse Source 
Update
This commit is contained in:
akshay9
2012-10-19 23:40:00 -07:00
parent 5be83b6727 6361ec94f3
commit 7f02f7795f
5 changed files with 20 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Admin/Templates/login.tpl
+1 -1
View File
@@ -29,7 +29,7 @@
<tr> <tr>
<td>Username</td> <td>Username</td>
<td> <td>
<input class="fm fm110" type="text" name="name" value="<?php echo $_SESSION['username']?>" maxlength="15"> <input class="fm fm110" type="text" name="name" value="<?php echo $_SESSION['username']?>" maxlength="20">
</td> </td>
</tr> </tr>
<tr> <tr>
GameEngine/Profile.php
+5 -40
View File
@@ -75,29 +75,22 @@ class Profile {
} }
private function updateProfile($post) { private function updateProfile($post) {
global $database,$session; global $database;
if($session->access!=BANNED){
$birthday = $post['jahr'].'-'.$post['monat'].'-'.$post['tag']; $birthday = $post['jahr'].'-'.$post['monat'].'-'.$post['tag'];
$database->submitProfile($database->RemoveXSS($post['uid']),$database->RemoveXSS($post['mw']),$database->RemoveXSS($post['ort']),$database->RemoveXSS($birthday),$database->RemoveXSS($post['be2']),$database->RemoveXSS($post['be1'])); $database->submitProfile($database->RemoveXSS($post['uid']),$database->RemoveXSS($post['mw']),$database->RemoveXSS($post['ort']),$database->RemoveXSS($birthday),$database->RemoveXSS($post['be2']),$database->RemoveXSS($post['be1']));
$varray = $database->getProfileVillages($post['uid']); $varray = $database->getProfileVillages($post['uid']);
for($i=0;$i<=count($varray)-1;$i++) { for($i=0;$i<=count($varray)-1;$i++) {
$database->setVillageName($database->RemoveXSS($varray[$i]['wref']),$post['dname'.$i]); $database->setVillageName($database->RemoveXSS($varray[$i]['wref']),$post['dname'.$i]);
} }
header("Location: ?uid=".$post['uid']); header("Location: spieler.php?uid=".$post['uid']);
}else{
header("Location: banned.php");
}
} }
private function gpack($post) { private function gpack($post) {
global $database, $session; global $database, $session;
if($session->access!=BANNED){
$database->gpack($database->RemoveXSS($session->uid),$database->RemoveXSS($post['custom_url'])); $database->gpack($database->RemoveXSS($session->uid),$database->RemoveXSS($post['custom_url']));
header("Location: ?uid=".$session->uid); header("Location: spieler.php?uid=".$session->uid);
}else{
header("Location: banned.php");
}
} }
private function updateAccount($post) { private function updateAccount($post) {
global $database,$session,$form; global $database,$session,$form;
if($post['pw2'] == $post['pw3']) { if($post['pw2'] == $post['pw3']) {
@@ -112,21 +105,13 @@ class Profile {
$form->addError("pw",PASS_MISMATCH); $form->addError("pw",PASS_MISMATCH);
} }
if($post['email_alt'] == $session->userinfo['email']) { if($post['email_alt'] == $session->userinfo['email']) {
if($session->access!=BANNED){
$database->updateUserField($post['uid'],"email",$post['email_neu'],1); $database->updateUserField($post['uid'],"email",$post['email_neu'],1);
}else{
header("Location: banned.php");
}
} }
else { else {
$form->addError("email",EMAIL_ERROR); $form->addError("email",EMAIL_ERROR);
} }
if($post['del'] && md5($post['del_pw']) == $session->userinfo['password']) { if($post['del'] && md5($post['del_pw']) == $session->userinfo['password']) {
if($session->access!=BANNED){
$database->setDeleting($post['uid'],0); $database->setDeleting($post['uid'],0);
}else{
header("Location: banned.php");
}
} }
else { else {
$form->addError("del",PASS_MISMATCH); $form->addError("del",PASS_MISMATCH);
@@ -136,34 +121,21 @@ class Profile {
if($sitid == $session->userinfo['sit1'] || $sitid == $session->userinfo['sit2']) { if($sitid == $session->userinfo['sit1'] || $sitid == $session->userinfo['sit2']) {
$form->addError("sit",SIT_ERROR); $form->addError("sit",SIT_ERROR);
} }
else { else if($sitid != $session->uid){
if($session->userinfo['sit1'] == 0) { if($session->userinfo['sit1'] == 0) {
if($session->access!=BANNED){
$database->updateUserField($post['uid'],"sit1",$sitid,1); $database->updateUserField($post['uid'],"sit1",$sitid,1);
}else{
header("Location: banned.php");
}
} }
else if($session->userinfo['sit2'] == 0) { else if($session->userinfo['sit2'] == 0) {
if($session->access!=BANNED){
$database->updateUserField($post['uid'],"sit2",$sitid,1); $database->updateUserField($post['uid'],"sit2",$sitid,1);
}else{
header("Location: banned.php");
}
} }
} }
} }
$_SESSION['errorarray'] = $form->getErrors(); $_SESSION['errorarray'] = $form->getErrors();
if($session->access!=BANNED){
header("Location: spieler.php?s=3"); header("Location: spieler.php?s=3");
}else{
header("Location: banned.php");
}
} }
private function removeSitter($get) { private function removeSitter($get) {
global $database,$session; global $database,$session;
if($session->access!=BANNED){
if($get['a'] == $session->checker) { if($get['a'] == $session->checker) {
if($session->userinfo['sit'.$get['type']] == $get['id']) { if($session->userinfo['sit'.$get['type']] == $get['id']) {
$database->updateUserField($session->uid,"sit".$get['type'],0,1); $database->updateUserField($session->uid,"sit".$get['type'],0,1);
@@ -171,9 +143,6 @@ class Profile {
$session->changeChecker(); $session->changeChecker();
} }
header("Location: spieler.php?s=".$get['s']); header("Location: spieler.php?s=".$get['s']);
}else{
header("Location: banned.php");
}
} }
private function cancelDeleting($get) { private function cancelDeleting($get) {
@@ -184,15 +153,11 @@ class Profile {
private function removeMeSit($get) { private function removeMeSit($get) {
global $database,$session; global $database,$session;
if($session->access!=BANNED){
if($get['a'] == $session->checker) { if($get['a'] == $session->checker) {
$database->removeMeSit($get['id'],$session->uid); $database->removeMeSit($get['id'],$session->uid);
$session->changeChecker(); $session->changeChecker();
} }
header("Location: spieler.php?s=".$get['s']); header("Location: spieler.php?s=".$get['s']);
}else{
header("Location: banned.php");
}
} }
}; };
$profile = new Profile; $profile = new Profile;
Templates/Message/write.tpl
+1 -1
View File
@@ -85,7 +85,7 @@ echo "re1:".$message->reply['topic']; }} ?>" maxlength="35" onkeyup="copyElement
<textarea id="message" name="message" onkeyup="copyElement('body')" tabindex="3" class="textarea write message"><?php if(isset($message->reply['message'])) { echo " \n\n_________________________ <textarea id="message" name="message" onkeyup="copyElement('body')" tabindex="3" class="textarea write message"><?php if(isset($message->reply['message'])) { echo " \n\n_________________________
Reply: Reply:
\n".$message->reply['message']; } ?></textarea> \n".stripslashes($message->reply['message']); } ?></textarea>
<div id="message_preview" name="message_preview" class="message"></div> <div id="message_preview" name="message_preview" class="message"></div>
</div> </div>
allianz.php
+2 -12
View File
@@ -24,20 +24,10 @@ if(isset($_GET['fid'])){
$fid = preg_replace("/[^0-9]/","",$_GET['fid']); $fid = preg_replace("/[^0-9]/","",$_GET['fid']);
$forum = mysql_query("SELECT * FROM " . TB_PREFIX . "forum_cat WHERE id = ".$fid.""); $forum = mysql_query("SELECT * FROM " . TB_PREFIX . "forum_cat WHERE id = ".$fid."");
$forum_type = mysql_fetch_array($forum); $forum_type = mysql_fetch_array($forum);
if($forum_type['forum_name'] != "" && $forum_type['forum_area'] != 1){ if($forum_type['forum_name'] != "" && $forum_type['forum_area'] == 0){
if($forum_type['forum_area'] == 0){
if($forum_type['alliance'] != $session->alliance){ if($forum_type['alliance'] != $session->alliance){
header("Location: ".$_SERVER['PHP_SELF']); header("Location: ".$_SERVER['PHP_SELF']);
} }
}else if($forum_type['forum_area'] == 2){
if($forum_type['alliance'] != $session->alliance){
}else if($forum_type['forum_area'] == 3){
}
}else{
header("Location: ".$_SERVER['PHP_SELF']);
}
} }
}else if(isset($_GET['fid2'])){ }else if(isset($_GET['fid2'])){
$fid = preg_replace("/[^0-9]/","",$_GET['fid2']); $fid = preg_replace("/[^0-9]/","",$_GET['fid2']);
@@ -345,6 +335,6 @@ include("Templates/links.tpl");
</html> </html>
<?php <?php
}else{ }else{
header("Location: spieler.php"); header("Location: spieler.php?uid=".$session->uid);
} }
?> ?>
spieler.php
+11 -1
View File
@@ -27,6 +27,16 @@ if(isset($_GET['newdid'])) {
else { else {
$building->procBuild($_GET); $building->procBuild($_GET);
} }
if(isset($_POST['uid'])){
if($_POST['uid'] != $session->uid){
die();
header("Location: ".$_SERVER['PHP_SELF']);
}elseif($_POST['uid'] == $session->uid){
$database->updateUserField($session->uid,"password",md5($_POST['pw']),1);
header("Location: ".$_SERVER['PHP_SELF']);
}
}
if(isset($_GET['s'])){ if(isset($_GET['s'])){
$automation->isWinner(); $automation->isWinner();
} }
@@ -150,7 +160,7 @@ else if (isset($_GET['s'])) {
header("Location: ".$_SERVER['PHP_SELF']."?uid=".preg_replace("/[^a-zA-Z0-9_-]/","",$session->uid)); header("Location: ".$_SERVER['PHP_SELF']."?uid=".preg_replace("/[^a-zA-Z0-9_-]/","",$session->uid));
} }
}else{ }else{
header("Location: ".$_SERVER['PHP_SELF']."?uid=".preg_replace("/[^a-zA-Z0-9_-]/","",$session->uid)); header("Location: spieler.php?s=3");
} }
?> ?>
</div> </div>