Merge a870e60571 into 4541ce1afe

Web/Presenters/UserPresenter.php

@@ -35,7 +35,7 @@ final class UserPresenter extends OpenVKPresenter
                 $this->template->_template = "User/deactivated.xml";
                 
                 $this->template->user = $user;
-            } else if($this->user->identity->isBlacklistedBy($user)) {
+            } else if($this->user->identity && $this->user->identity->isBlacklistedBy($user)) {
                 $this->template->_template = "User/blacklisted.xml";
 
                 $this->template->blacklist_status = $user->isBlacklistedBy($this->user->identity);

Web/Presenters/templates/@layout.xml

@@ -240,6 +240,14 @@
                                 </a>
                             </div>
 
+                            <div id="news" n:if="OPENVK_ROOT_CONF['openvk']['preferences']['news']['enable']">
+                                <b>{_news} </b>
+                                    <hr size="1">
+                                    <text>{php echo OPENVK_ROOT_CONF['openvk']['preferences']['news']['title'];}</text>
+                                    <br><br>
+                                    <a href="{php echo OPENVK_ROOT_CONF['openvk']['preferences']['news']['link'];}">Подробнее »</a>
+                            </div>
+                            
                             <div n:if="OPENVK_ROOT_CONF['openvk']['preferences']['commerce'] && $thisUser->getCoins() != 0" id="votesBalance">
                                 {tr("you_still_have_x_points", $thisUser->getCoins())|noescape}
                                 <br /><br />

Web/static/css/main.css

@@ -2314,7 +2314,7 @@ li {
     padding-left: 15px;
 }
 
-#votesBalance {
+#votesBalance, #news {
     margin-top: 10px;
     padding: 7px;
     background-color: #f6f6f6;
@@ -2323,6 +2323,12 @@ li {
     user-select: none;
 }
 
+#news b
+{
+    color: #8A0000;
+    font-size: 12px;
+}
+
 .cookies-popup {
     position: fixed;
     bottom: 0;

locales/en.strings

@@ -1138,6 +1138,8 @@
 
 "increased_your_rating_by" = "increased your rating by";
 
+"news" = "News";
+
 /* Gifts */
 
 "gift" = "Gift";

locales/ru.strings

@@ -1078,6 +1078,8 @@
 "negative_rating_value" = "Мы не можем украсть рейтинг у другого человека, извините.";
 "increased_your_rating_by" = "повысил ваш рейтинг на";
 
+"news" = "Новость";
+
 /* Gifts */
 
 "gift" = "Подарок";

openvk-example.yml

@@ -17,6 +17,10 @@ openvk:
             minLength: 3 # won't affect existing short urls or the ones set via admin panel
             forbiddenNames:
                 - "index.php"
+        news:
+            enable: false
+            link: "/link" 
+            title: "я покакал"        
         photos:
             upgradeStructure: false
             photoSaving: "quick"