From ce6f4ed3a9cf00501a918ddb781bc484bd881054 Mon Sep 17 00:00:00 2001
From: Martin Ambrus
Date: Mon, 4 Dec 2017 20:53:03 +0100
Subject: [PATCH] fix: all players can see forum edit links
#410
---
Templates/Alliance/Forum/forum_10.tpl | 459 +++++++++++++++++++++-----
Templates/Alliance/Forum/forum_2.tpl | 8 +-
Templates/Alliance/Forum/forum_4.tpl | 4 +-
Templates/Alliance/Forum/forum_6.tpl | 4 +-
Templates/Alliance/forum.tpl | 2 +-
5 files changed, 385 insertions(+), 92 deletions(-)
diff --git a/Templates/Alliance/Forum/forum_10.tpl b/Templates/Alliance/Forum/forum_10.tpl
index f361ad85..612c7f56 100644
--- a/Templates/Alliance/Forum/forum_10.tpl
+++ b/Templates/Alliance/Forum/forum_10.tpl
@@ -5,89 +5,382 @@
## FIX BY RONIX ##
## TRAVIANZ ##
############################################################
-if($session->access!=BANNED){
-$topic_id = $_GET['pod'];
-$post_id = $_GET['pod'];
-$topics = $database->ShowTopic($topic_id);
-$posts = $database->ShowPostEdit($post_id);
-foreach($topics as $top) {
- $title = stripslashes($top['title']);
+if($session->access!=BANNED) {
+ $topic_id = $_GET['pod'];
+ $post_id = $_GET['pod'];
+ $topics = $database->ShowTopic( $topic_id );
+ $posts = $database->ShowPostEdit( $post_id );
+ foreach ( $topics as $top ) {
+ $title = stripslashes( $top['title'] );
+ }
+ foreach ( $posts as $pos ) {
+ $poss = stripslashes( $pos['post'] );
+ $poss = preg_replace( '/\[message\]/', '', $poss );
+ $poss = preg_replace( '/\[\/message\]/', '', $poss );
+ $alliance0 = $pos['alliance0'];
+ $player0 = $pos['player0'];
+ $owner = $pos['owner'];
+ $coor0 = $pos['coor0'];
+ $report0 = $pos['report0'];
+ }
+
+ if ( $owner == $session->uid ) {
+ ?>
+
+ Warning: you can't use the values [message] or [/message] in your post because it can cause problem with bbcode system.
+
-
-
-
-
-
-
-
-
-
-
- Edit answer
-
-
-
- Thread
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Warning: you can't use the values [message] or [/message] in your post because it can cause problem with bbcode system.
-
\ No newline at end of file
diff --git a/Templates/Alliance/Forum/forum_2.tpl b/Templates/Alliance/Forum/forum_2.tpl
index 5b45d575..693da4c4 100644
--- a/Templates/Alliance/Forum/forum_2.tpl
+++ b/Templates/Alliance/Forum/forum_2.tpl
@@ -52,7 +52,7 @@ foreach($forumcat as $arr) {
}
}
echo '';
- if($database->CheckEditRes($aid)=="1"){
+ if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
echo '
@@ -113,7 +113,7 @@ foreach($forumcat as $arr) {
}
}
echo ' ';
- if($database->CheckEditRes($aid)=="1"){
+ if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
echo ' ';
}else{
echo ' ';
@@ -168,7 +168,7 @@ foreach($forumcat as $arr) {
}
}
echo ' ';
- if($database->CheckEditRes($aid)=="1"){
+ if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
echo ' ';
}else{
echo ' ';
@@ -223,7 +223,7 @@ if($closed1 != 0){
}
}
echo ' ';
- if($database->CheckEditRes($aid)=="1"){
+ if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
echo ' ';
}else{
echo ' ';
diff --git a/Templates/Alliance/Forum/forum_4.tpl b/Templates/Alliance/Forum/forum_4.tpl
index d31f2f26..0c9db803 100644
--- a/Templates/Alliance/Forum/forum_4.tpl
+++ b/Templates/Alliance/Forum/forum_4.tpl
@@ -38,7 +38,7 @@ if($ChckTopic){
}
echo ' ';
- if($database->CheckEditRes($aid)=="1"){
+ if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arrs['owner'] == $session->uid)){
if($database->CheckCloseTopic($arrs['id']) == 1){
$locks = ' ';
}else{
@@ -72,7 +72,7 @@ if($ChckTopic){
}
echo ' ';
- if($database->CheckEditRes($aid)=="1"){
+ if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
if($database->CheckCloseTopic($arr['id']) == 1){
$lock = ' ';
}else{
diff --git a/Templates/Alliance/Forum/forum_6.tpl b/Templates/Alliance/Forum/forum_6.tpl
index 73e52195..8f6130cc 100644
--- a/Templates/Alliance/Forum/forum_6.tpl
+++ b/Templates/Alliance/Forum/forum_6.tpl
@@ -61,7 +61,7 @@ $bbcode_topic = stripslashes(nl2br($bbcoded));
created:
CheckEditRes($aid)=="1"){
+if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
echo ' ';
}
?>
@@ -154,7 +154,7 @@ echo 'created: '.$date.'
';
- if($database->CheckEditRes($aid)=="1"){
+ if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $po['owner'] == $session->uid)){
echo ' ';
}
echo '
'.$bbcode_post.'
diff --git a/Templates/Alliance/forum.tpl b/Templates/Alliance/forum.tpl
index cf1791a8..e9dbc28a 100644
--- a/Templates/Alliance/forum.tpl
+++ b/Templates/Alliance/forum.tpl
@@ -372,7 +372,7 @@ if($opt['opt5'] == 1){
if($database->CheckResultEdit($aid) != 1){
$database->CreatResultEdit($aid,1);
}else{
- if($database->CheckEditRes($aid) == 1){
+ if($database->CheckEditRes($aid) == 1 && $database->isAllianceOwner($session->uid) == $session->alliance){
$database->UpdateResultEdit($aid,'');
}else{
$database->UpdateResultEdit($aid,1);