From 2d52a5a658b6652c507b59dcc5cfe02e21cdf987 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 16 Mar 2023 14:51:07 +0100 Subject: [PATCH] Remove missed references to sab --- app/Http/Controllers/ProfileController.php | 2 +- app/Models/User.php | 66 ++----------------- resources/views/themes/Gentele/books.tpl | 24 ------- resources/views/themes/Gentele/browse.tpl | 16 ----- resources/views/themes/Gentele/cart.tpl | 4 -- resources/views/themes/Gentele/console.tpl | 18 ----- resources/views/themes/Gentele/games.tpl | 18 ----- resources/views/themes/Gentele/headermenu.tpl | 3 - resources/views/themes/Gentele/movies.tpl | 16 ----- resources/views/themes/Gentele/music.tpl | 23 ------- resources/views/themes/Gentele/search.tpl | 16 ----- resources/views/themes/Gentele/viewanime.tpl | 7 -- .../views/themes/Gentele/viewmoviefull.tpl | 16 ----- resources/views/themes/Gentele/viewnzb.tpl | 7 -- resources/views/themes/Gentele/viewseries.tpl | 7 -- .../views/themes/Gentele/viewxxxfull.tpl | 16 ----- resources/views/themes/Gentele/xxx.tpl | 32 --------- routes/web.php | 2 - 18 files changed, 5 insertions(+), 288 deletions(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index d943a6164..f928169d7 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -13,7 +13,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Validator; -use Illuminate\Support\Str; use Jrean\UserVerification\Facades\UserVerification; class ProfileController extends BasePageController @@ -120,6 +119,7 @@ class ProfileController extends BasePageController switch ($action) { case 'newapikey': User::updateRssKey($userid); + return redirect('profile'); break; case 'clearcookies': diff --git a/app/Models/User.php b/app/Models/User.php index 50bfe1bb1..90644dd14 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -297,23 +297,6 @@ class User extends Authenticatable return $res->count(['id']); } - /** - * @param int $id - * @param string $userName - * @param string $email - * @param int $grabs - * @param int $role - * @param string $notes - * @param int $invites - * @param int $movieview - * @param int $musicview - * @param int $gameview - * @param int $xxxview - * @param int $consoleview - * @param int $bookview - * @param string $style - * @return int - */ public static function updateUser(int $id, string $userName, string $email, int $grabs, int $role, string $notes, int $invites, int $movieview, int $musicview, int $gameview, int $xxxview, int $consoleview, int $bookview, string $style = 'None'): int { $userName = trim($userName); @@ -349,7 +332,6 @@ class User extends Authenticatable } /** - * @param string $userName * @return User|Builder|Model|object|null */ public static function getByUsername(string $userName) @@ -367,9 +349,6 @@ class User extends Authenticatable return self::whereEmail($email)->first(); } - /** - * @return bool - */ public static function updateUserRole(int $uid, int $role): bool { $roleQuery = Role::query()->where('id', $role)->first(); @@ -381,10 +360,6 @@ class User extends Authenticatable return self::find($uid)->update(['roles_id' => $role]); } - /** - * @param int $uid - * @param int $addYear - */ public static function updateUserRoleChangeDate(int $uid, $date = '', int $addYear = 0): void { $user = self::find($uid); @@ -421,11 +396,6 @@ class User extends Authenticatable } /** - * @param string $userName - * @param string $email - * @param string $host - * @param string $role - * @param bool $apiRequests * @return \Illuminate\Database\Eloquent\Collection * * @throws \Throwable @@ -498,9 +468,9 @@ class User extends Authenticatable * * Automatically update the hash if it needs to be. * - * @param string $password Password to check against hash. - * @param bool|string $hash Hash to check against password. - * @param int $userID ID of the user. + * @param string $password Password to check against hash. + * @param bool|string $hash Hash to check against password. + * @param int $userID ID of the user. */ public static function checkPassword(string $password, bool|string $hash, int $userID = -1): bool { @@ -541,10 +511,6 @@ class User extends Authenticatable return self::SUCCESS; } - /** - * @param $password - * @return string - */ public static function hashPassword($password): string { return Hash::make($password); @@ -560,9 +526,6 @@ class User extends Authenticatable return self::whereResetguid($guid)->first(); } - /** - * @param int $num - */ public static function incrementGrabs(int $id, int $num = 1): void { self::find($id)->increment('grabs', $num); @@ -582,8 +545,6 @@ class User extends Authenticatable } /** - * @param int $length - * * @throws \Exception */ public static function generatePassword(int $length = 15): string @@ -592,17 +553,6 @@ class User extends Authenticatable } /** - * @param $userName - * @param $password - * @param $email - * @param $host - * @param $notes - * @param int $invites - * @param string $inviteCode - * @param bool $forceInviteMode - * @param int $role - * @param bool $validate - * @return bool|int|string * @throws \Exception */ public static function signUp($userName, $password, $email, $host, $notes, int $invites = Invitation::DEFAULT_INVITES, string $inviteCode = '', bool $forceInviteMode = false, int $role = self::ROLE_USER, bool $validate = true): bool|int|string @@ -660,14 +610,6 @@ class User extends Authenticatable /** * Add a new user. * - * @param string $userName - * @param string $password - * @param string $email - * @param int $role - * @param string $notes - * @param string $host - * @param int $invites - * @param int $invitedBy * @return bool|int * * @throws \Exception @@ -700,7 +642,7 @@ class User extends Authenticatable /** * Get the list of categories the user has excluded. * - * @param int $userID ID of the user. + * @param int $userID ID of the user. * * @throws \Exception */ diff --git a/resources/views/themes/Gentele/books.tpl b/resources/views/themes/Gentele/books.tpl index 919bbb1cc..dd317a576 100755 --- a/resources/views/themes/Gentele/books.tpl +++ b/resources/views/themes/Gentele/books.tpl @@ -34,14 +34,6 @@ data-bs-toggle="tooltip" data-bs-placement="top" title data-original-title="Send to my Download Basket"> - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if !empty($result->failed)} @@ -196,14 +180,6 @@ data-bs-toggle="tooltip" data-bs-placement="top" title data-original-title="Send to my Download Basket"> - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} With Selected:
- {if isset($sabintegrated) && $sabintegrated !=""} - - {/if}
diff --git a/resources/views/themes/Gentele/console.tpl b/resources/views/themes/Gentele/console.tpl index 52d6a274d..915e1696e 100755 --- a/resources/views/themes/Gentele/console.tpl +++ b/resources/views/themes/Gentele/console.tpl @@ -30,11 +30,6 @@ - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - {if isset($sabintegrated) && $sabintegrated !=""} - - - {/if} @@ -212,11 +199,6 @@ - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - {if isset($sabintegrated) && $sabintegrated !=""} - - - - {/if} {if !empty($result->failed)} @@ -235,11 +222,6 @@ - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} My Download Basket -
  • - My Queue -
  • My Movies
    • diff --git a/resources/views/themes/Gentele/movies.tpl b/resources/views/themes/Gentele/movies.tpl index 48eae429a..dfc39de17 100755 --- a/resources/views/themes/Gentele/movies.tpl +++ b/resources/views/themes/Gentele/movies.tpl @@ -33,14 +33,6 @@ data-bs-toggle="tooltip" data-bs-placement="top" title data-original-title="Send to my Download Basket"> - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)}     - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if !empty($result->failed)} @@ -190,14 +175,6 @@ data-bs-toggle="tooltip" data-bs-placement="top" title data-original-title="Send to my Download Basket"> - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} Add to Cart - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if}
    diff --git a/resources/views/themes/Gentele/viewseries.tpl b/resources/views/themes/Gentele/viewseries.tpl index 0056df243..15e56b59f 100755 --- a/resources/views/themes/Gentele/viewseries.tpl +++ b/resources/views/themes/Gentele/viewseries.tpl @@ -84,13 +84,6 @@ data-bs-toggle="tooltip" data-bs-placement="top" title data-original-title="Send to my Download Basket"> - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)} - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if !empty($mfailed[$m@index])} @@ -369,14 +353,6 @@ data-bs-toggle="tooltip" data-bs-placement="top" title data-original-title="Send to my download basket"> - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if !empty($mfailed[$m@index])} @@ -419,14 +395,6 @@ data-bs-toggle="tooltip" data-bs-placement="top" title data-original-title="Send to my Download Basket"> - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} {if isset($isadmin)}