User/Contribs

* added reputation threshold for replys to config
 * check canComment and canReply separately
 * disable contrib-tabs if the user is banned

includes/user.class.php

@@ -451,6 +451,14 @@ class User
         return self::$perms || self::$reputation >= CFG_REP_REQ_COMMENT;
     }
 
+    public static function canReply()
+    {
+        if (!self::$id || self::$banStatus & (ACC_BAN_COMMENT | ACC_BAN_PERM | ACC_BAN_TEMP))
+            return false;
+
+        return self::$perms || self::$reputation >= CFG_REP_REQ_REPLY;
+    }
+
     public static function canUpvote()
     {
         if (!self::$id || self::$banStatus & (ACC_BAN_COMMENT | ACC_BAN_PERM | ACC_BAN_TEMP))
@@ -475,6 +483,22 @@ class User
         return self::$reputation >= CFG_REP_REQ_SUPERVOTE;
     }
 
+    public static function canUploadScreenshot()
+    {
+        if (!self::$id || self::$banStatus & (ACC_BAN_SCREENSHOT | ACC_BAN_PERM | ACC_BAN_TEMP))
+            return false;
+
+        return true;
+    }
+
+    public static function canSuggestVideo()
+    {
+        if (!self::$id || self::$banStatus & (ACC_BAN_VIDEO | ACC_BAN_PERM | ACC_BAN_TEMP))
+            return false;
+
+        return true;
+    }
+
     public static function isPremium()
     {
         return self::isInGroup(U_GROUP_PREMIUM) || self::$reputation >= CFG_REP_REQ_PREMIUM;
@@ -521,10 +545,10 @@ class User
         if (!self::$id || self::$banStatus & (ACC_BAN_TEMP | ACC_BAN_PERM))
             return $gUser;
 
-        $gUser['commentban']        = (bool)(self::$banStatus & ACC_BAN_COMMENT);
+        $gUser['commentban']        = !self::canComment();
         $gUser['canUpvote']         = self::canUpvote();
         $gUser['canDownvote']       = self::canDownvote();
-        $gUser['canPostReplies']    = self::canComment();
+        $gUser['canPostReplies']    = self::canReply();
         $gUser['superCommentVotes'] = self::canSupervote();
         $gUser['downvoteRep']       = CFG_REP_REQ_DOWNVOTE;
         $gUser['upvoteRep']         = CFG_REP_REQ_UPVOTE;

pages/more.php

@@ -129,7 +129,7 @@ class MorePage extends GenericPage
              9 => CFG_REP_REQ_VOTEMORE_BASE,                // more votes per day
             10 => CFG_REP_REQ_UPVOTE,                       // can upvote
             11 => CFG_REP_REQ_DOWNVOTE,                     // can downvote
-            12 => CFG_REP_REQ_COMMENT,                      // can reply [NYI: grouped with canComment]
+            12 => CFG_REP_REQ_REPLY,                        // can reply
          // 13 => CFG_REP_REQ_XXX,                          // avatar border [NYI: checked by js, avatars not in use]
          // 14 => CFG_REP_REQ_XXX,                          // avatar border [NYI: checked by js, avatars not in use]
          // 15 => CFG_REP_REQ_XXX,                          // avatar border [NYI: checked by js, avatars not in use]

setup/db_structure.sql

@@ -2646,7 +2646,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `aowow_config` WRITE;
 /*!40000 ALTER TABLE `aowow_config` DISABLE KEYS */;
-INSERT INTO `aowow_config` VALUES ('sql_limit_search','500',1,129,'default: 500 - max results for search'),('sql_limit_default','300',1,129,'default: 300 - max results for listviews'),('sql_limit_quicksearch','10',1,129,'default: 10  - max results for suggestions'),('sql_limit_none','0',1,129,'default: 0 - unlimited results (i wouldn\'t change that mate)'),('ttl_rss','60',1,129,'default: 60 - time to live for RSS (in seconds)'),('name','Aowow Database Viewer (ADV)',1,136,' - website title'),('name_short','Aowow',1,136,' - feed title'),('board_url','http://www.wowhead.com/forums?board=',1,136,' - another halfbaked  javascript thing..'),('contact_email','feedback@aowow.org',1,136,' - displayed sender for auth-mails, ect'),('battlegroup','Pure Pwnage',1,136,' - pretend, we belong to a battlegroup to satisfy profiler-related Jscripts'),('debug','0',1,132,'default: 0 - disable cache, enable sql-errors, enable error_reporting'),('maintenance','1',1,132,'default: 0 - display brb gnomes and block access for non-staff'),('user_max_votes','50',1,129,'default: 50 - vote limit per day'),('force_ssl','0',1,132,'default: 0 - enforce SSL, if the server is behind a load balancer'),('locales','333',1,161,'default: 0x14D - allowed locales - 0:English, 2:French, 3:German, 6:Spanish, 8:Russian'),('screenshot_min_size','200',1,129,'default: 200 - minimum dimensions of uploaded screenshots in px (yes, it\'s square)'),('site_host','',1,136,' - points js to executable files'),('static_host','',1,136,' - points js to images & scripts'),('cache_decay','25200',2,129,'default: 60 * 60 * 7 - time to keep cache in seconds'),('cache_mode','1',2,161,'default: 1 - set cache method - 0:filecache, 1:memcached'),('cache_dir','',2,136,'default: cache/template - generated pages are saved here (requires CACHE_MODE: filecache)'),('acc_failed_auth_block','900',3,129,'default: 15 * 60 - how long an account is closed after exceeding FAILED_AUTH_COUNT (in seconds)'),('acc_failed_auth_count','5',3,129,'default: 5 - how often invalid passwords are tolerated'),('acc_allow_register','1',3,132,'default: 1 - allow/disallow account creation (requires AUTH_MODE: aowow)'),('acc_auth_mode','0',3,145,'default: 0 - source to auth against - 0:aowow, 1:TC auth-table, 2:external script'),('acc_create_save_decay','604800',3,129,'default: 604800 - time in wich an unconfirmed account cannot be overwritten by new registrations'),('acc_recovery_decay','300',3,129,'default: 300 - time to recover your account and new recovery requests are blocked'),('session_timeout_delay','3600',4,129,'default: 60 * 60 - non-permanent session times out in time() + X'),('session.gc_maxlifetime','604800',4,200,'default: 7*24*60*60 - lifetime of session data'),('session.gc_probability','1',4,200,'default: 0 - probability to remove session data on garbage collection'),('session.gc_divisor',100,4,200,'default: 100 - probability to remove session data on garbage collection'),('session_cache_dir','',4,136,'default:  - php sessions are saved here. Leave empty to use php default directory.'),('rep_req_upvote','125',5,129,'default: 125 - required reputation to upvote comments'),('rep_req_downvote','250',5,129,'default: 250 -  required reputation to downvote comments'),('rep_req_comment','75',5,129,'default: 75 - required reputation to write a comment / reply'),('rep_req_supervote','2500',5,129,'default: 2500 - required reputation for double vote effect'),('rep_req_votemore_base','2000',5,129,'default: 2000 - gains more votes past this threshold'),('rep_reward_register','100',5,129,'default: 100 - activated an account'),('rep_reward_upvoted','5',5,129,'default: 5 - comment received upvote'),('rep_reward_downvoted','0',5,129,'default: 0 - comment received downvote'),('rep_reward_good_report','10',5,129,'default: 10 - filed an accepted report'),('rep_reward_bad_report','0',5,129,'default: 0 - filed a rejected report'),('rep_reward_dailyvisit','5',5,129,'default: 5 - daily visit'),('rep_reward_user_warned','-50',5,129,'default: -50 - moderator imposed a warning'),('rep_reward_comment','1',5,129,'default: 1 - created a comment (not a reply) '),('rep_req_premium','25000',5,129,'default: 25000 - required reputation for premium status through reputation'),('rep_reward_upload','10',5,129,'default: 10 - suggested / uploaded video / screenshot was approved'),('rep_reward_article','100',5,129,'default: 100 - submitted an approved article/guide'),('rep_reward_user_suspended','-200',5,129,'default: -200 - moderator revoked rights'),('rep_req_votemore_add','250',5,129,'default: 250 - required reputation per additional vote past threshold'),('serialize_precision','5',0,65,' - some derelict code, probably unused'),('memory_limit','4096M',0,200,'default: 4096M - parsing spell.dbc is quite intense'),('default_charset','UTF-8',0,72,'default: UTF-8'),('analytics_user','',6,136,'default:  - enter your GA-user here to track site stats');
+INSERT INTO `aowow_config` VALUES ('sql_limit_search','500',1,129,'default: 500 - max results for search'),('sql_limit_default','300',1,129,'default: 300 - max results for listviews'),('sql_limit_quicksearch','10',1,129,'default: 10  - max results for suggestions'),('sql_limit_none','0',1,129,'default: 0 - unlimited results (i wouldn\'t change that mate)'),('ttl_rss','60',1,129,'default: 60 - time to live for RSS (in seconds)'),('name','Aowow Database Viewer (ADV)',1,136,' - website title'),('name_short','Aowow',1,136,' - feed title'),('board_url','http://www.wowhead.com/forums?board=',1,136,' - another halfbaked  javascript thing..'),('contact_email','feedback@aowow.org',1,136,' - displayed sender for auth-mails, ect'),('battlegroup','Pure Pwnage',1,136,' - pretend, we belong to a battlegroup to satisfy profiler-related Jscripts'),('debug','0',1,132,'default: 0 - disable cache, enable sql-errors, enable error_reporting'),('maintenance','1',1,132,'default: 0 - display brb gnomes and block access for non-staff'),('user_max_votes','50',1,129,'default: 50 - vote limit per day'),('force_ssl','0',1,132,'default: 0 - enforce SSL, if the server is behind a load balancer'),('locales','333',1,161,'default: 0x14D - allowed locales - 0:English, 2:French, 3:German, 6:Spanish, 8:Russian'),('screenshot_min_size','200',1,129,'default: 200 - minimum dimensions of uploaded screenshots in px (yes, it\'s square)'),('site_host','',1,136,' - points js to executable files'),('static_host','',1,136,' - points js to images & scripts'),('cache_decay','25200',2,129,'default: 60 * 60 * 7 - time to keep cache in seconds'),('cache_mode','1',2,161,'default: 1 - set cache method - 0:filecache, 1:memcached'),('cache_dir','',2,136,'default: cache/template - generated pages are saved here (requires CACHE_MODE: filecache)'),('acc_failed_auth_block','900',3,129,'default: 15 * 60 - how long an account is closed after exceeding FAILED_AUTH_COUNT (in seconds)'),('acc_failed_auth_count','5',3,129,'default: 5 - how often invalid passwords are tolerated'),('acc_allow_register','1',3,132,'default: 1 - allow/disallow account creation (requires AUTH_MODE: aowow)'),('acc_auth_mode','0',3,145,'default: 0 - source to auth against - 0:aowow, 1:TC auth-table, 2:external script'),('acc_create_save_decay','604800',3,129,'default: 604800 - time in wich an unconfirmed account cannot be overwritten by new registrations'),('acc_recovery_decay','300',3,129,'default: 300 - time to recover your account and new recovery requests are blocked'),('session_timeout_delay','3600',4,129,'default: 60 * 60 - non-permanent session times out in time() + X'),('session.gc_maxlifetime','604800',4,200,'default: 7*24*60*60 - lifetime of session data'),('session.gc_probability','1',4,200,'default: 0 - probability to remove session data on garbage collection'),('session.gc_divisor',100,4,200,'default: 100 - probability to remove session data on garbage collection'),('session_cache_dir','',4,136,'default:  - php sessions are saved here. Leave empty to use php default directory.'),('rep_req_upvote','125',5,129,'default: 125 - required reputation to upvote comments'),('rep_req_downvote','250',5,129,'default: 250 -  required reputation to downvote comments'),('rep_req_comment','75',5,129,'default: 75 - required reputation to write a comment'),('rep_req_reply','75',5,129,'default: 75 - required reputation to write a reply'),('rep_req_supervote','2500',5,129,'default: 2500 - required reputation for double vote effect'),('rep_req_votemore_base','2000',5,129,'default: 2000 - gains more votes past this threshold'),('rep_reward_register','100',5,129,'default: 100 - activated an account'),('rep_reward_upvoted','5',5,129,'default: 5 - comment received upvote'),('rep_reward_downvoted','0',5,129,'default: 0 - comment received downvote'),('rep_reward_good_report','10',5,129,'default: 10 - filed an accepted report'),('rep_reward_bad_report','0',5,129,'default: 0 - filed a rejected report'),('rep_reward_dailyvisit','5',5,129,'default: 5 - daily visit'),('rep_reward_user_warned','-50',5,129,'default: -50 - moderator imposed a warning'),('rep_reward_comment','1',5,129,'default: 1 - created a comment (not a reply) '),('rep_req_premium','25000',5,129,'default: 25000 - required reputation for premium status through reputation'),('rep_reward_upload','10',5,129,'default: 10 - suggested / uploaded video / screenshot was approved'),('rep_reward_article','100',5,129,'default: 100 - submitted an approved article/guide'),('rep_reward_user_suspended','-200',5,129,'default: -200 - moderator revoked rights'),('rep_req_votemore_add','250',5,129,'default: 250 - required reputation per additional vote past threshold'),('serialize_precision','5',0,65,' - some derelict code, probably unused'),('memory_limit','4096M',0,200,'default: 4096M - parsing spell.dbc is quite intense'),('default_charset','UTF-8',0,72,'default: UTF-8'),('analytics_user','',6,136,'default:  - enter your GA-user here to track site stats');
 /*!40000 ALTER TABLE `aowow_config` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2656,7 +2656,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `aowow_dbversion` WRITE;
 /*!40000 ALTER TABLE `aowow_dbversion` DISABLE KEYS */;
-INSERT INTO `aowow_dbversion` VALUES (1489942887,0,NULL,NULL);
+INSERT INTO `aowow_dbversion` VALUES (1489964226,0,NULL,NULL);
 /*!40000 ALTER TABLE `aowow_dbversion` ENABLE KEYS */;
 UNLOCK TABLES;
 

setup/updates/1489964225_01.sql

@@ -0,0 +1,2 @@
+UPDATE `aowow_config` SET `comment` = 'default: 75 - required reputation to write a comment' WHERE `key` = 'rep_req_comment';
+REPLACE INTO `aowow_config` (`key`, `value`, `cat`, `flags`, `comment`) VALUES ('rep_req_reply', '75', 5, 129, 'default: 75 - required reputation to write a reply');

static/js/locale_enus.js

@@ -984,7 +984,7 @@ var mn_reputation = [
     // [14, "Border: Rare", "?privilege=14"],
     // [15, "Border: Epic", "?privilege=15"],
     // [16, "Border: Legendary", "?privilege=16"],
-    [17, "Wowhead Premium", "?privilege=17"]
+    [17, "AoWoW Premium", "?privilege=17"]
 ];
 var mn_community = [
     [3,"Forum","http://forums.battle.net",null,{tinyIcon: g_staticUrl + "/images/icons/forum.png"}],

template/localized/contrib_0.tpl.php

@@ -1,120 +1,91 @@
-<?php
-if (User::$id > 0):
-?>
         <div id="tab-add-your-comment" style="display: none">
-
             Please keep the following in mind when posting a comment:
-
             <ul>
             <li><div>Your comment must be in English or it will be removed.</div></li>
             <li><div>Unsure how to post? Check out our <a href="?help=commenting-and-you" target="_blank">handy guide</a>!</div></li>
             <li><div>Please post questions on our <a href="?forums">forums</a> for quicker reply.</div></li>
             <li><div>You might want to proof-read your comments before posting them.</div></li>
             </ul>
-
+<?php
+    if (User::canComment()):
+?>
             <form name="addcomment" action="?comment=add&amp;type=<?php echo $this->type.'&amp;typeid='.$this->typeId; ?>" method="post" onsubmit="return co_validateForm(this)">
                 <div id="funcbox-generic"></div>
                 <script type="text/javascript">Listview.funcBox.coEditAppend($('#funcbox-generic'), {body: ''}, 1)</script>
                 <div class="pad"></div>
                 <input type="submit" value="Submit"></input>
+<?php
+    else:
+?>
+            <form action="/" method="post">
+            <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
+<?php
+    endif;
+    if (!User::$id):
+?>
+            <small>You are not logged in. Please <a href="?account=signin">log in</a> or <a href="?account=signup">register an account</a> to add your comment.</small>
+<?php
+    endif;
+?>
             </form>
-
         </div>
         <div id="tab-submit-a-screenshot" style="display: none">
-
             Simply browse for your screenshot using the form below.
-
             <ul>
             <li><div>In-game screenshots are preferred over model-viewer-generated ones.</div></li>
             <li><div>The higher the quality the better!</div></li>
             <li><div>Be sure to read the <a href="?help=screenshots-tips-tricks" target="_blank">tips &amp; tricks</a> if you haven't before.</div></li>
             </ul>
-
 <?php
     echo $this->ssError ? '            <div class="msg-failure">'.$this->ssError."</div>\n            <div class=\"pad\"></div>\n" : '';
+
+    if (User::canUploadScreenshot()):
 ?>
             <form action="?screenshot=add&<?php echo $this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return ss_validateForm(this)">
-
             <input type="file" name="screenshotfile" style="width: 35%"/><br />
             <div class="pad2"></div>
             <input type="submit" value="Submit" />
-
             <div class="pad3"></div>
             <small class="q0">Note: Your Screenshot will need to be approved before appearing on the site.</small>
-
+<?php
+    else:
+?>
+            <form action="/" method="post">
+            <input type="file" name="screenshotfile" disabled="disabled" /><br />
+<?php
+    endif;
+    if (!User::$id):
+?>
+            <small>You are not signed in. Please <a href="?account=signin">sign in</a> to submit a screenshot.</small>
+<?php
+    endif;
+?>
             </form>
-
         </div>
         <div id="tab-suggest-a-video" style="display: none">
-
             Simply type the URL of the video in the form below.
-
+<?php
+    if (User::canSuggestVideo()):
+?>
             <div class="pad2"></div>
             <form action="?video=add&<?php echo $this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
-
             <input type="text" name="videourl" style="width: 35%" /> <small>Supported: YouTube only</small>
             <div class="pad2"></div>
             <input type="submit" value="Submit" />
-
             <div class="pad3"></div>
             <small class="q0">Note: Your video will need to be approved before appearing on the site.</small>
-
-            </form>
-
-        </div>
 <?php
-else:
+    else:
 ?>
-        <div id="tab-add-your-comment" style="display: none">
-
-            Please keep the following in mind when posting a comment:
-
-            <ul>
-            <li><div>Your comment must be in English or it will be removed.</div></li>
-            <li><div>Unsure how to post? Check out our <a href="?help=commenting-and-you" target="_blank">handy guide</a>!</div></li>
-            <li><div>Please post questions on our <a href="?forums">forums</a> for quicker reply.</div></li>
-            <li><div>You might want to proof-read your comments before posting them.</div></li>
-            </ul>
-
             <form action="/" method="post">
-
-            <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
-            <small>You are not logged in. Please <a href="?account=signin">log in</a> or <a href="?account=signup">register an account</a> to add your comment.</small>
-
-            </form>
-
-        </div>
-        <div id="tab-submit-a-screenshot" style="display: none">
-
-            Simply browse for your screenshot using the form below.
-
-            <ul>
-            <li><div>In-game screenshots are preferred over model-viewer-generated ones.</div></li>
-            <li><div>The higher the quality the better!</div></li>
-            <li><div>Be sure to read the <a href="?help=screenshots-tips-tricks" target="_blank">tips &amp; tricks</a> if you haven't before.</div></li>
-            </ul>
-
-            <form action="/" method="post">
-
-            <input type="file" name="screenshotfile" disabled="disabled" /><br />
-            <small>You are not signed in. Please <a href="?account=signin">sign in</a> to submit a screenshot.</small>
-
-            </form>
-
-        </div>
-        <div id="tab-suggest-a-video" style="display: none">
-
-            Simply type the URL of the video in the form below.
-
-            <div class="pad2"></div>
-            <form action="/" method="post">
-
             <input type="text" name="videourl" disabled="disabled" /><br />
-            <small>You are not signed in. Please <a href="?account=signin">sign in</a> to submit a video.</small>
-
-            </form>
-
-        </div>
 <?php
-endif;
+    endif;
+    if (!User::$id):
 ?>
+            <small>You are not signed in. Please <a href="?account=signin">sign in</a> to submit a video.</small>
+<?php
+    endif;
+?>
+            </form>
+        </div>

template/localized/contrib_2.tpl.php

@@ -1,120 +1,91 @@
-<?php
-if (User::$id > 0):
-?>
         <div id="tab-add-your-comment" style="display: none">
-
             Gardez à l'esprit les points suivant avant de poster un commentaire :
-
             <ul>
             <li><div>Votre commentaire doit être en Français ou il sera supprimé.</div></li>
             <li><div>Pas certain de savoir comment écrire un commentaire ? Consultez notre <a href="?help=commenting-and-you" target="_blank">guide pratique</a> !</div></li>
             <li><div>Posez vos questions sur le <a href="?forums">forum</a> afin d'avoir une réponse plus rapide.</div></li>
             <li><div>Il serait avisé de corriger vos fautes avant de soumettre vos commentaires.</div></li>
             </ul>
-
+<?php
+    if (User::canComment()):
+?>
             <form name="addcomment" action="?comment=add&amp;type=<?php echo $this->type.'&amp;typeid='.$this->typeId; ?>" method="post" onsubmit="return co_validateForm(this)">
                 <div id="funcbox-generic"></div>
                 <script type="text/javascript">Listview.funcBox.coEditAppend($('#funcbox-generic'), {body: ''}, 1)</script>
                 <div class="pad"></div>
                 <input type="submit" value="Soumettre"></input>
+<?php
+    else:
+?>
+            <form action="/" method="post">
+            <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
+<?php
+    endif;
+    if (!User::$id):
+?>
+            <small>Vous n'êtes pas connecté(e). Veuillez vous <a href="?account=signin">connecter</a> ou vous <a href="?account=signup">inscrire</a> pour ajouter votre commentaire.</small>
+<?php
+    endif;
+?>
             </form>
-
         </div>
         <div id="tab-submit-a-screenshot" style="display: none">
-
             Sélectionez votre capture en utilisant le formulaire ci-dessous.
-
             <ul>
             <li><div>Les captures prises dans le jeu sont préférées à celles générées avec un logiciel.</div></li>
             <li><div>Plus la qualité est haute, mieux c'est !</div></li>
             <li><div>Assurez-vous de lire les <a href="?help=screenshots-tips-tricks" target="_blank">trucs et astuces</a> si ce n'est pas déjà fait.</div></li>
             </ul>
-
 <?php
         echo $this->ssError ? '            <div class="msg-failure">'.$this->ssError."</div>\n            <div class=\"pad\"></div>\n" : '';
+
+    if (User::canUploadScreenshot()):
 ?>
             <form action="?screenshot=add&<?php echo $this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return ss_validateForm(this)">
-
             <input type="file" name="screenshotfile" style="width: 35%"/><br />
             <div class="pad2"></div>
             <input type="submit" value="Soumettre" />
-
             <div class="pad3"></div>
             <small class="q0">Note: Votre capture d'écran devra être approuvé avant d'apparaitre sur le site.</small>
-
+<?php
+    else:
+?>
+            <form action="/" method="post">
+            <input type="file" name="screenshotfile" disabled="disabled" /><br />
+<?php
+    endif;
+    if (!User::$id):
+?>
+            <small>Vous n'êtes pas connecté(e). Veuillez vous <a href="?account=siginin">connecter</a> pour envoyer une capture d'écran.</small>
+<?php
+    endif;
+?>
             </form>
-
         </div>
         <div id="tab-suggest-a-video" style="display: none">
-
             Entrez simplement l'URL du vidéo dans le formulaire ci-dessous.
-
+<?php
+    if (User::canSuggestVideo()):
+?>
             <div class="pad2"></div>
             <form action="?video=add&<?php echo $this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
-
+            <input type="text" name="videourl" style="width: 35%" /> <small>Supporté : Youtube seulement</small>
-            <input type="text" name="videourl" style="width: 35%" /> <small>Supporté: Youtube seulement</small>
             <div class="pad2"></div>
             <input type="submit" value="Soumettre" />
-
             <div class="pad3"></div>
             <small class="q0">Note: Votre vidéo devra être approuvé avant d'apparaitre sur le site.</small>
-
-            </form>
-
-        </div>
 <?php
-else:
+    else:
 ?>
-        <div id="tab-add-your-comment" style="display: none">
-
-            Gardez à l'esprit les points suivant avant de poster un commentaire :
-
-            <ul>
-            <li><div>Votre commentaire doit être en Français ou il sera supprimé.</div></li>
-            <li><div>Pas certain de savoir comment écrire un commentaire ? Consultez notre <a href="?help=commenting-and-you" target="_blank">guide pratique</a> !</div></li>
-            <li><div>Posez vos questions sur le <a href="?forums">forum</a> afin d'avoir une réponse plus rapide.</div></li>
-            <li><div>Il serait avisé de corriger vos fautes avant de soumettre vos commentaires.</div></li>
-            </ul>
-
             <form action="/" method="post">
-
-            <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
-            <small>Vous n'êtes pas connecté(e). Veuillez vous <a href="?account=signin">connecter</a> ou vous <a href="?account=signup">inscrire</a> pour ajouter votre commentaire.</small>
-
-            </form>
-
-        </div>
-        <div id="tab-submit-a-screenshot" style="display: none">
-
-            Sélectionez votre capture en utilisant le formulaire ci-dessous.
-
-            <ul>
-            <li><div>Les captures prises dans le jeu sont préférées à celles générées avec un logiciel.</div></li>
-            <li><div>Plus la qualité est haute, mieux c'est !</div></li>
-            <li><div>Assurez-vous de lire les <a href="?help=screenshots-tips-tricks" target="_blank">trucs et astuces</a> si ce n'est pas déjà fait.</div></li>
-            </ul>
-
-            <form action="/" method="post">
-
-            <input type="file" name="screenshotfile" disabled="disabled" /><br />
-            <small>Vous n'êtes pas connecté(e). Veuillez vous <a href="?account=siginin">connecter</a> pour envoyer une capture d'écran.</small>
-
-            </form>
-
-        </div>
-        <div id="tab-suggest-a-video" style="display: none">
-
-            Entrez simplement l'URL du vidéo dans le formulaire ci-dessous.
-
-            <div class="pad2"></div>
-            <form action="/" method="post">
-
             <input type="text" name="videourl" disabled="disabled" /><br />
-            <small>Vous n'êtes pas connecté(e). Veuillez vous <a href="?account=siginin">connecter</a> pour envoyer une vidéo.</small>
-
-            </form>
-
-        </div>
 <?php
-endif;
+    endif;
+    if (!User::$id):
 ?>
+            <small>Vous n'êtes pas connecté(e). Veuillez vous <a href="?account=siginin">connecter</a> pour envoyer une vidéo.</small>
+<?php
+    endif;
+?>
+            </form>
+        </div>

template/localized/contrib_3.tpl.php

@@ -1,124 +1,91 @@
-<?php
-if (User::$id > 0):
-?>
         <div id="tab-add-your-comment" style="display: none">
-
             Denkt bitte an Folgendes, wenn Ihr einen Kommentar schreibt:
-
             <ul>
             <li><div>Euer Kommentar muss in Deutsch sein, oder er wird entfernt.</div></li>
             <li><div>Nicht sicher, wie Ihr schreiben sollt? Werft einen Blick auf unsere <a href="?help=commenting-and-you" target="_blank">praktische Anleitung</a>!</div></li>
             <li><div>Es ist ratsam, den Kommentar vor dem Einsenden noch einmal auf Richtigkeit zu überprüfen.</div></li>
             <li><div>Stellt Eure Fragen bitte in unseren <a href="?forums">Foren</a>, wenn Ihr eine schnellere Antwort wünscht.</div></li>
             </ul>
-
+<?php
+    if (User::canComment()):
+?>
             <form name="addcomment" action="?comment=add&amp;type=<?php echo $this->type.'&amp;typeid='.$this->typeId; ?>" method="post" onsubmit="return co_validateForm(this)">
                 <div id="funcbox-generic"></div>
                 <script type="text/javascript">Listview.funcBox.coEditAppend($('#funcbox-generic'), {body: ''}, 1)</script>
                 <div class="pad"></div>
                 <input type="submit" value="Absenden"></input>
+<?php
+    else:
+?>
+            <form action="/" method="post">
+            <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
+<?php
+    endif;
+    if (!User::$id):
+?>
+            <small>Ihr seid nicht angemeldet. Bitte <a href="?account=signin">meldet Euch an</a>, oder <a href="?account=signup">registriert Euch</a>, um einen Kommentar einzusenden.</small>
+<?php
+    endif;
+?>
             </form>
-
         </div>
         <div id="tab-submit-a-screenshot" style="display: none">
-
             Wählt einfach Euren Screenshot mit dem folgenden Formular aus.
-
             <ul>
             <li><div>Screenshots aus dem Spiel werden gegenüber Bildern aus dem Modellviewer bevorzugt.</div></li>
             <li><div>Je höher die Qualität, desto besser!</div></li>
             <li><div>Lest Euch unbedingt die <a href="?help=screenshots-tips-tricks" target="_blank">Tipps &amp; Tricks</a> durch, wenn nicht bereits geschehen.</div></li>
             </ul>
-
 <?php
         echo $this->ssError ? '            <div class="msg-failure">'.$this->ssError."</div>\n            <div class=\"pad\"></div>\n" : '';
+
+    if (User::canUploadScreenshot()):
 ?>
             <form action="?screenshot=add&<?php echo $this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return ss_validateForm(this)">
-
             <input type="file" name="screenshotfile" style="width: 35%"/><br />
             <div class="pad2"></div>
             <input type="submit" value="Senden" />
-
             <div class="pad3"></div>
             <small class="q0">Hinweis: Euer Screenshot muss zunächst zugelassen werden, bevor er auf der Seite erscheint.</small>
-
+<?php
+    else:
+?>
+            <form action="/" method="post">
+            <input type="file" name="screenshotfile" disabled="disabled" /><br />
+<?php
+    endif;
+    if (!User::$id):
+?>
+            <small>Ihr seid nicht angemeldet. Bitte <a href="?account=signin">meldet Euch an</a>, um einen Screenshot einzusenden.</small>
+<?php
+    endif;
+?>
             </form>
-
         </div>
         <div id="tab-suggest-a-video" style="display: none">
-
             Gebt einfach die URL des Videos im folgenden Formular ein.
-
+<?php
+    if (User::canSuggestVideo()):
+?>
             <div class="pad2"></div>
             <form action="?video=add&<?php echo $this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
-
             <input type="text" name="videourl" style="width: 35%" /> <small>Unterstützt: nur YouTube</small>
             <div class="pad2"></div>
             <input type="submit" value="Senden" />
-
             <div class="pad3"></div>
             <small class="q0">Hinweis: Euer Video muss zunächst zugelassen werden, bevor es auf der Seite erscheint.</small>
-
-            </form>
-
-        </div>
 <?php
-else:
+    else:
 ?>
-        <div id="tab-add-your-comment" style="display: none">
-
-            Denkt bitte an Folgendes, wenn Ihr einen Kommentar schreibt:
-
-            <ul>
-            <li><div>Euer Kommentar muss in Deutsch sein, oder er wird entfernt.</div></li>
-            <li><div>Nicht sicher, wie Ihr schreiben sollt? Werft einen Blick auf unsere <a href="?help=commenting-and-you" target="_blank">praktische Anleitung</a>!</div></li>
-            <li><div>Es ist ratsam, den Kommentar vor dem Einsenden noch einmal auf Richtigkeit zu überprüfen.</div></li>
-            <li><div>Stellt Eure Fragen bitte in unseren <a href="?forums">Foren</a>, wenn Ihr eine schnellere Antwort wünscht.</div></li>
-            </ul>
-
             <form action="/" method="post">
-
+            <input type="text" name="videourl" disabled="disabled" /><br />
-            <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
-            <small>Ihr seid nicht angemeldet. Bitte <a href="?account=signin">meldet Euch an</a>, oder <a href="?account=signup">registriert Euch</a>, um einen Kommentar einzusenden.</small>
-
-            </form>
-
-        </div>
-        <div id="tab-submit-a-screenshot" style="display: none">
-
-            Wählt einfach Euren Screenshot mit dem folgenden Formular aus.
-
-            <ul>
-            <li><div>Screenshots aus dem Spiel werden gegenüber Bildern aus dem Modellviewer bevorzugt.</div></li>
-            <li><div>Je höher die Qualität, desto besser!</div></li>
-            <li><div>Lest Euch unbedingt die <a href="?help=screenshots-tips-tricks" target="_blank">Tipps &amp; Tricks</a> durch, wenn nicht bereits geschehen.</div></li>
-            </ul>
-
-            <form action="/" method="post">
-
-            <input type="file" name="screenshotfile" disabled="disabled" /><br />
-            <small>Ihr seid nicht angemeldet. Bitte <a href="?account=signin">meldet Euch an</a>, um einen Screenshot einzusenden.</small>
-
-            </form>
-
-        </div>
-        <div id="tab-suggest-a-video" style="display: none">
-
-            Gebt einfach die URL des Videos im folgenden Formular ein.
-
-            <div class="pad2"></div>
-            <form action="/video=add&amp;13.7" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
-
-            <input type="text" name="videourl" style="width: 35%" /> <small>Unterstützt: nur YouTube</small>
-            <div class="pad"></div>
-            <input type="submit" value="Senden" />
-
-            <div class="pad3"></div>
-            <small class="q0">Hinweis: Euer Video muss zunächst zugelassen werden, bevor es auf der Seite erscheint.</small>
-
-            </form>
-
-        </div>
 <?php
-endif;
+    endif;
+    if (!User::$id):
 ?>
+            <small>Ihr seid nicht angemeldet. Bitte <a href="?account=signin">meldet Euch an</a>, um ein Video vorzuschlagen.</small>
+<?php
+    endif;
+?>
+            </form>
+        </div>

template/localized/contrib_6.tpl.php

@@ -1,120 +1,91 @@
-<?php
-if (User::$id > 0):
-?>
         <div id="tab-add-your-comment" style="display: none">
-
             Ten en cuenta lo siguiente cuando escribas un comentario:
-
             <ul>
             <li><div>Tu comentario debe ser en español, o será eliminado.</div></li>
             <li><div>¿No estás seguro de cómo escribir? ¡Échale un vistazo a <a href="?help=commenting-and-you" target="_blank">nuestra guía</a>!</div></li>
             <li><div>Por favor, pon tus preguntas en nuestro <a href="?forums">foro</a> para obtener una respuesta más rápida.</div></li>
             <li><div>Deberías corregir tus comentarios antes de enviarlos.</div></li>
             </ul>
-
+<?php
+    if (User::canComment()):
+?>
             <form name="addcomment" action="?comment=add&amp;type=<?php echo $this->type.'&amp;typeid='.$this->typeId; ?>" method="post" onsubmit="return co_validateForm(this)">
                 <div id="funcbox-generic"></div>
                 <script type="text/javascript">Listview.funcBox.coEditAppend($('#funcbox-generic'), {body: ''}, 1)</script>
                 <div class="pad"></div>
                 <input type="submit" value="Enviar"></input>
+<?php
+    else:
+?>
+            <form action="/" method="post">
+            <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
+<?php
+    endif;
+    if (!User::$id):
+?>
+            <small>No has iniciado sesión. Por favor <a href="?account=signin">entra a tu cuenta</a> o <a href="?account=signup">registra una cuenta</a> para añadir tu comentario.</small>
+<?php
+    endif;
+?>
             </form>
-
         </div>
         <div id="tab-submit-a-screenshot" style="display: none">
-
             Simplemente busca tu captura de imagen usando el formulario que aparece abajo.
-
             <ul>
             <li><div>Preferimos imágenes sacadas del juego a capturas de visualizadores de modelos.</div></li>
             <li><div>¡Mientras más calidad mejor!</div></li>
             <li><div>Asegurate de leer las <a href="?help=screenshots-tips-tricks" target="_blank">sugerencias y trucos</a> si no lo has hecho antes.</div></li>
             </ul>
-
 <?php
     echo $this->ssError ? '            <div class="msg-failure">'.$this->ssError."</div>\n            <div class=\"pad\"></div>\n" : '';
+
+    if (User::canUploadScreenshot()):
 ?>
             <form action="?screenshot=add&<?php echo $this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return ss_validateForm(this)">
-
             <input type="file" name="screenshotfile" style="width: 35%"/><br />
             <div class="pad2"></div>
             <input type="submit" value="Enviar" />
-
             <div class="pad3"></div>
             <small class="q0">Nota: Su captura de imagen deberá ser aprobado antes de aparecer en el sitio.</small>
-
+<?php
+    else:
+?>
+            <form action="/" method="post">
+            <input type="file" name="screenshotfile" disabled="disabled" /><br />
+<?php
+    endif;
+    if (!User::$id):
+?>
+            <small>No has iniciado sesión. <a href="?account=signin">Inicia sesión</a> para enviar una captura de pantalla.</small>
+<?php
+    endif;
+?>
             </form>
-
         </div>
         <div id="tab-suggest-a-video" style="display: none">
-
             Símplemente, escribe la URL del vídeo en el formulario.
-
+<?php
+    if (User::canSuggestVideo()):
+?>
             <div class="pad2"></div>
             <form action="?video=add&<?php echo $this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
-
             <input type="text" name="videourl" style="width: 35%" /> <small>Soportado: Sólo YouTube</small>
             <div class="pad2"></div>
             <input type="submit" value="Enviar" />
-
             <div class="pad3"></div>
             <small class="q0">Nota: Tu vídeo deberá ser aprobado antes de aparecer en el sitio.</small>
-
-            </form>
-
-        </div>
 <?php
-else:
+    else:
 ?>
-        <div id="tab-add-your-comment" style="display: none">
-
-            Ten en cuenta lo siguiente cuando escribas un comentario:
-
-            <ul>
-            <li><div>Tu comentario debe ser en español, o será eliminado.</div></li>
-            <li><div>¿No estás seguro de cómo escribir? ¡Échale un vistazo a <a href="?help=commenting-and-you" target="_blank">nuestra guía</a>!</div></li>
-            <li><div>Por favor, pon tus preguntas en nuestro <a href="?forums">foro</a> para obtener una respuesta más rápida.</div></li>
-            <li><div>Deberías corregir tus comentarios antes de enviarlos.</div></li>
-            </ul>
-
             <form action="/" method="post">
-
-            <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
-            <small>No has iniciado sesión. Por favor <a href="?account=signin">entra a tu cuenta</a> o <a href="?account=signup">registra una cuenta</a> para añadir tu comentario.</small>
-
-            </form>
-
-        </div>
-        <div id="tab-submit-a-screenshot" style="display: none">
-
-            Simplemente busca tu captura de imagen usando el formulario que aparece abajo.
-
-            <ul>
-            <li><div>Preferimos imágenes sacadas del juego a capturas de visualizadores de modelos.</div></li>
-            <li><div>¡Mientras más calidad mejor!</div></li>
-            <li><div>Asegurate de leer las <a href="?help=screenshots-tips-tricks" target="_blank">sugerencias y trucos</a> si no lo has hecho antes.</div></li>
-            </ul>
-
-            <form action="/" method="post">
-
-            <input type="file" name="screenshotfile" disabled="disabled" /><br />
-            <small>No has iniciado sesión. <a href="?account=signin">Inicia sesión</a> para enviar una captura de pantalla.</small>
-
-            </form>
-
-        </div>
-        <div id="tab-suggest-a-video" style="display: none">
-
-            Símplemente, escribe la URL del vídeo en el formulario.
-
-            <div class="pad2"></div>
-            <form action="/" method="post">
-
             <input type="text" name="videourl" disabled="disabled" /><br />
-            <small>No has iniciado sesión. <a href="?account=signin">Inicia sesión</a> para enviar un vídeo.</small>
-
-            </form>
-
-        </div>
 <?php
-endif;
+    endif;
+    if (!User::$id):
 ?>
+            <small>No has iniciado sesión. <a href="?account=signin">Inicia sesión</a> para enviar un video.</small>
+<?php
+    endif;
+?>
+            </form>
+        </div>

template/localized/contrib_8.tpl.php

@@ -1,120 +1,91 @@
-<?php
-if (User::$id > 0):
-?>
         <div id="tab-add-your-comment" style="display: none">
-
             При написании комментария, просим вас не забывать про следующее:
-
             <ul>
             <li><div>Ваш комментарий должен быть на русском языке, иначе он будет удален.</div></li>
             <li><div>Не уверены как правильно составить комментарий? Тогда прочтите наше <a href="?help=commenting-and-you" target="_blank">замечательное руководство</a>!</div></li>
             <li><div>Задавайте вопросы на наших <a href="?forums">форумах</a>, чтобы получить гарантированный ответ.</div></li>
             <li><div>У вас может возникнуть желание проверить написание своего комментария перед тем, как поместить его на сайт.</div></li>
             </ul>
-
+<?php
+    if (User::canComment()):
+?>
             <form name="addcomment" action="?comment=add&amp;type=<?php echo $this->type.'&amp;typeid='.$this->typeId; ?>" method="post" onsubmit="return co_validateForm(this)">
                 <div id="funcbox-generic"></div>
                 <script type="text/javascript">Listview.funcBox.coEditAppend($('#funcbox-generic'), {body: ''}, 1)</script>
                 <div class="pad"></div>
                 <input type="submit" value="Отправить"></input>
+<?php
+    else:
+?>
+            <form action="/" method="post">
+            <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
+<?php
+    endif;
+    if (!User::$id):
+?>
+            <small>YВы не вошли на сайт. Пожалуйста <a href="?account=signin">войдите</a> или <a href="?account=signup">зарегистрируйтесь</a>, чтобы добавлять комментарии.</small>
+<?php
+    endif;
+?>
             </form>
-
         </div>
         <div id="tab-submit-a-screenshot" style="display: none">
-
             Просмотрите изображение, используя форму ниже.
-
             <ul>
             <li><div>Внутриигровые изображения предпочтительнее изображений, полученных в программах просмотра 3D моделей.</div></li>
             <li><div>Чем выше качество, тем лучше!</div></li>
             <li><div>Если вы ещё не читали, то настоятельно рекомендуем вам прочесть <a href="?help=screenshots-tips-tricks" target="_blank">советы и особенности</a> получения изображений при помощи снимков экрана.</div></li>
             </ul>
-
 <?php
     echo $this->ssError ? '            <div class="msg-failure">'.$this->ssError."</div>\n            <div class=\"pad\"></div>\n" : '';
+
+    if (User::canUploadScreenshot()):
 ?>
             <form action="?screenshot=add&<?php echo $this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return ss_validateForm(this)">
-
             <input type="file" name="screenshotfile" style="width: 35%"/><br />
             <div class="pad2"></div>
             <input type="submit" value="Отправить" />
-
             <div class="pad3"></div>
             <small class="q0">Примечание: перед тем как появиться на сайте, ваше Скриншот должны быть утверждены.</small>
-
+<?php
+    else:
+?>
+            <form action="/" method="post">
+            <input type="file" name="screenshotfile" disabled="disabled" /><br />
+<?php
+    endif;
+    if (!User::$id):
+?>
+            <small>Вы не вошли на сайт. Пожалуйста <a href="?account=signin">войдите</a>, чтобы отправить скриншот.</small>
+<?php
+    endif;
+?>
             </form>
-
         </div>
         <div id="tab-suggest-a-video" style="display: none">
-
             Введите URL видео на YouTube в форму ниже.
-
+<?php
+    if (User::canSuggestVideo()):
+?>
             <div class="pad2"></div>
             <form action="?video=add&<?php echo $this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
-
             <input type="text" name="videourl" style="width: 35%" /> <small>Поддерживается: только YouTube</small>
             <div class="pad2"></div>
             <input type="submit" value="Отправить" />
-
             <div class="pad3"></div>
             <small class="q0">Примечание: перед тем как появиться на сайте, ваше видео должно быть одобрено.</small>
-
-            </form>
-
-        </div>
 <?php
-else:
+    else:
 ?>
-        <div id="tab-add-your-comment" style="display: none">
-
-            При написании комментария, просим вас не забывать про следующее:
-
-            <ul>
-            <li><div>Ваш комментарий должен быть на русском языке, иначе он будет удален.</div></li>
-            <li><div>Не уверены как правильно составить комментарий? Тогда прочтите наше <a href="?help=commenting-and-you" target="_blank">замечательное руководство</a>!</div></li>
-            <li><div>Задавайте вопросы на наших <a href="?forums">форумах</a>, чтобы получить гарантированный ответ.</div></li>
-            <li><div>У вас может возникнуть желание проверить написание своего комментария перед тем, как поместить его на сайт.</div></li>
-            </ul>
-
             <form action="/" method="post">
-
-            <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
-            <small>YВы не вошли на сайт. Пожалуйста <a href="?account=signin">войдите</a> или <a href="?account=signup">зарегистрируйтесь</a>, чтобы добавлять комментарии.</small>
-
-            </form>
-
-        </div>
-        <div id="tab-submit-a-screenshot" style="display: none">
-
-            Просмотрите изображение, используя форму ниже.
-
-            <ul>
-            <li><div>Внутриигровые изображения предпочтительнее изображений, полученных в программах просмотра 3D моделей.</div></li>
-            <li><div>Чем выше качество, тем лучше!</div></li>
-            <li><div>Если вы ещё не читали, то настоятельно рекомендуем вам прочесть <a href="?help=screenshots-tips-tricks" target="_blank">советы и особенности</a> получения изображений при помощи снимков экрана.</div></li>
-            </ul>
-
-            <form action="/" method="post">
-
-            <input type="file" name="screenshotfile" disabled="disabled" /><br />
-            <small>Вы не вошли на сайт. Пожалуйста <a href="?account=signin">войдите</a>, чтобы отправить скриншот.</small>
-
-            </form>
-
-        </div>
-        <div id="tab-suggest-a-video" style="display: none">
-
-            Введите URL видео на YouTube в форму ниже.
-
-            <div class="pad2"></div>
-            <form action="/" method="post">
-
             <input type="text" name="videourl" disabled="disabled" /><br />
-            <small>Вы не вошли на сайт. Пожалуйста <a href="?account=signin">войдите</a>, чтобы отправить видео.</small>
-
-            </form>
-
-        </div>
 <?php
-endif;
+    endif;
+    if (!User::$id):
 ?>
+            <small>Вы не вошли на сайт. Пожалуйста <a href="?account=signin">войдите</a>, чтобы отправить видео.</small>
+<?php
+    endif;
+?>
+            </form>
+        </div>