refactor(Entity): Move Class Torrent,User to namespace App\Entity

Rhilip · Oct 2, 2019 · 7814d88 · 7814d88
1 parent f06b342
commit 7814d88
Show file tree

Hide file tree

Showing 22 changed files with 38 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 ### Docs
 - **Sponsor:** Add Sponsor `MeiHeZi` (ae612e0)
 
+### Feat
+- **i18n:** Use symfony/translation and JSON format for locale (02cc251)
+
 
 <a name="v0.1.6-alpha"></a>
 ## [v0.1.6-alpha] - 2019-09-20

diff --git a/application/Components/Auth.php b/application/Components/Auth.php
@@ -8,7 +8,7 @@
 
 namespace App\Components;
 
-use App\Models;
+use App\Entity;
 use App\Libraries\Constant;
 
 use Rid\Base\Component;
@@ -30,14 +30,14 @@ public function onRequestBefore()
 
     public function onRequestAfter()
     {
-        parent::onRequestAfter();
         $this->logSessionInfo();
+        parent::onRequestAfter();
     }
 
     /**
      * @param string $grant
      * @param string|bool $flush
-     * @return Models\User|bool return False means this user is anonymous
+     * @return Entity\User|bool return False means this user is anonymous
      */
     public function getCurUser($grant = 'cookies', $flush = false)
     {
@@ -60,7 +60,7 @@ public function getGrant(): string
 
     /**
      * @param string $grant
-     * @return Models\User|boolean
+     * @return Entity\User|boolean
      */
     protected function loadCurUser($grant = 'cookies')
     {
@@ -71,7 +71,7 @@ protected function loadCurUser($grant = 'cookies')
         if ($user_id !== false && is_int($user_id) && $user_id > 0) {
             $user_id = intval($user_id);
             $curuser = app()->site->getUser($user_id);
-            if ($curuser->getStatus() !== Models\User::STATUS_DISABLED)  // user status shouldn't be disabled
+            if ($curuser->getStatus() !== Entity\User::STATUS_DISABLED)  // user status shouldn't be disabled
                 return $curuser;
         }
 
@@ -106,10 +106,11 @@ protected function loadCurUserIdFromCookies()
         $this->cur_user_jit = $payload['jti'];
 
         // Check if user want secure access but his environment is not secure
-        if (!app()->request->isSecure() &&                     // if User requests is not secure , then
-            ((isset($payload['ssl']) && $payload['ssl'] &&     //   if User want secure access
-                    config('security.ssl_login') > 0          //      and if Our site support ssl feature
-                ) || config('security.ssl_login') > 1)) {  //   or if  Our site FORCE enabled ssl feature
+        if (!app()->request->isSecure() &&                        // if User requests is not secure , and
+            (config('security.ssl_login') > 1 ||        // if Our site FORCE enabled ssl feature
+             (config('security.ssl_login') > 0 && isset($payload['ssl']) && $payload['ssl']) // if Our site support ssl feature and User want secure access
+            )
+        ) {
             app()->response->redirect(str_replace('http://', 'https://', app()->request->fullUrl()));
             app()->response->setHeader('Strict-Transport-Security', 'max-age=1296000; includeSubDomains');
         }

diff --git a/application/Components/Site.php b/application/Components/Site.php
@@ -8,7 +8,7 @@
 
 namespace App\Components;
 
-use App\Models;
+use App\Entity;
 use App\Libraries\Mailer;
 use App\Libraries\Constant;
 
@@ -48,30 +48,30 @@ public function getTorrent($tid)
         if (array_key_exists($tid, $this->torrents)) {
             $torrent = $this->torrents[$tid];
         } else {
-            $torrent = new Models\Torrent($tid);  // TODO Handing if this torrent id does not exist
+            $torrent = new Entity\Torrent($tid);  // TODO Handing if this torrent id does not exist
             $this->torrents[$tid] = $torrent;
         }
         return $torrent;
     }
 
     /**
      * @param $uid
-     * @return Models\User|bool return False means this user is not exist
+     * @return Entity\User|bool return False means this user is not exist
      */
     public function getUser($uid)
     {
         if (array_key_exists($uid, $this->users)) {
             $user = $this->users[$uid];
         } else {
-            $user = new Models\User($uid);  // TODO Handing if this user id does not exist
+            $user = new Entity\User($uid);  // TODO Handing if this user id does not exist
             $this->users[$uid] = $user;
         }
         return $user;
     }
 
     /**
      * @param $username
-     * @return Models\User|bool
+     * @return Entity\User|bool
      */
     public function getUserByUserName($username)
     {

diff --git a/application/Controllers/AuthController.php b/application/Controllers/AuthController.php
@@ -8,7 +8,7 @@
 
 namespace App\Controllers;
 
-use App\Models\User;
+use App\Entity\User;
 use App\Models\Form\Auth;
 
 use Rid\Http\Controller;

diff --git a/application/Controllers/TrackerController.php b/application/Controllers/TrackerController.php
@@ -9,7 +9,7 @@
 namespace App\Controllers;
 
 use App\Libraries\Constant;
-use App\Models\User;
+use App\Entity\User;
 use Rid\Utils\IpUtils;
 use App\Libraries\Bencode\Bencode;
 

diff --git a/application/Models/Torrent.php → application/Entity/Torrent.php b/application/Models/Torrent.php → application/Entity/Torrent.php
@@ -6,7 +6,7 @@
  * Time: 10:10
  */
 
-namespace App\Models;
+namespace App\Entity;
 
 use App\Libraries\Constant;
 

diff --git a/application/Models/User.php → application/Entity/User.php b/application/Models/User.php → application/Entity/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Entity;
 
 use Rid\Utils\AttributesImportUtils;
 use Rid\Utils\ClassValueCacheUtils;

diff --git a/application/Models/Form/Auth/UserConfirmForm.php b/application/Models/Form/Auth/UserConfirmForm.php
@@ -8,7 +8,7 @@
 
 namespace App\Models\Form\Auth;
 
-use App\Models\User;
+use App\Entity\User;
 use Rid\Helpers\StringHelper;
 use Rid\Validators\Validator;
 

diff --git a/application/Models/Form/Auth/UserLoginForm.php b/application/Models/Form/Auth/UserLoginForm.php
@@ -9,7 +9,7 @@
 namespace App\Models\Form\Auth;
 
 use App\Libraries\Constant;
-use App\Models\User;
+use App\Entity\User;
 
 use Rid\Helpers\StringHelper;
 use Rid\Helpers\JWTHelper;

diff --git a/application/Models/Form/Auth/UserRecoverForm.php b/application/Models/Form/Auth/UserRecoverForm.php
@@ -8,7 +8,7 @@
 
 namespace App\Models\Form\Auth;
 
-use App\Models\User;
+use App\Entity\User;
 use Rid\Helpers\StringHelper;
 use Rid\Validators\CaptchaTrait;
 use Rid\Validators\Validator;

diff --git a/application/Models/Form/Auth/UserRegisterForm.php b/application/Models/Form/Auth/UserRegisterForm.php
@@ -9,7 +9,7 @@
 namespace App\Models\Form\Auth;
 
 use App\Libraries\Constant;
-use App\Models\User;
+use App\Entity\User;
 
 use Rid\Helpers\StringHelper;
 use Rid\Validators\Validator;

diff --git a/application/Models/Form/Torrent/EditForm.php b/application/Models/Form/Torrent/EditForm.php
@@ -11,7 +11,7 @@
 
 use App\Libraries\Constant;
 use App\Models\Form\Traits\isValidTorrentTrait;
-use App\Models\Torrent;
+use App\Entity\Torrent;
 
 use Rid\Http\UploadFile;
 use Rid\Validators\Validator;

diff --git a/application/Models/Form/Traits/isValidTorrentTrait.php b/application/Models/Form/Traits/isValidTorrentTrait.php
@@ -9,7 +9,7 @@
 namespace App\Models\Form\Traits;
 
 
-use App\Models\Torrent;
+use App\Entity\Torrent;
 
 trait isValidTorrentTrait
 {

diff --git a/application/Models/Form/Traits/isValidUserTrait.php b/application/Models/Form/Traits/isValidUserTrait.php
@@ -8,7 +8,7 @@
 
 namespace App\Models\Form\Traits;
 
-use App\Models\User;
+use App\Entity\User;
 
 trait isValidUserTrait
 {

diff --git a/application/Models/Form/User/InviteActionForm.php b/application/Models/Form/User/InviteActionForm.php
@@ -8,7 +8,7 @@
 
 namespace App\Models\Form\User;
 
-use App\Models\User;
+use App\Entity\User;
 use Rid\Validators\Validator;
 
 class InviteActionForm extends Validator

diff --git a/templates/admin/layout.php b/templates/admin/layout.php
@@ -6,7 +6,7 @@
  * Time: 22:37
  *
  * @var League\Plates\Template\Template $this
- * @var \App\Models\Torrent $torrent
+ * @var \App\Entity\Torrent $torrent
  */
 ?>
 

diff --git a/templates/helper/torrent_table.php b/templates/helper/torrent_table.php
@@ -29,7 +29,7 @@
             </tr>
             </thead>
             <tbody>
-            <?php foreach ($search->getPagerData() as $torrent): /** @var \App\Models\Torrent $torrent */ ?>
+            <?php foreach ($search->getPagerData() as $torrent): /** @var \App\Entity\Torrent $torrent */ ?>
                 <tr data-tid="<?= $torrent->getId() ?>">
                     <td class="text-center" data-item="category" style="margin: 0;padding: 0">
                         <?php $cat = $torrent->getCategory(); ?>

diff --git a/templates/helper/username.php b/templates/helper/username.php
@@ -6,7 +6,7 @@
  * Time: 10:57 AM
  *
  * @var League\Plates\Template\Template $this
- * @var App\Models\User $user
+ * @var App\Entity\User $user
  */
 
 $hide = $hide ?? false;

diff --git a/templates/layout/nav_user.php b/templates/layout/nav_user.php
@@ -44,7 +44,7 @@
     <div id="info_block_line_1">
         Welcome Back, <?= $this->insert('helper/username', ['user' => $user, 'show_badge' => true]) ?>
         <span data-item="logout"><!--suppress HtmlUnknownTarget -->[<a href="/auth/logout">Logout</a>]</span>
-        <?php if ($user->getClass() > \App\Models\User::ROLE_FORUM_MODERATOR): ?>
+        <?php if ($user->getClass() > \App\Entity\User::ROLE_FORUM_MODERATOR): ?>
             <span><!--suppress HtmlUnknownTarget -->[<a href="/admin">Admin Panel</a>]</span>
         <?php endif; ?>
         <span data-item="favour"><!--suppress HtmlUnknownTarget -->[<a href="/torrents/favour">Favour</a>]</span>

diff --git a/templates/torrent/comments_field.php b/templates/torrent/comments_field.php
@@ -6,7 +6,7 @@
  * Time: 8:58 PM
  *
  * @var array $comments
- * @var \App\Models\Torrent $torrent
+ * @var \App\Entity\Torrent $torrent
  */
 
 $enabled_editor = $enabled_editor ?? false;

diff --git a/templates/torrent/edit.php b/templates/torrent/edit.php
@@ -11,7 +11,7 @@
 
 $torrent = $edit->getTorrent();
 
-use App\Models\Torrent; ?>
+use App\Entity\Torrent; ?>
 
 <?= $this->layout('layout/base') ?>
 

diff --git a/templates/user/invite.php b/templates/user/invite.php
@@ -6,7 +6,7 @@
  * Time: 16:33
  *
  * @var League\Plates\Template\Template $this
- * @var \App\Models\User $user
+ * @var \App\Entity\User $user
  */
 ?>
 
@@ -51,7 +51,7 @@
                         <td class="text-center"><?= $invitee['status'] ?></td>
                         <?php if (app()->auth->getCurUser()->isPrivilege('invite_manual_confirm')): ?>
                         <td class="text-center">
-                            <?php if ($invitee['status'] == \App\Models\User::STATUS_PENDING): ?>
+                            <?php if ($invitee['status'] == \App\Entity\User::STATUS_PENDING): ?>
                             <a class="btn btn-info btn-sm" href="?action=confirm&uid=<?= $this->e($invitee['id']) ?>" onclick="return confirm('Really?')">Confirm</a>
                             <?php endif ?>
                         </td>