Merge branch 'master' into l10n-test

Web/Models/Entities/User.php

@@ -304,6 +304,11 @@ class User extends RowModel
         return $this->getRecord()->notification_offset;
     }
 
+    function getBirthday(): int
+    {
+        return $this->getRecord()->birthday;
+    }
+    
     function updateNotificationOffset(): void
     {
         $this->stateChanges("notification_offset", time());

Web/Presenters/AuthPresenter.php

@@ -80,6 +80,9 @@ final class AuthPresenter extends OpenVKPresenter
         if($_SERVER["REQUEST_METHOD"] === "POST") {
             $this->assertCaptchaCheckPassed();
 
+            if(!OPENVK_ROOT_CONF['openvk']['preferences']['registration']['enable'] && !$referer)
+                $this->flashFail("err", "Подозрительная попытка регистрации", "Регистрация отключена системным администратором.");
+            
             if(!$this->ipValid())
                 $this->flashFail("err", "Подозрительная попытка регистрации", "Вы пытались зарегистрироваться из подозрительного места.");
             

Web/Presenters/UserPresenter.php

@@ -102,6 +102,8 @@ final class UserPresenter extends OpenVKPresenter
                     $user->setLast_Name(empty($this->postParam("last_name")) ? "" : $this->postParam("last_name"));
                     $user->setPseudo(empty($this->postParam("pseudo")) ? NULL : $this->postParam("pseudo"));
                     $user->setStatus(empty($this->postParam("status")) ? NULL : $this->postParam("status"));
+                    if (strtotime($this->postParam("birthday")) > 10)
+                    $user->setBirthday(strtotime($this->postParam("birthday")));
 
                     if ($this->postParam("marialstatus") <= 8 && $this->postParam("marialstatus") >= 0)
                     $user->setMarital_Status($this->postParam("marialstatus"));

Web/Presenters/templates/@layout.xml

@@ -111,7 +111,7 @@
                         <div class="link">
                             <a href="/login">вход</a>
                         </div>
-                        <div class="link">
+                        <div n:if="OPENVK_ROOT_CONF['openvk']['preferences']['registration']['enable']" class="link">
                             <a href="/reg">регистрация</a>
                         </div>
                         <div class="link">
@@ -190,7 +190,7 @@
                         <input type="hidden" name="jReturnTo" value="{$_SERVER['REQUEST_URI']}" />
                         <input type="hidden" name="hash" value="{$csrfToken}" />
                         <input type="submit" value="{_'log_in'}" class="button" style="display: inline-block;" />
-                        <a href="/reg" class="button" style="display: inline-block;" >{_registration}</a><br><br>
+                        <a n:if="OPENVK_ROOT_CONF['openvk']['preferences']['registration']['enable']" href="/reg" class="button" style="display: inline-block;" >{_registration}</a><br><br>
                         <a href="/restore.pl">Забыли пароль?</a>
                     </form>
                 {/ifset}

Web/Presenters/templates/About/Index.xml

@@ -21,6 +21,6 @@
     </ul>
     <center>
         <a class="button" style="margin-right: 5px;cursor: pointer;" href="/login">{_"log_in"}</a>
-        <a class="button" style="cursor: pointer;" href="/reg">{_"registration"}</a></center>
+        <a n:if="OPENVK_ROOT_CONF['openvk']['preferences']['registration']['enable']" class="button" style="cursor: pointer;" href="/reg">{_"registration"}</a></center>
     </div>
 {/block}

Web/Presenters/templates/About/Version.xml

@@ -387,7 +387,7 @@
                     <td class="e">
                         Vladimir Barinov (veselcraft), Alexandra Katunina (jill_senpai), Konstantin Kichulkin (kosfurler),
                         Nikita Volkov (sup_ban), Daniil Myslivets (myslivets), Alexander Kotov (l-lacker),
-                        Alexey Assemblerov (BiosNod), Ponywka and Ilya Prokopenko (dsrev)
+                        Alexey Assemblerov (BiosNod), Ponywka and Ilya Prokopenko (dsrev), Vladimir Lapskiy (0x7d5)
                     </td>
                 </tr>
             </tbody>

Web/Presenters/templates/Auth/Register.xml

@@ -18,6 +18,7 @@
 {/block}
 
 {block content}
+    {if OPENVK_ROOT_CONF['openvk']['preferences']['registration']['enable'] || $referer}
         <p n:if="!is_null($referer)" align="center">
             <strong>{$referer->getFullName()}</strong> приглашает вас в OpenVK!
         </p>
@@ -91,4 +92,15 @@
                 </tbody>
             </table>
         </form>
+    {else}
+        <center>
+            <img src="/assets/packages/static/openvk/img/oof.apng" alt="Регистрация закрыта." style="width: 20%;" />
+            <p>
+                Регистрация отключена системным администратором. При возможности попросите приглашение у вашего знакомого, если он зарегистрирован на этом сайте.
+                {if OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']}
+                    <br/><br/><b>{php echo OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']}</b>
+                {/if}
+            </p>
+        </center>
+    {/if}
 {/block}

Web/Presenters/templates/User/Edit.xml

@@ -130,6 +130,14 @@
                             </select>
                         </td>
                     </tr>
+                    <tr>
+                        <td width="120" valign="top">
+                             <span class="nobold">День рождения: </span>    
+                        </td>
+                        <td>
+                         <input name="birthday" value={gmdate("Y-m-d", $user->getBirthday())} type="date"/>
+                        </td>
+                    </tr>
                     <tr>
                         <td>
                             

Web/Presenters/templates/User/View.xml

@@ -357,6 +357,10 @@
                         <td class="label"><span class="nobold">{_"politViews"}:</span></td>
                         <td class="data">{var $pviews = $user->getPoliticalViews()}{_"politViews_$pviews"}</td>
                     </tr>
+                    <tr>
+                        <td class="label"><span class="nobold">{_"birth_date"}:</span></td>
+                        <td class="data">{date('d F Y',$user->getBirthday())}, {date('Y') - date('Y', $user->getBirthday())} {_"years"}</td>
+                    </tr>
                 </tbody>
             </table>
 			</div>

Web/di.yml

@@ -2,7 +2,6 @@ services:
     - openvk\Web\Presenters\AwayPresenter
     - openvk\Web\Presenters\AboutPresenter
     - openvk\Web\Presenters\AuthPresenter
-    - openvk\Web\Presenters\AudiosPresenter
     - openvk\Web\Presenters\UserPresenter
     - openvk\Web\Presenters\WallPresenter
     - openvk\Web\Presenters\CommentPresenter

locales/en.strings

@@ -38,6 +38,8 @@
 "was_online_m" = "was online"; 
 /* For male and female */
 
+"years" = "y.o";
+
 "was_online_f" = "was online";
 "all_title" = "All";
 "information" = "Information";

locales/ru.strings

@@ -43,6 +43,7 @@
 "status" = "Статус";
 "no_information_provided" = "Информация отсутствует.";
 "deceased_person" = "Страница покойного человека";
+"years" = "лет";
 
 "relationship" = "Семейное положение";
 

openvk-example.yml

@@ -23,6 +23,9 @@ openvk:
                 maxViolations: 50
                 maxViolationsAge: 120
                 autoban: true
+        registration:
+            enable: true
+            reason: "" # reason for disabling registration
         support:
             supportName: "Moderator"
             adminAccount: 1 # Change this ok